author | zautrix <zautrix> | 2004-10-07 19:42:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-07 19:42:44 (UTC) |
commit | 0a661f5800b86df385cc23f4c9a8324bd0b50a5c (patch) (side-by-side diff) | |
tree | fcc17cfad0ffd022a4b92974bc53d39ba3f650de | |
parent | 1f1538e5707b59bfcff2014901f29a65589229e3 (diff) | |
download | kdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.zip kdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.tar.gz kdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.tar.bz2 |
sync fix
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 25 |
2 files changed, 4 insertions, 23 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 568c2a9..01309d5 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -391,5 +391,5 @@ void KSyncManager::multiSync( bool askforPrefs ) if ( askforPrefs ) { edit_sync_options(); - mRingSyncAlgoPrefs = mSyncAlgoPrefs; + mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; } mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 7027894..1f7c7e7 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h @@ -49,5 +49,4 @@ public: void newConnection ( int socket ) ; void setFileName( QString fn ) {mFileName = fn;}; - signals: void file_received( bool ); @@ -82,5 +81,4 @@ public: void sendStop(); - signals: void commandFinished( KCommandSocket*, int ); @@ -114,5 +112,4 @@ class KSyncManager : public QObject PWMPI = 2 }; - KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); ~KSyncManager() ; @@ -124,5 +121,4 @@ class KSyncManager : public QObject QString defaultFileName() { return mDefFileName ;} QString syncFileName(); - void fillSyncMenu(); QString getCurrentSyncDevice() { return mCurrentSyncDevice; } @@ -139,9 +135,6 @@ class KSyncManager : public QObject bool mAskForPreferences; bool mShowSyncSummary; - bool mShowSyncEvents; - bool mShowTodoInAgenda; bool mWriteBackExistingOnly; int mSyncAlgoPrefs; - int mRingSyncAlgoPrefs; bool mWriteBackFile; int mWriteBackInFuture; @@ -162,8 +155,7 @@ class KSyncManager : public QObject void deleteCommandSocket(KCommandSocket*s, int state); void readFileFromSocket(); + void fillSyncMenu(); private: - // LR ******************************* - // sync stuff! void syncPi(); KServerSocket * mServerSocket; @@ -187,21 +179,12 @@ class KSyncManager : public QObject private slots: void confSync(); - // ********************* - private: bool mBlockSaveFlag; - - QWidget* mParent; KSyncInterface* mImplementation; TargetApp mTargetApp; QPopupMenu* mSyncMenu; - QProgressBar* bar; - - - - }; @@ -209,12 +192,10 @@ class KSyncManager : public QObject class KSyncInterface { - - public : virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; - virtual bool syncExternal(KSyncManager* manager, QString resource) { - // empty implementation, because some syncable applications do not have an external(sharpdtm) syncmode, like pwmanager. + // empty implementation, because some syncable applications do not + // have an external(sharpdtm) syncmode, like pwmanager. return false; } |