-rw-r--r-- | korganizer/kodaymatrix.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index ecca374..17a1d13 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -484,33 +484,32 @@ void KODayMatrix::updateViewTimed() | |||
484 | } | 484 | } |
485 | } | 485 | } |
486 | #endif | 486 | #endif |
487 | 487 | ||
488 | #else | 488 | #else |
489 | //qDebug("KODayMatrix::updateViewTimed "); | 489 | //qDebug("KODayMatrix::updateViewTimed "); |
490 | for(int i = 0; i < NUMDAYS; i++) { | 490 | for(int i = 0; i < NUMDAYS; i++) { |
491 | // if events are set for the day then remember to draw it bold | 491 | // if events are set for the day then remember to draw it bold |
492 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 492 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
493 | Event *event; | 493 | Event *event; |
494 | int numEvents = eventlist.count(); | 494 | int numEvents = eventlist.count(); |
495 | QString holiStr = ""; | 495 | QString holiStr = ""; |
496 | bDays.clearBit(i); | 496 | bDays.clearBit(i); |
497 | hDays.clearBit(i); | 497 | hDays.clearBit(i); |
498 | eDays.clearBit(i); | 498 | eDays.clearBit(i); |
499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
500 | qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF "); | ||
501 | ushort recurType = event->recurrence()->doesRecur(); | 500 | ushort recurType = event->recurrence()->doesRecur(); |
502 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 501 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
503 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 502 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
504 | numEvents--; | 503 | numEvents--; |
505 | } | 504 | } |
506 | if ( event->isHoliday()) { | 505 | if ( event->isHoliday()) { |
507 | hDays.setBit(i); | 506 | hDays.setBit(i); |
508 | if ( !holiStr.isEmpty() ) | 507 | if ( !holiStr.isEmpty() ) |
509 | holiStr += "\n"; | 508 | holiStr += "\n"; |
510 | holiStr += event->summary(); | 509 | holiStr += event->summary(); |
511 | if ( !event->location().isEmpty() ) | 510 | if ( !event->location().isEmpty() ) |
512 | holiStr += " (" + event->location() + ")"; | 511 | holiStr += " (" + event->location() + ")"; |
513 | } | 512 | } |
514 | if ( event->isBirthday()) { | 513 | if ( event->isBirthday()) { |
515 | if ( !holiStr.isEmpty() ) | 514 | if ( !holiStr.isEmpty() ) |
516 | holiStr += "\n"; | 515 | holiStr += "\n"; |