-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.h | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmdoc.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index e12dc49..8373850 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
@@ -1556,29 +1556,29 @@ void PwM::createAboutData_slot() | |||
1556 | "George Staikos - staikos@kde.org\n" | 1556 | "George Staikos - staikos@kde.org\n" |
1557 | "Matthew Palmer - mjp16@uow.edu.au\n" | 1557 | "Matthew Palmer - mjp16@uow.edu.au\n" |
1558 | "Olivier Sessink - gpasman@nl.linux.org\n" | 1558 | "Olivier Sessink - gpasman@nl.linux.org\n" |
1559 | "The libgcrypt developers -\nBlowfish and SHA1 algorithms\nftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/\n" | 1559 | "The libgcrypt developers -\nBlowfish and SHA1 algorithms\nftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/\n" |
1560 | "Troy Engel - tengel@sonic.net\n" | 1560 | "Troy Engel - tengel@sonic.net\n" |
1561 | "Wickey - wickey@gmx.at\n" | 1561 | "Wickey - wickey@gmx.at\n" |
1562 | "Ian MacGregor - original documentation author.\n" | 1562 | "Ian MacGregor - original documentation author.\n" |
1563 | ); | 1563 | ); |
1564 | } | 1564 | } |
1565 | 1565 | ||
1566 | 1566 | ||
1567 | //this are the overwritten callbackmethods from the syncinterface | 1567 | //this are the overwritten callbackmethods from the syncinterface |
1568 | bool PwM::sync(KSyncManager* manager, QString filename, int mode) | 1568 | bool PwM::sync(KSyncManager* manager, QString filename, int mode,QString resource) |
1569 | { | 1569 | { |
1570 | PWM_ASSERT(curDoc()); | 1570 | PWM_ASSERT(curDoc()); |
1571 | 1571 | ||
1572 | bool ret = curDoc()->sync(manager, filename, mode); | 1572 | bool ret = curDoc()->sync(manager, filename, mode,resource); |
1573 | 1573 | ||
1574 | qDebug("PwM::sync save now: ret=%i", ret); | 1574 | qDebug("PwM::sync save now: ret=%i", ret); |
1575 | 1575 | ||
1576 | if (ret == true) { | 1576 | if (ret == true) { |
1577 | //US BUG: what can we call here to update the view of the current doc? | 1577 | //US BUG: what can we call here to update the view of the current doc? |
1578 | //mViewManager->refreshView(); | 1578 | //mViewManager->refreshView(); |
1579 | 1579 | ||
1580 | //US curDoc()->sync sets the dirtyFlag in case the sync was successfull. | 1580 | //US curDoc()->sync sets the dirtyFlag in case the sync was successfull. |
1581 | save(); | 1581 | save(); |
1582 | } | 1582 | } |
1583 | 1583 | ||
1584 | return ret; | 1584 | return ret; |
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h index 2d1b854..c4bbb4e 100644 --- a/pwmanager/pwmanager/pwm.h +++ b/pwmanager/pwmanager/pwm.h | |||
@@ -270,25 +270,25 @@ protected: | |||
270 | KPopupMenu *importPopup; | 270 | KPopupMenu *importPopup; |
271 | /** force quit this window? */ | 271 | /** force quit this window? */ |
272 | bool forceQuit; | 272 | bool forceQuit; |
273 | /** force minimize this window to the tray */ | 273 | /** force minimize this window to the tray */ |
274 | bool forceMinimizeToTray; | 274 | bool forceMinimizeToTray; |
275 | 275 | ||
276 | 276 | ||
277 | 277 | ||
278 | 278 | ||
279 | private: | 279 | private: |
280 | #ifdef PWM_EMBEDDED | 280 | #ifdef PWM_EMBEDDED |
281 | //this are the overwritten callbackmethods from the syncinterface | 281 | //this are the overwritten callbackmethods from the syncinterface |
282 | virtual bool sync(KSyncManager* manager, QString filename, int mode); | 282 | virtual bool sync(KSyncManager* manager, QString filename, int mode,QString resource); |
283 | virtual void removeSyncInfo( QString syncProfile); | 283 | virtual void removeSyncInfo( QString syncProfile); |
284 | 284 | ||
285 | // LR ******************************* | 285 | // LR ******************************* |
286 | // sync stuff! | 286 | // sync stuff! |
287 | QPopupMenu *syncPopup; | 287 | QPopupMenu *syncPopup; |
288 | KSyncManager* syncManager; | 288 | KSyncManager* syncManager; |
289 | #endif | 289 | #endif |
290 | 290 | ||
291 | 291 | ||
292 | 292 | ||
293 | 293 | ||
294 | 294 | ||
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index 1f3c58b..b58d7e2 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp | |||
@@ -3435,25 +3435,25 @@ void PwMDoc::removeSyncInfo( QString syncProfile) | |||
3435 | { | 3435 | { |
3436 | res = delSyncDataEntry(count, false); | 3436 | res = delSyncDataEntry(count, false); |
3437 | if (res == false) { | 3437 | if (res == false) { |
3438 | qDebug("PwMDoc::removeSyncInfo: could not remove %s", syncProfile.latin1()); | 3438 | qDebug("PwMDoc::removeSyncInfo: could not remove %s", syncProfile.latin1()); |
3439 | 3439 | ||
3440 | } | 3440 | } |
3441 | } | 3441 | } |
3442 | } | 3442 | } |
3443 | } | 3443 | } |
3444 | 3444 | ||
3445 | 3445 | ||
3446 | //this are the overwritten callbackmethods from the syncinterface | 3446 | //this are the overwritten callbackmethods from the syncinterface |
3447 | bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode) | 3447 | bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode, QString resource) |
3448 | { | 3448 | { |
3449 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 3449 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
3450 | 3450 | ||
3451 | //1) unlock local file first if necessary (ask for password) | 3451 | //1) unlock local file first if necessary (ask for password) |
3452 | if (this->isDeepLocked()) { | 3452 | if (this->isDeepLocked()) { |
3453 | PwMerror ret = this->deepLock(false); | 3453 | PwMerror ret = this->deepLock(false); |
3454 | if (ret != e_success) | 3454 | if (ret != e_success) |
3455 | return false; | 3455 | return false; |
3456 | } | 3456 | } |
3457 | 3457 | ||
3458 | //2) construct and open a new doc on the stack(automatic cleanup of remote file). | 3458 | //2) construct and open a new doc on the stack(automatic cleanup of remote file). |
3459 | PwMDoc syncTarget(this, "synctarget"); | 3459 | PwMDoc syncTarget(this, "synctarget"); |
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h index 45dd729..144831f 100644 --- a/pwmanager/pwmanager/pwmdoc.h +++ b/pwmanager/pwmanager/pwmdoc.h | |||
@@ -787,25 +787,25 @@ QFile *f); | |||
787 | #ifdef PWM_EMBEDDED | 787 | #ifdef PWM_EMBEDDED |
788 | //US ENH: this is the magic function that syncronizes the local doc with the remote doc. | 788 | //US ENH: this is the magic function that syncronizes the local doc with the remote doc. |
789 | PwMerror syncronize(KSyncManager* manager, PwMDoc* syncLocal, PwMDoc* syncRemote, int mode ); | 789 | PwMerror syncronize(KSyncManager* manager, PwMDoc* syncLocal, PwMDoc* syncRemote, int mode ); |
790 | 790 | ||
791 | //takePwMDataItem returns the following values | 791 | //takePwMDataItem returns the following values |
792 | // 0 equal | 792 | // 0 equal |
793 | // 1 take local | 793 | // 1 take local |
794 | // 2 take remote | 794 | // 2 take remote |
795 | // 3 cancel | 795 | // 3 cancel |
796 | int takePwMDataItem( PwMDataItem* local, PwMDataItem* remote, QDateTime lastSync, int mode , bool full ); | 796 | int takePwMDataItem( PwMDataItem* local, PwMDataItem* remote, QDateTime lastSync, int mode , bool full ); |
797 | 797 | ||
798 | //the following methods are the overwritten callbackmethods from the syncinterface | 798 | //the following methods are the overwritten callbackmethods from the syncinterface |
799 | virtual bool sync(KSyncManager* manager, QString filename, int mode); | 799 | virtual bool sync(KSyncManager* manager, QString filename, int mode, QString resource); |
800 | virtual void removeSyncInfo( QString syncProfile); | 800 | virtual void removeSyncInfo( QString syncProfile); |
801 | 801 | ||
802 | #endif | 802 | #endif |
803 | //US ENH: helpermethods to return a whole category entry | 803 | //US ENH: helpermethods to return a whole category entry |
804 | /** returns a pointer to the categoryitem */ | 804 | /** returns a pointer to the categoryitem */ |
805 | PwMCategoryItem* getCategoryEntry(unsigned int index) | 805 | PwMCategoryItem* getCategoryEntry(unsigned int index) |
806 | { return &(dti.dta[index]); } | 806 | { return &(dti.dta[index]); } |
807 | 807 | ||
808 | private: | 808 | private: |
809 | //US ENH: helpermethods to access the sync data for a certain syncname. | 809 | //US ENH: helpermethods to access the sync data for a certain syncname. |
810 | // It returns the syncdatas index | 810 | // It returns the syncdatas index |
811 | bool findSyncData(const QString &syncname, unsigned int *index); | 811 | bool findSyncData(const QString &syncname, unsigned int *index); |