-rw-r--r-- | libkcal/calendarlocal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 5c889c3..00a43e5 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -289,25 +289,24 @@ void CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted | |||
289 | { | 289 | { |
290 | //mNextAlarmIncidence | 290 | //mNextAlarmIncidence |
291 | //mNextAlarmDateTime | 291 | //mNextAlarmDateTime |
292 | //return mNextSummary; | 292 | //return mNextSummary; |
293 | //return mNextAlarmEventDateTime; | 293 | //return mNextAlarmEventDateTime; |
294 | bool newNextAlarm = false; | 294 | bool newNextAlarm = false; |
295 | bool computeNextAlarm = false; | 295 | bool computeNextAlarm = false; |
296 | bool ok; | 296 | bool ok; |
297 | int offset; | 297 | int offset; |
298 | QDateTime nextA; | 298 | QDateTime nextA; |
299 | // QString nextSum; | 299 | // QString nextSum; |
300 | //QDateTime nextEvent; | 300 | //QDateTime nextEvent; |
301 | mNextAlarmEventDateTime = QDateTime(); | ||
302 | if ( mNextAlarmIncidence == 0 || incidence == 0 ) { | 301 | if ( mNextAlarmIncidence == 0 || incidence == 0 ) { |
303 | computeNextAlarm = true; | 302 | computeNextAlarm = true; |
304 | } else { | 303 | } else { |
305 | if ( ! deleted ) { | 304 | if ( ! deleted ) { |
306 | nextA = incidence->getNextAlarmDateTime(& ok, &offset ) ; | 305 | nextA = incidence->getNextAlarmDateTime(& ok, &offset ) ; |
307 | if ( ok ) { | 306 | if ( ok ) { |
308 | if ( nextA < mNextAlarmDateTime ) { | 307 | if ( nextA < mNextAlarmDateTime ) { |
309 | deRegisterAlarm(); | 308 | deRegisterAlarm(); |
310 | mNextAlarmDateTime = nextA; | 309 | mNextAlarmDateTime = nextA; |
311 | mNextSummary = incidence->summary(); | 310 | mNextSummary = incidence->summary(); |
312 | mNextAlarmEventDateTime = nextA.addSecs(offset ) ; | 311 | mNextAlarmEventDateTime = nextA.addSecs(offset ) ; |
313 | mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime); | 312 | mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime); |
@@ -365,24 +364,25 @@ void CalendarLocal::registerAlarm() | |||
365 | emit addAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString ); | 364 | emit addAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString ); |
366 | // #ifndef DESKTOP_VERSION | 365 | // #ifndef DESKTOP_VERSION |
367 | // AlarmServer::addAlarm ( mNextAlarmDateTime,"koalarm", mLastAlarmNotificationString.latin1() ); | 366 | // AlarmServer::addAlarm ( mNextAlarmDateTime,"koalarm", mLastAlarmNotificationString.latin1() ); |
368 | // #endif | 367 | // #endif |
369 | } | 368 | } |
370 | void CalendarLocal::deRegisterAlarm() | 369 | void CalendarLocal::deRegisterAlarm() |
371 | { | 370 | { |
372 | if ( mLastAlarmNotificationString.isNull() ) | 371 | if ( mLastAlarmNotificationString.isNull() ) |
373 | return; | 372 | return; |
374 | //qDebug("-- deregister Alarm %s ", mLastAlarmNotificationString.latin1() ); | 373 | //qDebug("-- deregister Alarm %s ", mLastAlarmNotificationString.latin1() ); |
375 | 374 | ||
376 | emit removeAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString ); | 375 | emit removeAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString ); |
376 | mNextAlarmEventDateTime = QDateTime(); | ||
377 | // #ifndef DESKTOP_VERSION | 377 | // #ifndef DESKTOP_VERSION |
378 | // AlarmServer::deleteAlarm (mNextAlarmDateTime ,"koalarm" ,mLastAlarmNotificationString.latin1() ); | 378 | // AlarmServer::deleteAlarm (mNextAlarmDateTime ,"koalarm" ,mLastAlarmNotificationString.latin1() ); |
379 | // #endif | 379 | // #endif |
380 | } | 380 | } |
381 | 381 | ||
382 | QPtrList<Todo> CalendarLocal::todos( const QDate &date ) | 382 | QPtrList<Todo> CalendarLocal::todos( const QDate &date ) |
383 | { | 383 | { |
384 | QPtrList<Todo> todos; | 384 | QPtrList<Todo> todos; |
385 | 385 | ||
386 | Todo *todo; | 386 | Todo *todo; |
387 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { | 387 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { |
388 | if ( todo->hasDueDate() && todo->dtDue().date() == date ) { | 388 | if ( todo->hasDueDate() && todo->dtDue().date() == date ) { |