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/qdbusinterface.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'qt/src/qdbusinterface.cpp')

diff --git a/qt/src/qdbusinterface.cpp b/qt/src/qdbusinterface.cpp
index 6367654d..72097077 100644
--- a/qt/src/qdbusinterface.cpp
+++ b/qt/src/qdbusinterface.cpp
@@ -75,7 +75,7 @@ void *QDBusInterface::qt_metacast(const char *_clname)
     if (!_clname) return 0;
     if (!strcmp(_clname, "QDBusInterface"))
         return static_cast<void*>(const_cast<QDBusInterface*>(this));
-    if (d_func()->interface == _clname)
+    if (d_func()->interface.toLatin1() == _clname)
         return static_cast<void*>(const_cast<QDBusInterface*>(this));
     return QDBusAbstractInterface::qt_metacast(_clname);
 }
@@ -107,7 +107,7 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv)
         } else if (mm.methodType() == QMetaMethod::Slot) {
             // method call relay from Qt world to D-Bus world
             // get D-Bus equivalent signature
-            QString methodName = metaObject->dbusNameForMethod(id);
+            QString methodName = QLatin1String(metaObject->dbusNameForMethod(id));
             const int *inputTypes = metaObject->inputTypesForMethod(id);
             const int *outputTypes = metaObject->outputTypesForMethod(id);
 
@@ -191,13 +191,13 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv)
 }
 
 QDBusInterfacePtr::QDBusInterfacePtr(QDBusConnection &conn, const QString &service, const QString &path,
-                   const QString &interface)
-    : d(conn.findInterface(service, path, interface))
+                   const QString &iface)
+    : d(conn.findInterface(service, path, iface))
 {
 }
 
-QDBusInterfacePtr::QDBusInterfacePtr(const QString &service, const QString &path, const QString &interface)
-    : d(QDBus::sessionBus().findInterface(service, path, interface))
+QDBusInterfacePtr::QDBusInterfacePtr(const QString &service, const QString &path, const QString &iface)
+    : d(QDBus::sessionBus().findInterface(service, path, iface))
 {
 }
 
-- 
cgit