4 files changed, 16 insertions, 24 deletions

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 3437f45..df05ab3 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -253,51 +253,48 @@ icalcomponent *ICalFormatImpl::writeJournal(Journal *journal)
 //      kdDebug(5800) << "§§ incidence " << event->summary() << " has time." << endl;
       start = writeICalDateTime(journal->dtStart());
     }
     icalcomponent_add_property(vjournal,icalproperty_new_dtstart(start));
   }
 
   return vjournal;
 }
 
 void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
 {
   // pilot sync stuff
 // TODO: move this application-specific code to kpilot
   if (incidence->pilotId()) {
     incidence->setNonKDECustomProperty("X-PILOTID", QString::number(incidence->pilotId()));
     incidence->setNonKDECustomProperty("X-PILOTSTAT", QString::number(incidence->syncStatus()));
   }
   if (incidence->zaurusId() >= 0) {
       incidence->setNonKDECustomProperty("X-ZAURUSID", QString::number(incidence->zaurusId()));
   }
 
   if (incidence->zaurusUid() > 0) {
       incidence->setNonKDECustomProperty("X-ZAURUSUID", QString::number(incidence->zaurusUid()));
   }
-  if (incidence->zaurusStat() > 0) {
-      incidence->setNonKDECustomProperty("X-ZAURUSSTAT", QString::number(incidence->zaurusStat()));
-  }
 
   writeIncidenceBase(parent,incidence);
   if (incidence->cancelled()) {
       icalcomponent_add_property(parent,icalproperty_new_status(ICAL_STATUS_CANCELLED));
   }
 
   // creation date
   icalcomponent_add_property(parent,icalproperty_new_created(
       writeICalDateTime(incidence->created())));
 
   // unique id
   icalcomponent_add_property(parent,icalproperty_new_uid(
       incidence->uid().utf8()));
 
   // revision
   icalcomponent_add_property(parent,icalproperty_new_sequence(
       incidence->revision()));
 
   // last modification date
   icalcomponent_add_property(parent,icalproperty_new_lastmodified(
       writeICalDateTime(incidence->lastModified())));
 
   // description
   if (!incidence->description().isEmpty()) {
@@ -1272,53 +1269,48 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence)
   }
   if ( readrec ) {
       readRecurrenceRule(rectype,incidence);
   }
   // kpilot stuff
 // TODO: move this application-specific code to kpilot
   QString kp = incidence->nonKDECustomProperty("X-PILOTID");
   if (!kp.isNull()) {
     incidence->setPilotId(kp.toInt());
   }
   kp = incidence->nonKDECustomProperty("X-PILOTSTAT");
   if (!kp.isNull()) {
     incidence->setSyncStatus(kp.toInt());
   }
   kp = incidence->nonKDECustomProperty("X-ZAURUSID");
   if (!kp.isNull()) {
     incidence->setZaurusId(kp.toInt());
   }
 
   kp = incidence->nonKDECustomProperty("X-ZAURUSUID");
   if (!kp.isNull()) {
     incidence->setZaurusUid(kp.toInt());
   }
 
-  kp = incidence->nonKDECustomProperty("X-ZAURUSSTAT");
-  if (!kp.isNull()) {
-    incidence->setZaurusStat(kp.toInt());
-  }
-
   // Cancel backwards compatibility mode for subsequent changes by the application
   incidence->recurrence()->setCompatVersion();
 
   // add categories
   incidence->setCategories(categories);
 
   // iterate through all alarms
   for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT);
        alarm;
        alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) {
     readAlarm(alarm,incidence);
   }
 }
 
 void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase)
 {
   icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY);
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_UID_PROPERTY:  // unique id
         incidenceBase->setUid(QString::fromUtf8(icalproperty_get_uid(p)));
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 9479048..707d666 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -19,72 +19,72 @@
 */
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "calformat.h"
 
 #include "incidencebase.h"
 
 using namespace KCal;
 
 IncidenceBase::IncidenceBase() :
   mReadOnly(false), mFloats(true), mDuration(0), mHasDuration(false),
   mPilotId(0), mSyncStatus(SYNCMOD)
 {
   setUid(CalFormat::createUniqueId());
   mOrganizer = "";
   mFloats = false;
   mDuration = 0;
   mHasDuration = false;
   mPilotId = 0; 
   mZaurusId = -1;
   mZaurusUid = 0;
-  mZaurusStat = 0;
+  mTempSyncStat = 0;
   mSyncStatus = 0;
   mAttendees.setAutoDelete( true );
 }
 
 IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   CustomProperties( i )
 {
   mReadOnly = i.mReadOnly;
   mDtStart = i.mDtStart;
   mDuration = i.mDuration;
   mHasDuration = i.mHasDuration;
   mOrganizer = i.mOrganizer;
   mUid = i.mUid;
   QPtrList<Attendee> attendees = i.attendees();
   for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
     mAttendees.append( new Attendee( *a ) );
   }
   mFloats = i.mFloats;
   mLastModified = i.mLastModified;
   mPilotId = i.mPilotId;
   mZaurusId = i.mZaurusId;
   mZaurusUid = i.mZaurusUid;
-  mZaurusStat = i.mZaurusStat;
+  mTempSyncStat = i.mTempSyncStat;
   mSyncStatus = i.mSyncStatus;
 
   // The copied object is a new one, so it isn't observed by the observer
   // of the original object.
   mObservers.clear();
   
   mAttendees.setAutoDelete( true );
 }
 
 IncidenceBase::~IncidenceBase()
 {
 }
 
 
 bool KCal::operator==( const IncidenceBase& i1, const IncidenceBase& i2 )
 {
 
     if( i1.attendees().count() != i2.attendees().count() ) {
         return false; // no need to check further
     }
     if ( i1.attendees().count() > 0 ) {
         Attendee * a1 = i1.attendees().first(), *a2 =i2.attendees().first() ;
         while ( a1 ) {
             if ( !( (*a1) == (*a2)) ) 
@@ -341,53 +341,53 @@ int IncidenceBase::pilotId() const
 {
   return mPilotId;
 }
 void IncidenceBase::setZaurusId( int id )
 {
   if (mReadOnly) return;
   mZaurusId = id;
 }
 
 int IncidenceBase::zaurusId() const
 {
   return mZaurusId;
 }
 
 int IncidenceBase::zaurusUid() const
 {
   return mZaurusUid;
 }
 void IncidenceBase::setZaurusUid( int id )
 {
   if (mReadOnly) return;
   mZaurusUid = id;
 }
 
-int IncidenceBase::zaurusStat() const
+int IncidenceBase::tempSyncStat() const
 {
-  return mZaurusStat;
+  return mTempSyncStat;
 }
-void IncidenceBase::setZaurusStat( int id )
+void IncidenceBase::setTempSyncStat( int id )
 {
   if (mReadOnly) return;
-  mZaurusStat = id;
+  mTempSyncStat = id;
 }
 
 void IncidenceBase::registerObserver( IncidenceBase::Observer *observer )
 {
   if( !mObservers.contains(observer) ) mObservers.append( observer );
 }
 
 void IncidenceBase::unRegisterObserver( IncidenceBase::Observer *observer )
 {
   mObservers.remove( observer );
 }
 
 void IncidenceBase::updated()
 {
   QPtrListIterator<Observer> it(mObservers);
   while( it.current() ) {
     Observer *o = it.current();
     ++it;
     o->incidenceUpdated( this );
   }
 }
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 0ab7eef..ce6e254 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -109,62 +109,62 @@ class IncidenceBase : public CustomProperties
     QPtrList<Attendee> attendees() const { return mAttendees; };
     /** Return number of attendees. */
     int attendeeCount() const { return mAttendees.count(); };
     /** Return the Attendee with this email */
     Attendee* attendeeByMail(const QString &);
     /** Return first Attendee with one of this emails */
     Attendee* attendeeByMails(const QStringList &, const QString& email = QString::null);
 
     /** pilot syncronization states */
     enum { SYNCNONE = 0, SYNCMOD = 1, SYNCDEL = 3 };
     /** Set synchronisation satus. */
     void setSyncStatus(int stat);
     /** Return synchronisation status. */
     int syncStatus() const;
 
     /** Set Pilot Id. */
     void setPilotId(int id);
     /** Return Pilot Id. */
     int pilotId() const;
 
     void setZaurusId(int id);
     int zaurusId() const;
     void setZaurusUid(int id);
     int zaurusUid() const;
-    void setZaurusStat(int id);
-    int zaurusStat() const;
+    void setTempSyncStat(int id);
+    int tempSyncStat() const;
 
     void registerObserver( Observer * );
     void unRegisterObserver( Observer * );
     void updated();
 
   protected:
     bool mReadOnly;
     QDateTime getEvenTime( QDateTime );
 
   private:
     // base components
     QDateTime mDtStart;
     QString mOrganizer;
     QString mUid;
     QDateTime mLastModified;
     QPtrList<Attendee> mAttendees;
 
     bool mFloats;
 
     int mDuration;
     bool mHasDuration;
     int mZaurusId;
     int mZaurusUid;
-    int mZaurusStat;
+    int mTempSyncStat;
 
     // PILOT SYNCHRONIZATION STUFF
     int mPilotId;                         // unique id for pilot sync
     int mSyncStatus;                      // status (for sync)
 
     QPtrList<Observer> mObservers;
 };
 
 bool operator==( const IncidenceBase&, const IncidenceBase& );
 }
 
 #endif
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 973f19d..d39d2dd 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -71,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(SYNC_TEMPSTATE_NEW_EXTERNAL );
+            event->setTempSyncStat(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";
@@ -182,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( SYNC_TEMPSTATE_NEW_EXTERNAL );
+            todo->setTempSyncStat( 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 );
                 }
                 
@@ -447,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( SYNC_TEMPSTATE_NEW_ID );
+                inc->setTempSyncStat( 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() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+        if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
             status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             QString eString = getEventString( ev );
-            if ( ev->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
+            if ( ev->tempSyncStat() == 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  ) ;
 
             }
@@ -572,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() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+       if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
              status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             QString eString = getTodoString( to );
-            if ( to->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
+            if ( to->tempSyncStat() == 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  ) ;
 
             }