* qt/qdbusconnection_p.h:

	* qt/qdbusmetaobject.cpp:
	* qt/qdbusmetaobject_p.h:
	* qt/qdbusintegrator.cpp: Use the new merged-interface mode
	for the dynamic meta object. No need to guess which
	interface to call.
	* qt/qdbusabstractinterface_p.h:
	* qt/qdbusconnection.cpp:
	* qt/qdbusintegrator.cpp:
	* qt/qdbusinterface.cpp:
	* qt/qdbusinterface.h: Make findInterface always return a non-null pointer.
	Add a QDBusRef that looks and behaves like DCOPRef.

1 files changed, 12 insertions, 0 deletions

diff --git a/qt/qdbusinterface.h b/qt/qdbusinterface.h
index 0495ada1..f667698b 100644
--- a/qt/qdbusinterface.h
+++ b/qt/qdbusinterface.h
@@ -43,4 +43,16 @@ private:
     Q_DECLARE_PRIVATE(QDBusInterface);
 };
 
+struct QDBUS_EXPORT QDBusRef
+{
+    QDBusRef(QDBusConnection &conn, const QString &service, const QString &path,
+             const QString &interface = QString());
+    QDBusRef(const QString &service, const QString &path, const QString &interface = QString());
+    ~QDBusRef() { delete d; }
+
+    QDBusInterface* operator->() const { return d; }
+private:
+    QDBusInterface *const d;
+};
+
 #endif