some prefs cleanups

8 files changed, 79 insertions, 96 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b014cba..9041e45 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2606,5 +2606,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         ++deletedAddresseeL; 
                     } else {
-                        if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
+                        if ( ! syncManager->mWriteBackExistingOnly ) {
                             inL.removeID(mCurrentSyncDevice );
                             ++addedAddresseeR;
@@ -2623,5 +2623,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         ++deletedAddresseeL; 
                     } else {
-                        if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
+                        if ( ! syncManager->mWriteBackExistingOnly ) {
                             ++addedAddresseeR; 
                             inL.setRevision( modifiedCalendar );
@@ -2659,5 +2659,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
-    if ( KABPrefs::instance()->mShowSyncSummary ) {
+    if ( syncManager->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
     }
@@ -2669,5 +2669,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
-{
+{ 
 
     //pending prepare addresseeview for output
@@ -2720,5 +2720,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
         if (  syncOK ) {
-            if ( KABPrefs::instance()->mWriteBackFile )
+            if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
@@ -2770,7 +2770,7 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
         qDebug("KABCore::syncExternal: why do we acces here KABPrefs and not somehow KSyncProfile? ");
-        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, KABPrefs::instance()->mSyncAlgoPrefs );
+        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
-            if ( KABPrefs::instance()->mWriteBackFile ) {
+            if ( syncManager->mWriteBackFile ) {
                 abLocal.saveAB();
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 38b55f7..1de2759 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -878,19 +878,5 @@ Event* CalendarView::getLastSyncEvent()
 
 }
-// probaly useless
-void CalendarView::setupExternSyncProfiles()
-{
-    Event* lse; 
-    mExternLastSyncEvent.clear();
-    int i;
-    for ( i = 0; i < KOPrefs::instance()->mExternSyncProfiles.count(); ++i ) {
-        lse = mCalendar->event( "last-syncEvent-"+ KOPrefs::instance()->mExternSyncProfiles[i] );
-        if ( lse )
-            mExternLastSyncEvent.append( lse );
-        else
-            qDebug("Last Sync event not found for %s ",  KOPrefs::instance()->mExternSyncProfiles[i].latin1());
-    }
 
-}
 // we check, if the to delete event has a id for a profile
 //  if yes, we set this id in the profile to delete
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index a713c91..0f7e696 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -114,5 +114,4 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
-    void setupExternSyncProfiles();
 
   signals:
@@ -545,5 +544,4 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     Incidence *mSelectedIncidence;
     Incidence *mMoveIncidence;
-    QPtrList<Event> mExternLastSyncEvent;
     KOTodoView *mTodoList;
     KOEventEditor * mEventEditor;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index ec69b11..9104347 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -991,5 +991,4 @@ void MainWindow::fillSyncMenu()
         syncMenu->setItemEnabled( false , 1000 );
     }
-    mView->setupExternSyncProfiles();
 }
 
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 01c57a3..6f92919 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -57,21 +57,5 @@ class KPimPrefs : public KPrefs
     QStringList mCustomCategories;
 
-    // sync stuff
-    QString mLocalMachineName;
-    QStringList  mExternSyncProfiles;
-    QStringList  mSyncProfileNames;
-    bool mAskForPreferences;
-    bool mShowSyncSummary;
-    bool mShowSyncEvents;
-    bool mShowTodoInAgenda;
-    bool mWriteBackExistingOnly;
-    int mSyncAlgoPrefs;
-    int mRingSyncAlgoPrefs;
-    bool mWriteBackFile;
-    int  mWriteBackInFuture;
-    QString mPhoneDevice;
-    QString mPhoneConnection;
-    QString mPhoneModel;
-    QString mLastSyncedLocalFile; // save!
+  
 
 
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 07e6761..c0cc840 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -53,5 +53,5 @@
 
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
-  : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs), mSyncMenu(syncmenu)
+  : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu)
 {
     bar = new QProgressBar ( 1, 0 );
@@ -87,5 +87,5 @@ void KSyncManager::fillSyncMenu()
     config.setGroup("General");
     QStringList prof = config.readListEntry("SyncProfileNames");
-    mPrefs->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
+    mLocalMachineName = config.readEntry("LocalMachineName","undefined");
     if ( prof.count() < 3 ) {
         prof.clear();
@@ -106,6 +106,6 @@ void KSyncManager::fillSyncMenu()
         delete temp;
     }
-    mPrefs->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
-    mPrefs->mSyncProfileNames = prof;
+    mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
+    mSyncProfileNames = prof;
     unsigned int i;
     for ( i = 0; i < prof.count(); ++i ) {
@@ -122,6 +122,4 @@ void KSyncManager::fillSyncMenu()
         mSyncMenu->setItemEnabled( 1000, false );
     }
-    //probaly useless
-    //mView->setupExternSyncProfiles();
 }
 
@@ -151,18 +149,18 @@ void KSyncManager::slotSyncMenu( int action )
 
     mCurrentSyncProfile = action - 1000 ;
-    mCurrentSyncDevice = mPrefs->mSyncProfileNames[mCurrentSyncProfile] ;
-    mCurrentSyncName =  mPrefs->mLocalMachineName ;
+    mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
+    mCurrentSyncName =  mLocalMachineName ;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
-    temp->setName(mPrefs->mSyncProfileNames[mCurrentSyncProfile]);
+    temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
-    mPrefs->mAskForPreferences = temp->getAskForPreferences();
-    mPrefs->mSyncAlgoPrefs = temp->getSyncPrefs();
-    mPrefs->mWriteBackFile = temp->getWriteBackFile();
-    mPrefs->mWriteBackExistingOnly = temp->getWriteBackExisting();
-    mPrefs->mWriteBackInFuture = 0;
+    mAskForPreferences = temp->getAskForPreferences();
+    mSyncAlgoPrefs = temp->getSyncPrefs();
+    mWriteBackFile = temp->getWriteBackFile();
+    mWriteBackExistingOnly = temp->getWriteBackExisting();
+    mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
-        mPrefs->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
-    mPrefs->mShowSyncSummary = temp->getShowSummaryAfterSync();
+        mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
+    mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
         syncSharp();
@@ -180,13 +178,13 @@ void KSyncManager::slotSyncMenu( int action )
             case (KAPI):
               if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
-                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
+                mLastSyncedLocalFile = temp->getRemoteFileNameAB();
               break;
             case (KOPI):
               if ( syncWithFile( temp->getRemoteFileName( ), false ) )
-                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
+                mLastSyncedLocalFile = temp->getRemoteFileName();
               break;
             case (PWMPI):
               if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
-                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
+                mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
               break;
             default:
@@ -197,7 +195,7 @@ void KSyncManager::slotSyncMenu( int action )
         } else {
             if (  temp->getIsPhoneSync() ) {
-                mPrefs->mPhoneDevice = temp->getPhoneDevice( ) ;
-                mPrefs->mPhoneConnection = temp->getPhoneConnection( );
-                mPrefs->mPhoneModel = temp->getPhoneModel( );
+                mPhoneDevice = temp->getPhoneDevice( ) ;
+                mPhoneConnection = temp->getPhoneConnection( );
+                mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else
@@ -213,5 +211,5 @@ void KSyncManager::syncLocalFile()
 {
 
-    QString fn =mPrefs->mLastSyncedLocalFile;
+    QString fn =mLastSyncedLocalFile;
     QString ext;
 
@@ -264,14 +262,14 @@ bool  KSyncManager::syncWithFile( QString fn , bool quick )
             return false;
     }
-    if ( mPrefs->mAskForPreferences )
+    if ( mAskForPreferences )
         edit_sync_options();
     if ( result == 0 ) {
         //qDebug("Now sycing ... ");
-        if ( ret = mImplementation->sync( this, fn, mPrefs->mSyncAlgoPrefs ) )
+        if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
             mParent->setCaption( i18n("Synchronization successful") );
         else
             mParent->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
         if ( ! quick )
-            mPrefs->mLastSyncedLocalFile = fn;
+            mLastSyncedLocalFile = fn;
         mImplementation->sync_setModified();
     }
@@ -281,5 +279,5 @@ void KSyncManager::quickSyncLocalFile()
 {
     
-    if ( syncWithFile( mPrefs->mLastSyncedLocalFile, false ) ) {
+    if ( syncWithFile( mLastSyncedLocalFile, false ) ) {
         qDebug("quick syncLocalFile() successful ");
       
@@ -301,8 +299,8 @@ void KSyncManager::multiSync( bool askforPrefs  )
     }
     mCurrentSyncDevice = i18n("Multiple profiles") ;
-    mPrefs->mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
+    mSyncAlgoPrefs = mRingSyncAlgoPrefs;
     if ( askforPrefs ) {
         edit_sync_options();
-        mPrefs->mRingSyncAlgoPrefs = mPrefs->mSyncAlgoPrefs;
+        mRingSyncAlgoPrefs = mSyncAlgoPrefs;
     }
     mParent->setCaption(i18n("Multiple sync started.") );
@@ -326,7 +324,7 @@ int KSyncManager::ringSync()
     QTime timer;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
-    QStringList syncProfileNames = mPrefs->mSyncProfileNames;
+    QStringList syncProfileNames = mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
-    mPrefs->mAskForPreferences = false;
+    mAskForPreferences = false;
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
@@ -356,13 +354,13 @@ int KSyncManager::ringSync()
             mParent->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
-            // mPrefs->mAskForPreferences = temp->getAskForPreferences();
-            mPrefs->mWriteBackFile = temp->getWriteBackFile();
-            mPrefs->mWriteBackExistingOnly = temp->getWriteBackExisting();
-            mPrefs->mWriteBackInFuture = 0;
+            // mAskForPreferences = temp->getAskForPreferences();
+            mWriteBackFile = temp->getWriteBackFile();
+            mWriteBackExistingOnly = temp->getWriteBackExisting();
+            mWriteBackInFuture = 0;
             if ( temp->getWriteBackFuture() )
-                mPrefs->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
-            mPrefs->mShowSyncSummary = false;
+                mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
+            mShowSyncSummary = false;
             mCurrentSyncDevice = syncProfileNames[i] ;
-            mCurrentSyncName = mPrefs->mLocalMachineName;
+            mCurrentSyncName = mLocalMachineName;
             if ( i == 0 ) {
                 syncSharp();
@@ -373,13 +371,13 @@ int KSyncManager::ringSync()
                     case (KAPI):
                       if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
-                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
+                        mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                       break;
                     case (KOPI):
                       if ( syncWithFile( temp->getRemoteFileName( ), false ) )
-                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
+                        mLastSyncedLocalFile = temp->getRemoteFileName();
                       break;
                     case (PWMPI):
                       if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
-                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
+                        mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                       break;
                     default:
@@ -389,7 +387,7 @@ int KSyncManager::ringSync()
                 } else {
                     if (  temp->getIsPhoneSync() ) {
-                        mPrefs->mPhoneDevice = temp->getPhoneDevice( ) ;
-                        mPrefs->mPhoneConnection = temp->getPhoneConnection( );
-                        mPrefs->mPhoneModel = temp->getPhoneModel( );
+                        mPhoneDevice = temp->getPhoneDevice( ) ;
+                        mPhoneConnection = temp->getPhoneConnection( );
+                        mPhoneModel = temp->getPhoneModel( );
                         syncPhone();
                     } else
@@ -492,5 +490,5 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
-        if ( mPrefs->mWriteBackFile ) {
+        if ( mWriteBackFile ) {
             int fi;
             if ( (fi = postCommand.find("$PWD$")) > 0 ) {
@@ -516,5 +514,5 @@ void KSyncManager::edit_sync_options()
 {
     //mDialogManager->showSyncOptions();
-    //mPrefs->mSyncAlgoPrefs 
+    //mSyncAlgoPrefs 
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
@@ -534,5 +532,5 @@ void KSyncManager::edit_sync_options()
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
-    switch ( mPrefs->mSyncAlgoPrefs ) {
+    switch ( mSyncAlgoPrefs ) {
     case 0:
         loc.setChecked( true);
@@ -560,5 +558,5 @@ void KSyncManager::edit_sync_options()
     }
     if ( dia.exec() ) {
-        mPrefs->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
+        mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
     }
    
@@ -604,6 +602,6 @@ void KSyncManager::confSync()
 #endif
     sp->exec();
-    mPrefs->mSyncProfileNames = sp->getSyncProfileNames();
-    mPrefs->mLocalMachineName = sp->getLocalMachineName ();
+    mSyncProfileNames = sp->getSyncProfileNames();
+    mLocalMachineName = sp->getLocalMachineName ();
     fillSyncMenu();
 }
@@ -620,5 +618,5 @@ bool KSyncManager::syncExternalApplication(QString  resource)
         mImplementation->sync_save();
 
-    if ( mPrefs->mAskForPreferences )
+    if ( mAskForPreferences )
         edit_sync_options();
 
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 9761107..6b10016 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -60,4 +60,23 @@ class KSyncManager : public QObject
     bool isProgressBarCanceled();
 
+  // sync stuff
+    QString mLocalMachineName;
+    QStringList  mExternSyncProfiles;
+    QStringList  mSyncProfileNames;
+    bool mAskForPreferences;
+    bool mShowSyncSummary;
+    bool mShowSyncEvents;
+    bool mShowTodoInAgenda;
+    bool mWriteBackExistingOnly;
+    int mSyncAlgoPrefs;
+    int mRingSyncAlgoPrefs;
+    bool mWriteBackFile;
+    int  mWriteBackInFuture;
+    QString mPhoneDevice;
+    QString mPhoneConnection;
+    QString mPhoneModel;
+    QString mLastSyncedLocalFile; // save!
+
+
 
  public slots:
@@ -93,5 +112,4 @@ class KSyncManager : public QObject
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
-    KPimPrefs* mPrefs;
     QPopupMenu* mSyncMenu;
 
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 6c1a9c0..76a45f4 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2961,5 +2961,5 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
                     ++deletedPasswordsLocal; 
                 } else {
-                    if ( ! PWMPrefs::instance()->mWriteBackExistingOnly ) {
+                    if ( ! manager->mWriteBackExistingOnly ) {
                         ++addedPasswordsRemote; 
                         inLocal->meta.update = modifiedSync;
@@ -2996,5 +2996,5 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedPasswordsLocal, addedPasswordsRemote, changedLocal, changedRemote, deletedPasswordsLocal, deletedPasswordsRemote ); 
-    if ( PWMPrefs::instance()->mShowSyncSummary ) {
+    if ( manager->mShowSyncSummary ) {
         KMessageBox::information(0, mes, i18n("PWM/Pi Synchronization") );
     }
@@ -3140,5 +3140,5 @@ bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode)
 
   if (err == e_success) {
-            if ( PWMPrefs::instance()->mWriteBackFile ){
+            if ( manager->mWriteBackFile ){
       qDebug("Saving remote PWManager file");
       err = pSyncTarget->saveDoc(conf()->confGlobCompression());