From 838a740ea6f25108b2bca922a1f1ea9d90b64ec2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago@kde.org>
Date: Tue, 2 May 2006 14:00:27 +0000
Subject: 	* qt/dbusidl2cpp.cpp: There's no callAsync. Use the correct   
      call (r535506)

	* qt/dbusidl2cpp.cpp:
	* qt/qdbusabstractadaptor.cpp:
	* qt/qdbusabstractadaptor.h: Make QDBusAdaptorConnector be a
        sibling of the QDBusAbstractAdaptor objects instead of the
        parent. (r535848)

	* qt/dbusidl2cpp.cpp:
	* qt/qdbusabstractinterface.cpp:
	* qt/qdbusabstractinterface.h:
	* qt/qdbusabstractinterface_p.h:
	* qt/qdbusinterface.cpp: Make properties in interfaces
        actually work. The code that was generated would not compile,
        due to moc calls to functions that did not exist. They now
        shall. (r536571)
---
 qt/qdbusabstractinterface_p.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'qt/qdbusabstractinterface_p.h')

diff --git a/qt/qdbusabstractinterface_p.h b/qt/qdbusabstractinterface_p.h
index 8f4d8dc3..43807071 100644
--- a/qt/qdbusabstractinterface_p.h
+++ b/qt/qdbusabstractinterface_p.h
@@ -54,7 +54,7 @@ public:
     QString service;
     QString path;
     QString interface;
-    QDBusError lastError;
+    mutable QDBusError lastError;
     bool isValid;
 
     inline QDBusAbstractInterfacePrivate(const QDBusConnection& con, QDBusConnectionPrivate *conp,
@@ -62,6 +62,10 @@ public:
         : conn(con), connp(conp), service(serv), path(p), interface(iface), isValid(true)
     { }
     virtual ~QDBusAbstractInterfacePrivate() { }
+
+    // these functions do not check if the property is valid
+    QVariant property(const QMetaProperty &mp) const;
+    void setProperty(const QMetaProperty &mp, const QVariant &value);
 };
 
 
-- 
cgit