Add a function to check if an interface is implemented by an object.

Also reorganise a bit, moving the function to create the interface
name from an object's class name to qdbusmisc.cpp too.

Reviewed-By: Trust Me

1 files changed, 2 insertions, 6 deletions

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 0578bf1..76179c9 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1359,12 +1359,8 @@ void QDBusConnectionPrivate::activateObject(ObjectTreeNode &node, const QDBusMes
     // try the object itself:
     if (node.flags & (QDBusConnection::ExportScriptableSlots|QDBusConnection::ExportNonScriptableSlots)) {
         bool interfaceFound = true;
-        if (!msg.interface().isEmpty()) {
-            // check if the interface name matches anything in the class hierarchy
-            const QMetaObject *mo = node.obj->metaObject();
-            for ( ; !interfaceFound && mo != &QObject::staticMetaObject; mo = mo->superClass())
-                interfaceFound = msg.interface() == qDBusInterfaceFromMetaObject(mo);
-        }
+        if (!msg.interface().isEmpty())
+            interfaceFound = qDBusInterfaceInObject(node.obj, msg.interface());
 
         if (interfaceFound) {
             if (!activateCall(node.obj, node.flags, msg))