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
@@ -2602,13 +2602,13 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                         // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                         local->removeAddressee( inL );
                         ++deletedAddresseeL; 
                     } else {
-                        if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
+                        if ( ! syncManager->mWriteBackExistingOnly ) {
                             inL.removeID(mCurrentSyncDevice );
                             ++addedAddresseeR;
                             inL.setRevision( modifiedCalendar );
                             local->insertAddressee( inL, false );
                             inR = inL;
                             inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
@@ -2619,13 +2619,13 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                 } else {
                     if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
                         // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                         local->removeAddressee( inL );
                         ++deletedAddresseeL; 
                     } else {
-                        if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
+                        if ( ! syncManager->mWriteBackExistingOnly ) {
                             ++addedAddresseeR; 
                             inL.setRevision( modifiedCalendar );
                             local->insertAddressee( inL, false );
                             inR = inL;
                             inR.setResource( 0 );
                             remote->insertAddressee( inR, false );
@@ -2655,23 +2655,23 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
 
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
         remote->insertAddressee( addresseeRSync, false );
     local->insertAddressee( addresseeLSync, false );
     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") );
     }
     qDebug( mes );
     return syncOK;
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
-{
+{ 
 
     //pending prepare addresseeview for output
     //pending detect, if remote file has REV field. if not switch to external sync
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
@@ -2716,13 +2716,13 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
         //QStringList vcards;
         //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
         //  qDebug("Name %s ", (*it).familyName().latin1());
         //}
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
         if (  syncOK ) {
-            if ( KABPrefs::instance()->mWriteBackFile )
+            if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
                     qDebug("Saving remote AB ");
                     abLocal.saveAB();
                     if ( isXML ) {
@@ -2766,15 +2766,15 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         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 );
             }
         }
         setModified();
     }
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 38b55f7..1de2759 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -874,27 +874,13 @@ Event* CalendarView::getLastSyncEvent()
         mCalendar->addEvent( lse );
     }
 
     return lse;
 
 }
-// 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
 void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
 {
     if ( lastSync.count() == 0 ) {
         //qDebug(" lastSync.count() == 0");
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index a713c91..0f7e696 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -110,13 +110,12 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     KDateNavigator *dateNavigatorWidget();
 
     void addView(KOrg::BaseView *);
     void showView(KOrg::BaseView *);
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
-    void setupExternSyncProfiles();
 
   signals:
     /** This todo has been modified */
     void todoModified(Todo *, int);
   
     /** when change is made to options dialog, the topwidget will catch this
@@ -541,13 +540,12 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
             bool            mModified;   // flag indicating if calendar is modified
     bool            mReadOnly; // flag indicating if calendar is read-only
     QDate mSaveSingleDate;
 
     Incidence *mSelectedIncidence;
     Incidence *mMoveIncidence;
-    QPtrList<Event> mExternLastSyncEvent;
     KOTodoView *mTodoList;
     KOEventEditor * mEventEditor;
     KOTodoEditor  * mTodoEditor;
     KOEventViewerDialog * mEventViewerDialog;
     void keyPressEvent ( QKeyEvent *e) ;
     //QMap<Incidence*,KOIncidenceEditor*> mDialogList;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index ec69b11..9104347 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -987,13 +987,12 @@ void MainWindow::fillSyncMenu()
             syncMenu->insertSeparator();
     }
     QDir app_dir;
     if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
         syncMenu->setItemEnabled( false , 1000 );
     }
-    mView->setupExternSyncProfiles();
 }
 
 int MainWindow::ringSync()
 {
     int syncedProfiles = 0;
     int i;
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 01c57a3..6f92919 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -53,29 +53,13 @@ class KPimPrefs : public KPrefs
     void usrWriteConfig();
 
 
   public:
     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!
+  
 
 
   protected:
     virtual void setCategoryDefaults();
 
 
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 07e6761..c0cc840 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -49,13 +49,13 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 
 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 );
     bar->setCaption ("");
     
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
@@ -83,13 +83,13 @@ void KSyncManager::fillSyncMenu()
     mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
     mSyncMenu->insertSeparator();
     
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     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();
         prof << i18n("Sharp_DTM");
         prof << i18n("Local_file");
         prof << i18n("Last_file");
         KSyncProfile* temp = new KSyncProfile ();
@@ -102,14 +102,14 @@ void KSyncManager::fillSyncMenu()
         config.setGroup("General");
         config.writeEntry("SyncProfileNames",prof);
         config.writeEntry("ExternSyncProfiles","Sharp_DTM");
         config.sync();
         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 ) {
         mSyncMenu->insertItem(  prof[i], 1000+i );
         if ( i == 2 )
             mSyncMenu->insertSeparator();
     }
@@ -118,14 +118,12 @@ void KSyncManager::fillSyncMenu()
     if ( mTargetApp == PWMPI) {
         mSyncMenu->removeItem( 1000 );
     }
     else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
         mSyncMenu->setItemEnabled( 1000, false );
     }
-    //probaly useless
-    //mView->setupExternSyncProfiles();
 }
 
 void KSyncManager::slotSyncMenu( int action )
 {
     //qDebug("syncaction %d ", action);
     if ( action == 0 ) {
@@ -147,26 +145,26 @@ void KSyncManager::slotSyncMenu( int action )
     if (blockSave())
       return;
 
     setBlockSave(true);
 
     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();
     
     } else if ( action == 1001 ) {
         syncLocalFile();
 
@@ -176,32 +174,32 @@ void KSyncManager::slotSyncMenu( int action )
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
           switch(mTargetApp)
           {
             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:
               qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
               break;
               
           }
         } 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
                 syncRemote( temp );
 
         }
     }
@@ -209,13 +207,13 @@ void KSyncManager::slotSyncMenu( int action )
     setBlockSave(false);
 }
 
 void KSyncManager::syncLocalFile()
 {
 
-    QString fn =mPrefs->mLastSyncedLocalFile;
+    QString fn =mLastSyncedLocalFile;
     QString ext;
 
           switch(mTargetApp)
           {
             case (KAPI):
               ext = "(*.vcf)";
@@ -260,30 +258,30 @@ bool  KSyncManager::syncWithFile( QString fn , bool quick )
                                        mess,
                                        i18n("Sync"), i18n("Cancel"), 0,
                                        0, 1 );
         if ( result )
             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();
     }
     return ret;
 }
 void KSyncManager::quickSyncLocalFile()
 {
     
-    if ( syncWithFile( mPrefs->mLastSyncedLocalFile, false ) ) {
+    if ( syncWithFile( mLastSyncedLocalFile, false ) ) {
         qDebug("quick syncLocalFile() successful ");
       
     }
 }
 void KSyncManager::multiSync( bool askforPrefs  )
 {
@@ -297,16 +295,16 @@ void KSyncManager::multiSync( bool askforPrefs  )
                                    0, 0 ) != 0 ) {
         setBlockSave(false);
         mParent->setCaption(i18n("Aborted! Nothing synced!"));
         return;
     }
     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.") );
     qApp->processEvents();
     int num = ringSync() ;
     if (  num > 1 )
         ringSync();
@@ -322,15 +320,15 @@ void KSyncManager::multiSync( bool askforPrefs  )
 int KSyncManager::ringSync()
 {
     int syncedProfiles = 0;
     unsigned int i;
     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;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
 
         QString includeInRingSync;
@@ -352,48 +350,48 @@ int KSyncManager::ringSync()
           }
         
         
         if ( includeInRingSync && ( i < 1 || i > 2  )) {
             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();
             } else {
                 if ( temp->getIsLocalFileSync() ) {
                   switch(mTargetApp)
                     {
                     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:
                       qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
                       break;
                     }
                 } 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
                         syncRemote( temp, false );
 
                 }
             }
@@ -488,13 +486,13 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 
     if ( syncWithFile( localTempFile, true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
-        if ( mPrefs->mWriteBackFile ) {
+        if ( mWriteBackFile ) {
             int fi;
             if ( (fi = postCommand.find("$PWD$")) > 0 ) {
                 QString pwd = getPassword();
                 postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                 
             }
@@ -512,13 +510,13 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     return;
 }
 
 void KSyncManager::edit_sync_options()
 {
     //mDialogManager->showSyncOptions();
-    //mPrefs->mSyncAlgoPrefs 
+    //mSyncAlgoPrefs 
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
     QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
     QVBoxLayout lay ( &dia );
     lay.setSpacing( 2 );
     lay.setMargin( 3 );
@@ -530,13 +528,13 @@ void KSyncManager::edit_sync_options()
     QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
     QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
     //QRadioButton both( i18n("Take both on conflict"), &gr );
     QPushButton pb ( "OK",  &dia); 
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
-    switch ( mPrefs->mSyncAlgoPrefs ) {
+    switch ( mSyncAlgoPrefs ) {
     case 0:
         loc.setChecked( true);
         break;
     case 1:
         rem.setChecked( true );
         break;
@@ -556,13 +554,13 @@ void KSyncManager::edit_sync_options()
         // both.setChecked( true);
         break; 
     default:
         break;
     }
     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 ;
     }
    
 
 }
 QString  KSyncManager::getPassword( )
 {
@@ -600,14 +598,14 @@ void KSyncManager::confSync()
 #ifndef DESKTOP_VERSION
     sp->showMaximized();
 #else
     sp->show();
 #endif
     sp->exec();
-    mPrefs->mSyncProfileNames = sp->getSyncProfileNames();
-    mPrefs->mLocalMachineName = sp->getLocalMachineName ();
+    mSyncProfileNames = sp->getSyncProfileNames();
+    mLocalMachineName = sp->getLocalMachineName ();
     fillSyncMenu();
 }
 
 void KSyncManager::syncSharp()
 {
     if ( ! syncExternalApplication("sharp") )
@@ -616,13 +614,13 @@ void KSyncManager::syncSharp()
 
 bool KSyncManager::syncExternalApplication(QString  resource)
 {
     if (  mImplementation->sync_isModified()  )
         mImplementation->sync_save();
 
-    if ( mPrefs->mAskForPreferences )
+    if ( mAskForPreferences )
         edit_sync_options();
 
     qDebug("sync %s", resource.latin1());
 
     bool syncOK = mImplementation->syncExternal(this, resource);
 
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 9761107..6b10016 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -56,12 +56,31 @@ class KSyncManager : public QObject
     QString getCurrentSyncName() { return mCurrentSyncName; }
 
     void showProgressBar(int percentage, QString caption = QString::null, int total=100);
     void hideProgressBar();
     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:
     void slotSyncMenu( int );
 
  private:
     // LR *******************************
@@ -89,13 +108,12 @@ class KSyncManager : public QObject
     bool mBlockSaveFlag;
 
 
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
-    KPimPrefs* mPrefs;
     QPopupMenu* mSyncMenu;
 
     QProgressBar* bar;
 
 
 
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
@@ -2957,13 +2957,13 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
                 if ( inLocal->meta.update < mLastSync && mode != 4 ) {
                     // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                     syncLocal->delEntry(catLocal, indexLocal, true);
                         //USsyncLocal->removeAddressee( inLocal );
                     ++deletedPasswordsLocal; 
                 } else {
-                    if ( ! PWMPrefs::instance()->mWriteBackExistingOnly ) {
+                    if ( ! manager->mWriteBackExistingOnly ) {
                         ++addedPasswordsRemote; 
                         inLocal->meta.update = modifiedSync;
                         //USsyncLocal->insertAddressee( inLocal, false );
                         (*inRemote) = (*inLocal);
                         //USsyncRemote->insertAddressee( inRemote, false );
                         syncRemote->addEntry("newcategory", inRemote, true, false);
@@ -2992,13 +2992,13 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
     //    addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
 
     syncRemote->addSyncDataEntry( syncItemRemote, false );
     syncLocal->addSyncDataEntry( syncItemLocal, false );
     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") );
     }
     qDebug( mes );
   return e_success;
 }
 
@@ -3136,13 +3136,13 @@ bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode)
   }
 
   
   err = syncronize(manager, this, pSyncTarget, mode );
 
   if (err == e_success) {
-            if ( PWMPrefs::instance()->mWriteBackFile ){
+            if ( manager->mWriteBackFile ){
       qDebug("Saving remote PWManager file");
       err = pSyncTarget->saveDoc(conf()->confGlobCompression());
       if (err != e_success) {
         qDebug("PwmDoc::sync: Sync failed. Error %i while storing file %s",err, filename.latin1());
         return false;
       }