From 517b8c2446029901e9062e858b723906cf20d7ef Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago@kde.org>
Date: Mon, 5 Jun 2006 18:13:07 +0000
Subject: 	* 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.
---
 qt/src/qdbusconnection.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'qt/src/qdbusconnection.h')

diff --git a/qt/src/qdbusconnection.h b/qt/src/qdbusconnection.h
index c1c420a6..61a3439e 100644
--- a/qt/src/qdbusconnection.h
+++ b/qt/src/qdbusconnection.h
@@ -101,17 +101,17 @@ public:
 
 private:
     QDBusAbstractInterfacePrivate *findInterface_helper(const QString &, const QString &,
-                                                        const QString&);
+                                                        const char*);
     QDBusConnectionPrivate *d;
 };
 
 template<class Interface>
 inline Interface *QDBusConnection::findInterface(const QString &service, const QString &path)
 {
-    register QDBusAbstractInterfacePrivate *d;
-    d = findInterface_helper(service, path, Interface::staticInterfaceName());
-    if (d)
-        return new Interface(d);
+    register QDBusAbstractInterfacePrivate *d_ptr;
+    d_ptr = findInterface_helper(service, path, Interface::staticInterfaceName());
+    if (d_ptr)
+        return new Interface(d_ptr);
     return 0;
 }
 
-- 
cgit