Changeset 846 for trunk/tools/qdbus/qdbusxml2cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp (modified) (3 diffs)

trunk/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -54 +54 @@
 #include "private/qdbusintrospection_p.h"
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef Q_WS_WIN
-#include <process.h>
-#endif
-
 #define PROGRAMNAME     "qdbusxml2cpp"
 #define PROGRAMVERSION  "0.7"
-#define PROGRAMCOPYRIGHT "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
+#define PROGRAMCOPYRIGHT "Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)."
 
 #define ANNOTATION_NO_WAIT      "org.freedesktop.DBus.Method.NoReply"
@@ -1136 +1131 @@
     objects or implement said interfaces.
 
-    \c qdbusxml2dcpp has two modes of operation, that correspond to the two possible outputs it can
+    \c qdbusxml2cpp has two modes of operation, that correspond to the two possible outputs it can
     produce: the interface (proxy) class or the adaptor class. The latter consists of both a C++
     header and a source file, which are meant to be edited and adapted to your needs.
 
-    The \c qdbusxml2dcpp tool is not meant to be run every time you compile your
+    The \c qdbusxml2cpp tool is not meant to be run every time you compile your
     application. Instead, it's meant to be used when developing the code or when the interface
     changes.