summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2014-07-10 11:56:26 +0200
committerTomasz Sterna <tomek@xiaoka.com>2014-07-10 11:56:26 +0200
commit072da88eee57e5d16f0b75c7b90c8a0bc6a60cb3 (patch)
tree48ad2f71d598a5b44d4522a37cf1a1e681bbfe79 /daemon
parentc5132f1434eb6e14abfe2d2761d9f3abdcc3ad0e (diff)
Implemented ping, disconnect, reconnect in daemon
Diffstat (limited to 'daemon')
-rw-r--r--daemon/dbusadaptor.cpp20
-rw-r--r--daemon/dbusadaptor.h14
-rw-r--r--daemon/manager.h5
-rw-r--r--daemon/org.pebbled.xml5
4 files changed, 40 insertions, 4 deletions
diff --git a/daemon/dbusadaptor.cpp b/daemon/dbusadaptor.cpp
index 6460dca..6125ee7 100644
--- a/daemon/dbusadaptor.cpp
+++ b/daemon/dbusadaptor.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -a daemon/dbusadaptor -p app/daemonproxy daemon/org.pebbled.xml
+ * Command line was: qdbusxml2cpp -a dbusadaptor org.pebbled.xml
*
* qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*
@@ -57,3 +57,21 @@ QVariantMap PebbledAdaptor::pebble() const
return qvariant_cast< QVariantMap >(parent()->property("pebble"));
}
+void PebbledAdaptor::disconnect()
+{
+ // handle method call org.pebbled.disconnect
+ QMetaObject::invokeMethod(parent(), "disconnect");
+}
+
+void PebbledAdaptor::ping(int val)
+{
+ // handle method call org.pebbled.ping
+ QMetaObject::invokeMethod(parent(), "ping", Q_ARG(int, val));
+}
+
+void PebbledAdaptor::reconnect()
+{
+ // handle method call org.pebbled.reconnect
+ QMetaObject::invokeMethod(parent(), "reconnect");
+}
+
diff --git a/daemon/dbusadaptor.h b/daemon/dbusadaptor.h
index d1662c6..7613fba 100644
--- a/daemon/dbusadaptor.h
+++ b/daemon/dbusadaptor.h
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -a daemon/dbusadaptor -p app/daemonproxy daemon/org.pebbled.xml
+ * Command line was: qdbusxml2cpp -a dbusadaptor org.pebbled.xml
*
* qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*
@@ -9,8 +9,8 @@
* before re-generating it.
*/
-#ifndef DBUSADAPTOR_H_1404660047
-#define DBUSADAPTOR_H_1404660047
+#ifndef DBUSADAPTOR_H_1404986135
+#define DBUSADAPTOR_H_1404986135
#include <QtCore/QObject>
#include <QtDBus/QtDBus>
@@ -40,6 +40,11 @@ class PebbledAdaptor: public QDBusAbstractAdaptor
" <property access=\"read\" type=\"b\" name=\"connected\"/>\n"
" <signal name=\"pebbleChanged\"/>\n"
" <signal name=\"connectedChanged\"/>\n"
+" <method name=\"ping\">\n"
+" <arg direction=\"in\" type=\"i\" name=\"val\"/>\n"
+" </method>\n"
+" <method name=\"disconnect\"/>\n"
+" <method name=\"reconnect\"/>\n"
" </interface>\n"
"")
public:
@@ -60,6 +65,9 @@ public: // PROPERTIES
QVariantMap pebble() const;
public Q_SLOTS: // METHODS
+ void disconnect();
+ void ping(int val);
+ void reconnect();
Q_SIGNALS: // SIGNALS
void connectedChanged();
void pebbleChanged();
diff --git a/daemon/manager.h b/daemon/manager.h
index b9aa01b..8d3c8de 100644
--- a/daemon/manager.h
+++ b/daemon/manager.h
@@ -71,6 +71,11 @@ class PebbledProxy : public QObject
public:
explicit PebbledProxy(QObject *parent) : QObject(parent) {}
+public slots:
+ void ping(int val) { static_cast<Manager*>(parent())->watch->ping((unsigned int)val); }
+ void disconnect() { static_cast<Manager*>(parent())->watch->disconnect(); }
+ void reconnect() { static_cast<Manager*>(parent())->watch->reconnect(); }
+
};
#endif // MANAGER_H
diff --git a/daemon/org.pebbled.xml b/daemon/org.pebbled.xml
index a282815..0a958c8 100644
--- a/daemon/org.pebbled.xml
+++ b/daemon/org.pebbled.xml
@@ -10,5 +10,10 @@
<property name="connected" type="b" access="read"/>
<signal name="pebbleChanged"/>
<signal name="connectedChanged"/>
+ <method name="ping">
+ <arg name="val" type="i" direction="in"/>
+ </method>
+ <method name="disconnect"/>
+ <method name="reconnect"/>
</interface>
</node>