4 files changed, 41 insertions, 100 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index fab4540..5150455 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -727,7 +727,7 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
     QDateTime lastSync = mLastCalendarSync;
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
-        remCh = ( remote->zaurusUid() != local->zaurusUid() );
+        remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
         locCh = ( local->lastModified() > mLastCalendarSync );
         //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() );
         if ( !remCh && ! locCh ) {
@@ -773,7 +773,7 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
         if ( equ ) {
             //qDebug("equal ");
             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                local->setZaurusUid( remote->zaurusUid() );
+                local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
             }
             if ( mode < SYNC_PREF_FORCE_LOCAL )
                 return 0;
@@ -895,13 +895,13 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t
     Event* eve = lastSync.first();
 
     while ( eve ) {
-        int id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name
-        if ( id >=  0 ) {
+        QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name
+        if ( !id.isEmpty() ) {
             QString des = eve->description();
             QString pref = "e";
             if ( toDelete->type() == "Todo" )
                 pref = "t";
-            des += pref+ QString::number ( id ) + ",";
+            des += pref+  id  + ",";
             eve->setReadOnly( false );
             eve->setDescription( des );
             eve->setReadOnly( true );
@@ -1013,7 +1013,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local
-                        inL->setZaurusUid( inR->zaurusUid() );
+                        inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                         remote->deleteIncidence( inR );
                         if ( inL->revision() < maxrev )
                             inL->setRevision( maxrev );
@@ -1033,7 +1033,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     QString pref = "e";
                     if ( inR->type() == "Todo" )
                         pref = "t";
-                    if ( des.find(pref+QString::number( inR->getID(mCurrentSyncDevice) ) +"," ) >= 0 && mode != 5) { // delete it
+                    if ( des.find(pref+ inR->getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                         inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         //remote->deleteIncidence( inR );
                         ++deletedEventR; 
@@ -1083,12 +1083,12 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             inR = remote->incidence( uid );
             if ( ! inR ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                    if ( inL->getID(mCurrentSyncDevice) >= 0 && mode != 4 ) {
+                    if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
-                            inL->setID(mCurrentSyncDevice, -1 );
+                            inL->removeID(mCurrentSyncDevice );
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
                             remote->addIncidence(  inL->clone() );
@@ -1208,7 +1208,7 @@ void CalendarView::syncSharp()
                         loc = mCalendar->incidence(inc->uid() );
                         if ( loc ) {
                             loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) );
-                            loc->setZaurusUid( inc->zaurusUid() );
+                            loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) );
                         }
                     }
                     inc =  iL.next();
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 5d8785b..15c4fa8 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -21,6 +21,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
+#include <kidmanager.h>
 
 #include "calformat.h"
 
@@ -38,7 +39,6 @@ IncidenceBase::IncidenceBase() :
   mDuration = 0;
   mHasDuration = false;
   mPilotId = 0; 
-  mZaurusUid = 0;
   mExternalId = ":";
   mTempSyncStat = 0;
   mSyncStatus = 0;
@@ -61,7 +61,6 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   mFloats = i.mFloats;
   mLastModified = i.mLastModified;
   mPilotId = i.mPilotId;
-  mZaurusUid = i.mZaurusUid;
   mTempSyncStat = i.mTempSyncStat;
   mSyncStatus = i.mSyncStatus;
   mExternalId = i.mExternalId;
@@ -341,16 +340,6 @@ int IncidenceBase::pilotId() const
   return mPilotId;
 }
 
-int IncidenceBase::zaurusUid() const
-{
-  return mZaurusUid;
-}
-void IncidenceBase::setZaurusUid( int id )
-{
-  if (mReadOnly) return;
-  mZaurusUid = id;
-}
-
 int IncidenceBase::tempSyncStat() const
 {
   return mTempSyncStat;
@@ -361,74 +350,29 @@ void IncidenceBase::setTempSyncStat( int id )
   mTempSyncStat = id;
 }
 
-void IncidenceBase::setID( const QString & prof , int id )
+void IncidenceBase::removeID(const QString &prof)
 {
-    int num = mExternalId.find( ":"+prof+";" );
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        int end = mExternalId.find( ";", num+len );
-        if ( end > 0 ) {
-            mExternalId = mExternalId.left( num+len ) +QString::number( id)+mExternalId.mid( end );
-        } else
-            qDebug("Error in IncidenceBase::setID ");
-    } else {
-        mExternalId += prof+";"+QString::number( id) +";0:";
-    }
-    qDebug("setID*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
+    mExternalId = KIdManager::removeId ( mExternalId, prof);
+
 }
-int IncidenceBase::getID( const QString &  prof)
+void IncidenceBase::setID( const QString & prof , const QString & id )
 {
-    int ret = -1;
-    int num = mExternalId.find(":"+ prof+";" );
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        int end = mExternalId.find( ";", num+len );
-        if ( end > 0 ) {
-            bool ok;
-            ret = mExternalId.mid ( num + len,end-len-num).toInt( &ok );
-            if (!ok)
-                ret = -1;
-        }
+    mExternalId = KIdManager::setId ( mExternalId, prof, id );
     }
-    qDebug("getID*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
-    return ret; 
+QString IncidenceBase::getID( const QString &  prof)
+{
+    return KIdManager::getId ( mExternalId, prof ); 
 }
 
 // example  :Sharp_DTM;22;23566:TP;-1;8654:TPP;18;0:
 // format name;III;JJJ:  III >= 0, may be -1.  JJJ always >= 0  
-void IncidenceBase::setCsum( const QString & prof , int id )
-{
-    int num = mExternalId.find( ":"+prof+";");
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        num = mExternalId.find(  ";", num+len );
-        int end = mExternalId.find( ":", num+1 );
-        if ( end > 0 ) {
-            mExternalId = mExternalId.left( num ) +QString::number(id)+mExternalId.mid( end );
-        } else
-            qDebug("Error in IncidenceBase::setCsum ");
-    } else {
-        mExternalId += prof+";-1;"+QString::number( id) +":";
-    }
-    qDebug("setCsum*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
-}
-int IncidenceBase::getCsum( const QString &  prof)
-{
-    int ret = -1;
-    int num = mExternalId.find( ":"+prof+";" );
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        num = mExternalId.find(  ";", num+len );
-        int end = mExternalId.find( ":", num+1 );
-        if ( end > 0 ) {
-            bool ok;
-            ret = mExternalId.mid ( num ,end-num).toInt( &ok );
-            if (!ok)
-                ret = -1;
-        }
-    }
-    qDebug("getCsum*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
-    return ret;
+void IncidenceBase::setCsum( const QString & prof , const QString & id )
+{
+    mExternalId = KIdManager::setCsum ( mExternalId, prof, id );
+}
+QString IncidenceBase::getCsum( const QString &  prof)
+{
+    return KIdManager::getCsum ( mExternalId, prof ); 
 }
 
 void IncidenceBase::setIDStr( const QString & s )
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index e2950d3..e02d03a 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -126,17 +126,15 @@ class IncidenceBase : public CustomProperties
     /** Return Pilot Id. */
     int pilotId() const;
 
-    void setZaurusUid(int id);
-    int zaurusUid() const;
     void setTempSyncStat(int id);
     int tempSyncStat() const;
     void setIDStr( const QString & );
     QString IDStr() const;
-    void setID( const QString &, int );
-    int getID( const QString & );
-    void setCsum( const QString &, int );
-    int getCsum( const QString & );
-
+    void setID( const QString &, const QString & );
+    QString  getID( const QString & );
+    void setCsum( const QString &, const QString & );
+    QString getCsum( const QString & );
+    void removeID(const QString &);
 
     void registerObserver( Observer * );
     void unRegisterObserver( Observer * );
@@ -159,7 +157,6 @@ class IncidenceBase : public CustomProperties
     int mDuration;
     bool mHasDuration;
     QString  mExternalId;
-    int mZaurusUid;
     int mTempSyncStat;
 
     // PILOT SYNCHRONIZATION STUFF
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 605a54d..e8934bf 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -90,8 +90,8 @@ class SharpParser : public QObject
                 event = (Event*)event->clone();
             else
                 event = new Event;
-            event->setID("Sharp_DTM", attList[0].toInt() );
-            event->setZaurusUid( cSum );
+            event->setID("Sharp_DTM", attList[0] );
+            event->setCsum( "Sharp_DTM", QString::number( cSum ));
             event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
 
             event->setSummary( attList[2] );
@@ -201,8 +201,8 @@ class SharpParser : public QObject
 //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->setID( "Sharp_DTM", attList[0].toInt() );
-            todo->setZaurusUid( cSum );
+            todo->setID( "Sharp_DTM", attList[0]);
+            todo->setCsum( "Sharp_DTM", QString::number( cSum ));
             todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
       
             todo->setSummary( attList[7] );
@@ -466,8 +466,8 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
             int newnum = templist[0].toInt( &ok );
             if ( ok && newnum > 0) {
                 retval = newnum; 
-                inc->setID( "Sharp_DTM",newnum );
-                inc->setZaurusUid( getCsum( templist ) );
+                inc->setID( "Sharp_DTM",templist[0] );
+                inc->setCsum( "Sharp_DTM", QString::number( getCsum( templist ) ));
                 inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             }
         }
@@ -520,7 +520,7 @@ bool SharpFormat::save( Calendar *calendar)
                 deleteEnt = true;
                 changeEnt = true;
                 }
-            else  if ( ev->getID("Sharp_DTM") == -1  ) {       // add new 
+            else  if ( ev->getID("Sharp_DTM").isEmpty()  ) {       // add new 
                 command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 system (  command.utf8() );
                 QFile file( fileName );
@@ -606,7 +606,7 @@ bool SharpFormat::save( Calendar *calendar)
                 deleteEnt = true;
                 changeEnt = true;
                 }
-            else  if ( to->getID("Sharp_DTM") == -1  ) {       // add new 
+            else  if ( to->getID("Sharp_DTM").isEmpty() ) {       // add new 
                 command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName;
                 system (  command.utf8() );
                 QFile file( fileName );
@@ -696,7 +696,7 @@ QString SharpFormat::dtToString( const QDateTime& dti, bool useTZ )
 QString SharpFormat::getEventString( Event* event )
 {
     QStringList list;
-    list.append( QString::number(event->getID("Sharp_DTM") ) );
+    list.append( event->getID("Sharp_DTM")  );
     list.append( event->categories().join(",") );
     if ( !event->summary().isEmpty() )
         list.append( event->summary() );
@@ -860,7 +860,7 @@ QString SharpFormat::getEventString( Event* event )
 QString SharpFormat::getTodoString( Todo* todo )
 {
     QStringList list;
-    list.append( QString::number( todo->getID("Sharp_DTM") ) );
+    list.append(  todo->getID("Sharp_DTM")  );
     list.append( todo->categories().join(",") );
 
     if ( todo->hasStartDate() ) {