fix

4 files changed, 8 insertions, 10 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index e029fdb..eb3a6cd 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1417,10 +1417,9 @@ void KOAgendaView::setHolidayMasks()
         if ( KOPrefs::instance()->mExcludeHolidays ) {
             QPtrList<Event> events = calendar()->events( date, true );
             Event *event;
             for( event = events.first(); event; event = events.next() ) {
-                if ( event->categories().contains("Holiday") ||
-                     event->categories().contains(i18n("Holiday"))) {
+                if ( event->isHoliday()) {
                     showHoliday = true;
                     break;
                 }
             }
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index d7a4112..36cd990 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -347,16 +347,16 @@ void KODayMatrix::updateViewTimed()
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
-            if ( event->categories().contains( i18n("Holiday") ) || event->categories().contains( "Holiday" )) {
+            if ( event->isHoliday()) {
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
             }
-            if ( event->categories().contains( i18n("Birthday") ) || event->categories().contains( "Birthday" )) {
+            if ( event->isBirthday()) {
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += i18n("Birthday") + ": "+event->summary();
                 if ( !event->location().isEmpty() )
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 004ff50..76982b4 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -514,10 +514,9 @@ void MonthViewCell::insertEvent(Event *event)
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     return;
         }
         
-        if ( event->categories().contains("Holiday") ||
-             event->categories().contains(i18n("Holiday"))) {
+        if ( event->isHoliday()) {
             setHoliday( true );
             if ( mDate.dayOfWeek() == 7 )
                 mItemList->setLineWidth( 3 );
         }
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 18dc656..66ff75d 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -477,9 +477,9 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
         if (! ok && ev->type() == "Event")
             return false;
     }
     bool bDay = false;
-    if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") )  )
+    if ( ev->isBirthday()  || ev->isAnniversary()  )
         bDay = true;
     tempText += "<tr><td><b>";
     if (ev->type()=="Event") {
         if (reply)  {
@@ -535,12 +535,12 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
     
             } else {
                 if ( bDay ) {
                     
-                    if ( ev->categories().contains( i18n("Birthday") ))
-                        tempText += "<font color=\"#F00000\">" + i18n("Birthday") +":</font>";
+                    if ( ev->isBirthday())
+                        tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>";
                     else
-                        tempText += "<font color=\"#F00000\">" + i18n("Anniversary")+":</font>";
+                        tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>";
                 } else {
                     tempText += i18n("Allday:");
                 }