summaryrefslogtreecommitdiffstats
path: root/qt/tools
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2006-06-11 12:16:30 +0000
committerThiago Macieira <thiago@kde.org>2006-06-11 12:16:30 +0000
commit3b50a8c9fe65839b79f8df988aee6124abd4f0c4 (patch)
tree3ded141c1f1f88dbbd318dd6106d637ed40a4a69 /qt/tools
parenta0ccd8a2a0cca7095fc1a9c5e1027e10a44caeee (diff)
* qt/tools/dbuscpp2xml.cpp: Compile on Windows.
* qt/tools/dbusidl2cpp.cpp: Add missing newline. * qt/examples/Makefile.am: * qt/examples/chat.h: Use UI-generated files with the ui_*.h form. * qt/src/qdbusmarshall.cpp: Allow sending of QString() and QByteArray() (nulls) over the bus. * qt/src/qdbusabstractinterface.cpp: Use the correct variable, the one that has the signature suffix stripped. * qt/src/qdbusreply.h: Make some methods const.
Diffstat (limited to 'qt/tools')
-rw-r--r--qt/tools/dbuscpp2xml.cpp1
-rw-r--r--qt/tools/dbusidl2cpp.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/qt/tools/dbuscpp2xml.cpp b/qt/tools/dbuscpp2xml.cpp
index 42d78312..02e5825b 100644
--- a/qt/tools/dbuscpp2xml.cpp
+++ b/qt/tools/dbuscpp2xml.cpp
@@ -33,6 +33,7 @@
#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <stdlib.h>
#include "../src/qdbusconnection.h" // for the Export* flags
diff --git a/qt/tools/dbusidl2cpp.cpp b/qt/tools/dbusidl2cpp.cpp
index 216c7ced..ab61e672 100644
--- a/qt/tools/dbusidl2cpp.cpp
+++ b/qt/tools/dbusidl2cpp.cpp
@@ -70,7 +70,7 @@ static const char help[] =
"If the file name given to the options -a and -p does not end in .cpp or .h, the\n"
"program will automatically append the suffixes and produce both files.\n"
"You can also use a colon (:) to separate the header name from the source file\n"
- "name, as in '-a filename_p.h:filename.cpp'.";
+ "name, as in '-a filename_p.h:filename.cpp'.\n";
static const char includeList[] =
"#include <QtCore/QByteArray>\n"