| author | sandman <sandman> | 2002-06-09 23:42:42 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-06-09 23:42:42 (UTC) |
| commit | 1c56ab829f04ea5b127c1c632cec330e47bca524 (patch) (side-by-side diff) | |
| tree | 30f0bd7c2d124cbf2dc41f32234922d2f3be19a7 | |
| parent | 25d084dd1a4b69cefcf16a889f22feb39d60f541 (diff) | |
| download | opie-1c56ab829f04ea5b127c1c632cec330e47bca524.zip opie-1c56ab829f04ea5b127c1c632cec330e47bca524.tar.gz opie-1c56ab829f04ea5b127c1c632cec330e47bca524.tar.bz2 | |
Fixed a counter bug in alarm timer loop.
| -rw-r--r-- | core/pim/datebook/datebook.cpp | 14 | ||||
| -rw-r--r-- | core/pim/datebook/datebook.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 8614b3f..2c2965e 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp @@ -83,3 +83,4 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) syncing(FALSE), - inSearch(FALSE) + inSearch(FALSE), + alarmCounter(0) { @@ -616,2 +617,3 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data) Sound::soundAlarm(); + alarmCounter = 0; stopTimer = startTimer( 5000 ); @@ -685,10 +687,8 @@ void DateBook::timerEvent( QTimerEvent *e ) { - static int stop = 0; - if ( stop < 10 ) { + if ( alarmCounter < 10 ) { + alarmCounter++; Sound::soundAlarm(); - stop++; - } else { - stop = 0; + } + else killTimer( e->timerId() ); - } } diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h index d1fe90d..e7be0dd 100644 --- a/core/pim/datebook/datebook.h +++ b/core/pim/datebook/datebook.h @@ -122,2 +122,4 @@ private: + int alarmCounter; + QString checkEvent(const Event &); |