-rw-r--r-- | korganizer/mainwindow.cpp | 6 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 4 |
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 | |||
@@ -856,7 +856,7 @@ void MainWindow::fillSyncMenu() | |||
856 | syncMenu->insertSeparator(); | 856 | syncMenu->insertSeparator(); |
857 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); | 857 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); |
858 | syncMenu->insertSeparator(); | 858 | syncMenu->insertSeparator(); |
859 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 859 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
860 | config.setGroup("General"); | 860 | config.setGroup("General"); |
861 | QStringList prof = config.readListEntry("SyncProfileNames"); | 861 | QStringList prof = config.readListEntry("SyncProfileNames"); |
862 | KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); | 862 | KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); |
@@ -899,7 +899,7 @@ int MainWindow::ringSync() | |||
899 | int syncedProfiles = 0; | 899 | int syncedProfiles = 0; |
900 | int i; | 900 | int i; |
901 | QTime timer; | 901 | QTime timer; |
902 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 902 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
903 | QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames; | 903 | QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames; |
904 | KSyncProfile* temp = new KSyncProfile (); | 904 | KSyncProfile* temp = new KSyncProfile (); |
905 | KOPrefs::instance()->mAskForPreferences = false; | 905 | KOPrefs::instance()->mAskForPreferences = false; |
@@ -1003,7 +1003,7 @@ void MainWindow::slotSyncMenu( int action ) | |||
1003 | mCurrentSyncProfile = action - 1000 ; | 1003 | mCurrentSyncProfile = action - 1000 ; |
1004 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); | 1004 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); |
1005 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); | 1005 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); |
1006 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 1006 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
1007 | KSyncProfile* temp = new KSyncProfile (); | 1007 | KSyncProfile* temp = new KSyncProfile (); |
1008 | temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | 1008 | temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); |
1009 | temp->readConfig(&config); | 1009 | temp->readConfig(&config); |
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 67a3f52..857ceac 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -542,7 +542,7 @@ QStringList KSyncPrefsDialog::getSyncProfileNames() | |||
542 | void KSyncPrefsDialog::usrReadConfig() | 542 | void KSyncPrefsDialog::usrReadConfig() |
543 | { | 543 | { |
544 | //KConfig *config = KOGlobals::config(); | 544 | //KConfig *config = KOGlobals::config(); |
545 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 545 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
546 | config.setGroup("General"); | 546 | config.setGroup("General"); |
547 | mSyncProfileNames =config.readListEntry("SyncProfileNames"); | 547 | mSyncProfileNames =config.readListEntry("SyncProfileNames"); |
548 | mMyMachineName->setText(config.readEntry("LocalMachineName","undefined")); | 548 | mMyMachineName->setText(config.readEntry("LocalMachineName","undefined")); |
@@ -566,7 +566,7 @@ void KSyncPrefsDialog::usrWriteConfig() | |||
566 | if ( currentSelection >= 0 ) | 566 | if ( currentSelection >= 0 ) |
567 | profileChanged(currentSelection); | 567 | profileChanged(currentSelection); |
568 | //KConfig *config = KOGlobals::config(); | 568 | //KConfig *config = KOGlobals::config(); |
569 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 569 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
570 | KSyncProfile* prof = mSyncProfiles.first(); | 570 | KSyncProfile* prof = mSyncProfiles.first(); |
571 | QStringList externalSyncProfileNames; | 571 | QStringList externalSyncProfileNames; |
572 | externalSyncProfileNames.append("Sharp_DTM");; | 572 | externalSyncProfileNames.append("Sharp_DTM");; |