qt 6.5.1 original

tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt

@@ -0,0 +1,23 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_subdirectory(qpinger)
+
+qt_internal_add_test(tst_qdbusabstractinterface
+    SOURCES
+        interface.cpp
+        tst_qdbusabstractinterface.cpp
+    LIBRARIES
+        Qt::Core
+        Qt::DBus
+)
+
+qt_internal_extend_target(tst_qdbusabstractinterface
+    DBUS_INTERFACE_SOURCES
+        org.qtproject.QtDBus.Pinger.xml
+    DBUS_INTERFACE_BASENAME
+        pinger_interface
+    DBUS_INTERFACE_FLAGS
+        -i interface.h
+)
+

tests/auto/dbus/qdbusabstractinterface/interface.cpp

@@ -0,0 +1,24 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "interface.h"
+#include <QThread>
+
+Interface::Interface()
+{
+}
+
+// Export the sleep function
+// TODO QT5: remove this class, QThread::msleep is now public
+class FriendlySleepyThread : public QThread {
+public:
+    using QThread::msleep;
+};
+
+int Interface::sleepMethod(int msec)
+{
+    FriendlySleepyThread::msleep(msec);
+    return 42;
+}
+
+#include "moc_interface.cpp"

tests/auto/dbus/qdbusabstractinterface/interface.h

@@ -0,0 +1,78 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#ifndef INTERFACE_H
+#define INTERFACE_H
+
+#include <QObject>
+#include <QHash>
+#include <QDBusArgument>
+
+struct RegisteredType
+{
+    inline RegisteredType(const QString &str = QString()) : s(str) {}
+    inline bool operator==(const RegisteredType &other) const { return s == other.s; }
+    QString s;
+};
+Q_DECLARE_METATYPE(RegisteredType)
+
+inline QDBusArgument &operator<<(QDBusArgument &s, const RegisteredType &data)
+{
+    s.beginStructure();
+    s << data.s;
+    s.endStructure();
+    return s;
+}
+
+inline const QDBusArgument &operator>>(const QDBusArgument &s, RegisteredType &data)
+{
+    s.beginStructure();
+    s >> data.s;
+    s.endStructure();
+    return s;
+}
+
+struct UnregisteredType
+{
+    QString s;
+};
+Q_DECLARE_METATYPE(UnregisteredType)
+
+class Interface: public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.qtproject.QtDBus.Pinger")
+    Q_PROPERTY(QString stringProp READ stringProp WRITE setStringProp SCRIPTABLE true)
+    Q_PROPERTY(QDBusVariant variantProp READ variantProp WRITE setVariantProp SCRIPTABLE true)
+    Q_PROPERTY(RegisteredType complexProp READ complexProp WRITE setComplexProp SCRIPTABLE true)
+
+    friend class tst_QDBusAbstractInterface;
+    friend class PingerServer;
+    QString m_stringProp;
+    QDBusVariant m_variantProp;
+    RegisteredType m_complexProp;
+
+public:
+    Interface();
+
+    QString stringProp() const { return m_stringProp; }
+    void setStringProp(const QString &s) { m_stringProp = s; }
+    QDBusVariant variantProp() const { return m_variantProp; }
+    void setVariantProp(const QDBusVariant &v) { m_variantProp = v; }
+    RegisteredType complexProp() const { return m_complexProp; }
+    void setComplexProp(const RegisteredType &r) { m_complexProp = r; }
+
+public slots:
+    Q_SCRIPTABLE void voidMethod() {}
+    Q_SCRIPTABLE int sleepMethod(int);
+    Q_SCRIPTABLE QString stringMethod() { return "Hello, world"; }
+    Q_SCRIPTABLE RegisteredType complexMethod(const QVariantHash &vars) { return RegisteredType(vars.value("arg1").toString()); }
+    Q_SCRIPTABLE QString multiOutMethod(int &value) { value = 42; return "Hello, world"; }
+
+signals:
+    Q_SCRIPTABLE void voidSignal();
+    Q_SCRIPTABLE void stringSignal(const QString &);
+    Q_SCRIPTABLE void complexSignal(RegisteredType);
+};
+
+#endif // INTERFACE_H

tests/auto/dbus/qdbusabstractinterface/org.qtproject.QtDBus.Pinger.xml

@@ -0,0 +1,36 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.qtproject.QtDBus.Pinger">
+    <property name="stringProp" type="s" access="readwrite"/>
+    <property name="variantProp" type="v" access="readwrite"/>
+    <property name="complexProp" type="(s)" access="readwrite">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="RegisteredType"/>
+    </property>
+    <signal name="voidSignal"/>
+    <signal name="stringSignal">
+       <arg type="s" name="string-data"/>
+    </signal>
+    <signal name="complexSignal">
+       <arg name="" type="(s)"/>
+       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="RegisteredType"/>
+    </signal>
+    <method name="voidMethod" />
+    <method name="sleepMethod">
+       <arg type="i" />
+       <arg type="i" direction="out"/>
+    </method>
+    <method name="stringMethod">
+       <arg type="s" direction="out"/>
+    </method>
+    <method name="complexMethod">
+       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QHash&lt;QString,QVariant&gt;"/>
+       <arg type='a{sv}' name='platform_data' direction='in'/>
+       <arg type="(s)" direction="out"/>
+       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="RegisteredType"/>
+    </method>
+    <method name="multiOutMethod">
+       <arg type="s" direction="out"/>
+       <arg type="i" direction="out"/>
+    </method>
+  </interface>
+</node>

tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qdbusabstractinterface Test:
+#####################################################################
+# this test can not be generated here. It needs to be set up in the
+# parent directory

tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt

@@ -0,0 +1,16 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## qpinger Binary:
+#####################################################################
+
+qt_internal_add_executable(qpinger
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    NO_INSTALL
+    SOURCES
+        ../interface.cpp ../interface.h
+        qpinger.cpp
+    LIBRARIES
+        Qt::DBus
+)

tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp

@@ -0,0 +1,122 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// Copyright (C) 2016 Intel Corporation.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QCoreApplication>
+
+#include <QDBusServer>
+#include <QDBusContext>
+#include <QDBusMetaType>
+#include <QDBusConnection>
+#include <QDBusMessage>
+
+#include "../interface.h"
+
+static const char serviceName[] = "org.qtproject.autotests.qpinger";
+static const char objectPath[] = "/org/qtproject/qpinger";
+//static const char *interfaceName = serviceName;
+
+class PingerServer : public QDBusServer, protected QDBusContext
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qpinger")
+public:
+    PingerServer(QObject *parent = nullptr)
+        : QDBusServer(parent),
+          m_conn("none")
+    {
+        connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection)));
+        reset();
+    }
+
+public slots:
+    QString address() const
+    {
+        if (!QDBusServer::isConnected())
+            sendErrorReply(QDBusServer::lastError().name(), QDBusServer::lastError().message());
+        return QDBusServer::address();
+    }
+
+    void waitForConnected()
+    {
+        if (callPendingReply.type() != QDBusMessage::InvalidMessage) {
+            sendErrorReply(QDBusError::NotSupported, "One call already pending!");
+            return;
+        }
+        if (m_conn.isConnected())
+            return;
+        // not connected, we'll reply later
+        setDelayedReply(true);
+        callPendingReply = message();
+    }
+
+    void reset()
+    {
+        targetObj.m_stringProp = "This is a test";
+        targetObj.m_variantProp = QDBusVariant(QVariant(42));
+        targetObj.m_complexProp = RegisteredType("This is a test");
+    }
+
+    void voidSignal()
+    {
+        emit targetObj.voidSignal();
+    }
+
+    void stringSignal(const QString& value)
+    {
+        emit targetObj.stringSignal(value);
+    }
+
+    void complexSignal(const QString& value)
+    {
+        RegisteredType reg(value);
+        emit targetObj.complexSignal(reg);
+    }
+
+    void quit()
+    {
+        qApp->quit();
+    }
+
+private slots:
+    void handleConnection(const QDBusConnection& con)
+    {
+        m_conn = con;
+        m_conn.registerObject("/", &targetObj, QDBusConnection::ExportScriptableContents);
+        if (callPendingReply.type() != QDBusMessage::InvalidMessage) {
+            QDBusConnection::sessionBus().send(callPendingReply.createReply());
+            callPendingReply = QDBusMessage();
+        }
+    }
+
+private:
+    Interface targetObj;
+    QDBusConnection m_conn;
+    QDBusMessage callPendingReply;
+};
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    // register the meta types
+    qDBusRegisterMetaType<RegisteredType>();
+    qRegisterMetaType<UnregisteredType>();
+
+    QDBusConnection con = QDBusConnection::sessionBus();
+    if (!con.isConnected())
+        exit(1);
+
+    if (!con.registerService(serviceName))
+        exit(2);
+
+    PingerServer server;
+    con.registerObject(objectPath, &server, QDBusConnection::ExportAllSlots);
+
+    printf("ready.\n");
+    fflush(stdout);
+
+    return app.exec();
+}
+
+#include "qpinger.moc"