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

diff --git a/qt/src/qdbusabstractadaptor.cpp b/qt/src/qdbusabstractadaptor.cpp
index b7c41888..4592b29a 100644
--- a/qt/src/qdbusabstractadaptor.cpp
+++ b/qt/src/qdbusabstractadaptor.cpp
@@ -88,8 +88,7 @@ void QDBusAbstractAdaptorPrivate::saveIntrospectionXml(QDBusAbstractAdaptor *ada
 }
 
 /*!
-    \page usingannotations.html
-    \title Using annotations in adaptors
+    \page usingannotations.html Using annotations in adaptors
 
     It is currently not possible to specify arbitrary annotations in adaptors.
 */
@@ -121,12 +120,12 @@ void QDBusAbstractAdaptorPrivate::saveIntrospectionXml(QDBusAbstractAdaptor *ada
 */
 
 /*!
-    Constructs a QDBusAbstractAdaptor with \a parent as the object we refer to.
+    Constructs a QDBusAbstractAdaptor with \a obj as the parent object.
 */
-QDBusAbstractAdaptor::QDBusAbstractAdaptor(QObject* parent)
-    : QObject(parent), d(new QDBusAbstractAdaptorPrivate)
+QDBusAbstractAdaptor::QDBusAbstractAdaptor(QObject* obj)
+    : QObject(obj), d(new QDBusAbstractAdaptorPrivate)
 {
-    QDBusAdaptorConnector *connector = qDBusCreateAdaptorConnector(parent);
+    QDBusAdaptorConnector *connector = qDBusCreateAdaptorConnector(obj);
 
     connector->waitingForPolish = true;
     QTimer::singleShot(0, connector, SLOT(polish()));
@@ -181,8 +180,8 @@ void QDBusAbstractAdaptor::setAutoRelaySignals(bool enable)
     }
 }
 
-QDBusAdaptorConnector::QDBusAdaptorConnector(QObject *parent)
-    : QObject(parent), waitingForPolish(false), lastSignalIdx(0), argv(0)
+QDBusAdaptorConnector::QDBusAdaptorConnector(QObject *obj)
+    : QObject(obj), waitingForPolish(false), lastSignalIdx(0), argv(0)
 {
 }
 
@@ -258,18 +257,18 @@ void QDBusAdaptorConnector::relaySlot()
     relay(sender());
 }
 
-void QDBusAdaptorConnector::relay(QObject *sender)
+void QDBusAdaptorConnector::relay(QObject *senderObj)
 {
     // we're being called because there is a signal being emitted that we must relay
     Q_ASSERT(lastSignalIdx);
     Q_ASSERT(argv);
     Q_ASSERT(senderMetaObject);
 
-    if (senderMetaObject != sender->metaObject()) {
+    if (senderMetaObject != senderObj->metaObject()) {
         qWarning("Inconsistency detected: QDBusAdaptorConnector::relay got called with unexpected sender object!");
     } else {
         QMetaMethod mm = senderMetaObject->method(lastSignalIdx);
-        QObject *object = static_cast<QDBusAbstractAdaptor *>(sender)->parent();
+        QObject *object = static_cast<QDBusAbstractAdaptor *>(senderObj)->parent();
 
         // break down the parameter list
         QList<int> types;