diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:29:47 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:30:49 +0200 |
| commit | 2101baf2911d7965c86e5308e4d8350790a6956c (patch) | |
| tree | 2acb875cabca055797620458baad26d5f8612105 /app/pebbledinterface.h | |
| parent | 959e251f2336e21d3615b1525a38773fe58ab2e7 (diff) | |
| parent | 84e775d768f0675ee733132b3762db647f1409ac (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/manager.cpp
Diffstat (limited to 'app/pebbledinterface.h')
| -rw-r--r-- | app/pebbledinterface.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/pebbledinterface.h b/app/pebbledinterface.h index eccc766..df9cd3d 100644 --- a/app/pebbledinterface.h +++ b/app/pebbledinterface.h @@ -10,7 +10,9 @@ class PebbledInterface : public QObject Q_OBJECT static QString PEBBLED_SYSTEMD_UNIT; - static QString SYSTEMD_UNIT_IFACE; + static QString PEBBLED_DBUS_SERVICE; + static QString PEBBLED_DBUS_PATH; + static QString PEBBLED_DBUS_IFACE; Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) bool enabled() const; @@ -58,7 +60,7 @@ private slots: private: QDBusInterface *pebbled; QDBusInterface *systemd; - QDBusInterface *unitprops; + QDBusObjectPath unitPath; QVariantMap properties; }; |