1 files changed, 6 insertions, 6 deletions

diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index e5ff8af..02f13c7 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -87,142 +87,142 @@ void KOEventViewerDialog::showMe()
     showMaximized();
 #endif
    QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) );
 
 }
 void KOEventViewerDialog::setMyFocus()
 {
    
     setActiveWindow();
     mEventViewer->setFocus();  
     
 }
 void KOEventViewerDialog::print()
 {
     mEventViewer->printMe();
 
 }
 void KOEventViewerDialog::setSyncMode( bool b )
 {
   mSyncMode = b;
   //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode );
   if ( mSyncMode ) {
     findButton( Close )->setText( i18n("Cancel Sync"));
     findButton( Ok )->setText( i18n("Remote"));
     findButton( User1 )->setText( i18n("Local"));
   } else {
     findButton( Close )->setText( i18n("Close"));
     findButton( Ok )->setText( i18n("Edit"));
     findButton( User1 )->setText( i18n("Agenda"));
   }
   mEventViewer->setSyncMode( b );
 }
 void KOEventViewerDialog::setColorMode( int m )
 {
     mEventViewer->setColorMode( m );
 }
 int KOEventViewerDialog::executeS( bool local )
 {
     mSyncResult = 3; 
     if ( local ) 
         findButton( User1 )->setFocus();
     else 
         findButton( Ok )->setFocus();
     exec();
     return mSyncResult;
 }
 
 void KOEventViewerDialog::updateConfig()
 {
   mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
 
 }
 void KOEventViewerDialog::setEvent(Event *event)
 {
   mEventViewer->setEvent(event);
   mIncidence = event; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
 }
 void KOEventViewerDialog::setIncidence(Incidence *in )
 {
-    if ( in->type() == "Event" )
+    if ( in->typeID() == eventID )
         setEvent( (Event*) in );
-    else if ( in->type() =="Todo" )
+    else if ( in->typeID() == todoID )
         setTodo( (Todo*) in );
-    else if ( in->type() =="Journal" )
+    else if ( in->typeID() == journalID )
         setJournal( (Journal*) in );
 }
 void KOEventViewerDialog::addIncidence(Incidence *in)
 {
-    if ( in->type() == "Event" )
+    if ( in->typeID() == eventID )
         addEvent( (Event*) in );
-    else if ( in->type() =="Todo" )
+    else if ( in->typeID() == todoID )
          mEventViewer->setTodo( (Todo*) in, false );
-    else if ( in->type() =="Journal" )
+    else if ( in->typeID() == journalID )
          mEventViewer->setJournal( (Journal*) in, false );
   if ( mSyncMode ) {
       findButton( User1 )->setFocus();
       setCaption(i18n("Conflict! Please choose entry"));
   }   
 }
 
 void KOEventViewerDialog::addEvent(Event *event)
 { 
   mEventViewer->addEvent(event);
   mIncidence = event; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
 }
 
 void KOEventViewerDialog::setTodo(Todo *event)
 {
   mEventViewer->setTodo(event);
   mIncidence = (Incidence*)event; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Set complete"));
   }
 }
 void KOEventViewerDialog::setJournal(Journal *j)
 {
   mEventViewer->setJournal(j);
   mIncidence = (Incidence*)j; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
 }
 
 void KOEventViewerDialog::addText(QString text)
 {
   mEventViewer->addText(text); 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::editIncidence()
 {   
     sendSignalViewerClosed = false;
     if ( mSyncMode ) {
         mSyncResult = 2;
         accept();
         return;
     }
     if ( mIncidence ){
         close();
         emit editIncidence( mIncidence );
     }
 }
 void KOEventViewerDialog::showIncidence()
 {
     sendSignalViewerClosed = false;
     if ( mSyncMode ) {
         mSyncResult = 1;
         accept();