From 9e3eff1c3a2b7105fecf6d0d7f052eb9943fbada Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Tue, 14 May 2013 01:57:34 +0200 Subject: perform only one bluetooth discovery for all watches --- libsowatch/allwatchscanner.cpp | 2 ++ libsowatch/watchserver.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'libsowatch') diff --git a/libsowatch/allwatchscanner.cpp b/libsowatch/allwatchscanner.cpp index 97f8454..b01ad05 100644 --- a/libsowatch/allwatchscanner.cpp +++ b/libsowatch/allwatchscanner.cpp @@ -23,6 +23,7 @@ AllWatchScanner::AllWatchScanner(QObject *parent) : void AllWatchScanner::start() { + _finishedCount = 0; if (_scanners.empty()) { emit finished(); } else { @@ -40,5 +41,6 @@ void AllWatchScanner::handleFinished() if (_finishedCount >= _scanners.length()) { qDebug() << "all finished"; emit finished(); + _finishedCount = 0; } } diff --git a/libsowatch/watchserver.h b/libsowatch/watchserver.h index 06f4e4b..2abeb1b 100644 --- a/libsowatch/watchserver.h +++ b/libsowatch/watchserver.h @@ -23,7 +23,6 @@ class SOWATCH_EXPORT WatchServer : public QObject { Q_OBJECT Q_PROPERTY(Watch* watch READ watch CONSTANT) - Q_PROPERTY(QString nextWatchletButton READ nextWatchletButton WRITE setNextWatchletButton) Q_PROPERTY(Watchlet* idleWatchlet READ idleWatchlet WRITE setIdleWatchlet) Q_PROPERTY(Watchlet* notificationWatchlet READ notificationWatchlet WRITE setNotificationWatchlet) @@ -33,9 +32,6 @@ public: Watch* watch(); const Watch* watch() const; - QString nextWatchletButton() const; - void setNextWatchletButton(const QString& value); - Watchlet *idleWatchlet(); void setIdleWatchlet(Watchlet *watchlet); -- cgit v1.2.3