RWADBusAdaptor.{cpp, h}: Update D-Bus adaptor to new API

4 files changed, 80 insertions, 14 deletions

diff --git a/src/RWADBusAdaptor.cpp b/src/RWADBusAdaptor.cpp
index 8fd9e7d..381faca 100644
--- a/src/RWADBusAdaptor.cpp
+++ b/src/RWADBusAdaptor.cpp
@@ -1,6 +1,7 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -i RWADBusAdaptor.h -p :RWADBusAdaptor.cpp rwa.xml
+ * Command line was: qdbusxml2cpp -i src/RWADBusAdaptor.h -p :src/RWADBusAdaptor.cpp rwa.xml
+ * rwa.xml is the xml output of the Introspect D-Bus method
  *
  * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
@@ -9,17 +10,30 @@
  * before re-generating it.
  */
 
-#include "RWADBusAdaptor.h"
+#include "src/RWADBusAdaptor.h"
 /*
- * Implementation of interface class OrgArcticaProjectRWAInterface
+ * Implementation of interface class OrgArcticaProjectRWASupportSessionServiceInterface
  */
 
-OrgArcticaProjectRWAInterface::OrgArcticaProjectRWAInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+OrgArcticaProjectRWASupportSessionServiceInterface::OrgArcticaProjectRWASupportSessionServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
     : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
 {
 }
 
-OrgArcticaProjectRWAInterface::~OrgArcticaProjectRWAInterface()
+OrgArcticaProjectRWASupportSessionServiceInterface::~OrgArcticaProjectRWASupportSessionServiceInterface()
+{
+}
+
+/*
+ * Implementation of interface class OrgFreedesktopDBusIntrospectableInterface
+ */
+
+OrgFreedesktopDBusIntrospectableInterface::OrgFreedesktopDBusIntrospectableInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+OrgFreedesktopDBusIntrospectableInterface::~OrgFreedesktopDBusIntrospectableInterface()
 {
 }
 
diff --git a/src/RWADBusAdaptor.h b/src/RWADBusAdaptor.h
index 4fbad44..741687f 100644
--- a/src/RWADBusAdaptor.h
+++ b/src/RWADBusAdaptor.h
@@ -1,6 +1,7 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p RWADBusAdaptor.h: rwa.xml
+ * Command line was: qdbusxml2cpp -p src/RWADBusAdaptor.h: rwa.xml
+ * rwa.xml is the xml output of the Introspect D-Bus method
  *
  * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
@@ -21,9 +22,9 @@
 #include <QtDBus/QtDBus>
 
 /*
- * Proxy class for interface org.ArcticaProject.RWA
+ * Proxy class for interface org.ArcticaProject.RWASupportSessionService
  */
-class OrgArcticaProjectRWAInterface: public QDBusAbstractInterface
+class OrgArcticaProjectRWASupportSessionServiceInterface: public QDBusAbstractInterface
 {
     Q_OBJECT
 public:
@@ -31,11 +32,24 @@ public:
     { return "org.ArcticaProject.RWASupportSessionService"; }
 
 public:
-    OrgArcticaProjectRWAInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
+    OrgArcticaProjectRWASupportSessionServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
-    ~OrgArcticaProjectRWAInterface();
+    ~OrgArcticaProjectRWASupportSessionServiceInterface();
 
 public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<QString> add_web_app_host(const QString &host)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(host);
+        return asyncCallWithArgumentList(QStringLiteral("add_web_app_host"), argumentList);
+    }
+
+    inline QDBusPendingReply<QString> get_web_app_hosts()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("get_web_app_hosts"), argumentList);
+    }
+
     inline QDBusPendingReply<QString> refresh_status(int pid)
     {
         QList<QVariant> argumentList;
@@ -43,9 +57,17 @@ public Q_SLOTS: // METHODS
         return asyncCallWithArgumentList(QStringLiteral("refresh_status"), argumentList);
     }
 
-    inline QDBusPendingReply<QString> start()
+    inline QDBusPendingReply<QString> remove_web_app_host(int host_idx)
     {
         QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(host_idx);
+        return asyncCallWithArgumentList(QStringLiteral("remove_web_app_host"), argumentList);
+    }
+
+    inline QDBusPendingReply<QString> start(int host_idx)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(host_idx);
         return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
     }
 
@@ -66,9 +88,39 @@ public Q_SLOTS: // METHODS
 Q_SIGNALS: // SIGNALS
 };
 
+/*
+ * Proxy class for interface org.freedesktop.DBus.Introspectable
+ */
+class OrgFreedesktopDBusIntrospectableInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.freedesktop.DBus.Introspectable"; }
+
+public:
+    OrgFreedesktopDBusIntrospectableInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
+
+    ~OrgFreedesktopDBusIntrospectableInterface();
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<QString> Introspect()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("Introspect"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+};
+
 namespace org {
   namespace ArcticaProject {
-    typedef ::OrgArcticaProjectRWAInterface RWA;
+    typedef ::OrgArcticaProjectRWASupportSessionServiceInterface RWASupportSessionService;
+  }
+  namespace freedesktop {
+    namespace DBus {
+      typedef ::OrgFreedesktopDBusIntrospectableInterface Introspectable;
+    }
   }
 }
 #endif
diff --git a/src/session.cpp b/src/session.cpp
index 1fa97d0..f327d65 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -233,7 +233,7 @@ void Session::_initDBus() {
     }
 
     // Create DBus object
-    _dbus_rwa = new OrgArcticaProjectRWAInterface("org.ArcticaProject.RWASupportSessionService", "/RWASupportSessionService",
+    _dbus_rwa = new OrgArcticaProjectRWASupportSessionServiceInterface("org.ArcticaProject.RWASupportSessionService", "/RWASupportSessionService",
                                QDBusConnection::sessionBus(), this->parent());
 
     qDebug("Initialized DBus object!");
diff --git a/src/session.h b/src/session.h
index ad1b140..41d414a 100644
--- a/src/session.h
+++ b/src/session.h
@@ -87,7 +87,7 @@ private:
     QString _session_id;
     QString _url;
     QString _pin;
-    OrgArcticaProjectRWAInterface* _dbus_rwa;
+    OrgArcticaProjectRWASupportSessionServiceInterface* _dbus_rwa;
     void _initDBus();
 
     bool _minimizedBefore = false;