Changing sync profiles filename

2 files changed, 5 insertions, 5 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7978b46..9e326a1 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -811,140 +811,140 @@ void MainWindow::initActions()
     if (p-> mShowIconDay1)
         configureToolBarMenu->setItemChecked( 40, true );
     if (p-> mShowIconDay5)
         configureToolBarMenu->setItemChecked( 50, true );
     if (p-> mShowIconDay7)
         configureToolBarMenu->setItemChecked( 60, true );
     if (p-> mShowIconMonth)
         configureToolBarMenu->setItemChecked( 70, true );
     if (p-> mShowIconTodoview)
         configureToolBarMenu->setItemChecked( 80, true );
     if (p-> mShowIconBackFast)
         configureToolBarMenu->setItemChecked( 200, true );
     if (p-> mShowIconBack)
         configureToolBarMenu->setItemChecked( 210, true );
     if (p-> mShowIconToday)
         configureToolBarMenu->setItemChecked( 130, true );
     if (p-> mShowIconForward)
         configureToolBarMenu->setItemChecked( 220, true );
     if (p-> mShowIconForwardFast)
         configureToolBarMenu->setItemChecked( 230, true );
     if (p-> mShowIconNextDays)
         configureToolBarMenu->setItemChecked( 100, true );
     if (p-> mShowIconNext)
         configureToolBarMenu->setItemChecked( 110, true );
     if (p-> mShowIconJournal)
         configureToolBarMenu->setItemChecked( 90, true );
     if (p-> mShowIconWhatsThis)
         configureToolBarMenu->setItemChecked( 300, true );
 
     QLabel* dummy = new QLabel( iconToolBar );
     dummy->setBackgroundColor( iconToolBar->backgroundColor() );
     if (!p-> mShowIconStretch)
         iconToolBar->setStretchableWidget ( dummy ) ;
     else
         configureToolBarMenu->setItemChecked( 5, true );
     if (p-> mShowIconWhatsThis)
         QWhatsThis::whatsThisButton (  iconToolBar );
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
     configureAgenda( p->mHourSize );
     connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
 void MainWindow::fillSyncMenu()
 {
     syncMenu->clear();
     syncMenu->insertItem( i18n("Configure..."), 0 );
     syncMenu->insertSeparator();
     syncMenu->insertItem( i18n("Multiple sync"), 1 );
     syncMenu->insertSeparator();
-    KConfig config ( locateLocal( "config","syncprofilesrc"  ) );
+    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     config.setGroup("General");
     QStringList prof = config.readListEntry("SyncProfileNames");
     KOPrefs::instance()->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 ();
         temp->setName( prof[0] );
         temp->writeConfig(&config);
         temp->setName( prof[1] );
         temp->writeConfig(&config);
         temp->setName( prof[2] );
         temp->writeConfig(&config);
         config.setGroup("General");
         config.writeEntry("SyncProfileNames",prof);
         config.writeEntry("ExternSyncProfiles","Sharp_DTM");
         config.sync();
         delete temp;
     }
     KOPrefs::instance()->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
     KOPrefs::instance()->mSyncProfileNames = prof;
     int i;
     for ( i = 0; i < prof.count(); ++i ) {
 
         syncMenu->insertItem(  prof[i], 1000+i );
         if ( i == 2 )
             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;
     QTime timer;
-    KConfig config ( locateLocal( "config","syncprofilesrc"  ) );
+    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
     KOPrefs::instance()->mAskForPreferences = false;
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
         if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2  )) {
             setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
             // KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
             KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
             KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
             KOPrefs::instance()->mShowSyncSummary = false;
             mView->setSyncDevice(syncProfileNames[i] );
             mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
             if ( i == 0 ) {
                 syncSharp();
             } else {
                 if ( temp->getIsLocalFileSync() ) {
                     if ( syncWithFile( temp->getRemoteFileName( ), true ) )
                         KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
                 } else {
                     if (  temp->getIsPhoneSync() ) {
                         KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
                         KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
                         KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
                         syncPhone();
                     } else
                         syncRemote( temp, false );
 
                 }
             }
             timer.start();
             setCaption(i18n("Multiple sync in progress ... please wait!") );
             while ( timer.elapsed () < 2000 ) {
                 qApp->processEvents();
 #ifndef _WIN32_
                 sleep (1);
 #endif
             }
 
         }
 
     }
     delete temp;
     return syncedProfiles;
 }
@@ -958,97 +958,97 @@ void MainWindow::multiSync( bool askforPrefs  )
     if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                    question,
                                    i18n("Yes"), i18n("No"),
                                    0, 0 ) != 0 ) {
         mBlockSaveFlag = false;
         setCaption(i18n("Aborted! Nothing synced!"));
         return;
     }
     mView->setSyncDevice(i18n("Multiple profiles") );
     KOPrefs::instance()->mSyncAlgoPrefs = KOPrefs::instance()->mRingSyncAlgoPrefs;
     if ( askforPrefs ) {
         mView->edit_sync_options();
         KOPrefs::instance()->mRingSyncAlgoPrefs = KOPrefs::instance()->mSyncAlgoPrefs;
     }
     setCaption(i18n("Multiple sync started.") );
     qApp->processEvents();
     int num = ringSync() ;
     if (  num > 1 )
         ringSync();
     mBlockSaveFlag = false;
     if ( num )
         save();
     if ( num )
         setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
     else
         setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
     return;
 }
 void MainWindow::slotSyncMenu( int action )
 {
     //qDebug("syncaction %d ", action);
     if ( action == 0 ) {
 
         confSync();
 
         return;
     }
     if ( action == 1 ) {
         multiSync( true );
         return;
     }
 
     if (mBlockSaveFlag)
         return;
     mBlockSaveFlag = true;
     mCurrentSyncProfile = action - 1000 ;
     mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
     mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
-    KConfig config ( locateLocal( "config","syncprofilesrc"  ) );
+    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
     KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
     KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
     KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
     KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
         syncSharp();
 
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
             if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                 KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
         } else {
             if (  temp->getIsPhoneSync() ) {
                 KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
                 KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
                 KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else
                 syncRemote( temp );
 
         }
     }
     delete temp;
     mBlockSaveFlag = false;
 }
 void MainWindow::setDefaultPreferences()
 {
     KOPrefs *p = KOPrefs::instance();
 
     p->mCompactDialogs = true;
     p->mConfirm = true;
     // p->mEnableQuickTodo = false;
 }
 
 QString MainWindow::resourcePath()
 {
     return KGlobal::iconLoader()->iconPath();
 }
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 67a3f52..857ceac 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -497,121 +497,121 @@ void KSyncPrefsDialog::insertProfiles()
         profileChanged( mProfileBox->currentItem() );
         currentSelection = mProfileBox->currentItem();
     }
     mProfileBox->blockSignals( false );
 }
    
 void KSyncPrefsDialog::addProfile ( KSyncProfile* temp )
 {
     saveProfile();
     mSyncProfiles.append( temp );
     mSyncProfileNames << temp->getName();
     insertProfiles();
     int last = mProfileBox->count() -1;
     mProfileBox->blockSignals( true );
     mProfileBox->setCurrentItem( last );
     mProfileBox->blockSignals( false );
     profileChanged(last);
 }
 void KSyncPrefsDialog::newProfile()
 {
     addProfile ( new KSyncProfile () );
 }
 
 void KSyncPrefsDialog::cloneProfile()
 { 
     if ( currentSelection >= 0 ) 
         addProfile (mSyncProfiles.at(currentSelection)->clone()) ;
     else
         newProfile();
 }
 
 void KSyncPrefsDialog::setLocalMachineName ( const QString& name )
 {
     mMyMachineName->setText( name );
 
 }
 QString KSyncPrefsDialog::getLocalMachineName ( )
 {
     return mMyMachineName->text();
 }
 
 QStringList KSyncPrefsDialog::getSyncProfileNames()
 {
     return mSyncProfileNames;
 }
 void KSyncPrefsDialog::usrReadConfig()
 { 
     //KConfig *config = KOGlobals::config();
-    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
+    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) ); 
     config.setGroup("General");
     mSyncProfileNames =config.readListEntry("SyncProfileNames");
     mMyMachineName->setText(config.readEntry("LocalMachineName","undefined"));
     int i;
     KSyncProfile* temp ;
     mSyncProfiles.clear();
     for ( i = 0; i < mSyncProfileNames.count();++i ) {
         temp = new KSyncProfile ();
         temp->setName( mSyncProfileNames[i] );
         temp->readConfig( &config );
         mSyncProfiles.append( temp );
     }
     insertProfiles();
     //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
 }
 
 
 void KSyncPrefsDialog::usrWriteConfig()
 {
     saveProfile();
     if ( currentSelection >= 0 ) 
         profileChanged(currentSelection);
     //KConfig *config = KOGlobals::config();
-    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
+    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) ); 
     KSyncProfile* prof = mSyncProfiles.first();
     QStringList externalSyncProfileNames;
     externalSyncProfileNames.append("Sharp_DTM");;
     while ( prof ) {
         prof->writeConfig(&config);
         if ( prof->getIsPhoneSync( ) )
             externalSyncProfileNames.append(prof->getName( ) );
         prof = mSyncProfiles.next();
     }
     //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
     //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
     config.setGroup("General");
     config.writeEntry("SyncProfileNames",mSyncProfileNames);
     config.writeEntry("ExternSyncProfiles",externalSyncProfileNames);
     config.writeEntry("LocalMachineName",mMyMachineName->text());
     config.sync();
 }
 
 void  KSyncPrefsDialog::helpDevice()
 {
     QString hint = i18n("Insert device where\nphone is connected. E.g.:\n");
 #ifdef _WIN32_
     hint += "Leave empty for Irda.\n"
         "com1:\n(first serial port)\n"
         "usb not supported\n"
         "???\n(bluetooth device address)\n";
 
 #else
     hint += "/dev/ircomm\n(Irda)\n"
         "/dev/ttyS0\n(first serial port)\n"
         "/dev/ttyUSB0\n(first device usb port)\n"
         "???\n(bluetooth device address)\n";
 #endif
     KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
 }
 void  KSyncPrefsDialog::helpModel()
 {
     QString hint = i18n("Leave empty or\ninsert name of phone model:\n");
     hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection";
     KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
 
 }
 void  KSyncPrefsDialog::helpConnection()
 {
     QString hint = i18n("Insert kind of connection,e.g.:\n");
     hint += "irda | Nokia FBUS over infrared\n"
         "irdaat | AT commands infrared\n(for Siemens/Sony-Erricsson)\n"
         "irdaobex | set also model as obex\n"