* qt/dbus: Add directory. I had forgotten to add this

	yesterday after the move...

	* qt/examples/Makefile.am:
	* qt/examples/dbus.cpp: Moved to qt/tools/dbus.cpp.

	* qt/tools/Makefile.am:
	* qt/tools/dbus.cpp: Moved from qt/examples/dbus.cpp.
	Added feature to get and set properties.
	Added validation of service, object path and interface names.

	* qt/tools/dbusidl2cpp.cpp: Two new features:
	1) Allow specifying both the header and the source file names,
	by separating them with a colon.
	2) Don't write an interface output if the -p switch wasn't
	given, but the -a was.

	* qt/src/*: Fix usage of Iterators and ConstIterators.
	Fix shadowing of variables by other variables (-Wshadow).
	Fix keyword-cleanliness in headers.
	Fix ASCII-cast (QLatin1String, QLatin1Char).
	Fix validation of member names.
	Add extra checking of introspection data during XML parsing.
	Various bug fixes.

1 files changed, 17 insertions, 17 deletions

diff --git a/qt/src/qdbusbus.h b/qt/src/qdbusbus.h
index 22606852..1f695798 100644
--- a/qt/src/qdbusbus.h
+++ b/qt/src/qdbusbus.h
@@ -105,14 +105,14 @@ public: // METHODS
 
     QDBusReply<StartServiceReply> StartServiceByName(const QString &name, uint flags);
 
-signals: // SIGNALS
+Q_SIGNALS: // SIGNALS
     void NameAcquired(const QString &service);
     void NameLost(const QString &service);
     void NameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
 #endif
 
     // Qt-style naming    
-public slots:
+public Q_SLOTS:
     QDBusReply<QString> hello()
     { return Hello(); }
     QDBusReply<void> reloadConfig()
@@ -121,33 +121,33 @@ public slots:
     QDBusReply<QStringList> listNames()
     { return ListNames(); }
         
-    QDBusReply<bool> nameHasOwner(const QString &service)
-    { return NameHasOwner(service); }
+    QDBusReply<bool> nameHasOwner(const QString &serviceName)
+    { return NameHasOwner(serviceName); }
     QDBusReply<QString> nameOwner(const QString &name)
     { return GetNameOwner(name); }
-    QDBusReply<ReleaseNameReply> releaseName(const QString &service)
-    { return ReleaseName(service); }
-    QDBusReply<RequestNameReply> requestName(const QString &service, RequestNameOptions flags)
-    { return RequestName(service, flags); }
-    QDBusReply<QStringList> listQueuedOwners(const QString &service)
-    { return ListQueuedOwners(service); }
+    QDBusReply<ReleaseNameReply> releaseName(const QString &serviceName)
+    { return ReleaseName(serviceName); }
+    QDBusReply<RequestNameReply> requestName(const QString &serviceName, RequestNameOptions flags)
+    { return RequestName(serviceName, flags); }
+    QDBusReply<QStringList> listQueuedOwners(const QString &serviceName)
+    { return ListQueuedOwners(serviceName); }
 
     QDBusReply<void> addMatch(const QString &rule)
     { return AddMatch(rule); }
     QDBusReply<void> removeMatch(const QString &rule)
     { return RemoveMatch(rule); }
 
-    QDBusReply<QByteArray> connectionSELinuxSecurityContext(const QString &service)
-    { return GetConnectionSELinuxSecurityContext(service); }
-    QDBusReply<uint> connectionUnixProcessID(const QString &service)
-    { return GetConnectionUnixProcessID(service); }
-    QDBusReply<uint> connectionUnixUser(const QString &service)
-    { return GetConnectionUnixUser(service); }
+    QDBusReply<QByteArray> connectionSELinuxSecurityContext(const QString &serviceName)
+    { return GetConnectionSELinuxSecurityContext(serviceName); }
+    QDBusReply<uint> connectionUnixProcessID(const QString &serviceName)
+    { return GetConnectionUnixProcessID(serviceName); }
+    QDBusReply<uint> connectionUnixUser(const QString &serviceName)
+    { return GetConnectionUnixUser(serviceName); }
 
     QDBusReply<StartServiceReply> startServiceByName(const QString &name, uint flags)
     { return StartServiceByName(name, flags); }
 
-signals:
+Q_SIGNALS:
     void nameAcquired(const QString &service);
     void nameLost(const QString &service);
     void nameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);