more fixes

6 files changed, 22 insertions, 137 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 185cf46..7bec90a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1,89 +1,90 @@
 /*
     This file is part of KAddressbook.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-/*
+/*s
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "kabcore.h"
 
 #include <stdaddressbook.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <qtimer.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qprogressbar.h>
+#include <libkdepim/phoneaccess.h>
 
 #ifndef KAB_EMBEDDED
 #include <qclipboard.h>
 #include <qdir.h> 
 #include <qfile.h>
 #include <qapplicaton.h>
 #include <qprogressbar.h>
 #include <qlayout.h>
 #include <qregexp.h>
 #include <qvbox.h>
 #include <kabc/addresseelist.h>
 #include <kabc/errorhandler.h>
 #include <kabc/resource.h>
 #include <kabc/vcardconverter.h>
 #include <kapplication.h>
 #include <kactionclasses.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <kdeversion.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kprotocolinfo.h>
 #include <kresources/selectdialog.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kxmlguiclient.h>
 #include <kaboutdata.h>
 #include <libkdepim/categoryselectdialog.h>
 
 #include "addresseeutil.h"
 #include "addresseeeditordialog.h"
 #include "extensionmanager.h"
 #include "kstdaction.h"
 #include "kaddressbookservice.h"
 #include "ldapsearchdialog.h"
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 
 #include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include "addresseedialog.h"
 //US
 #include <addresseeview.h>
 
 #include <qapp.h>
@@ -628,160 +629,155 @@ void KABCore::mailVCard( const QStringList& uids )
 
   bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") );
 
 
 /*US
   kapp->invokeMailer( QString::null, QString::null, QString::null,
                       QString::null,  // subject
                       QString::null,  // body
                       QString::null,
                       urls );  // attachments
 */
 
 }
 
 /**
   Beams the "WhoAmI contact.
 */
 void KABCore::beamMySelf()
 {
   KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
   if (!a.isEmpty())
   {
     QStringList uids;
     uids << a.uid();
 
         beamVCard(uids);
   } else {
       KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) );
 
 
   }
 }
 
 void KABCore::export2phone()
 {
 
     KAex2phonePrefs ex2phone;
     ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
     ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
     ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     if ( !ex2phone.exec() ) {
         return;
     }
     KPimGlobalPrefs::instance()->mEx2PhoneConnection  = ex2phone.mPhoneConnection->text();
     KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
     KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
 
-#if 0
-    PhoneFormat::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
+
+    PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
                               KPimGlobalPrefs::instance()->mEx2PhoneConnection,
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
+    QStringList uids = mViewManager->selectedUids();
+    if ( uids.isEmpty() )
+        return;
 
+#ifdef _WIN32_
+    QString  fileName = locateLocal("tmp", "tempfile.vcf");
+#else
+    QString  fileName = "/tmp/kdepimtemp.vcf";
+#endif
 
-
-
-  QString fileName = "/tmp/kapibeamfile.vcf";
-
-
-  //QDir().mkdir( dirName, true );
-
- 
   KABC::VCardConverter converter;
   QString description;
   QString datastream;
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee a = mAddressBook->findByUid( *it );
 
       if ( a.isEmpty() )
           continue;
 
       if (description.isEmpty())
           description = a.formattedName();
 
       QString vcard;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
       while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
           int semi = vcard.find(";", next);
           int dopp = vcard.find(":", next);
           int sep;
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           datastream +=vcard.mid( start, next - start);
           datastream +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       datastream += vcard.mid( start,vcard.length() );
   }
-#ifndef DESKTOP_VERSION
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       QTextStream t( &outFile );  // use a text stream
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t <<datastream;
       outFile.close();
-      Ir *ir = new Ir( this );
-      connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
-      ir->send( fileName, description, "text/x-vCard" );
   } else {
-      qDebug("Error open temp  beam file ");
+      qDebug("Error open temp file ");
       return;
   }
-#endif
-
 
 
+#if 0
 
     setCaption( i18n("Writing to phone..."));
     if ( PhoneFormat::writeToPhone( cal ) )
         setCaption( i18n("Export to phone successful!"));
     else
         setCaption( i18n("Error exporting to phone!"));
 #endif
 
 
 }
 void KABCore::beamVCard()
 {
   QStringList uids = mViewManager->selectedUids();
   if ( !uids.isEmpty() )
     beamVCard( uids );
 }
 
 
 void KABCore::beamVCard(const QStringList& uids)
 {
 /*US
         QString beamFilename;
         Opie::OPimContact c;
         if ( actionPersonal->isOn() ) {
                 beamFilename = addressbookPersonalVCardName();
                 if ( !QFile::exists( beamFilename ) )
                         return; // can't beam a non-existent file
                 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                         beamFilename );
                 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
                 Opie::OPimContactAccess::List allList = access->allRecords();
                 Opie::OPimContactAccess::List::Iterator it = allList.begin();  // Just take first
                 c = *it;
 
                 delete access;
         } else {
                 unlink( beamfile ); // delete if exists
                 mkdir("/tmp/obex/", 0755);
                 c = m_abView -> currentEntry();
                 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                         beamfile );
                 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
                 access->add( c );
                 access->save();
                 delete access;
 
                 beamFilename = beamfile;
         }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2f286e0..ec69b11 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,89 +1,90 @@
 #include <stdlib.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qpainter.h>
 #include <qwhatsthis.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapp.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qmap.h>
 #include <qwmatrix.h>
 #include <qtextbrowser.h>
 #include <qtextstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qtopia/alarmserver.h>
 #include <qtopia/qcopenvelope_qws.h>
 #include <unistd.h> // for sleep
 #else
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 //#include <resource.h>
 
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/phoneformat.h>
 #include <libkdepim/ksyncprofile.h>
+#include <libkdepim/phoneaccess.h>
 #include <libkcal/kincidenceformatter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "datenavigator.h"
 #include "koagendaview.h"
 #include "koagenda.h"
 #include "kodialogmanager.h"
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "simplealarmclient.h"
 #include "externalapphandler.h"
 
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #include "koimportoldialog.h"
 #endif
 #include "mainwindow.h"
 
 class KOex2phonePrefs : public QDialog
 {
   public:
     KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QHBox* temphb;
         temphb = new QHBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
@@ -1187,98 +1188,98 @@ void MainWindow::exportToPhone( int mode )
     if ( !ex2phone.exec() ) {
         return;
     }
     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();
     QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
     QDateTime end = cur.addDays( ( inFuture +1 ) *7 );
     while ( incidence ) {
         if ( incidence->type() != "Journal" ) {
             bool add = true;
             if ( inFuture ) {
                 QDateTime dt;
                 if ( incidence->type() == "Todo" ) {
                     Todo * t = (Todo*)incidence;
                     if ( t->hasDueDate() )
                         dt = t->dtDue();
                     else
                         dt = cur.addSecs( 62 );
                 }
                 else  {
                     bool ok;
                     dt =  incidence->getNextOccurence( cur, &ok );
                     if ( !ok )
                         dt = cur.addSecs( -62 );
                 }
                 if ( dt < cur || dt > end ) {
                     add = false;
                 }
             }
             if ( add ) {
                 Incidence *in = incidence->clone();
                 cal->addIncidence( in );
             }
         }
         incidence = delSel.next();
-    }
-    PhoneFormat::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
+    } 
+    PhoneAccess::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()
 {
     KOPrefs *p = KOPrefs::instance();
 
     p->mCompactDialogs = true;
     p->mConfirm = true;
     // p->mEnableQuickTodo = false;
 
 }
 
 QString MainWindow::resourcePath()
 {
     return KGlobal::iconLoader()->iconPath();
 }
 
 void MainWindow::displayText( QString text ,QString cap  )
 {
     QDialog dia( this, "name", true ); ;
     dia.setCaption( cap );
     QVBoxLayout* lay = new QVBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QTextBrowser tb ( &dia );
     lay->addWidget( &tb );
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
 #endif
     dia.exec();
 }
 void MainWindow::displayFile( QString fn, QString cap )
 {
  QString fileName =  resourcePath() + fn;
  QString text;
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index 7a0bd22..171c726 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -1,55 +1,55 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on
         TARGET  = microkcal
 
 include( ../variables.pri )
 
-INCLUDEPATH += ../microkde  versit ../microkde/kdecore
+INCLUDEPATH += ../libkdepim ../microkde  versit ../microkde/kdecore
 #../qtcompat
 INCLUDEPATH += ../libical/src/libical
 INCLUDEPATH += ../libical/src/libicalss
 DESTDIR = ../bin
 DEFINES +=  DESKTOP_VERSION
 unix: {
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 
 }
 
 INTERFACES = \
 
 HEADERS = \
  alarm.h \
  attachment.h \
  attendee.h \
  calendar.h \
  calendarlocal.h \
  calfilter.h \
  calformat.h \
  calstorage.h \
  compat.h \
  customproperties.h \
  dummyscheduler.h \
 kincidenceformatter.h \
  duration.h \
  event.h \
  exceptions.h \
  filestorage.h \
  freebusy.h \
  icaldrag.h \
  icalformat.h \
  icalformatimpl.h \
  imipscheduler.h \
  incidence.h \
  incidencebase.h \
  journal.h \
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index e379b95..e42dc9c 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -1,53 +1,53 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on
         TARGET  = komicrokcal
 
-INCLUDEPATH += ../microkde ../qtcompat versit ../microkde/kdecore $(QPEDIR)/include
+INCLUDEPATH += ../libkdepim ../microkde ../qtcompat versit ../microkde/kdecore $(QPEDIR)/include
 INCLUDEPATH += ../libical/src/libical
 INCLUDEPATH += ../libical/src/libicalss
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += ../libical/lib/$(PLATFORM)/libical.a
 LIBS += ../libical/lib/$(PLATFORM)/libicalss.a
 
 INTERFACES = \
 
 HEADERS = \
  alarm.h \
  attachment.h \
  attendee.h \
  calendar.h \
  calendarlocal.h \
  calfilter.h \
  calformat.h \
  calstorage.h \
  compat.h \
  customproperties.h \
  dummyscheduler.h \
  duration.h \
  event.h \
  exceptions.h \
  filestorage.h \
  freebusy.h \
  icaldrag.h \
  icalformat.h \
  icalformatimpl.h \
  imipscheduler.h \
  incidence.h \
  incidencebase.h \
 kincidenceformatter.h \
  journal.h \
  period.h \
  person.h \
  qtopiaformat.h \
  sharpformat.h \
  phoneformat.h \
  recurrence.h \
  scheduler.h \
  todo.h \
  vcaldrag.h \
  vcalformat.h \
  versit/port.h \
  versit/vcc.h \
  versit/vobject.h \
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index b2a62b1..c39413e 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -1,239 +1,142 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qdir.h>
 #include <qlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
+#include <phoneaccess.h>
 
 #include "calendar.h"
 #include "alarm.h"
 #include "recurrence.h"
 #include "calendarlocal.h"
 
 #include "phoneformat.h"
 #include "syncdefines.h"
 
 using namespace KCal;
 class PhoneParser : public QObject
 {
 public:
     PhoneParser(   )  {
         ;
     }
    
     static QString dtToString( const QDateTime& dti, bool useTZ = false )
     {
         QString datestr;
         QString timestr;
         int offset =  KGlobal::locale()->localTimeOffset( dti );
         QDateTime   dt;
         if (useTZ)
             dt =  dti.addSecs ( -(offset*60));
         else
             dt =  dti;
         if(dt.date().isValid()){
             const QDate& date = dt.date();
             datestr.sprintf("%04d%02d%02d",
                             date.year(), date.month(), date.day());
         }
         if(dt.time().isValid()){
             const QTime& time = dt.time();
             timestr.sprintf("T%02d%02d%02d",
                             time.hour(), time.minute(), time.second());
         }
         return datestr + timestr;
     }
 
 
 };
 
   
 
 PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection, QString model )
 {
     mProfileName = profileName;
-    writeConfig( device, connection, model );
+    PhoneAccess::writeConfig( device, connection, model );
 }
 
 PhoneFormat::~PhoneFormat()
 {
 }
-void PhoneFormat::writeConfig( QString device, QString connection, QString model )
-{
-#ifdef _WIN32_
-    QString fileName = qApp->applicationDirPath () +"\\gammurc";
-#else
-    QString fileName = QDir::homeDirPath() +"/.gammurc";
-#endif
-    //qDebug("save %d ", load );
-    QString content;
-    bool write = false;
-    bool addPort = true, addConnection = true, addModel = true;
-    QFile file( fileName );
-    if ( QFile::exists(  fileName) ) {
-        if (!file.open( IO_ReadOnly ) ) {
-            qDebug("Error: cannot open %s ", fileName.latin1() );
-            return;
-        } 
-        QString line;
-        while ( file.readLine( line, 1024 ) > 0 ) {
-            //qDebug("*%s* ", line.latin1() );
-            if ( line.left(7 ) == "[gammu]" ) {
-                ;
-            } else 
-            if ( line.left(4 ) == "port" ) {
-                if ( line == "port = " + device+"\n" ) {
-                    content += line ;
-                    addPort = false;  
-                    //qDebug("port found" );
-                }
-               
-            } else  if ( line.left(5 ) == "model" )  {
-                if ( line == "model = " + model +"\n") {
-                    content += line ;
-                    addModel = false;  
-                    //qDebug("model found" );
-                }
-              
-            } else  if ( line.left( 10 ) == "connection" )  {
-                if ( line == "connection = " + connection +"\n") {
-                    addConnection = false; 
-                    content += line ;
-                    //qDebug("con found" );
-                }
-              
-            } else {
-                content += line ;
-            }
-        }
-        file.close();
-    } else {
-        if ( ! connection.isEmpty() ) {
-            addConnection = true; 
-        }
-        if ( ! device.isEmpty() ) {
-            addPort = true; 
 
-        }
-        if ( ! model.isEmpty() ) {
-            addModel = true; 
-        }
-    }
-
-    if ( addConnection ) {
-        if ( ! write ) 
-            content += "[gammu]\n";
-        write = true;
-        content += "connection = ";
-        content += connection;
-        content += "\n";
-    }
-    if ( addPort ) {
-        if ( ! write ) 
-            content += "[gammu]\n";
-        write = true;
-        content += "port = ";
-        content += device;
-        content += "\n";
-
-    }
-    if ( addModel ) {
-        if ( ! write ) 
-            content += "[gammu]\n";
-        write = true;
-        content += "model = ";
-        content += model;
-        content += "\n";
-    }
-    if ( write ) {
-        if (!file.open( IO_WriteOnly ) ) {
-            qDebug("Error: cannot write file  %s ", fileName.latin1() );
-            return;
-        } 
-        qDebug("Writing file  %s ", fileName.latin1() );
-        QTextStream ts( &file );
-        ts << content ;
-        file.close();
-    }
-
-}
 #if 0
 int PhoneFormat::initDevice(GSM_StateMachine *s)
 {
     GSM_ReadConfig(NULL, &s->Config[0], 0);
                 s->ConfigNum = 1;
     GSM_Config *cfg = &s->Config[0];
     if ( ! mConnection.isEmpty() ) {
         cfg->Connection = strdup(mConnection.latin1());
                 cfg->DefaultConnection = false;
         qDebug("Connection set %s ", cfg->Connection );
 
     }
     if ( ! mDevice.isEmpty() ) {
         cfg->Device = strdup(mDevice.latin1());
                 cfg->DefaultDevice = false;
         qDebug("Device  set %s ", cfg->Device);
 
     }
     if ( ! mModel.isEmpty() ) {
                 strcpy(cfg->Model,mModel.latin1() );
                 cfg->DefaultModel = false;
         qDebug("Model  set %s ",cfg->Model );
     }
     int error=GSM_InitConnection(s,3);
     return error;
 }
 #endif
 ulong PhoneFormat::getCsumTodo( Todo* todo )
 {
     QStringList  attList;
     if ( todo->hasDueDate() )
         attList << PhoneParser::dtToString ( todo->dtDue() );
     attList << todo->summary();
     QString completedString = "no";
     if ( todo->isCompleted() )
         completedString = "yes";
     attList << completedString; 
     int prio = todo->priority();
     if( prio == 2 ) prio = 1;
     if (prio == 4 ) prio = 5 ;
     attList << QString::number( prio ); 
     QString alarmString = "na";
     Alarm *alarm;
     if (  todo->alarms().count() > 0 ) {
         alarm = todo->alarms().first();
         if ( alarm->enabled() ) {
             alarmString = QString::number(alarm->offset() );
         }
@@ -545,111 +448,97 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
             }
     }
     to->setCategories( cat );
     if ( from->isCompleted() ) {
         to->setCompleted( true );
         if( from->completed().isValid() )
             to->setCompleted( from->completed() );
     } else {
         // set percentcomplete only, if to->isCompleted()
         if ( to->isCompleted() )
             to->setPercentComplete(from->percentComplete()); 
     }
     if( to->priority() == 2 && from->priority() == 1 )
         ; //skip
     else if (to->priority() == 4 && from->priority() == 5 )
         ;
     else
         to->setPriority(from->priority());
 
 }
 #include <qcstring.h>
 
 void PhoneFormat::afterSave( Incidence* inc)
 {
     uint csum;
     inc->removeID( mProfileName );
     if ( inc->type() == "Event")
         csum = PhoneFormat::getCsumEvent( (Event*) inc );
     else
         csum = PhoneFormat::getCsumTodo( (Todo*) inc );
     inc->setCsum( mProfileName, QString::number( csum ));
 
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
 
 }
 
 bool PhoneFormat::writeToPhone( Calendar *  calendar)
 {
 #ifdef _WIN32_
     QString  fileName = locateLocal("tmp", "tempfile.vcs");
 #else
     QString  fileName = "/tmp/kdepimtemp.vcs";
 #endif
 
     VCalFormat vfsave;
     vfsave.setLocalTime ( true ); 
     if ( ! vfsave.save( calendar, fileName ) )
         return false;
-    // 4 call kammu
-#ifdef DESKTOP_VERSION
-    QString command ="./kammu --restore " + fileName ;
-#else
-    QString command ="kammu --restore " + fileName ;
-#endif
-    int ret;
-    while ( (ret = system (  command.latin1())) != 0 ) {
-        qDebug("Error S::command returned %d. asking users", ret); 
-        int retval = KMessageBox::warningContinueCancel(0,
-                                                        i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone access"),i18n("Retry"),i18n("Cancel"));
-        if ( retval != KMessageBox::Continue )
-            return false;
-    }
-    return true;
+    return PhoneAccess::writeToPhone( fileName );
 }
 bool PhoneFormat::save( Calendar *calendar)
 {
     QLabel status ( i18n(" Opening device ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 230;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     status.setCaption(i18n("Writing to phone...") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     QString message;
 
     // 1 remove events which should be deleted
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
         if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { 
             calendar->deleteEvent( ev );
         } else {
 
         }
         ev =  er.next();
     }
     //  2 remove todos which should be deleted
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     while ( to ) {
         if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
             calendar->deleteTodo( to );   
         } else {
             if ( to->isCompleted()) {
                 calendar->deleteTodo( to );   
             }
         }
         to = tl.next();
     } 
     //  3 save file 
     if ( !writeToPhone( calendar ) )
         return false;
     
     // 5 reread data
     message = i18n(" Rereading all data ... ");
     status.setText ( message  );
     qApp->processEvents();
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h
index 61e8160..001fd81 100644
--- a/libkcal/phoneformat.h
+++ b/libkcal/phoneformat.h
@@ -3,61 +3,60 @@
 
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef PHONEFORMAT_H
 #define PHONEFORMAT_H
 
 #include <qstring.h>
 
 #include "scheduler.h"
 
 #include "vcalformat.h"
 #include "calformat.h"
 
 namespace KCal {
 
 /**
   This class implements the calendar format used by Phone.
 */
     class Event;
     class Todo;
 class PhoneFormat : public QObject {
   public:
     /** Create new iCalendar format. */
     PhoneFormat(QString profileName, QString device,QString connection, QString model);
     virtual ~PhoneFormat();
 
     bool load( Calendar * ,Calendar * );
     bool save( Calendar * );
     bool fromString( Calendar *, const QString & );  
     QString toString( Calendar * );
     static ulong getCsum( const QStringList & );
     static ulong getCsumTodo( Todo* to );
     static ulong getCsumEvent( Event* ev );
-    static void writeConfig( QString device,QString connection, QString model );
     static bool writeToPhone( Calendar * );
   private:
     void copyEvent( Event* to,  Event* from );
     void copyTodo( Todo* to,  Todo* from );
     //int initDevice(GSM_StateMachine *s);
     QString mProfileName;
     void afterSave( Incidence* );
 };
 
 }
 
 #endif