author | zecke <zecke> | 2005-01-13 21:41:55 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-01-13 21:41:55 (UTC) |
commit | 4177963b2f0211c3fa9b15a1af227c8217187b72 (patch) (side-by-side diff) | |
tree | d6d222f97a3d02caa50ee1f3663bcd7ad790bd0a | |
parent | e1a1079f4b12d70a946761443492592236012f79 (diff) | |
download | opie-4177963b2f0211c3fa9b15a1af227c8217187b72.zip opie-4177963b2f0211c3fa9b15a1af227c8217187b72.tar.gz opie-4177963b2f0211c3fa9b15a1af227c8217187b72.tar.bz2 |
-Use const char array instead of writing QPE/Application/clock at many applications
-Use const char array for the message the AlarmServer should send
-Try to remove the issue with 'sticky' alarms. Remove all
alarms with the internal ids
-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 @@ -59,12 +59,14 @@ static const int sw_prec = 2; static const int magic_daily = 2292922; static const int magic_countdown = 2292923; 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)"; #include <math.h> #include <unistd.h> #include <sys/types.h> #include <pthread.h> @@ -124,21 +126,21 @@ AlarmDlg::setText(const QString &txt) void AlarmDlg::checkSnooze(void) { // // Ensure we have only one snooze alarm. // - AlarmServer::deleteAlarm(QDateTime(), "QPE/Application/clock", - "alarm(QDateTime,int)", magic_snooze); + AlarmServer::deleteAlarm(QDateTime(), ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, magic_snooze); if (snoozeTime->value() > 0) { QDateTime wake = QDateTime::currentDateTime(); wake = wake.addSecs(snoozeTime->value() * 60); // snoozeTime in minutes - AlarmServer::addAlarm(wake, "QPE/Application/clock", - "alarm(QDateTime,int)", magic_snooze); + AlarmServer::addAlarm(wake, ALARM_CLOCK_CHANNEL, + ALARM_CLOCK_MESSAGE, magic_snooze); } accept(); } @@ -568,13 +570,13 @@ void Clock::enableDaily( bool ) { scheduleApplyDailyAlarm(); } void Clock::appMessage( const QCString &msg, const QByteArray &data ) { - if ( msg == "alarm(QDateTime,int)" ) { + if ( msg == ALARM_CLOCK_MESSAGE ) { QDataStream ds(data,IO_ReadOnly); QDateTime when; int t; ds >> when >> t; QTime theTime( when.time() ); if ( t == magic_daily || t == magic_snooze || @@ -713,15 +715,13 @@ void Clock::applyDailyAlarm() Config config( "Clock" ); config.setGroup( "Daily Alarm" ); config.writeEntry( "Hour", hour ); config.writeEntry( "Minute", minute ); 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; config.writeEntry( "Enabled", enableDaily ); config.writeEntry( "SoundEnabled", isSound ); QString exclDays; int exclCount = 0; @@ -732,19 +732,24 @@ void Clock::applyDailyAlarm() exclDays += QString::number( i ); exclCount++; } } config.writeEntry( "ExcludeDays", exclDays ); - /* 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); } } bool Clock::validDaysSelected(void) { for ( int i = 1; i <= 7; i++ ) { |