diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2013-05-14 01:57:34 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2013-05-14 01:57:34 +0200 |
| commit | 9e3eff1c3a2b7105fecf6d0d7f052eb9943fbada (patch) | |
| tree | e28d75366e004e3865deefb5bcaa2dc8e0d3a773 /libsowatch | |
| parent | 80c58c124caf17f670d8efc120f5ae4bfd9aa09f (diff) | |
| download | sowatch-9e3eff1c3a2b7105fecf6d0d7f052eb9943fbada.tar.gz sowatch-9e3eff1c3a2b7105fecf6d0d7f052eb9943fbada.zip | |
perform only one bluetooth discovery for all watches
Diffstat (limited to 'libsowatch')
| -rw-r--r-- | libsowatch/allwatchscanner.cpp | 2 | ||||
| -rw-r--r-- | libsowatch/watchserver.h | 4 |
2 files changed, 2 insertions, 4 deletions
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); |