summaryrefslogtreecommitdiff
path: root/saltoqd/toqmanager.h
diff options
context:
space:
mode:
Diffstat (limited to 'saltoqd/toqmanager.h')
-rw-r--r--saltoqd/toqmanager.h24
1 files changed, 2 insertions, 22 deletions
diff --git a/saltoqd/toqmanager.h b/saltoqd/toqmanager.h
index 6cc8b8d..a7e99b2 100644
--- a/saltoqd/toqmanager.h
+++ b/saltoqd/toqmanager.h
@@ -2,7 +2,6 @@
#define TOQMANAGER_H
#include <QtCore/QObject>
-#include <QtDBus/QDBusAbstractAdaptor>
#include "toqconnection.h"
#include "settings.h"
@@ -27,6 +26,8 @@ class ToqManager : public QObject
Q_OBJECT
Q_PROPERTY(bool connected READ isConnected NOTIFY connectedChanged)
+ friend class ToqManagerAdaptor;
+
public:
explicit ToqManager(Settings *settings, QObject *parent = 0);
@@ -81,22 +82,6 @@ private:
NotificationManager *_notificationManager;
};
-class ToqManagerAdaptor : public QDBusAbstractAdaptor
-{
- Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "com.javispedro.saltoq.ToqManager")
-
- Q_PROPERTY(bool connected READ isConnected NOTIFY connectedChanged)
-
-public:
- ToqManagerAdaptor(ToqManager *parent);
-
- bool isConnected() const;
-
-signals:
- void connectedChanged();
-};
-
inline bool ToqManager::isConnected() const
{
return _conn->isConnected();
@@ -107,9 +92,4 @@ inline quint16 ToqManager::newTransactionId()
return _conn->newTransactionId();
}
-inline bool ToqManagerAdaptor::isConnected() const
-{
- return static_cast<ToqManager*>(parent())->isConnected();
-}
-
#endif // TOQMANAGER_H