diff options
author | Thiago Macieira <thiago@kde.org> | 2006-04-29 12:44:31 +0000 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2006-04-29 12:44:31 +0000 |
commit | 7cabddaa4237b7e0ce1c6b9781d115b9831e77f2 (patch) | |
tree | 982dc3f62b4356ee5d78d94767cb44d8f0d98973 /qt/qdbusinternalfilters.cpp | |
parent | 47999a1c43302e9e80884b4018c416327fe675d2 (diff) |
* qt/qdbusinterface.h: Rename QDBusRef to QDBusInterfacePtr
and disable the copy operators. (r533772, r534746)
* qt/qdbuserror.h: Remove the automatic cast to
bool. (r533929)
* qt/qdbusabstractinterface.cpp:
* qt/qdbusabstractinterface.h: Change the default call mode to
not use the event loop. Add convenience call() methods that
take a CallMode parameter. (r534042)
* qt/qdbusconnection.h: Change the default call mode to not
use the event loop. (r534042)
* qt/qdbusinterface.cpp:
* qt/qdbusinterface.h: Add a method to tell us if the
interface is valid (since we don't return a null pointer
anymore) (r534099)
* qt/qdbusinterface_p.h: Don't crash if metaObject is 0
(r534101)
* qt/qdbusinternalfilters.cpp: Decouple the introspection
function in two so taht we get the chance to introspect
without having a QDBusMessage (r534102)
* qt/qdbusbus.h:
* qt/qdbusconnection.cpp:
* qt/qdbusconnection_p.h:
* qt/qdbusintegrator.cpp: Keep a list of our own names to
avoid a round-trip to the server when attempting to introspect
one of our own objects. Also make sure the filter functions
match the empty interface as well. (r534108)
Don't keep the connection names. Instead, trust the unique
connection name (r534111)
Remove event loop usage (r534112)
Diffstat (limited to 'qt/qdbusinternalfilters.cpp')
-rw-r--r-- | qt/qdbusinternalfilters.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qt/qdbusinternalfilters.cpp b/qt/qdbusinternalfilters.cpp index fe57a875..3d454277 100644 --- a/qt/qdbusinternalfilters.cpp +++ b/qt/qdbusinternalfilters.cpp @@ -225,8 +225,7 @@ static QString generateSubObjectXml(QObject *object) return retval; } -void qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode *node, - const QDBusMessage &msg) +QString qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode *node) { // object may be null @@ -281,10 +280,15 @@ void qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode *node, } xml_data += QLatin1String("</node>\n"); + return xml_data; +} +void qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode *node, + const QDBusMessage &msg) +{ // now send it QDBusMessage reply = QDBusMessage::methodReply(msg); - reply << xml_data; + reply << qDBusIntrospectObject(node); msg.connection().send(reply); } |