diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2011-12-09 02:26:31 +0100 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2011-12-09 02:26:31 +0100 |
| commit | 140c6bfafe91007c7e24ebf59270c8ad8060e875 (patch) | |
| tree | 59c23a95edb83736fb914ade8fc287c5490528fd /libsowatch/declarativewatchwrapper.cpp | |
| parent | cbf8e3ad49917dc71e8c5f6413c55f266c1c4ad3 (diff) | |
| download | sowatch-140c6bfafe91007c7e24ebf59270c8ad8060e875.tar.gz sowatch-140c6bfafe91007c7e24ebf59270c8ad8060e875.zip | |
Removing the entire grabButton/ungrab mechanism
Applications&server no longer have to grab/ungrab buttons.
Also, LED button should now work everywhere in digital MetaWatch.
Diffstat (limited to 'libsowatch/declarativewatchwrapper.cpp')
| -rw-r--r-- | libsowatch/declarativewatchwrapper.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libsowatch/declarativewatchwrapper.cpp b/libsowatch/declarativewatchwrapper.cpp index 122545f..ebf92b5 100644 --- a/libsowatch/declarativewatchwrapper.cpp +++ b/libsowatch/declarativewatchwrapper.cpp @@ -36,16 +36,6 @@ QList<QObject*> DeclarativeWatchWrapper::notifications() const return ol; } -void DeclarativeWatchWrapper::useButton(int button) -{ - if (!_usedButtons.contains(button)) { - _usedButtons.insert(button); - if (_active) { - _watch->grabButton(button); - } - } -} - void DeclarativeWatchWrapper::vibrate(int msecs) { if (_active) { @@ -58,11 +48,6 @@ void DeclarativeWatchWrapper::activate() if (!_active) { _active = true; - // Grab all of the buttons used by this watchlet - foreach (int button, _usedButtons) { - _watch->grabButton(button); - } - // Forward the button signals connect(_watch, SIGNAL(buttonPressed(int)), this, SIGNAL(buttonPressed(int))); connect(_watch, SIGNAL(buttonReleased(int)), this, SIGNAL(buttonReleased(int))); @@ -84,13 +69,7 @@ void DeclarativeWatchWrapper::deactivate() // Stop forwarding button presses disconnect(_watch, 0, this, 0); - // Ungrab all the buttons used by this watchlet - foreach (int button, _usedButtons) { - _watch->ungrabButton(button); - } - // Emit the deactivated signal emit activeChanged(); } } - |