added phone export

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
@@ -70,28 +70,24 @@ KOPrefs::KOPrefs() :
 
   mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
   mDefaultViewFont = QFont("helvetica",10);
   mDefaultMonthViewFont = QFont("helvetica",8);
   mMarcusBainsFont= QFont("helvetica",10);
   mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
   mEditBoxFont = QFont("helvetica",12);
   mJornalViewFont = QFont("helvetica",12);
 
   KPrefs::setCurrentGroup("General");
 
 
-  addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
-  addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda");
-  addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
-
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
 
   addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
   addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
   addItemBool("ShowIconSearch",&mShowIconSearch,true);
   addItemBool("ShowIconList",&mShowIconList,true);
   addItemBool("ShowIconDay1",&mShowIconDay1,true);
   addItemBool("ShowIconDay5",&mShowIconDay5,true);
   addItemBool("ShowIconDay7",&mShowIconDay7,true);
   addItemBool("ShowIconMonth",&mShowIconMonth,true);
   addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
   addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index a1ba8b3..d9ac851 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -201,27 +201,24 @@ class KOPrefs : public KPimPrefs
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
     bool mWriteBackExistingOnly;
 
     QString mRemoteIP;
     QString mRemoteUser;
     QString mRemotePassWd;
     QString mRemoteFile;
     QString mLocalTempFile;
     QString mPhoneDevice;
     QString mPhoneConnection;
     QString mPhoneModel;
-    QString mEx2PhoneDevice;
-    QString mEx2PhoneConnection;
-    QString mEx2PhoneModel;
 
     int mLastSyncTime;
     int mSyncAlgoPrefs;
     int mRingSyncAlgoPrefs;
     QStringList mSyncProfileNames;
     QStringList mExternSyncProfiles;
     QString mLocalMachineName;
     void setCategoryColor(QString cat,const QColor & color);
     QColor *categoryColor(QString cat);
 
     QString mArchiveFile;
     QString mHtmlExportFile;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index bd14fbf..2f286e0 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1166,38 +1166,39 @@ void MainWindow::slotSyncMenu( int action )
 
         }
     }
     delete temp;
     mBlockSaveFlag = false;
 }
 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();
     QPtrList<Incidence> delSel;
     if ( mode == 1 )
         delSel  = mCalendar->rawIncidences(); 
     if ( mode == 2 )
         delSel  = mCalendar->incidences(); 
     CalendarLocal* cal = new CalendarLocal();
     cal->setLocalTime();
     Incidence *incidence = delSel.first();
@@ -1223,27 +1224,27 @@ void MainWindow::exportToPhone( int mode )
                 }
                 if ( dt < cur || dt > end ) {
                     add = false;
                 }
             }
             if ( add ) {
                 Incidence *in = incidence->clone();
                 cal->addIncidence( in );
             }
         }
         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!"));
     else
         setCaption( i18n("Error exporting to phone!"));
     delete cal;
 }
 
 
 void MainWindow::setDefaultPreferences()
 {