Made sync code more readable by using defines

5 files changed, 60 insertions, 60 deletions

diff --git a/Makefile b/Makefile
index 826e70e..19c57e5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,61 +5,55 @@ DISTDIR = $(shell basename $(DISTPATH))
 ifeq ($(PLATFORM) , zaurus)
   BUILD_NO_LDAP_PLUGIN=1
 endif
 
 ifneq ($(PLATFORM) , zaurus)
   BUILD_NO_SHARP_PLUGIN=1
 endif
 
 SUBDIRS_MICROKDE = \
    libical/src/libical \
    libical/src/libicalss \
    qtcompat \
    microkde \
    libkcal \
    libkdepim \
    kabc \
    kabc/formats/binary \
    kabc/plugins/file \
    kabc/plugins/dir \
    korganizer \
    kalarmd \
    kaddressbook
 
 SUBDIRS_QTOPIA_PLUGIN = \
-   kabc/converter/qtopia \
-   kabc/plugins/qtopia \
-   kaddressbook/xxport/qtopia
+   kabc/plugins/qtopia 
 
 SUBDIRS_OPIE_PLUGIN = \
-   kabc/converter/opie \
-   kabc/plugins/opie \
-   kaddressbook/xxport/opie
+   kabc/plugins/opie
 
 SUBDIRS_SHARP_PLUGIN = \
-   kabc/converter/sharpdtm \
-   kabc/plugins/sharpdtm \
-   kaddressbook/xxport/sharpdtm
+   kabc/plugins/sharpdtm 
 
 SUBDIRS_LDAP_PLUGIN = \
    kabc/plugins/ldap
 
 SUBDIRS_MICROMAIL = \
    kmicromail/libetpan \
    kmicromail/libmailwrapper \
    kmicromail
 
 SUBDIRS = \
    $(SUBDIRS_MICROKDE) \
    $(SUBDIRS_QTOPIA_PLUGIN) \
    $(SUBDIRS_OPIE_PLUGIN) \
    $(SUBDIRS_SHARP_PLUGIN) \
    $(SUBDIRS_LDAP_PLUGIN) \
    $(SUBDIRS_MICROMAIL)
 
 
 all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
      build_sharp_plugin \
      build_ldap_plugin \
      build_micromail
@@ -175,107 +169,93 @@ install:
 
 dist:
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
 	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
 	./mkipks kmicrokdelibs.control
 	./mkipks korganizer.control
 	./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	./mkipks kopiemail.control
   endif
 	./mkipks korganizer-alarm.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
-       kabc/converter/opie/Makefile$(PLATFORM) \
-       kabc/converter/qtopia/Makefile$(PLATFORM) \
-       kabc/converter/sharpdtm/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/xxport/opie/Makefile$(PLATFORM) \
        kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \
        kaddressbook/xxport/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
        kmicromail/libmailwrapper/Makefile$(PLATFORM) 
        
 
 
-
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
 	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
 
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
 	cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
 
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
 	cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
 
 
 libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
 	cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
 
 kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
 	cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
 
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
 	cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
 
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
 	cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
 
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
 	cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
 
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
 	cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
 
-kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieE.pro
-	cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
-
-kabc/converter/qtopia/Makefile$(PLATFORM): kabc/converter/qtopia/qtopiaE.pro
-	cd kabc/converter/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
-   
-kabc/converter/sharpdtm/Makefile$(PLATFORM): kabc/converter/sharpdtm/sharpdtmE.pro
-	cd kabc/converter/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
-
- 
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
 	cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
 	cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
 	cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
 	cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
 	cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
 	cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
 	cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
 
 kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro
 	cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 58b3d70..fd68dc4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -108,51 +108,49 @@
 #include "kdatenavigator.h"
 #include "kotodoview.h"
 #include "datenavigator.h"
 #include "resourceview.h"
 #include "navigatorbar.h"
 #include "searchdialog.h"
 #include "mainwindow.h"
 
 #include "calendarview.h"
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h> 
 #endif
 #ifndef _WIN32_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #else
 #include <qprocess.h>
 #endif
 using namespace KOrg;
 using namespace KCal;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 
-#define SYNC_MODE_NORMAL 0
-#define SYNC_MODE_SHARP 1
-#define SYNC_MODE_QTOPIA 2
+
 
 class KOBeamPrefs : public QDialog
 {
   public:
     KOBeamPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Beam Options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("File format"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         QButtonGroup* time = new  QButtonGroup(1, Horizontal, i18n("Time format"), this );
         lay->addWidget( time ); time->setExclusive ( true ) ;
         vcal = new QRadioButton(" vCalendar ", format );
         ical = new QRadioButton(" iCalendar ", format );
         vcal->setChecked( true );
         tz = new QRadioButton(i18n(" With timezone "), time );
         local = new QRadioButton(i18n(" Local time "), time );
         tz->setChecked( true );
         QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this );
         lay->addWidget( ok );
@@ -706,164 +704,165 @@ void CalendarView::confSync()
 //KOPrefs::instance()->mWriteBackFile
 //KOPrefs::instance()->mWriteBackExistingOnly
 
 //  0  syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
 //  1  syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
 //  2  syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
 //  3  syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
 //  4  syncPrefsGroup->addRadio(i18n("Force take local entry always"));
 //  5  syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
 
 int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , bool full )
 {
  
     //void setZaurusId(int id);
     // int zaurusId() const;
     //  void setZaurusUid(int id);
    // int zaurusUid() const;
    // void setZaurusStat(int id);
    // int zaurusStat() const;
     // 0 equal
     // 1 take local
     // 2 take remote
     // 3 cancel 
     QDateTime lastSync = mLastCalendarSync;
-    if ( mGlobalSyncMode == SYNC_MODE_SHARP ) {
+    if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->zaurusUid() != local->zaurusUid() );
-        locCh = ( local->zaurusStat() != local->revision() );
+        locCh = ( local->lastModified() > mLastCalendarSync );
         //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
             lastSync = local->lastModified().addDays(1);
         } else {
             if ( locCh ) {
                 //qDebug("loc changed %d %d", local->zaurusStat(), local->revision() );
                 lastSync = local->lastModified().addDays( -1 );
                 if ( !remCh )
                     remote->setLastModified( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
                 lastSync = local->lastModified().addDays( 1 );
                 if ( remCh )
                     remote->setLastModified( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
-        if ( mode < 3 )
-            mode = 3;
+        if ( mode < SYNC_PREF_ASK )
+            mode = SYNC_PREF_ASK;
     } else {
           if ( local->lastModified() == remote->lastModified() )
             if ( local->revision() == remote->revision() )
                 return 0;
         
     }
     // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
 
     //qDebug("%s %d  %s %d", local->lastModified().toString().latin1() , local->revision(), remote->lastModified().toString().latin1(), remote->revision());  
     //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(),  remote->lastModified().time().second(), remote->lastModified().time().msec() );
     //full = true; //debug only
     if ( full ) {
         bool equ = false;
         if ( local->type() == "Event" ) {
             equ =  (*((Event*) local) == *((Event*) remote));
         }
         else if ( local->type() =="Todo" )
             equ =  (*((Todo*) local) == (*(Todo*) remote));
         else if ( local->type() =="Journal" )
             equ =  (*((Journal*) local) == *((Journal*) remote));
         if ( equ ) {
             //qDebug("equal ");
-            if ( mGlobalSyncMode == SYNC_MODE_SHARP ) {
+            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                 local->setZaurusUid( remote->zaurusUid() );
             }
-            if ( mode < 4 )
+            if ( mode < SYNC_PREF_FORCE_LOCAL )
                 return 0;
               
         }//else //debug only
         //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
     }
     int result;
     bool localIsNew;
-    if ( full && mode < 2 )
-        mode = 3;
+    if ( full && mode < SYNC_PREF_NEWEST )
+        mode = SYNC_PREF_ASK;
 
     switch( mode ) {
-    case 0:
+    case SYNC_PREF_LOCAL:
         if ( lastSync > remote->lastModified() )
             return 1;
         if ( lastSync > local->lastModified() )
             return 2;
         return 1;
         break;
-    case 1:
+    case SYNC_PREF_REMOTE:
         if ( lastSync > remote->lastModified() )
             return 1;
         if ( lastSync > local->lastModified() )
             return 2;
         return 2;
         break;
-    case 2:
+    case SYNC_PREF_NEWEST:
         if ( local->lastModified() > remote->lastModified() )
             return 1;
         else
             return 2;
         break;
-    case 3: 
+    case SYNC_PREF_ASK: 
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
         if ( lastSync > remote->lastModified() )
             return 1;
         if ( lastSync > local->lastModified() )
             return 2;
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
         localIsNew = local->lastModified() > remote->lastModified();
         if ( localIsNew )
             getEventViewerDialog()->setColorMode( 1 );
          else 
             getEventViewerDialog()->setColorMode( 2 );
         getEventViewerDialog()->setIncidence(local);
         if ( localIsNew )
             getEventViewerDialog()->setColorMode( 2 );
          else 
             getEventViewerDialog()->setColorMode( 1 );
         getEventViewerDialog()->addIncidence(remote);
         getEventViewerDialog()->setColorMode( 0 );
         //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo()  );
         getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!"));
         getEventViewerDialog()->showMe();
         result = getEventViewerDialog()->executeS( localIsNew );
         return result;
           
         break;
-    case 4:
+    case SYNC_PREF_FORCE_LOCAL:
         return 1;
         break;
-    case 5:
+    case SYNC_PREF_FORCE_REMOTE:
         return 2;
         break;
        
     default:
+        // SYNC_PREF_TAKE_BOTH not implemented
         break;
     }
     return 0;
 }
 Event* CalendarView::getLastSyncEvent()
 {
     Event* lse; 
     //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
     lse =   mCalendar->event( "last-syncEvent-device-"+mCurrentSyncDevice );
     if (!lse) {
         lse = new Event();
         lse->setUid( "last-syncEvent-device-"+mCurrentSyncDevice ); 
         lse->setSummary(mCurrentSyncDevice + i18n(" - sync event"));
         lse->setDtStart( mLastCalendarSync );
         lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         lse->setCategories( i18n("SyncEvent") );
         lse->setReadOnly( true );
         mCalendar->addEvent( lse );
     }
 
     return lse;
 
 }
 void CalendarView::checkSharpEvent( Event* lastSync, Incidence* toDelete )
@@ -975,103 +974,103 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             if ( inL ) { // maybe conflict - same uid in both calendars
                 int maxrev = inL->revision();
                 if ( maxrev < inR->revision() )
                     maxrev = inR->revision();
                 if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
                     //qDebug("take %d %s ", take, inL->summary().latin1());
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local
                         inL->setZaurusUid( inR->zaurusUid() );
                         remote->deleteIncidence( inR );
                         if ( inL->revision() < maxrev )
                             inL->setRevision( maxrev );
                         remote->addIncidence(  inL->clone() );
                         ++changedRemote;
                     } else {
                         if ( inR->revision() < maxrev )
                             inR->setRevision( maxrev );
                         local->deleteIncidence( inL );
                         local->addIncidence(  inR->clone()  );
                         ++changedLocal;
                     }
                 }
             } else { //  no conflict
-                if ( mGlobalSyncMode == SYNC_MODE_SHARP ) {
+                if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = eventLSync->description(); 
                     QString pref = "e";
                     if ( inR->type() == "Todo" )
                         pref = "t";
                     if ( des.find(pref+QString::number( inR->zaurusId() ) +"," ) >= 0 && mode != 5) { // delete it
-                        inR->setZaurusStat( -3 );
+                        inR->setZaurusStat( SYNC_TEMPSTATE_DELETE );
                         //remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     } else {
                         inR->setLastModified( modifiedCalendar );
                         local->addIncidence( inR->clone() );
                         ++addedEvent;
                     }
                 } else {
                     if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) {
                         inR->setLastModified( modifiedCalendar );
                         local->addIncidence( inR->clone() );
                         ++addedEvent;
                     } else {
                         checkSharpEvent(eventRSyncSharp, inR);
                         remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     }
                 }
             }
         }
         inR =  er.next();
     }
     QPtrList<Incidence> el = local->rawIncidences(); 
     inL = el.first();
     modulo = (el.count()/10)+1;
     bar.setCaption (i18n("Add / remove events") ); 
     bar.setTotalSteps (  el.count()  ) ;
     bar.show();
     incCounter = 0;
    
     while ( inL ) {
            
         qApp->processEvents();
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inL->uid();
         bool skipIncidence = false;
         if ( uid.left(21) == QString("last-syncEvent-device") )
             skipIncidence = true;
-        if ( mGlobalSyncMode == SYNC_MODE_SHARP && inL->type() == "Journal" )
+        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inR = remote->incidence( uid );
             if ( ! inR ) { 
-                if ( mGlobalSyncMode == SYNC_MODE_SHARP ) {
+                if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     if ( inL->zaurusId() >= 0 && mode != 4 ) {
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
                             inL->setZaurusId( -1 );
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
                             remote->addIncidence(  inL->clone() );
                         }
                     }
                 } else {
                     if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
                         checkSharpEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
                             remote->addIncidence(  inL->clone() );
                         }
                     }
                 }
@@ -1120,78 +1119,80 @@ bool CalendarView::syncCalendar(QString filename, int mode)
     storage->setFileName( filename );
     // qDebug("loading ... ");
     if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( KOPrefs::instance()->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
                 storage->save();
             }
         }
         setModified( true );
     }
     delete storage;
     delete calendar;
     if ( syncOK )
         updateView();
     return syncOK;
 }
 void CalendarView::syncSharp()
 {
 #ifndef DESKTOP_VERSION
-    mGlobalSyncMode = SYNC_MODE_SHARP;
+    mGlobalSyncMode = SYNC_MODE_EXTERNAL;
     //mCurrentSyncDevice = "sharp-DTM";
     if ( KOPrefs::instance()->mAskForPreferences )
         edit_sync_options(); 
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
     SharpFormat sharpFormat;
     if ( sharpFormat.load( calendar, mCalendar ) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
             if ( KOPrefs::instance()->mWriteBackFile )
             {
                 QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
                 Incidence* inc = iL.first();
+                /* obsolete
                 while ( inc ) {
                     inc->setZaurusStat( inc->revision () );
                     inc =  iL.next();
                 }
+                */
                 // pending: clean last sync event description
                 sharpFormat.save(calendar);
                 iL = calendar->rawIncidences(); 
                 inc = iL.first();
                 Incidence* loc;
                 while ( inc ) {
-                    if ( inc->zaurusStat() == -4 ) {
+                    if ( inc->zaurusStat() == SYNC_TEMPSTATE_NEW_ID ) {
                         loc = mCalendar->incidence(inc->uid() );
                         if ( loc ) {
                             loc->setZaurusId( inc->zaurusId() );
                             loc->setZaurusUid( inc->zaurusUid() );
                         }
                     }
                     inc =  iL.next();
                 }
                 Incidence* lse = getLastSyncEvent();
                 if ( lse ) {
                     lse->setReadOnly( false );
                     lse->setDescription( "" );
                     lse->setReadOnly( true );
                 }
             }
         }
         setModified( true );
     } else {
         QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ;
         QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                       question, i18n("Ok")) ;
 
     }
     delete calendar;
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index f83f72e..973f19d 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -21,48 +21,49 @@
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qxml.h>
 #include <qlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include "calendar.h"
 #include "alarm.h"
 #include "recurrence.h"
 #include "calendarlocal.h"
 
 #include "sharpformat.h"
+#include "syncdefines.h"
 
 using namespace KCal;
 
 //CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY
 //  0       1      2     3   4    5     6   7    8     9   10   11   12   13   14   15   16   17   18   19
 
 //ARSD  silentalarm = 0
 // 11 RTYP 225 no /0 dialy/ 1 weekly/ 3 month by date/ 2 month by day(pos)/ yearly
 // 12 RFRQ
 // 13 RPOS pos = 4. monday in month
 // 14 RDYS days: 1 mon/ 2 tue .. 64 sun
 // 15 REND 0 = no end/ 1 = end
 // 16 REDT rec end dt  
 //ALSD
 //ALED
 //MDAY
 
 class SharpParser : public QObject
 {
   public:
     SharpParser( Calendar *calendar ) : mCalendar( calendar ) {
         oldCategories = 0;
     }
   
@@ -70,49 +71,49 @@ class SharpParser : public QObject
     {
         int i = 1;
         bool skip = true;
         int max = attList.count() -2;
         while ( i < max ) {
             if ( !attList[i].isEmpty() ) {
                 skip = false;
                 break;
             } 
             ++i ;
         }
         if ( skip )
             return false;
         ulong cSum = SharpFormat::getCsum(attList );
         
         if ( qName == "Event" ) {
             Event *event;
             event = existingCalendar->event( attList[0].toInt() );
             if ( event )
                 event = (Event*)event->clone();
             else
                 event = new Event;
             event->setZaurusId( attList[0].toInt() );
             event->setZaurusUid( cSum );
-            event->setZaurusStat( -2 );
+            event->setZaurusStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
 
             event->setSummary( attList[2] );
             event->setLocation( attList[3] );
             event->setDescription( attList[4]  );
             if ( attList[7] == "1" ) {
                 event->setDtStart( QDateTime(fromString( attList[17]+"000000", false ).date(),QTime(0,0,0 ) ));
                 event->setDtEnd( QDateTime(fromString( attList[18]+"000000", false ).date(),QTime(0,0,0 )));
                 event->setFloats( true );
             } else {
                 event->setFloats( false );
                 event->setDtStart( fromString( attList[5] ) );
                 event->setDtEnd( fromString( attList[6]  ));
             }
         
             QString rtype = attList[11];
             if ( rtype != "255" ) {
                 //  qDebug("recurs ");
                 QDate startDate = event->dtStart().date();
         
                 QString freqStr = attList[12];
                 int freq = freqStr.toInt();
 
                 QString hasEndDateStr = attList[15] ;
                 bool hasEndDate = hasEndDateStr == "1";
@@ -181,49 +182,49 @@ class SharpParser : public QObject
                 alarm->setType( Alarm::Audio );
                 alarm->setEnabled( true );
                 int alarmOffset = attList[9].toInt();
                 alarm->setStartOffset( alarmOffset * -60 );
             }
         
             mCalendar->addEvent( event);
         } else if ( qName == "Todo" ) {
             Todo *todo;
 
             todo = existingCalendar->todo( attList[0].toInt() );
             if (todo )
                 todo = (Todo*)todo->clone();
             else
                 todo = new Todo;
 
 //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1
 //  0      1       2    3    4    5    6    7    8
 //1,,,,,1,4,Loch zumachen,""
 //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb ""   "
 //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes
      
             todo->setZaurusId( attList[0].toInt() );
             todo->setZaurusUid( cSum );
-            todo->setZaurusStat( -2 );
+            todo->setZaurusStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
       
             todo->setSummary( attList[7] );
             todo->setDescription( attList[8]);
         
             int priority = attList[6].toInt();
             if ( priority == 0 ) priority = 3;
             todo->setPriority( priority );
         
             QString categoryList = attList[1];
             todo->setCategories( lookupCategories( categoryList ) );
         
        
         
             QString hasDateStr = attList[3]; // due
             if ( !hasDateStr.isEmpty() ) {
                 if ( hasDateStr.right(6) == "000000" ) {
                     todo->setDtDue( QDateTime(fromString( hasDateStr, false ).date(), QTime(0,0,0 )) );
                     todo->setFloats( true );
                 }
                 else {
                     todo->setDtDue( fromString( hasDateStr ) );
                     todo->setFloats( false );
                 }
                 
@@ -446,92 +447,92 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
                 ok = false;
                 start = 0;
                 break;
             }
             if ( ok )
                 tempString = getPart(  answer, ok, start );
             if ( start >= len || start == 0 ) {
                 start = 0;
                 ok = false;
             }
             if ( tempString.right(1) =="\n" )
                 tempString = tempString.left( tempString.length()-1);
            
             templist.append( tempString ); 
         }
         ++ccc;
         if ( ccc == 2 && loopCount < 25 ) { 
             start = 0;
             bool ok;
             int newnum = templist[0].toInt( &ok );
             if ( ok && newnum > 0) {
                 retval = newnum; 
                 inc->setZaurusId( newnum );
                 inc->setZaurusUid( getCsum( templist ) );
-                inc->setZaurusStat( -4 );
+                inc->setZaurusStat( SYNC_TEMPSTATE_NEW_ID );
             }
         }
     }
     //qDebug("getNumFromRecord returning : %d ", retval);
     return retval;
 }
 bool SharpFormat::save( Calendar *calendar)
 {
 
     QLabel status ( i18n("Processing/adding events ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 200;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     status.setCaption(i18n("Writing DTM Data") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     bool debug = DEBUGMODE;
     QString codec = "utf8";
     QString answer;
     QString ePrefix = "CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY\n";
     QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n";
     QString command;
     QPtrList<Event> er = calendar->rawEvents(); 
     Event* ev = er.first();
     QString  fileName = "/tmp/kopitempout";
     int i = 0;
     QString changeString = ePrefix;
     QString  deleteString = ePrefix;
     bool deleteEnt = false;
     bool changeEnt = false;
     QString message = i18n("Processing event # ");
     int procCount = 0;
     while ( ev ) {
         //qDebug("i %d ", ++i);
-        if ( ev->zaurusStat() != -2 ) {
+        if ( ev->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
             status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             QString eString = getEventString( ev );
-            if ( ev->zaurusStat() == -3 ) { // delete
+            if ( ev->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
                 // we write first and x  and then delete the record with the x
                 eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
                 changeString += eString + "\n";
                 deleteString += eString + "\n";
                 deleteEnt = true;
                 changeEnt = true;
                 }
             else  if ( ev->zaurusId() == -1  ) {       // add new 
                 command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 system (  command.utf8() );
                 QFile file( fileName );
                 if (!file.open( IO_ReadOnly ) ) {
                     return false;
                     
                 } 
                 QTextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, ev  ) ;
 
             }
@@ -571,53 +572,53 @@ bool SharpFormat::save( Calendar *calendar)
         if (!file.open( IO_WriteOnly ) ) {
             return false;
             
         } 
         QTextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << deleteString;
         file.close();
         command = "db2file datebook -d -c " + codec+ " < "+ fileName;
         system ( command.latin1() );
         // qDebug("command %s file :\n%s ", command.latin1(), deleteString.latin1());
     }
 
 
     changeString = tPrefix;
     deleteString = tPrefix;
     status.setText ( i18n("Processing todos ...") );
     qApp->processEvents();
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     i = 0;
     message = i18n("Processing todo # ");
     procCount = 0;
     while ( to ) {
-       if ( to->zaurusStat() != -2 ) {
+       if ( to->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
              status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             QString eString = getTodoString( to );
-            if ( to->zaurusStat() == -3 ) { // delete
+            if ( to->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
                 // we write first and x  and then delete the record with the x
                 eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
                 changeString += eString + "\n";
                 deleteString += eString + "\n";
                 deleteEnt = true;
                 changeEnt = true;
                 }
             else  if ( to->zaurusId() == -1  ) {       // add new 
                 command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName;
                 system (  command.utf8() );
                 QFile file( fileName );
                 if (!file.open( IO_ReadOnly ) ) {
                     return false;
                     
                 } 
                 QTextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, to  ) ;
 
             }
diff --git a/libkcal/syncdefines.h b/libkcal/syncdefines.h
new file mode 100644
index 0000000..57642ec
--- a/dev/null
+++ b/libkcal/syncdefines.h
@@ -0,0 +1,22 @@
+ 
+#ifndef _KSYNC_DEFINES_H_
+#define _KSYNC_DEFINES_H_
+
+#define SYNC_PREF_LOCAL 0
+#define SYNC_PREF_REMOTE 1
+#define SYNC_PREF_NEWEST 2
+#define SYNC_PREF_ASK 3
+#define SYNC_PREF_FORCE_LOCAL 4
+#define SYNC_PREF_FORCE_REMOTE 5
+#define SYNC_PREF_TAKE_BOTH 6
+
+#define SYNC_MODE_NORMAL 0
+#define SYNC_MODE_EXTERNAL 1
+
+#define SYNC_TEMPSTATE_INITIAL 0
+#define SYNC_TEMPSTATE_NEW_EXTERNAL  -2
+#define SYNC_TEMPSTATE_DELETE -3
+#define SYNC_TEMPSTATE_NEW_ID -4
+
+
+#endif
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 238ffad..3f7f1ac 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -6,55 +6,51 @@
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef _KSYNCPROFILE_H
 #define _KSYNCPROFILE_H
 
 #include <qptrlist.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qstringlist.h>
 #include <qobject.h>
 #include <qstring.h>
 
-#define SYNC_PREF_LOCAL 0
-#define SYNC_PREF_REMOTE 1
-#define SYNC_PREF_NEWEST 2
-#define SYNC_PREF_ASK 3
-#define SYNC_PREF_FORCE_LOCAL 4
-#define SYNC_PREF_FORCE_REMOTE 5
-#define SYNC_PREF_TAKE_BOTH 6
+#include <libkcal/syncdefines.h>
+
+
 
 class KConfig;
 
 /**
   @short Class for storing a preferences setting
   @author Cornelius Schumacher
   @see KPref
   
   This class represents one preferences setting as used by @ref KPrefs.
   Subclasses of KPrefsItem implement storage functions for a certain type of
   setting. Normally you don't have to use this class directly. Use the special
   addItem() functions of KPrefs instead. If you subclass this class you will
   have to register instances with the function KPrefs::addItem().
 */
 class KSyncProfile : public QObject {
   public:
     KSyncProfile( const char * name = 0);
     ~KSyncProfile() ;
     
     KSyncProfile* clone();
     void setDefault();
     void readConfig(KConfig *);
     void writeConfig(KConfig *);
     void setName( const QString& n ) {mName = n;}