-rw-r--r-- | libkdepim/ksyncmanager.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index d3734da..f4654ce 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -68,49 +68,50 @@ class KServerSocket : public QServerSocket | |||
68 | void get_file(); | 68 | void get_file(); |
69 | void end_connect(); | 69 | void end_connect(); |
70 | void error_connect( QString ); | 70 | void error_connect( QString ); |
71 | QDialog* mSyncActionDialog; | 71 | QDialog* mSyncActionDialog; |
72 | QSocket* mSocket; | 72 | QSocket* mSocket; |
73 | QString mPassWord; | 73 | QString mPassWord; |
74 | QString mFileName; | 74 | QString mFileName; |
75 | QTime piTime; | 75 | QTime piTime; |
76 | QString piFileString; | 76 | QString piFileString; |
77 | }; | 77 | }; |
78 | 78 | ||
79 | class KCommandSocket : public QObject | 79 | class KCommandSocket : public QObject |
80 | { | 80 | { |
81 | Q_OBJECT | 81 | Q_OBJECT |
82 | public: | 82 | public: |
83 | enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet }; | 83 | enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet }; |
84 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); | 84 | KCommandSocket (QString remoteResource, QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); |
85 | void readFile( QString ); | 85 | void readFile( QString ); |
86 | void writeFile( QString ); | 86 | void writeFile( QString ); |
87 | void sendStop(); | 87 | void sendStop(); |
88 | 88 | ||
89 | private slots : | 89 | private slots : |
90 | void sendFileRequest(); | 90 | void sendFileRequest(); |
91 | void updateConnectDialog(); | 91 | void updateConnectDialog(); |
92 | 92 | ||
93 | signals: | 93 | signals: |
94 | void commandFinished( KCommandSocket*, int ); | 94 | void commandFinished( KCommandSocket*, int ); |
95 | private slots: | 95 | private slots: |
96 | void startReadFileFromSocket(); | 96 | void startReadFileFromSocket(); |
97 | void readFileFromSocket(); | 97 | void readFileFromSocket(); |
98 | void deleteSocket(); | 98 | void deleteSocket(); |
99 | void writeFileToSocket(); | 99 | void writeFileToSocket(); |
100 | private : | 100 | private : |
101 | QString mRemoteResource; | ||
101 | int mConnectCount; | 102 | int mConnectCount; |
102 | int mConnectMax; | 103 | int mConnectMax; |
103 | KProgressDialog mConnectProgress; | 104 | KProgressDialog mConnectProgress; |
104 | QWidget* tlw; | 105 | QWidget* tlw; |
105 | QSocket* mSocket; | 106 | QSocket* mSocket; |
106 | QString mPassWord; | 107 | QString mPassWord; |
107 | Q_UINT16 mPort; | 108 | Q_UINT16 mPort; |
108 | QString mHost; | 109 | QString mHost; |
109 | QString mFileName; | 110 | QString mFileName; |
110 | QTimer* mTimerSocket; | 111 | QTimer* mTimerSocket; |
111 | int mRetVal; | 112 | int mRetVal; |
112 | QTime mTime; | 113 | QTime mTime; |
113 | QString mFileString; | 114 | QString mFileString; |
114 | bool mFirst; | 115 | bool mFirst; |
115 | bool mFirstLine; | 116 | bool mFirstLine; |
116 | }; | 117 | }; |
@@ -189,49 +190,52 @@ class KSyncManager : public QObject | |||
189 | QString mCurrentSyncDevice; | 190 | QString mCurrentSyncDevice; |
190 | QString mCurrentSyncName; | 191 | QString mCurrentSyncName; |
191 | void quickSyncLocalFile(); | 192 | void quickSyncLocalFile(); |
192 | bool syncWithFile( QString fn , bool quick ); | 193 | bool syncWithFile( QString fn , bool quick ); |
193 | void syncLocalFile(); | 194 | void syncLocalFile(); |
194 | void syncPhone(); | 195 | void syncPhone(); |
195 | void syncSharp(); | 196 | void syncSharp(); |
196 | void syncKDE(); | 197 | void syncKDE(); |
197 | bool syncExternalApplication(QString); | 198 | bool syncExternalApplication(QString); |
198 | int mCurrentSyncProfile ; | 199 | int mCurrentSyncProfile ; |
199 | void syncRemote( KSyncProfile* prof, bool ask = true); | 200 | void syncRemote( KSyncProfile* prof, bool ask = true); |
200 | bool edit_sync_options(); | 201 | bool edit_sync_options(); |
201 | bool edit_pisync_options(); | 202 | bool edit_pisync_options(); |
202 | int ringSync(); | 203 | int ringSync(); |
203 | QString getPassword( ); | 204 | QString getPassword( ); |
204 | bool mPisyncFinished; | 205 | bool mPisyncFinished; |
206 | QStringList mSpecificResources; | ||
207 | QString mCurrentResourceLocal; | ||
208 | QString mCurrentResourceRemote; | ||
205 | bool mBlockSaveFlag; | 209 | bool mBlockSaveFlag; |
206 | QWidget* mParent; | 210 | QWidget* mParent; |
207 | KSyncInterface* mImplementation; | 211 | KSyncInterface* mImplementation; |
208 | TargetApp mTargetApp; | 212 | TargetApp mTargetApp; |
209 | QPopupMenu* mSyncMenu; | 213 | QPopupMenu* mSyncMenu; |
210 | QProgressBar* bar; | 214 | QProgressBar* bar; |
211 | bool mSyncWithDesktop; | 215 | bool mSyncWithDesktop; |
212 | 216 | ||
213 | private slots: | 217 | private slots: |
214 | void displayErrorPort(); | 218 | void displayErrorPort(); |
215 | void confSync(); | 219 | void confSync(); |
216 | 220 | ||
217 | 221 | ||
218 | }; | 222 | }; |
219 | 223 | ||
220 | 224 | ||
221 | class KSyncInterface | 225 | class KSyncInterface |
222 | { | 226 | { |
223 | public : | 227 | public : |
224 | virtual void removeSyncInfo( QString syncProfile) = 0; | 228 | virtual void removeSyncInfo( QString syncProfile) = 0; |
225 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; | 229 | virtual bool sync(KSyncManager* manager, QString filename, int mode, QString resource) = 0; |
226 | virtual bool syncExternal(KSyncManager* manager, QString resource) | 230 | virtual bool syncExternal(KSyncManager* manager, QString resource) |
227 | { | 231 | { |
228 | // empty implementation, because some syncable applications do not | 232 | // empty implementation, because some syncable applications do not |
229 | // have an external(sharpdtm) syncmode, like pwmanager. | 233 | // have an external(sharpdtm) syncmode, like pwmanager. |
230 | return false; | 234 | return false; |
231 | } | 235 | } |
232 | 236 | ||
233 | 237 | ||
234 | }; | 238 | }; |
235 | 239 | ||
236 | 240 | ||
237 | #endif | 241 | #endif |