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

diff --git a/qt/src/qdbuserror.cpp b/qt/src/qdbuserror.cpp
index d5cd6758..ee6ce12c 100644
--- a/qt/src/qdbuserror.cpp
+++ b/qt/src/qdbuserror.cpp
@@ -135,11 +135,11 @@ Q_GLOBAL_STATIC(ErrorMessageMapping, errorMessages)
                                 pre-defined values (\c org.freedesktop.DBus.Error.LimitsExceeded)
     \value AccessDenied         The call/operation tried to access a resource it isn't allowed to
                                 (\c org.freedesktop.DBus.Error.AccessDenied)
-    \value NoServer             \i{Documentation doesn't say what this is for}
+    \value NoServer             \e {Documentation doesn't say what this is for}
                                 (\c org.freedesktop.DBus.Error.NoServer)
-    \value Timeout              \i{Documentation doesn't say what this is for or how it's used}
+    \value Timeout              \e {Documentation doesn't say what this is for or how it's used}
                                 (\c org.freedesktop.DBus.Error.Timeout)
-    \value NoNetwork            \i{Documentation doesn't say what this is for}
+    \value NoNetwork            \e {Documentation doesn't say what this is for}
                                 (\c org.freedesktop.DBus.Error.NoNetwork)
     \value AddressInUse         QDBusServer tried to bind to an address that is already in use
                                 (\c org.freedesktop.DBus.Error.AddressInUse)
@@ -149,7 +149,7 @@ Q_GLOBAL_STATIC(ErrorMessageMapping, errorMessages)
                                 (\c org.freedesktop.DBus.Error.InvalidArgs)
     \value UnknownMethod        The method called was not found in this object/interface with the
                                 given parameters (\c org.freedesktop.DBus.Error.UnknownMethod)
-    \value TimedOut             \i{Documentation doesn't say...}
+    \value TimedOut             \e {Documentation doesn't say...}
                                 (\c org.freedesktop.DBus.Error.TimedOut)
     \value InvalidSignature     The type signature is not valid or compatible
                                 (\c org.freedesktop.DBus.Error.InvalidSignature)
@@ -194,11 +194,11 @@ QDBusError::QDBusError(const QDBusMessage &qdmsg)
     \internal
     Constructs a QDBusError from a well-known error code
 */
-QDBusError::QDBusError(KnownErrors error, const QString &message)
+QDBusError::QDBusError(KnownErrors error, const QString &mess)
     : code(error)
 {
-    nm = errorMessages()->get(error);
-    msg = message;
+    nm = QLatin1String(errorMessages()->get(error));
+    msg = mess;
 }
 
 /*!
@@ -233,7 +233,7 @@ QDBusError::QDBusError(KnownErrors error, const QString &message)
     match.
 */
 
-#ifndef QT_NO_DEBUG
+#ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QDBusError &msg)
 {
     dbg.nospace() << "QDBusError(" << msg.name() << ", " << msg.message() << ")";