summaryrefslogtreecommitdiff
path: root/daemon/manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'daemon/manager.cpp')
-rw-r--r--daemon/manager.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index 7a02c86..778fdc6 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -1,19 +1,21 @@
-#include "manager.h"
-#include "dbusadaptor.h"
-
#include <QDebug>
#include <QtContacts/QContact>
#include <QtContacts/QContactPhoneNumber>
+#include "manager.h"
+#include "dbusadaptor.h"
+
Manager::Manager(Settings *settings, QObject *parent) :
QObject(parent), settings(settings),
watch(new WatchConnector(this)),
dbus(new DBusConnector(this)),
+ apps(new AppManager(this)),
voice(new VoiceCallManager(settings, this)),
notifications(new NotificationManager(settings, this)),
music(new MusicManager(watch, this)),
datalog(new DataLogManager(watch, this)),
- apps(new AppManager(this)),
+ appmsg(new AppMsgManager(watch, this)),
+ js(new JSKitManager(apps, appmsg, this)),
notification(MNotification::DeviceEvent)
{
connect(settings, SIGNAL(valueChanged(QString)), SLOT(onSettingChanged(const QString&)));
@@ -42,11 +44,6 @@ Manager::Manager(Settings *settings, QObject *parent) :
}
return true;
});
- watch->setEndpointHandler(WatchConnector::watchLAUNCHER,
- [this](const QByteArray &data) {
- logger()->debug() << "LAUNCHER msg:" << data.toHex();
- return true;
- });
connect(voice, SIGNAL(activeVoiceCallChanged()), SLOT(onActiveVoiceCallChanged()));
connect(voice, SIGNAL(error(const QString &)), SLOT(onVoiceError(const QString &)));