-rw-r--r-- | korganizer/mainwindow.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index bd14fbf..2f286e0 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1174,22 +1174,23 @@ void MainWindow::exportToPhone( int mode ) //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); KOex2phonePrefs ex2phone; - ex2phone.mPhoneConnection->setText( KOPrefs::instance()->mEx2PhoneConnection ); - ex2phone.mPhoneDevice->setText( KOPrefs::instance()->mEx2PhoneDevice ); - ex2phone.mPhoneModel->setText( KOPrefs::instance()->mEx2PhoneModel ); + + ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); + ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); + ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); if ( mode == 1 ) ex2phone.setCaption(i18n("Export complete calendar")); if ( mode == 2 ) ex2phone.setCaption(i18n("Export filtered calendar")); if ( !ex2phone.exec() ) { return; } - KOPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); - KOPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); - KOPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); + KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); + KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); + KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); int inFuture = 0; if ( ex2phone.mWriteBackFuture->isChecked() ) inFuture = ex2phone.mWriteBackFutureWeeks->value(); @@ -1231,11 +1232,11 @@ void MainWindow::exportToPhone( int mode ) } } incidence = delSel.next(); } - PhoneFormat::writeConfig( KOPrefs::instance()->mEx2PhoneDevice, - KOPrefs::instance()->mEx2PhoneConnection, - KOPrefs::instance()->mEx2PhoneModel ); + PhoneFormat::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, + KPimGlobalPrefs::instance()->mEx2PhoneConnection, + KPimGlobalPrefs::instance()->mEx2PhoneModel ); setCaption( i18n("Writing to phone...")); if ( PhoneFormat::writeToPhone( cal ) ) setCaption( i18n("Export to phone successful!")); |