implemented qtopia support

5 files changed, 92 insertions, 156 deletions

diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index d945c31..d9fa87f 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,9 +1,8 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
-#release debug
-TARGET = microkabc_qtopia
 
-INCLUDEPATH += ../.. ../../converter/opie ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include
+TARGET = microkabc_qtopia
 
+INCLUDEPATH += ../.. ../../converter/qtopia ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
 
 OBJECTS_DIR = obj/$(PLATFORM)
@@ -13,11 +12,7 @@ LIBS += -lmicrokde
 LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
-LIBS += -L$(OPIEDIR)/lib
-LIBS += -lopie
+LIBS += -lqpepim
 LIBS += -lqpe
-LIBS += -lqte
-LIBS += -lmicrokabc_opieconverter
-#LIBS += -L../../lib/$(PLATFORM)
-
+LIBS += -lmicrokabc_qtopiaconverter
 
 INTERFACES = \
@@ -25,8 +20,7 @@ INTERFACES = \
 HEADERS = \
  resourceqtopia.h \
- resourceqtopiaconfig.h \
+ resourceqtopiaconfig.h
  
 SOURCES = \
  resourceqtopia.cpp \
- resourceqtopiaconfig.cpp \
- 
+ resourceqtopiaconfig.cpp
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 3d9d28b..4854197 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -25,5 +25,4 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
-
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -34,5 +33,5 @@ $Id$
 #include <qfileinfo.h>
 #include <qregexp.h>
-#include <qtimer.h>
+//US #include <qtimer.h>
 
 #include <kapplication.h>
@@ -43,15 +42,11 @@ $Id$
 #include <kstandarddirs.h>
 
-//US #include "formatfactory.h"
-//US #include <qpe/qpeapplication.h>
+#include <qpe/pim/addressbookaccess.h>
 
-#include <opie/ocontactaccess.h>
-#include <opie/ocontactaccessbackend_xml.h>
 
-#include "resource.h"
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
-#include "opieconverter.h"
+#include "qtopiaconverter.h"
 
 #include "resourceqtopia.h"
@@ -62,73 +57,54 @@ extern "C"
   void *init_microkabc_qtopia()
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>();
+    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
   }
 }
 
-ResourceOpie::ResourceOpie( const KConfig *config )
+ResourceQtopia::ResourceQtopia( const KConfig *config )
   : Resource( config ), mConverter (0)
 {
+  // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-
-  KConfig *cfg = (KConfig *)config;
-  if ( cfg ) {
-    fileName = cfg->readEntry( "FileName", fileName );
- 
-  }
-
-//  qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() );
   
   init( fileName );
 }
 
-ResourceOpie::ResourceOpie( const QString &fileName )
+ResourceQtopia::ResourceQtopia( const QString &fileName )
   : Resource( 0 )
 {
-//  qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
+//  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
 
-void ResourceOpie::init( const QString &fileName )
+void ResourceQtopia::init( const QString &fileName )
 {
 
-/*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
-*/
-  //US opie addressbook is always readonly
-//US  setReadOnly( true );
 
   setFileName( fileName );
- 
 }
 
-ResourceOpie::~ResourceOpie()
+ResourceQtopia::~ResourceQtopia()
 {
   if (mConverter != 0)
     delete mConverter;
+
 }
 
-void ResourceOpie::writeConfig( KConfig *config )
+void ResourceQtopia::writeConfig( KConfig *config )
 {
-  //US opie addressbook is always readonly
-//US  setReadOnly( true );
-
   Resource::writeConfig( config );
-
-  config->writeEntry( "FileName", mFileName );
-  
-//    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  
 }
 
-Ticket *ResourceOpie::requestSaveTicket()
+Ticket *ResourceQtopia::requestSaveTicket()
 {
-  kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
+  kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mFileName ) ) {
-    kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
+    kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
                   << mFileName << "'" << endl;
     return 0;
@@ -138,8 +114,7 @@ Ticket *ResourceOpie::requestSaveTicket()
 
 
-bool ResourceOpie::doOpen()
+bool ResourceQtopia::doOpen()
 {
-//  qDebug("ResourceOpie::doOpen() %s", mFileName.latin1());
-/*US  
+/*US
   QFile file( mFileName );
 
@@ -168,23 +143,19 @@ bool ResourceOpie::doOpen()
   }
 */
-  qDebug("ResourceOpie::doOpen() has to be fixed - %s", mFileName.latin1());
   return true;  
 }
 
-void ResourceOpie::doClose()
+void ResourceQtopia::doClose()
 {
-//  qDebug("ResourceOpie::doClose() %s", mFileName.latin1());
 }
 
-bool ResourceOpie::load()
+bool ResourceQtopia::load()
 {
-//  qDebug("ResourceOpie::load() %s", mFileName.latin1());
-  kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl;
+  kdDebug(5700) << "ResourceQtopia::load(): '" << mFileName << "'" << endl;
+
+//  qDebug("ResourceQtopia::load: Try to load file() %s", mFileName.latin1());
+  
+  AddressBookAccess* access = new AddressBookAccess();
 
-  qDebug("ResourceOpie::load: Try to load file() %s", mFileName.latin1());
-    
-  OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", mFileName );
-  OContactAccess* access = new OContactAccess("KDEPim/Pi", 0l, backend, false);
-        
   if ( !access ) {
     qDebug("Unable to load file() %s", mFileName.latin1());
@@ -193,58 +164,50 @@ bool ResourceOpie::load()
   }
   
-  access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
-
   bool res = false;
   if (mConverter == 0)
   {
-    mConverter = new OpieConverter();
+    mConverter = new QtopiaConverter();
     res = mConverter->init();
     if ( !res )
     {
-      qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
-      addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) );
+      qDebug("Unable to initialize qtopia converter. Most likely a problem with the category file");
+      addressBook()->error( i18n( "Unable to initialize qtopia converter. Most likely a problem with the category file" ) );
       delete access;
       return false;
     }
   }
+  
+  { //create a new scope 
+    AddressBookIterator it(*access);
+    const PimContact* contact;
 
-
-        OContactAccess::List::Iterator it;
-  OContactAccess::List allList = access->allRecords();
-  for ( it = allList.begin(); it != allList.end(); ++it )
-  {
-    OContact c = (*it);
+    for (contact=it.toFirst(); it.current(); ++it) {
+      contact = it.current();
     
-    KABC::Addressee addressee;
+      KABC::Addressee addressee;
     
-    res = mConverter->opieToAddressee( c, addressee );    
+      res = mConverter->qtopiaToAddressee( (*contact), addressee );    
     
-    if ( !addressee.isEmpty() && res )
-    {
-      addressee.setResource( this );
-      addressBook()->insertAddressee( addressee );
+      if ( !addressee.isEmpty() && res )
+      {
+        addressee.setResource( this );
+        addressBook()->insertAddressee( addressee );
+      }
     }
-    
-//    qDebug("found %s", c.fullName().latin1());
   }
-  
+    
   delete access;
-  // it seems so, that deletion of access deletes backend as well
-  //delete backend;
-  
   return true;
 }
 
-bool ResourceOpie::save( Ticket *ticket )
+bool ResourceQtopia::save( Ticket *ticket )
 {
-  qDebug("ResourceOpie::save() has to be fixed - %s", mFileName.latin1());
-/*US  
-  
-  qDebug("ResourceOpie::save %s", mFileName.latin1());
-  kdDebug(5700) << "ResourceOpie::save()" << endl;
+/*US
+//    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
+  kdDebug(5700) << "ResourceQtopia::save()" << endl;
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
-*/   
+   
 /*US we use a simpler method to create a backupfile
     
@@ -260,4 +223,5 @@ bool ResourceOpie::save( Ticket *ticket )
   }
 */
+
 /*US
 //US ToDo: write backupfile  
@@ -283,17 +247,12 @@ bool ResourceOpie::save( Ticket *ticket )
   return ok;
 
-  qDebug("ResourceOpie::save has to be changed");
+  qDebug("ResourceQtopia::save has to be changed");
 */  
   return true;
-  
 }
 
-bool ResourceOpie::lock( const QString &fileName )
+bool ResourceQtopia::lock( const QString &fileName )
 {
-  qDebug("ResourceOpie::lock() has to be fixed - %s", mFileName.latin1());
-
-/*US
-//  qDebug("ResourceOpie::lock() %s", fileName.latin1());
-  kdDebug(5700) << "ResourceOpie::lock()" << endl;
+  kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
   QString fn = fileName;
@@ -335,15 +294,8 @@ bool ResourceOpie::lock( const QString &fileName )
 
   return false;
-*/
-
-  return true;  
 }
 
-void ResourceOpie::unlock( const QString &fileName )
+void ResourceQtopia::unlock( const QString &fileName )
 {
-  qDebug("ResourceOpie::unlock() has to be fixed - %s", mFileName.latin1());
-/*US
-//  qDebug("ResourceOpie::unlock() %s", fileName.latin1());
-  
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
@@ -357,30 +309,26 @@ void ResourceOpie::unlock( const QString &fileName )
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
-*/  
 }
 
-void ResourceOpie::setFileName( const QString &fileName )
+void ResourceQtopia::setFileName( const QString &fileName )
 {
-/*US ToDo: no synchronization so far. Has to be changed in the future
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
-*/
+  
   mFileName = fileName;
 
-  
-/*US ToDo: no synchronization so far. Has to be changed in the future
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
-*/
+
 //US simulate KDirWatch event  
-  fileChanged();
+//US  fileChanged();
 }
 
-QString ResourceOpie::fileName() const
+QString ResourceQtopia::fileName() const
 {
   return mFileName;
 }
 
-void ResourceOpie::fileChanged()
+void ResourceQtopia::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
@@ -392,19 +340,12 @@ void ResourceOpie::fileChanged()
 }
 
-void ResourceOpie::removeAddressee( const Addressee &addr )
+void ResourceQtopia::removeAddressee( const Addressee &addr )
 {
-/*US
-  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
-  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
-  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
-*/  
 }
 
-void ResourceOpie::cleanUp()
+void ResourceQtopia::cleanUp()
 {
-//  qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
-
   unlock( mFileName );
 }
 
-//US #include "resourceopie.moc"
+//US #include "resourceqtopia.moc"
diff --git a/kabc/plugins/qtopia/resourceqtopia.h b/kabc/plugins/qtopia/resourceqtopia.h
index ea0b5ee..bf9dd45 100644
--- a/kabc/plugins/qtopia/resourceqtopia.h
+++ b/kabc/plugins/qtopia/resourceqtopia.h
@@ -27,6 +27,6 @@ $Id$
 
 
-#ifndef KABC_RESOURCEQTOPIA_H
-#define KABC_RESOURCEQTOPIA_H
+#ifndef KABC_RESOURCEOPIE_H
+#define KABC_RESOURCEOPIE_H
 
 #include <kconfig.h>
@@ -38,16 +38,14 @@ $Id$
 
 
-//class QTimer;
-//class FormatPlugin;
-
 namespace KABC {
 
 //US class FormatPlugin;
 class ResourceConfigWidget;
-class OpieConverter;
+class QtopiaConverter;
+
 /**
   @internal
 */
-class ResourceOpie : public Resource
+class ResourceQtopia : public Resource
 {
   Q_OBJECT
@@ -60,15 +58,15 @@ public:
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceOpie( const KConfig *cfg );
+  ResourceQtopia( const KConfig *cfg );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceOpie( const QString &fileName );
+  ResourceQtopia( const QString &fileName );
 
   /**
    * Destructor.
    */
-  ~ResourceOpie();
+  ~ResourceQtopia();
 
   /**
@@ -139,5 +137,5 @@ protected:
 
 private:
-  OpieConverter* mConverter;
+  QtopiaConverter* mConverter;
   
   QString mFileName;
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index 8cb8505..b2310c4 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -47,9 +47,7 @@ $Id$
 using namespace KABC;
 
-ResourceOpieConfig::ResourceOpieConfig( QWidget* parent,  const char* name )
+ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
 {
-//qDebug("ResourceFileConfig::ResourceFileConfig");
-  
   QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
       KDialog::spacingHint() );
@@ -63,13 +61,14 @@ ResourceOpieConfig::ResourceOpieConfig( QWidget* parent,  const char* name )
   mainLayout->addWidget( label, 0, 0 );
   mainLayout->addWidget( mFileNameEdit, 0, 1 );
+ 
 }
 
-void ResourceOpieConfig::loadSettings( KRES::Resource *res  )
+void ResourceQtopiaConfig::loadSettings( KRES::Resource *res  )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
-  ResourceOpie *resource = (ResourceOpie*)( res );
+  ResourceQtopia *resource = (ResourceQtopia*)( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceOpieConfig::loadSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceQtopiaConfig::loadSettings(): cast failed" << endl;
     return;
   }
@@ -78,16 +77,20 @@ void ResourceOpieConfig::loadSettings( KRES::Resource *res  )
   if ( mFileNameEdit->url().isEmpty() )
     mFileNameEdit->setURL( QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml" );
-    
-  //US Opie resources are ReadOnly by definition
+
+  //US Qtopia resources are ReadOnly by definition
   emit setPersistentReadOnly( true );
+  
+  //US we can not choose the filename for the qtopia backend => make it readonly.
+  mFileNameEdit->setEnabled( false );
+  
 }
 
-void ResourceOpieConfig::saveSettings( KRES::Resource *res )
+void ResourceQtopiaConfig::saveSettings( KRES::Resource *res )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
-  ResourceOpie *resource = (ResourceOpie*)( res );
+  ResourceQtopia *resource = (ResourceQtopia*)( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceOpieConfig::saveSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceQtopiaConfig::saveSettings(): cast failed" << endl;
     return;
   }
@@ -96,5 +99,5 @@ void ResourceOpieConfig::saveSettings( KRES::Resource *res )
 }
 
-void ResourceOpieConfig::checkFilePermissions( const QString& fileName )
+void ResourceQtopiaConfig::checkFilePermissions( const QString& fileName )
 {
   // If file exist but is not writeable...
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.h b/kabc/plugins/qtopia/resourceqtopiaconfig.h
index 0d80625..6b90b64 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.h
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.h
@@ -36,10 +36,10 @@ $Id$
 namespace KABC {
 
-class ResourceOpieConfig : public KRES::ConfigWidget
+class ResourceQtopiaConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
 
 public:
-  ResourceOpieConfig( QWidget* parent = 0, const char* name = 0 );
+  ResourceQtopiaConfig( QWidget* parent = 0, const char* name = 0 );
 
 public slots: