summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-10-13 22:15:49 (UTC)
committer ulf69 <ulf69>2004-10-13 22:15:49 (UTC)
commit7c2a228f94d8bcb783ce6f3527cb2daa9221217b (patch) (side-by-side diff)
tree2c009f3dfd2d9897a53d0e02a067f3fff36d970b
parent737183a5abd7d7b02048e8a939bafd0a8e803918 (diff)
downloadkdepimpi-7c2a228f94d8bcb783ce6f3527cb2daa9221217b.zip
kdepimpi-7c2a228f94d8bcb783ce6f3527cb2daa9221217b.tar.gz
kdepimpi-7c2a228f94d8bcb783ce6f3527cb2daa9221217b.tar.bz2
changes to make sync working
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/pwmdoc.cpp22
-rw-r--r--pwmanager/pwmanager/pwmdoc.h4
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
@@ -2799,8 +2799,8 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
int changedLocal = 0;
int changedRemote = 0;
- PwMSyncItem syncItemLocal;
- PwMSyncItem syncItemRemote;
+ PwMSyncItem* syncItemLocal;
+ PwMSyncItem* syncItemRemote;
QString mCurrentSyncName = manager->getCurrentSyncName();
QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
@@ -2828,7 +2828,7 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
}
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);
@@ -2849,21 +2849,21 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
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!
@@ -2997,14 +2997,14 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
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 ) {
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
@@ -791,8 +791,8 @@ protected:
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);