more AB sync

1 files changed, 23 insertions, 21 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0c75632..8e83723 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -705,143 +705,145 @@ 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;
+    QDateTime localMod = local->lastModified();
+    QDateTime remoteMod = remote->lastModified();
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
         //if ( remCh )        
             //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
-        locCh = ( local->lastModified() > mLastCalendarSync );
+        locCh = ( localMod > mLastCalendarSync );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
-            lastSync = local->lastModified().addDays(1);
+            lastSync = localMod.addDays(1);
             if ( mode <= SYNC_PREF_ASK )
                 return 0;
         } else {
             if ( locCh ) {
-                //qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1());
-                lastSync = local->lastModified().addDays( -1 );
+                //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1());
+                lastSync = localMod.addDays( -1 );
                 if ( !remCh )
-                    remote->setLastModified( lastSync.addDays( -1 ) );
+                    remoteMod = ( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
-                lastSync = local->lastModified().addDays( 1 );
+                lastSync = localMod.addDays( 1 );
                 if ( remCh )
-                    remote->setLastModified( lastSync.addDays( 1 ) );
+                    remoteMod =( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
         if ( mode < SYNC_PREF_ASK )
             mode = SYNC_PREF_ASK;
     } else {
-          if ( local->lastModified() == remote->lastModified() )
+          if ( localMod == remoteMod )
             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() );
+    //qDebug("%s %d  %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision());  
+    //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(),  remoteMod.time().second(), remoteMod.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_EXTERNAL ) {
                 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
             }
             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;
-    //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  local->lastModified().toString().latin1() , remote->lastModified().toString().latin1()  );
+    //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  localMod.toString().latin1() , remoteMod.toString().latin1()  );
 
     if ( full && mode < SYNC_PREF_NEWEST )
         mode = SYNC_PREF_ASK;
 
     switch( mode ) {
     case SYNC_PREF_LOCAL:
-        if ( lastSync > remote->lastModified() )
+        if ( lastSync > remoteMod )
             return 1;
-        if ( lastSync > local->lastModified() )
+        if ( lastSync > localMod )
             return 2;
         return 1;
         break;
     case SYNC_PREF_REMOTE:
-        if ( lastSync > remote->lastModified() )
+        if ( lastSync > remoteMod )
             return 1;
-        if ( lastSync > local->lastModified() )
+        if ( lastSync > localMod )
             return 2;
         return 2;
         break;
     case SYNC_PREF_NEWEST:
-        if ( local->lastModified() > remote->lastModified() )
+        if ( localMod > remoteMod )
             return 1;
         else
             return 2;
         break;
     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() )
+        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
+        if ( lastSync > remoteMod )
             return 1;
-        if ( lastSync > local->lastModified() )
+        if ( lastSync > localMod )
             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();
+        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
+        localIsNew = localMod >= remoteMod;
         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 SYNC_PREF_FORCE_LOCAL:
         return 1;
         break;
     case SYNC_PREF_FORCE_REMOTE:
         return 2;
         break;