diff options
author | Thiago Macieira <thiago@kde.org> | 2006-03-06 14:29:39 +0000 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2006-03-06 14:29:39 +0000 |
commit | 9393d6b459d02a8508750a846bf97a69e48c97e2 (patch) | |
tree | 4cf83534dc0ea77ce63819b0358f6f72820db9bc /qt/qdbusinterface_p.h | |
parent | 305ce15e4f0568d5eeb8ca169c4fb0f77e50fcb4 (diff) |
2006-03-06 Thiago Macieira <thiago.macieira@trolltech.com>
* 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.
Diffstat (limited to 'qt/qdbusinterface_p.h')
-rw-r--r-- | qt/qdbusinterface_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
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<QDBusIntrospection::Interface> 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(); }; |