more fixes

4 files changed, 5 insertions, 117 deletions

diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index 7a0bd22..171c726 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -5,5 +5,5 @@ TARGET		= microkcal
 include( ../variables.pri )
 
-INCLUDEPATH += ../microkde  versit ../microkde/kdecore
+INCLUDEPATH += ../libkdepim ../microkde  versit ../microkde/kdecore
 #../qtcompat
 INCLUDEPATH += ../libical/src/libical
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index e379b95..e42dc9c 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -3,5 +3,5 @@ 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
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index b2a62b1..c39413e 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -37,4 +37,5 @@
 #include <kglobal.h>
 #include <kmessagebox.h>
+#include <phoneaccess.h>
 
 #include "calendar.h"
@@ -85,5 +86,5 @@ PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection,
 {
     mProfileName = profileName;
-    writeConfig( device, connection, model );
+    PhoneAccess::writeConfig( device, connection, model );
 }
 
@@ -91,103 +92,5 @@ 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)
@@ -591,19 +494,5 @@ bool PhoneFormat::writeToPhone( Calendar *  calendar)
     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)
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h
index 61e8160..001fd81 100644
--- a/libkcal/phoneformat.h
+++ b/libkcal/phoneformat.h
@@ -49,5 +49,4 @@ class PhoneFormat : public QObject {
     static ulong getCsumTodo( Todo* to );
     static ulong getCsumEvent( Event* ev );
-    static void writeConfig( QString device,QString connection, QString model );
     static bool writeToPhone( Calendar * );
   private: