[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/playground/libs/qt-dbus/selftests
From:       Thiago Macieira <thiago () kde ! org>
Date:       2006-02-23 16:48:59
Message-ID: 1140713339.731506.13987.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 512795 by thiago:

Upgrade the tests to the new API.


 M  +24 -7     qdbusinterface/tst_qdbusinterface.cpp  
 M  +1 -1      qdbusmarshall/qpong/qpong.cpp  
 M  +24 -7     qdbusobject/tst_qdbusobject.cpp  


--- branches/work/kde4/playground/libs/qt-dbus/selftests/qdbusinterface/tst_qdbusinterface.cpp \
#512794:512795 @@ -64,25 +64,43 @@
     "<node name=\"subObject\"/>"
     "</node>";
 
-class MyObject: public QObject
+class IntrospectionAdaptor: public QDBusAbstractAdaptor
 {
     Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.freedesktop.DBus.Introspectable")
+public:
+    IntrospectionAdaptor(QObject *parent)
+        : QDBusAbstractAdaptor(parent)
+    { }
+        
 public slots:
 
-    void ping(const QDBusMessage &msg)
+    void Introspect(const QDBusMessage &msg)
     {
         QDBusConnection con = \
QDBusConnection::addConnection(QDBusConnection::SessionBus);  QDBusMessage reply = \
                QDBusMessage::methodReply(msg);
-        reply << static_cast<QList<QVariant> >(msg);
+        reply << ::introspectionData;
         if (!con.send(reply))
             exit(1);
     }
+};    
 
-    void Introspect(const QDBusMessage &msg)
+class MyObject: public QObject
+{
+    Q_OBJECT
+public:
+    MyObject()
     {
+        new IntrospectionAdaptor(this);
+    }
+
+public slots:
+
+    void ping(const QDBusMessage &msg)
+    {
         QDBusConnection con = \
QDBusConnection::addConnection(QDBusConnection::SessionBus);  QDBusMessage reply = \
                QDBusMessage::methodReply(msg);
-        reply << ::introspectionData;
+        reply << static_cast<QList<QVariant> >(msg);
         if (!con.send(reply))
             exit(1);
     }
@@ -139,8 +157,7 @@
     QVERIFY(con.isConnected());
     QVERIFY(con.requestName( TEST_SERVICE_NAME ));
 
-    con.registerObject("/", "org.freedesktop.DBus.Introspectable", &obj);
-    con.registerObject("/", TEST_INTERFACE_NAME, &obj);
+    con.registerObject("/", &obj, QDBusConnection::ExportAdaptors | \
QDBusConnection::ExportSlots);  }
 
 void tst_QDBusInterface::cleanupTestCase()
--- branches/work/kde4/playground/libs/qt-dbus/selftests/qdbusmarshall/qpong/qpong.cpp \
#512794:512795 @@ -26,7 +26,7 @@
         exit(2);
 
     Pong pong;
-    con.registerObject("/org/kde/selftest", "org.kde.selftest", &pong);
+    con.registerObject("/org/kde/selftest", &pong, QDBusConnection::ExportSlots);
 
     printf("ready.\n");
 
--- branches/work/kde4/playground/libs/qt-dbus/selftests/qdbusobject/tst_qdbusobject.cpp \
#512794:512795 @@ -47,25 +47,43 @@
     "<node name=\"subObject\"/>"
     "</node>";
 
-class MyObject: public QObject
+class IntrospectionAdaptor: public QDBusAbstractAdaptor
 {
     Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.freedesktop.DBus.Introspectable")
+public:
+    IntrospectionAdaptor(QObject *parent)
+        : QDBusAbstractAdaptor(parent)
+    { }
+        
 public slots:
 
-    void ping(const QDBusMessage &msg)
+    void Introspect(const QDBusMessage &msg)
     {
         QDBusConnection con = \
QDBusConnection::addConnection(QDBusConnection::SessionBus);  QDBusMessage reply = \
                QDBusMessage::methodReply(msg);
-        reply << static_cast<QList<QVariant> >(msg);
+        reply << ::introspectionData;
         if (!con.send(reply))
             exit(1);
     }
+};    
 
-    void Introspect(const QDBusMessage &msg)
+class MyObject: public QObject
+{
+    Q_OBJECT
+public:
+    MyObject()
     {
+        new IntrospectionAdaptor(this);
+    }
+
+public slots:
+
+    void ping(const QDBusMessage &msg)
+    {
         QDBusConnection con = \
QDBusConnection::addConnection(QDBusConnection::SessionBus);  QDBusMessage reply = \
                QDBusMessage::methodReply(msg);
-        reply << ::introspectionData;
+        reply << static_cast<QList<QVariant> >(msg);
         if (!con.send(reply))
             exit(1);
     }
@@ -93,8 +111,7 @@
     QVERIFY(con.isConnected());
     QVERIFY(con.requestName("com.trolltech.tst_qdbusobject"));
 
-    con.registerObject("/", "org.freedesktop.DBus.Introspectable", &obj);
-    con.registerObject("/", "com.trolltech.tst_qdbusobject.MyObject", &obj);
+    con.registerObject("/", &obj, QDBusConnection::ExportAdaptors | \
QDBusConnection::ExportSlots);  }
 
 void tst_QDBusObject::cleanupTestCase()


[prev in list] [next in list] [prev in thread] [next in thread]