diff options
author | Thiago Macieira <thiago@kde.org> | 2006-05-29 18:17:09 +0000 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2006-05-29 18:17:09 +0000 |
commit | 26ab02e91671548e2b55a16bb953b3d9e0a82497 (patch) | |
tree | 6618b0255fc1fc8c6b56ec3e9e13e0eea7aecccb /qt/qdbusabstractadaptor.cpp | |
parent | 5bc9dc5cf03d05feb62f0e28e2d5e04faf33610b (diff) |
* qt/*: Update the QtDBus bindings up to revision 546310 in
Subversion.
This adds the dbuscpp2xml tool, that parses a C++ header and
outputs a D-BUS Introspection XML.
Diffstat (limited to 'qt/qdbusabstractadaptor.cpp')
-rw-r--r-- | qt/qdbusabstractadaptor.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/qt/qdbusabstractadaptor.cpp b/qt/qdbusabstractadaptor.cpp index 2794293d..b7c41888 100644 --- a/qt/qdbusabstractadaptor.cpp +++ b/qt/qdbusabstractadaptor.cpp @@ -242,12 +242,11 @@ void QDBusAdaptorConnector::polish() return; // avoid working multiple times if multiple adaptors were added waitingForPolish = false; - const QObjectList &objs = children(); + const QObjectList &objs = parent()->children(); foreach (QObject *obj, objs) { - Q_ASSERT(qobject_cast<QDBusAbstractAdaptor *>(obj)); - - QDBusAbstractAdaptor *adaptor = static_cast<QDBusAbstractAdaptor *>(obj); - addAdaptor(adaptor); + QDBusAbstractAdaptor *adaptor = qobject_cast<QDBusAbstractAdaptor *>(obj); + if (adaptor) + addAdaptor(adaptor); } // sort the adaptor list |