3 files changed, 10 insertions, 16 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 716a125..84e3d00 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -81,6 +81,2 @@ KOPrefs::KOPrefs() :
 
-  addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
-  addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda");
-  addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
-
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index a1ba8b3..d9ac851 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -212,5 +212,2 @@ class KOPrefs : public KPimPrefs
     QString mPhoneModel;
-    QString mEx2PhoneDevice;
-    QString mEx2PhoneConnection;
-    QString mEx2PhoneModel;
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index bd14fbf..2f286e0 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1177,5 +1177,6 @@ void MainWindow::exportToPhone( int mode )
     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 )
@@ -1188,5 +1189,5 @@ void MainWindow::exportToPhone( int mode )
     }
-    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();
 
@@ -1234,5 +1235,5 @@ void MainWindow::exportToPhone( int mode )
     }
-    PhoneFormat::writeConfig( KOPrefs::instance()->mEx2PhoneDevice,
-                              KOPrefs::instance()->mEx2PhoneConnection,
-                              KOPrefs::instance()->mEx2PhoneModel );
+    PhoneFormat::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
+                              KPimGlobalPrefs::instance()->mEx2PhoneConnection,
+                              KPimGlobalPrefs::instance()->mEx2PhoneModel );