| -rw-r--r-- | noncore/tools/clock/clock.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index e681650..0ad69d9 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp @@ -64,2 +64,4 @@ static const int magic_snooze = 2292924; static const int magic_playmp = 2292925; +static const char ALARM_CLOCK_CHANNEL [] = "QPE/Application/clock"; +static const char ALARM_CLOCK_MESSAGE [] = "alarm(QDateTime,int)"; @@ -129,4 +131,4 @@ AlarmDlg::checkSnooze(void) // - AlarmServer::deleteAlarm(QDateTime(), "QPE/Application/clock", - "alarm(QDateTime,int)", magic_snooze); + AlarmServer::deleteAlarm(QDateTime(), ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, magic_snooze); @@ -136,4 +138,4 @@ AlarmDlg::checkSnooze(void) - AlarmServer::addAlarm(wake, "QPE/Application/clock", - "alarm(QDateTime,int)", magic_snooze); + AlarmServer::addAlarm(wake, ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, magic_snooze); } @@ -573,3 +575,3 @@ void Clock::appMessage( const QCString &msg, const QByteArray &data ) { - if ( msg == "alarm(QDateTime,int)" ) { + if ( msg == ALARM_CLOCK_MESSAGE ) { QDataStream ds(data,IO_ReadOnly); @@ -718,5 +720,3 @@ void Clock::applyDailyAlarm() bool enableDaily = dailyEnabled->isChecked(); - bool wasSound = config.readEntry( "SoundEnabled" ); bool isSound = sndCheck->isChecked(); - int oldMagic = wasSound ? magic_playmp : magic_daily; int isMagic = isSound ? magic_playmp : magic_daily; @@ -737,9 +737,14 @@ void Clock::applyDailyAlarm() - /* try to delete both */ - AlarmServer::deleteAlarm(QDateTime(), "QPE/Application/clock", - "alarm(QDateTime,int)", oldMagic); + /* try to delete all */ + AlarmServer::deleteAlarm(QDateTime(), ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, magic_daily); + AlarmServer::deleteAlarm(QDateTime(), ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, magic_playmp ); + AlarmServer::deleteAlarm(QDateTime(), ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, magic_snooze); + if ( enableDaily && exclCount < 7 ) { QDateTime when = nextAlarm( hour, minute ); - AlarmServer::addAlarm(when, "QPE/Application/clock", - "alarm(QDateTime,int)", isMagic); + AlarmServer::addAlarm(when, ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, isMagic); } |