Merge remote-tracking branch 'javispedro/js-testing'

Conflicts:
	daemon/daemon.pro
	daemon/dbusconnector.cpp
	daemon/manager.cpp
	daemon/watchcommands.cpp
	daemon/watchcommands.h
	daemon/watchconnector.cpp
	daemon/watchconnector.h
	log4qt-debug.conf
	log4qt-release.conf
	rpm/pebble.spec
	rpm/pebble.yaml

1 files changed, 25 insertions, 0 deletions

diff --git a/daemon/datalogmanager.h b/daemon/datalogmanager.h
new file mode 100644
index 0000000..b36875a
--- /dev/null
+++ b/daemon/datalogmanager.h
@@ -0,0 +1,25 @@
+#ifndef DATALOGMANAGER_H
+#define DATALOGMANAGER_H
+
+#include "watchconnector.h"
+
+class DataLogManager : public QObject
+{
+    Q_OBJECT
+    QLoggingCategory l;
+
+public:
+    explicit DataLogManager(WatchConnector *watch, QObject *parent = 0);
+
+signals:
+
+public slots:
+
+private:
+    void handleDataCommand(int session, const QByteArray &data);
+
+private:
+    WatchConnector *watch;
+};
+
+#endif // DATALOGMANAGER_H