From 9393d6b459d02a8508750a846bf97a69e48c97e2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 6 Mar 2006 14:29:39 +0000 Subject: 2006-03-06 Thiago Macieira * qt/*: * dbus/qdbus.h: Sync with KDE Subversion revision 516237. This represents the first feature-complete version of the Qt4 bindings since I took ove maintainership. --- qt/qdbusinterface_p.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'qt/qdbusinterface_p.h') diff --git a/qt/qdbusinterface_p.h b/qt/qdbusinterface_p.h index 3e0bd010..04aa243f 100644 --- a/qt/qdbusinterface_p.h +++ b/qt/qdbusinterface_p.h @@ -56,11 +56,16 @@ public: //QConstSharedDataPointer data; const QDBusIntrospection::Interface* data; + inline QDBusInterfacePrivate(const QDBusConnection &other) : conn(other), data(emptyData()) + { } + inline bool needsIntrospection() const - { return data->introspection.isNull(); } + { return data && data->introspection.isNull(); } inline void introspect() - { if (needsIntrospection()) QDBusObject(conn, service, path).introspect(); } + { if (needsIntrospection()) conn.findObject(service, path).introspect(); } + + static const QDBusIntrospection::Interface *emptyData(); }; -- cgit