* 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, 6 insertions, 6 deletions

diff --git a/qt/src/qdbusreply.h b/qt/src/qdbusreply.h
index 0b5c12d9..2b69cbb5 100644
--- a/qt/src/qdbusreply.h
+++ b/qt/src/qdbusreply.h
@@ -53,13 +53,13 @@ public:
         return *this;
     }
 
-    inline QDBusReply(const QDBusError &error = QDBusError())
-        : m_error(error), m_data(Type())
+    inline QDBusReply(const QDBusError &dbusError = QDBusError())
+        : m_error(dbusError), m_data(Type())
     {
     }
-    inline QDBusReply& operator=(const QDBusError& error)
+    inline QDBusReply& operator=(const QDBusError& dbusError)
     {
-        m_error = error;
+        m_error = dbusError;
         m_data = Type();
         return *this;
     }
@@ -114,8 +114,8 @@ public:
         : m_error(reply)
     {
     }
-    inline QDBusReply(const QDBusError &error)
-        : m_error(error)
+    inline QDBusReply(const QDBusError &dbusError)
+        : m_error(dbusError)
     {
     }