1 files changed, 8 insertions, 8 deletions

diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index df2e478..5a3c4d2 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -106,7 +106,7 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd )
     mLastMultiItem = 0;  
     computeText();
    
-    if ( (incidence->type() == "Todo") &&
+    if ( (incidence->typeID() == todoID ) &&
          ( !((static_cast<Todo*>(incidence))->isCompleted()) &&
            ((static_cast<Todo*>(incidence))->dtDue().date() <=  QDate::currentDate()) ) ) {
         if (  (static_cast<Todo*>(incidence))->dtDue() <  QDateTime::currentDateTime().date()) 
@@ -118,13 +118,13 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd )
         QStringList categories = mIncidence->categories();
         QString cat = categories.first();
         if (cat.isEmpty()) {
-            if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) )
+            if ( (incidence->typeID() == todoID ) &&((static_cast<Todo*>(incidence))->isCompleted()) )
                 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
             else
                 mBackgroundColor =KOPrefs::instance()->mEventColor;
         } else {
             mBackgroundColor = *KOPrefs::instance()->categoryColor(cat);
-            if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) ) {
+            if ( (incidence->typeID() == todoID ) &&((static_cast<Todo*>(incidence))->isCompleted()) ) {
                 if ( mBackgroundColor == KOPrefs::instance()->mEventColor )
                     mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
             }
@@ -359,7 +359,7 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
     paint->fillRect ( x, yy,  w, h, mBackgroundColor );
     static const  QPixmap completedPxmp = SmallIcon("greenhook16");
     static const QPixmap overduePxmp = SmallIcon("redcross16");
-    if ( mIncidence->type() == "Todo" ) {
+    if ( mIncidence->typeID() == todoID ) {
         Todo* tempTodo = static_cast<Todo*>(mIncidence);
         int xx = pos().x()+(width()-completedPxmp.width()-3 );
         int yyy =  yy+3;
@@ -540,7 +540,7 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
 void KOAgendaItem::computeText()
 {
     mDisplayedText =  mIncidence->summary();
-    if ( (mIncidence->type() == "Todo") ) {
+    if ( (mIncidence->typeID() == todoID ) ) {
         if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) {
             if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() )
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")";
@@ -572,7 +572,7 @@ void KOAgendaItem::computeText()
 #ifdef DESKTOP_VERSION
     QString tipText = mIncidence->summary();
     if ( !mIncidence->doesFloat() ) {
-        if ( mIncidence->type() == "Event" ) {
+        if ( mIncidence->typeID() == eventID ) {
             if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) {
                 tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr();
                 tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr();
@@ -582,13 +582,13 @@ void KOAgendaItem::computeText()
                 tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr();
             }
         }
-        else if ( mIncidence->type() == "Todo" ) {
+        else if ( mIncidence->typeID() == todoID ) {
             if (mIncidence->hasStartDate())
                 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr();
             if (((Todo*)mIncidence)->hasDueDate())
                 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr();
         }
-    } else if ( mIncidence->type() == "Todo" ) {
+    } else if ( mIncidence->typeID() == todoID ) {
             if (mIncidence->hasStartDate())
                 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr();
             if (((Todo*)mIncidence)->hasDueDate())