Merge branch 'master' into notifications

Conflicts:
	daemon/manager.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/daemon/watchconnector.h b/daemon/watchconnector.h
index eaeccdc..36d0936 100644
--- a/daemon/watchconnector.h
+++ b/daemon/watchconnector.h
@@ -33,9 +33,11 @@
 #include <QObject>
 #include <QPointer>
 #include <QStringList>
+#include <QTimer>
 #include <QBluetoothDeviceInfo>
 #include <QBluetoothSocket>
 #include <QBluetoothServiceInfo>
+#include "Logger"
 
 using namespace QtBluetooth;
 
@@ -45,8 +47,11 @@ namespace watch
 class WatchConnector : public QObject
 {
     Q_OBJECT
+    LOG4QT_DECLARE_QCLASS_LOGGER
+
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
     Q_PROPERTY(QString connected READ isConnected NOTIFY connectedChanged)
+
 public:
     enum {
         watchTIME = 11,
@@ -125,6 +130,7 @@ private:
 
     QPointer<QBluetoothSocket> socket;
     bool is_connected;
+    QTimer reconnectTimer;
     QString _last_name;
     QString _last_address;
 };