summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-07 19:42:44 (UTC)
committer zautrix <zautrix>2004-10-07 19:42:44 (UTC)
commit0a661f5800b86df385cc23f4c9a8324bd0b50a5c (patch) (unidiff)
treefcc17cfad0ffd022a4b92974bc53d39ba3f650de
parent1f1538e5707b59bfcff2014901f29a65589229e3 (diff)
downloadkdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.zip
kdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.tar.gz
kdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.tar.bz2
sync fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp2
-rw-r--r--libkdepim/ksyncmanager.h25
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
@@ -392,3 +392,3 @@ void KSyncManager::multiSync( bool askforPrefs )
392 edit_sync_options(); 392 edit_sync_options();
393 mRingSyncAlgoPrefs = mSyncAlgoPrefs; 393 mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
394 } 394 }
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 7027894..1f7c7e7 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -50,3 +50,2 @@ public:
50 void setFileName( QString fn ) {mFileName = fn;}; 50 void setFileName( QString fn ) {mFileName = fn;};
51
52signals: 51signals:
@@ -83,3 +82,2 @@ public:
83 82
84
85signals: 83signals:
@@ -115,3 +113,2 @@ class KSyncManager : public QObject
115 113
116
117 KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); 114 KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
@@ -125,3 +122,2 @@ class KSyncManager : public QObject
125 QString syncFileName(); 122 QString syncFileName();
126 void fillSyncMenu();
127 123
@@ -140,7 +136,4 @@ class KSyncManager : public QObject
140 bool mShowSyncSummary; 136 bool mShowSyncSummary;
141 bool mShowSyncEvents;
142 bool mShowTodoInAgenda;
143 bool mWriteBackExistingOnly; 137 bool mWriteBackExistingOnly;
144 int mSyncAlgoPrefs; 138 int mSyncAlgoPrefs;
145 int mRingSyncAlgoPrefs;
146 bool mWriteBackFile; 139 bool mWriteBackFile;
@@ -163,6 +156,5 @@ class KSyncManager : public QObject
163 void readFileFromSocket(); 156 void readFileFromSocket();
157 void fillSyncMenu();
164 158
165 private: 159 private:
166 // LR *******************************
167 // sync stuff!
168 void syncPi(); 160 void syncPi();
@@ -188,8 +180,4 @@ class KSyncManager : public QObject
188 void confSync(); 180 void confSync();
189 // *********************
190
191 private: 181 private:
192 bool mBlockSaveFlag; 182 bool mBlockSaveFlag;
193
194
195 QWidget* mParent; 183 QWidget* mParent;
@@ -198,9 +186,4 @@ class KSyncManager : public QObject
198 QPopupMenu* mSyncMenu; 186 QPopupMenu* mSyncMenu;
199
200 QProgressBar* bar; 187 QProgressBar* bar;
201 188
202
203
204
205
206}; 189};
@@ -210,10 +193,8 @@ class KSyncInterface
210{ 193{
211
212
213 public : 194 public :
214 virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; 195 virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
215
216 virtual bool syncExternal(KSyncManager* manager, QString resource) 196 virtual bool syncExternal(KSyncManager* manager, QString resource)
217 { 197 {
218 // empty implementation, because some syncable applications do not have an external(sharpdtm) syncmode, like pwmanager. 198 // empty implementation, because some syncable applications do not
199 // have an external(sharpdtm) syncmode, like pwmanager.
219 return false; 200 return false;