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
@@ -275,7 +275,4 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
       incidence->setNonKDECustomProperty("X-ZAURUSUID", QString::number(incidence->zaurusUid()));
   }
-  if (incidence->zaurusStat() > 0) {
-      incidence->setNonKDECustomProperty("X-ZAURUSSTAT", QString::number(incidence->zaurusStat()));
-  }
 
   writeIncidenceBase(parent,incidence);
@@ -1294,9 +1291,4 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence)
   }
 
-  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();
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 9479048..707d666 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -41,5 +41,5 @@ IncidenceBase::IncidenceBase() :
   mZaurusId = -1;
   mZaurusUid = 0;
-  mZaurusStat = 0;
+  mTempSyncStat = 0;
   mSyncStatus = 0;
   mAttendees.setAutoDelete( true );
@@ -64,5 +64,5 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   mZaurusId = i.mZaurusId;
   mZaurusUid = i.mZaurusUid;
-  mZaurusStat = i.mZaurusStat;
+  mTempSyncStat = i.mTempSyncStat;
   mSyncStatus = i.mSyncStatus;
 
@@ -363,12 +363,12 @@ void IncidenceBase::setZaurusUid( int 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;
 }
 
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 0ab7eef..ce6e254 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -131,6 +131,6 @@ class IncidenceBase : public CustomProperties
     void setZaurusUid(int id);
     int zaurusUid() const;
-    void setZaurusStat(int id);
-    int zaurusStat() const;
+    void setTempSyncStat(int id);
+    int tempSyncStat() const;
 
     void registerObserver( Observer * );
@@ -156,5 +156,5 @@ class IncidenceBase : public CustomProperties
     int mZaurusId;
     int mZaurusUid;
-    int mZaurusStat;
+    int mTempSyncStat;
 
     // PILOT SYNCHRONIZATION STUFF
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 973f19d..d39d2dd 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -93,5 +93,5 @@ class SharpParser : public QObject
             event->setZaurusId( attList[0].toInt() );
             event->setZaurusUid( cSum );
-            event->setZaurusStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
+            event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
 
             event->setSummary( attList[2] );
@@ -204,5 +204,5 @@ class SharpParser : public QObject
             todo->setZaurusId( attList[0].toInt() );
             todo->setZaurusUid( cSum );
-            todo->setZaurusStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
+            todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
       
             todo->setSummary( attList[7] );
@@ -469,5 +469,5 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
                 inc->setZaurusId( newnum );
                 inc->setZaurusUid( getCsum( templist ) );
-                inc->setZaurusStat( SYNC_TEMPSTATE_NEW_ID );
+                inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             }
         }
@@ -508,9 +508,9 @@ bool SharpFormat::save( Calendar *calendar)
     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
@@ -594,9 +594,9 @@ bool SharpFormat::save( Calendar *calendar)
     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