summaryrefslogtreecommitdiff
path: root/daemon/manager.cpp
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2014-07-06 17:22:25 +0200
committerTomasz Sterna <tomek@xiaoka.com>2014-07-09 01:57:32 +0200
commit7283842cbed6a378d430552d327eab4a27775538 (patch)
tree708f4a2b4e702ddcc07bef8e6fdcd8f8a32a23ef /daemon/manager.cpp
parentd3d54722d8532bd649db6792126c0a990712e26c (diff)
Moved watchConnector to daemon and implemented daemon interface for QML
Diffstat (limited to 'daemon/manager.cpp')
-rw-r--r--daemon/manager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index 4ba2a8b..f25e724 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -37,8 +37,8 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan
dbus->findPebble();
}
- DBusProxy *proxy = new DBusProxy(this);
- DBusAdaptor *adaptor = new DBusAdaptor(proxy);
+ PebbledProxy *proxy = new PebbledProxy(this);
+ PebbledAdaptor *adaptor = new PebbledAdaptor(proxy);
QDBusConnection connection = QDBusConnection::sessionBus();
connection.registerObject("/", proxy);
connection.registerService("org.pebbled");