author | zautrix <zautrix> | 2005-11-28 05:53:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-28 05:53:55 (UTC) |
commit | 29c3ed5181b8a33aac73eec90956819b71641048 (patch) (side-by-side diff) | |
tree | 8733a18a337b28545ccda5e178cab1b1977314d5 | |
parent | c09ac6c4c77ee1ed50cd9d86a6798eebdede3991 (diff) | |
download | kdepimpi-29c3ed5181b8a33aac73eec90956819b71641048.zip kdepimpi-29c3ed5181b8a33aac73eec90956819b71641048.tar.gz kdepimpi-29c3ed5181b8a33aac73eec90956819b71641048.tar.bz2 |
sync
-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 @@ -1562,17 +1562,17 @@ void PwM::createAboutData_slot() "Ian MacGregor - original documentation author.\n" ); } //this are the overwritten callbackmethods from the syncinterface -bool PwM::sync(KSyncManager* manager, QString filename, int mode) +bool PwM::sync(KSyncManager* manager, QString filename, int mode,QString resource) { PWM_ASSERT(curDoc()); - bool ret = curDoc()->sync(manager, filename, mode); + bool ret = curDoc()->sync(manager, filename, mode,resource); qDebug("PwM::sync save now: ret=%i", ret); if (ret == true) { //US BUG: what can we call here to update the view of the current doc? //mViewManager->refreshView(); 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 @@ -276,13 +276,13 @@ protected: private: #ifdef PWM_EMBEDDED //this are the overwritten callbackmethods from the syncinterface - virtual bool sync(KSyncManager* manager, QString filename, int mode); + virtual bool sync(KSyncManager* manager, QString filename, int mode,QString resource); virtual void removeSyncInfo( QString syncProfile); // LR ******************************* // sync stuff! QPopupMenu *syncPopup; KSyncManager* syncManager; 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 @@ -3441,13 +3441,13 @@ void PwMDoc::removeSyncInfo( QString syncProfile) } } } //this are the overwritten callbackmethods from the syncinterface -bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode) +bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode, QString resource) { QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); //1) unlock local file first if necessary (ask for password) if (this->isDeepLocked()) { PwMerror ret = this->deepLock(false); 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 @@ -793,13 +793,13 @@ QFile *f); // 1 take local // 2 take remote // 3 cancel int takePwMDataItem( PwMDataItem* local, PwMDataItem* remote, QDateTime lastSync, int mode , bool full ); //the following methods are the overwritten callbackmethods from the syncinterface - virtual bool sync(KSyncManager* manager, QString filename, int mode); + virtual bool sync(KSyncManager* manager, QString filename, int mode, QString resource); virtual void removeSyncInfo( QString syncProfile); #endif //US ENH: helpermethods to return a whole category entry /** returns a pointer to the categoryitem */ PwMCategoryItem* getCategoryEntry(unsigned int index) |