author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /libkcal/event.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | libkcal/event.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libkcal/event.cpp b/libkcal/event.cpp index fdf5657..060df81 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp | |||
@@ -371,33 +371,33 @@ QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_ | |||
371 | return QDateTime (); | 371 | return QDateTime (); |
372 | bool yes; | 372 | bool yes; |
373 | QDateTime incidenceStart = getNextOccurence( start_dt, &yes ); | 373 | QDateTime incidenceStart = getNextOccurence( start_dt, &yes ); |
374 | if ( ! yes || cancelled() ) { | 374 | if ( ! yes || cancelled() ) { |
375 | *ok = false; | 375 | *ok = false; |
376 | return QDateTime (); | 376 | return QDateTime (); |
377 | } | 377 | } |
378 | 378 | ||
379 | bool enabled = false; | 379 | bool enabled = false; |
380 | Alarm* alarm; | 380 | Alarm* alarm; |
381 | int off = 0; | 381 | int off = 0; |
382 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; | 382 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; |
383 | // if ( QDateTime::currentDateTime() > incidenceStart ){ | 383 | // if ( QDateTime::currentDateTime() > incidenceStart ){ |
384 | // *ok = false; | 384 | // *ok = false; |
385 | // return incidenceStart; | 385 | // return incidenceStart; |
386 | // } | 386 | // } |
387 | for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { | 387 | for (Q3PtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { |
388 | if (alarm->enabled()) { | 388 | if (alarm->enabled()) { |
389 | if ( alarm->hasTime () ) { | 389 | if ( alarm->hasTime () ) { |
390 | if ( alarm->time() < alarmStart ) { | 390 | if ( alarm->time() < alarmStart ) { |
391 | alarmStart = alarm->time(); | 391 | alarmStart = alarm->time(); |
392 | enabled = true; | 392 | enabled = true; |
393 | off = alarmStart.secsTo( incidenceStart ); | 393 | off = alarmStart.secsTo( incidenceStart ); |
394 | } | 394 | } |
395 | 395 | ||
396 | } else { | 396 | } else { |
397 | int secs = alarm->startOffset().asSeconds(); | 397 | int secs = alarm->startOffset().asSeconds(); |
398 | if ( incidenceStart.addSecs( secs ) < alarmStart ) { | 398 | if ( incidenceStart.addSecs( secs ) < alarmStart ) { |
399 | alarmStart = incidenceStart.addSecs( secs ); | 399 | alarmStart = incidenceStart.addSecs( secs ); |
400 | enabled = true; | 400 | enabled = true; |
401 | off = -secs; | 401 | off = -secs; |
402 | } | 402 | } |
403 | } | 403 | } |