summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/dbus/qdbusconnection.cpp21
-rw-r--r--src/dbus/qdbusconnection.h2
-rw-r--r--src/dbus/qdbusconnection_p.h1
-rw-r--r--src/dbus/qdbusintegrator.cpp8
-rw-r--r--src/dbus/qdbusinternalfilters.cpp2
-rw-r--r--tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp70
6 files changed, 101 insertions, 3 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index c758f85d79..ff897faab6 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -762,6 +762,26 @@ bool QDBusConnection::disconnect(const QString &service, const QString &path, co
*/
bool QDBusConnection::registerObject(const QString &path, QObject *object, RegisterOptions options)
{
+ return registerObject(path, QString(), object, options);
+}
+
+/*!
+ \overload
+ \since 5.5
+
+ Registers the object \a object at path \a path with interface name \a interface
+ and returns \c true if the registration was successful. The \a options parameter
+ specifies how much of the object \a object will be exposed through
+ D-Bus.
+
+ This function does not replace existing objects: if there is already an object registered at
+ path \a path, this function will return false. Use unregisterObject() to unregister it first.
+
+ You cannot register an object as a child object of an object that
+ was registered with QDBusConnection::ExportChildObjects.
+*/
+bool QDBusConnection::registerObject(const QString &path, const QString &interface, QObject *object, RegisterOptions options)
+{
Q_ASSERT_X(QDBusUtil::isValidObjectPath(path), "QDBusConnection::registerObject",
"Invalid object path given");
if (!d || !d->connection || !object || !options || !QDBusUtil::isValidObjectPath(path))
@@ -793,6 +813,7 @@ bool QDBusConnection::registerObject(const QString &path, QObject *object, Regis
// we can add the object here
node->obj = object;
node->flags = options;
+ node->interfaceName = interface;
d->registerObject(node);
//qDebug("REGISTERED FOR %s", path.toLocal8Bit().constData());
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index c89bbf4e3a..10598c0b7b 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -161,6 +161,8 @@ public:
bool registerObject(const QString &path, QObject *object,
RegisterOptions options = ExportAdaptors);
+ bool registerObject(const QString &path, const QString &interface, QObject *object,
+ RegisterOptions options = ExportAdaptors);
void unregisterObject(const QString &path, UnregisterMode mode = UnregisterNode);
QObject *objectRegisteredAt(const QString &path) const;
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 29c4d6869c..5d8777c622 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -152,6 +152,7 @@ public:
{ return obj || !children.isEmpty(); }
QString name;
+ QString interfaceName;
union {
QObject *obj;
QDBusVirtualObject *treeNode;
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index d819009d9b..a95d96e526 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1481,8 +1481,12 @@ void QDBusConnectionPrivate::activateObject(ObjectTreeNode &node, const QDBusMes
if (node.flags & (QDBusConnection::ExportScriptableSlots|QDBusConnection::ExportNonScriptableSlots) ||
node.flags & (QDBusConnection::ExportScriptableInvokables|QDBusConnection::ExportNonScriptableInvokables)) {
bool interfaceFound = true;
- if (!msg.interface().isEmpty())
- interfaceFound = qDBusInterfaceInObject(node.obj, msg.interface());
+ if (!msg.interface().isEmpty()) {
+ if (!node.interfaceName.isEmpty())
+ interfaceFound = msg.interface() == node.interfaceName;
+ else
+ interfaceFound = qDBusInterfaceInObject(node.obj, msg.interface());
+ }
if (interfaceFound) {
if (!activateCall(node.obj, node.flags, msg))
diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index e206db105a..d9e5f7408b 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -134,7 +134,7 @@ QString qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode &node
// create XML for the object itself
const QMetaObject *mo = node.obj->metaObject();
for ( ; mo != &QObject::staticMetaObject; mo = mo->superClass())
- xml_data += qDBusGenerateMetaObjectXml(QString(), mo, mo->superClass(),
+ xml_data += qDBusGenerateMetaObjectXml(node.interfaceName, mo, mo->superClass(),
node.flags);
}
diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
index c9c9152580..32c228c186 100644
--- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
+++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
@@ -65,6 +65,27 @@ void MyObject::method(const QDBusMessage &msg)
//qDebug() << msg;
}
+class MyObjectWithoutInterface: public QObject
+{
+ Q_OBJECT
+public slots:
+ void method(const QDBusMessage &msg);
+
+public:
+ static QString path;
+ static QString interface;
+ int callCount;
+ MyObjectWithoutInterface(QObject *parent = 0) : QObject(parent), callCount(0) {}
+};
+
+void MyObjectWithoutInterface::method(const QDBusMessage &msg)
+{
+ path = msg.path();
+ interface = msg.interface();
+ ++callCount;
+ //qDebug() << msg;
+}
+
class tst_QDBusConnection: public QObject
{
Q_OBJECT
@@ -87,6 +108,8 @@ private slots:
void registerObject_data();
void registerObject();
+ void registerObjectWithInterface_data();
+ void registerObjectWithInterface();
void registerObjectPeer_data();
void registerObjectPeer();
void registerObject2();
@@ -112,6 +135,7 @@ private slots:
public:
QString serviceName() const { return "org.qtproject.Qt.Autotests.QDBusConnection"; }
bool callMethod(const QDBusConnection &conn, const QString &path);
+ bool callMethod(const QDBusConnection &conn, const QString &path, const QString &interface);
bool callMethodPeer(const QDBusConnection &conn, const QString &path);
};
@@ -379,6 +403,40 @@ void tst_QDBusConnection::registerObject()
QVERIFY(!callMethod(con, path));
}
+void tst_QDBusConnection::registerObjectWithInterface_data()
+{
+ QTest::addColumn<QString>("path");
+ QTest::addColumn<QString>("interface");
+
+ QTest::newRow("/") << "/" << "org.foo";
+ QTest::newRow("/p1") << "/p1" << "org.foo";
+ QTest::newRow("/p2") << "/p2" << "org.foo";
+ QTest::newRow("/p1/q") << "/p1/q" << "org.foo";
+ QTest::newRow("/p1/q/r") << "/p1/q/r" << "org.foo";
+
+}
+
+void tst_QDBusConnection::registerObjectWithInterface()
+{
+ QFETCH(QString, path);
+ QFETCH(QString, interface);
+
+ QDBusConnection con = QDBusConnection::sessionBus();
+ QVERIFY(con.isConnected());
+
+ {
+ // register one object at root:
+ MyObjectWithoutInterface obj;
+ QVERIFY(con.registerObject(path, interface, &obj, QDBusConnection::ExportAllSlots));
+ QCOMPARE(con.objectRegisteredAt(path), static_cast<QObject *>(&obj));
+ QVERIFY(callMethod(con, path, interface));
+ QCOMPARE(obj.path, path);
+ QCOMPARE(obj.interface, interface);
+ }
+ // make sure it's gone
+ QVERIFY(!callMethod(con, path, interface));
+}
+
class MyServer : public QDBusServer
{
Q_OBJECT
@@ -844,6 +902,16 @@ bool tst_QDBusConnection::callMethod(const QDBusConnection &conn, const QString
return (MyObject::path == path);
}
+bool tst_QDBusConnection::callMethod(const QDBusConnection &conn, const QString &path, const QString &interface)
+{
+ QDBusMessage msg = QDBusMessage::createMethodCall(conn.baseService(), path, interface, "method");
+ QDBusMessage reply = conn.call(msg, QDBus::Block/*WithGui*/);
+ if (reply.type() != QDBusMessage::ReplyMessage)
+ return false;
+ QTest::qCompare(MyObjectWithoutInterface::path, path, "MyObjectWithoutInterface::path", "path", __FILE__, __LINE__);
+ return (MyObjectWithoutInterface::path == path) && MyObjectWithoutInterface::interface == interface;
+}
+
bool tst_QDBusConnection::callMethodPeer(const QDBusConnection &conn, const QString &path)
{
QDBusMessage msg = QDBusMessage::createMethodCall("", path, "", "method");
@@ -1307,6 +1375,8 @@ void tst_QDBusConnection::callVirtualObjectLocal()
}
QString MyObject::path;
+QString MyObjectWithoutInterface::path;
+QString MyObjectWithoutInterface::interface;
QTEST_MAIN(tst_QDBusConnection)
#include "tst_qdbusconnection.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 18:14:39 +0000