summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2009-06-04 23:55:22 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-06-04 23:55:22 (GMT)
commitef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch)
tree5f00de5b8913379f9bb28df91782840c7efe6a2d /src/dbus
parent58c5df4109acf44982c3a2a7b2318da52606232d (diff)
downloadQt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip
Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz
Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbus_symbols_p.h2
-rw-r--r--src/dbus/qdbusthreaddebug_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index 764d368..db5e1bb 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -353,7 +353,7 @@ DEFINEFUNC(dbus_bool_t , dbus_signature_validate_single, (const char *
DBusError *error),
(signature, error), return)
DEFINEFUNC(dbus_bool_t , dbus_type_is_basic, (int typecode),
- (typecode), return);
+ (typecode), return)
DEFINEFUNC(dbus_bool_t , dbus_type_is_fixed, (int typecode),
(typecode), return)
diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h
index 20d819f..f2ac598 100644
--- a/src/dbus/qdbusthreaddebug_p.h
+++ b/src/dbus/qdbusthreaddebug_p.h
@@ -100,7 +100,7 @@ enum ThreadAction {
RemoveWatchAction = 61,
ToggleWatchAction = 62,
SocketReadAction = 63,
- SocketWriteAction = 64,
+ SocketWriteAction = 64
};
struct QDBusLockerBase