summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-07 19:42:44 (UTC)
committer zautrix <zautrix>2004-10-07 19:42:44 (UTC)
commit0a661f5800b86df385cc23f4c9a8324bd0b50a5c (patch) (side-by-side diff)
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
@@ -390,7 +390,7 @@ void KSyncManager::multiSync( bool askforPrefs )
mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
if ( askforPrefs ) {
edit_sync_options();
- mRingSyncAlgoPrefs = mSyncAlgoPrefs;
+ mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
}
mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") );
qApp->processEvents();
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 7027894..1f7c7e7 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -48,7 +48,6 @@ public:
void newConnection ( int socket ) ;
void setFileName( QString fn ) {mFileName = fn;};
-
signals:
void file_received( bool );
void request_file();
@@ -81,7 +80,6 @@ public:
void writeFile( QString );
void sendStop();
-
signals:
void commandFinished( KCommandSocket*, int );
private slots:
@@ -113,7 +111,6 @@ class KSyncManager : public QObject
KAPI = 1,
PWMPI = 2 };
-
KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
~KSyncManager() ;
@@ -123,7 +120,6 @@ class KSyncManager : public QObject
void setDefaultFileName( QString s) { mDefFileName = s ;}
QString defaultFileName() { return mDefFileName ;}
QString syncFileName();
- void fillSyncMenu();
QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
QString getCurrentSyncName() { return mCurrentSyncName; }
@@ -138,11 +134,8 @@ class KSyncManager : public QObject
QStringList mSyncProfileNames;
bool mAskForPreferences;
bool mShowSyncSummary;
- bool mShowSyncEvents;
- bool mShowTodoInAgenda;
bool mWriteBackExistingOnly;
int mSyncAlgoPrefs;
- int mRingSyncAlgoPrefs;
bool mWriteBackFile;
int mWriteBackInFuture;
QString mPhoneDevice;
@@ -161,10 +154,9 @@ class KSyncManager : public QObject
void slotSyncMenu( int );
void deleteCommandSocket(KCommandSocket*s, int state);
void readFileFromSocket();
+ void fillSyncMenu();
private:
- // LR *******************************
- // sync stuff!
void syncPi();
KServerSocket * mServerSocket;
void enableQuick();
@@ -186,36 +178,25 @@ class KSyncManager : public QObject
private slots:
void confSync();
- // *********************
-
private:
bool mBlockSaveFlag;
-
-
QWidget* mParent;
KSyncInterface* mImplementation;
TargetApp mTargetApp;
QPopupMenu* mSyncMenu;
-
QProgressBar* bar;
-
-
-
-
};
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;
}