1 files changed, 8 insertions, 7 deletions

diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index f83f72e..973f19d 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -33,24 +33,25 @@
 #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
@@ -82,25 +83,25 @@ class SharpParser : public QObject
             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]  ));
@@ -193,25 +194,25 @@ class SharpParser : public QObject
                 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 ) );
         
        
@@ -458,25 +459,25 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
            
             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;
@@ -497,29 +498,29 @@ bool SharpFormat::save( Calendar *calendar)
     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 );
@@ -583,29 +584,29 @@ bool SharpFormat::save( Calendar *calendar)
 
 
     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 );