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, 3 insertions, 11 deletions

diff --git a/daemon/dbusconnector.h b/daemon/dbusconnector.h
index e44ff3f..6b48f99 100644
--- a/daemon/dbusconnector.h
+++ b/daemon/dbusconnector.h
@@ -6,34 +6,26 @@
 #include <QVariantMap>
 #include <QLoggingCategory>
 
+// TODO Remove this.
+
 class DBusConnector : public QObject
 {
     Q_OBJECT
     QLoggingCategory l;
 
     Q_PROPERTY(QVariantMap pebble READ pebble NOTIFY pebbleChanged)
-    Q_PROPERTY(QStringList services READ services NOTIFY servicesChanged)
-
     QVariantMap pebbleProps;
-    QStringList dbusServices;
 
 public:
     explicit DBusConnector(QObject *parent = 0);
 
-    QVariantMap pebble() { return pebbleProps; }
-    QStringList services() { return dbusServices; }
+    QVariantMap pebble() const { return pebbleProps; }
 
 signals:
     void pebbleChanged();
-    void servicesChanged();
 
 public slots:
     bool findPebble();
-
-protected slots:
-    void onServiceRegistered(const QString &);
-    void onServiceUnregistered(const QString &);
-
 };
 
 #endif // DBUSCONNECTOR_H