2 files changed, 13 insertions, 13 deletions

diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index ab3238a..3f2f042 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2790,26 +2790,26 @@ out_ignore:
 #ifdef PWM_EMBEDDED
 //US ENH: this is the magic function that syncronizes the this doc with the remote doc
 //US it could have been defined as static, but I did not want to. 
 PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* syncRemote, int mode )
 {
   int addedPasswordsLocal = 0;
   int addedPasswordsRemote = 0;
   int deletedPasswordsRemote = 0;
   int deletedPasswordsLocal = 0;
   int changedLocal = 0;
   int changedRemote = 0;
 
-  PwMSyncItem syncItemLocal;
-  PwMSyncItem syncItemRemote;
+  PwMSyncItem* syncItemLocal;
+  PwMSyncItem* syncItemRemote;
 
   QString mCurrentSyncName = manager->getCurrentSyncName();
   QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
   bool fullDateRange = false;
   int take;
   //    local->resetTempSyncStat();
   QDateTime mLastSync = QDateTime::currentDateTime();
   QDateTime modifiedSync = mLastSync;
 
   unsigned int index;
   //Step 1. Find syncinfo in Local file and create if not existent.
@@ -2819,60 +2819,60 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
       PwMSyncItem newSyncItemLocal;
       newSyncItemLocal.syncName = mCurrentSyncDevice;
       newSyncItemLocal.lastSyncDate = mLastSync;
       syncLocal->addSyncDataEntry(&newSyncItemLocal, true);
       found = syncLocal->findSyncData(mCurrentSyncDevice, &index);
       if (found == false) {
         qDebug("PwMDoc::syncronize : newly created local sync data could not be found");
         return e_syncError;
       }
             }
 
   syncItemLocal = syncLocal->getSyncDataEntry(index); 
-  qDebug("Last Sync %s ", syncItemLocal.lastSyncDate.toString().latin1());
+  qDebug("Last Sync %s ", syncItemLocal->lastSyncDate.toString().latin1());
 
   //Step 2. Find syncinfo in remote file and create if not existent.
   found = syncRemote->findSyncData(mCurrentSyncName, &index);
   if (found == false)
     {
       qDebug("FULLDATE 1");
       fullDateRange = true;
       PwMSyncItem newSyncItemRemote;
       newSyncItemRemote.syncName = mCurrentSyncName;
       newSyncItemRemote.lastSyncDate = mLastSync;
       syncRemote->addSyncDataEntry(&newSyncItemRemote, true);
       found = syncRemote->findSyncData(mCurrentSyncName, &index);
       if (found == false) {
         qDebug("PwMDoc::syncronize : newly created remote sync data could not be found");
         return e_syncError;
       }
     }
   
   syncItemRemote = syncRemote->getSyncDataEntry(index); 
   //and remove the found entry here. We will reenter it later again.
-  syncRemote->delSyncDataEntry(index, true);
+  //US  syncRemote->delSyncDataEntry(index, true);
 
 
-  if ( syncItemLocal.lastSyncDate == mLastSync ) {
+  if ( syncItemLocal->lastSyncDate == mLastSync ) {
     qDebug("FULLDATE 2");
     fullDateRange = true;
   }
   
   if ( ! fullDateRange  ) {
-        if ( syncItemLocal.lastSyncDate != syncItemRemote->lastSyncDate ) {
+        if ( syncItemLocal->lastSyncDate != syncItemRemote->lastSyncDate ) {
             
             // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
             //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
             fullDateRange = true;
-            qDebug("FULLDATE 3 %s %s", syncItemLocal.lastSyncDate.toString().latin1() , syncItemRemote.lastSyncDate.toString().latin1() );
+            qDebug("FULLDATE 3 %s %s", syncItemLocal->lastSyncDate.toString().latin1() , syncItemRemote->lastSyncDate.toString().latin1() );
         } 
     }
     // fullDateRange = true; // debug only!
     if ( fullDateRange )
         mLastSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastSync = syncItemLocal->lastSyncDate;
 
 
     qDebug("*************************** ");
     // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
     QStringList er = syncRemote->getIDEntryList(); 
@@ -2988,32 +2988,32 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
     }
     el.clear();
     manager->hideProgressBar();
 
     // Now write the info back into the sync data space of the files
 
     mLastSync = QDateTime::currentDateTime().addSecs( 1 );
     // get rid of micro seconds
     QTime t =  mLastSync.time();
     mLastSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
 
    
-    syncItemLocal.lastSyncDate = mLastSync;
-    syncItemRemote.lastSyncDate = mLastSync;
+    syncItemLocal->lastSyncDate = mLastSync;
+    syncItemRemote->lastSyncDate = mLastSync;
 
     //    addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
     //    addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
 
-    syncRemote->addSyncDataEntry( syncItemRemote, false );
-    syncLocal->addSyncDataEntry( syncItemLocal, false );
+    //US    syncRemote->addSyncDataEntry( syncItemRemote, false );
+    //US    syncLocal->addSyncDataEntry( syncItemLocal, false );
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedPasswordsLocal, addedPasswordsRemote, changedLocal, changedRemote, deletedPasswordsLocal, deletedPasswordsRemote ); 
     if ( manager->mShowSyncSummary ) {
         KMessageBox::information(0, mes, i18n("PWM/Pi Synchronization") );
     }
     qDebug( mes );
   return e_success;
 }
 
 
 int PwMDoc::takePwMDataItem( PwMDataItem* local,  PwMDataItem* remote, QDateTime lastSync, int mode , bool full )
 {
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index ddab7f3..2e9547e 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -782,25 +782,25 @@ protected:
         virtual void sync_save();
 
 #endif
  private:
         //US ENH: helpermethods to access the sync data for a certain syncname.
         // It returns the syncdatas index
         bool findSyncData(const QString &syncname, unsigned int *index);
 
         /** add new syncdataentry */
         PwMerror addSyncDataEntry(PwMSyncItem *d, bool dontFlagDirty = false);
 
         /** returns a pointer to the syncdata */
-        PwMSyncItem getSyncDataEntry(unsigned int index)
-                        { return *(dti.syncDta[index]); }
+        PwMSyncItem* getSyncDataEntry(unsigned int index)
+                        { return &(dti.syncDta[index]); }
 
         /** delete entry */
         bool delSyncDataEntry(unsigned int index, bool dontFlagDirty = false);
 
         PwMDataItem* findEntryByID(const QString &uid, unsigned int *category, unsigned int *index);
 
         QStringList getIDEntryList(); 
 
 };
 
 #endif