commit

7 files changed, 94 insertions, 100 deletions

diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro
index ca0a6a8..4416d0c 100644
--- a/kabc/plugins/olaccess/olaccess.pro
+++ b/kabc/plugins/olaccess/olaccess.pro
@@ -4,7 +4,7 @@ TARGET = microkabc_olaccess
 
 include( ../../../variables.pri )
 
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
+INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 
 INTERFACES = \
 
diff --git a/kabc/plugins/olaccess/olaccessconverter.cpp b/kabc/plugins/olaccess/olaccessconverter.cpp
index 4adcae4..e95f3cb 100644
--- a/kabc/plugins/olaccess/olaccessconverter.cpp
+++ b/kabc/plugins/olaccess/olaccessconverter.cpp
@@ -29,46 +29,48 @@ $Id$
 #include <qregexp.h>
 
 
-#include "sharpdtmconverter.h"
+#include "olaccessconverter.h"
 
-#include <sl/slcategories.h>
 #include <libkdepim/ksyncprofile.h>
 //US #include <qpe/categoryselect.h>
 
 
 using namespace KABC;
-using namespace SlCategory;
 
-SharpDTMConverter::SharpDTMConverter() : catDB(0)
+OlaccessConverter::OlaccessConverter()
 {
 }
 
-SharpDTMConverter::~SharpDTMConverter()
+OlaccessConverter::~OlaccessConverter()
 {
   deinit();
 }
 
-bool SharpDTMConverter::init()
+bool OlaccessConverter::init()
 {
+#if 0
   catDB = new SlCategory::SlCategories();
 
   if (!catDB)
     return false;
 
 //  catDB->load( categoryFileName() );
+#endif
   return true;
 }
 
-void SharpDTMConverter::deinit()
+void OlaccessConverter::deinit()
 {
+#if 0
   if (catDB)
   {
     delete catDB;
     catDB = 0;
   }
+#endif
 }
-
-bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr )
+#if 0
+bool OlaccessConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr )
 {
 	SlZDataBase* db = (SlZDataBase*)database;
 
@@ -79,7 +81,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 
 
     // name
-    //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!");
+    //qDebug("OlaccessConverter::sharpToAddressee check if the fileAs transformation works!!");
     addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); 
     //addr.setName(db->readField(ZdbAdrs::FullName));
 
@@ -94,7 +96,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     emailstr.replace( QRegExp(","), " " ); 
     emailstr.replace( QRegExp(";"), " " ); 
     emailstr.replace( QRegExp(":"), " " ); 
-    //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1());
+    //qDebug("OlaccessConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1());
     QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace());
     bool defE = false;
     bool found = false;
@@ -221,8 +223,8 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) );
 
 	QString gen = db->readField(ZdbAdrs::Gender);
-	//qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1());
-	//qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited");
+	//qDebug("OlaccessConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1());
+	//qDebug("OlaccessConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited");
     if (gen == "1")
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
     else if (gen == "2")
@@ -264,7 +266,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
-	//qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" );
+	//qDebug("OlaccessConverter::sharpToAddressee please check that the categories will be converted" );
     QArray<int> catArray = db->readCategories();
     QString cat;
 
@@ -279,7 +281,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     return true;
 }
 
-bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact )
+bool OlaccessConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact )
 {
     bool cellHome = false, cellWork = false;
     // name
@@ -289,7 +291,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     database->writeField(ZdbAdrs::Title, addr.prefix());
     database->writeField(ZdbAdrs::Suffix, addr.suffix());
 
-    //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() );
+    //qDebug("OlaccessConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() );
     QString formattedName = addr.formattedName();
     if ( formattedName.isEmpty() ) {
         if ( !addr.familyName().isEmpty() ) {
@@ -305,8 +307,8 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     database->writeField(ZdbAdrs::FullName, formattedName);
 
     // email
-    //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!");
-    //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee");
+    //qDebug("OlaccessConverter::addresseeToSharp check which seperator we need here for the emails!!");
+    //qDebug("OlaccessConverter::addresseeToSharp its probably the same from sharpToAddressee");
     QString emails = addr.emails().join(" ");
     database->writeField(ZdbAdrs::Emails, emails );
 
@@ -373,9 +375,9 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" ));
 
     QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" );
-	//qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1());
-	//qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?");
-	//qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
+	//qDebug("OlaccessConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1());
+	//qDebug("OlaccessConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?");
+	//qDebug("OlaccessConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
     if (gt == "male")
       database->writeField(ZdbAdrs::Gender, "1");
     else if (gt == "female")
@@ -405,13 +407,13 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
 //US    QStringList groupList() const; 
 
 
-	//qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works");
+	//qDebug("OlaccessConverter::addresseeToSharp please check if category transformation works");
 
     return true;
 }
 
 
-bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact )
+bool OlaccessConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact )
 {  
     QStringList list = addr.categories();
 
@@ -431,12 +433,12 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
     bool res ;
 
     if ( !(res = database->updateCategories(contact, ids) ))
-        qDebug("SharpDTMConverter::Error updating categories");
+        qDebug("OlaccessConverter::Error updating categories");
 
     return res;
 }
-
-QDate SharpDTMConverter::convertDate( QString  s)
+#endif
+QDate OlaccessConverter::convertDate( QString  s)
 {
     QDate dt = KGlobal::locale()->readDate( s ); 
     return dt;
diff --git a/kabc/plugins/olaccess/olaccessconverter.h b/kabc/plugins/olaccess/olaccessconverter.h
index db1bf2d..48a255d 100644
--- a/kabc/plugins/olaccess/olaccessconverter.h
+++ b/kabc/plugins/olaccess/olaccessconverter.h
@@ -29,31 +29,25 @@ $Id$
 
 #include <qstring.h>
 
-#include <sl/slzdb.h>
 
 #include "addressee.h"
 
-namespace SlCategory {
-  class SlCategories;
-}
-
-class SlZDataBase;
 
 namespace KABC {
 
-class SharpDTMConverter
+class OlaccessConverter
 {
 public:
 
   /**
    * Constructor.
    */
-  SharpDTMConverter();
+  OlaccessConverter();
 
   /**
    * Destructor.
    */
-  virtual ~SharpDTMConverter();
+  virtual ~OlaccessConverter();
 
   bool init();
   void deinit();
@@ -65,7 +59,7 @@ public:
    * @param database The sharp database pointer we use for the conversion
    * @param addr    The addressee.
    */
-  bool sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr );
+  //bool sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr );
 
   /**
    * Converts an addressee to a sharp dtm contact.
@@ -74,11 +68,11 @@ public:
    * @param database The sharp database pointer we use for the conversion
    * @param contact The sharp card id, eventhough it might be 0, if the contact is a new one.
    */
-  bool addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact );
-  bool setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact );
+  //bool addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact );
+  //bool setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact );
 
   private:
-    SlCategory::SlCategories* catDB;
+  //SlCategory::SlCategories* catDB;
     QDate convertDate( QString );
 
 
diff --git a/kabc/plugins/olaccess/resourceolaccess.cpp b/kabc/plugins/olaccess/resourceolaccess.cpp
index e8f8bdd..7113e0e 100644
--- a/kabc/plugins/olaccess/resourceolaccess.cpp
+++ b/kabc/plugins/olaccess/resourceolaccess.cpp
@@ -27,7 +27,6 @@ $Id$
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
@@ -43,46 +42,45 @@ $Id$
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
-#include <sl/slzdb.h>
 
 #include <libkdepim/ksyncprofile.h>
 
-#include "resourcesharpdtmconfig.h"
-#include "resourcesharpdtm.h"
+#include "resourceolaccessconfig.h"
+#include "resourceolaccess.h"
 
 #include "stdaddressbook.h"
 
-#include "sharpdtmconverter.h"
+#include "olaccessconverter.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 {
-  void *init_microkabc_sharpdtm()
+  void *init_microkabc_olaccess()
   {
-    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>();
+    return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>();
   }
 }
 
-ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
+Resourceolaccess::Resourceolaccess( const KConfig *config  )
   : Resource( config ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
-    mAccess = 0;
-    QString fileName = SlZDataBase::addressbookFileName();
+  //mAccess = 0;
+  QString fileName;// = SlZDataBase::addressbookFileName();
     init( fileName );
 }
 
-ResourceSharpDTM::ResourceSharpDTM( const QString &fileName  )
+Resourceolaccess::Resourceolaccess( const QString &fileName  )
   : Resource( 0 )
 {
-    mAccess = 0;
+  //mAccess = 0;
     init( fileName );
 }
 
-void ResourceSharpDTM::init( const QString &fileName )
+void Resourceolaccess::init( const QString &fileName )
 {
     if (mConverter == 0) {
-        mConverter = new SharpDTMConverter();
+        mConverter = new OlaccessConverter();
         bool res = mConverter->init(); 
         if ( !res )
             {
@@ -94,47 +92,48 @@ void ResourceSharpDTM::init( const QString &fileName )
     setFileName( fileName );
 }
 
-ResourceSharpDTM::~ResourceSharpDTM()
+Resourceolaccess::~Resourceolaccess()
 {
   if (mConverter != 0)
     delete mConverter;
 
-  if(mAccess != 0)
-    delete mAccess;
+  //if(mAccess != 0)
+  //delete mAccess;
 }
 
-void ResourceSharpDTM::writeConfig( KConfig *config )
+void Resourceolaccess::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 }
 
-Ticket *ResourceSharpDTM::requestSaveTicket()
+Ticket *Resourceolaccess::requestSaveTicket()
 {
 
-  qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
+  qDebug("Resourceolaccess::requestSaveTicket: %s", fileName().latin1());
 
   if ( !addressBook() ) return 0;
   return createTicket( this );
 }
 
 
-bool ResourceSharpDTM::doOpen()
+bool Resourceolaccess::doOpen()
 { 
     if (!mConverter)
         return false;
     return true;
 }
 
-void ResourceSharpDTM::doClose()
+void Resourceolaccess::doClose()
 {
   return;
 }
 
-bool ResourceSharpDTM::load()
+bool Resourceolaccess::load()
 {
     if (!mConverter)
         return false;
-    QString fileN = SlZDataBase::addressbookFileName();
+    QString fileN ;//= SlZDataBase::addressbookFileName();
+#if 0
     if ( ! mAccess  ) {
         mAccess = new SlZDataBase(fileN,
                                   SlZDataBase::addressbookItems(),
@@ -143,7 +142,7 @@ bool ResourceSharpDTM::load()
     if(mAccess == 0)
         return false;
 
-    qDebug("ResourceSharpDTM:: %x load: %s",this, fileName().latin1());
+    qDebug("Resourceolaccess:: %x load: %s",this, fileName().latin1());
     bool res = false;
     CardId id;
     for (bool res=mAccess->first(); res == true; res=mAccess->next())
@@ -160,12 +159,13 @@ bool ResourceSharpDTM::load()
     if(mAccess != 0)
         delete mAccess;
     mAccess = 0;
-
+#endif
     return true;
 }
 
-bool ResourceSharpDTM::save( Ticket *ticket )
+bool Resourceolaccess::save( Ticket *ticket )
 {  
+#if 0
     if (!mConverter)
         return false;
     QString fileN = SlZDataBase::addressbookFileName();
@@ -176,7 +176,7 @@ bool ResourceSharpDTM::save( Ticket *ticket )
     }
     if(mAccess == 0)
         return false;
-    qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
+    qDebug("Resourceolaccess::save: %s", fileName().latin1());
     KABC::AddressBook::Iterator it;
     bool res;
     KABC::Addressee::List changedAddressees;
@@ -267,34 +267,35 @@ bool ResourceSharpDTM::save( Ticket *ticket )
     if(mAccess != 0)
         delete mAccess;
     mAccess = 0;
+#endif
     return true;
 }
 
-bool ResourceSharpDTM::lock( const QString &lockfileName )
+bool Resourceolaccess::lock( const QString &lockfileName )
 {
     return true;
 }
 
-void ResourceSharpDTM::unlock( const QString &fileName )
+void Resourceolaccess::unlock( const QString &fileName )
 {
 
 }
 
-void ResourceSharpDTM::setFileName( const QString &newFileName )
+void Resourceolaccess::setFileName( const QString &newFileName )
 {
     Resource::setFileName( newFileName );
 }
 
-void ResourceSharpDTM::fileChanged()
+void Resourceolaccess::fileChanged()
 {
  
 }
 
-void ResourceSharpDTM::removeAddressee( const Addressee &addr )
+void Resourceolaccess::removeAddressee( const Addressee &addr )
 {
 }
 
-void ResourceSharpDTM::cleanUp()
+void Resourceolaccess::cleanUp()
 {
  
 }
diff --git a/kabc/plugins/olaccess/resourceolaccess.h b/kabc/plugins/olaccess/resourceolaccess.h
index 64d06f9..0066331 100644
--- a/kabc/plugins/olaccess/resourceolaccess.h
+++ b/kabc/plugins/olaccess/resourceolaccess.h
@@ -26,8 +26,10 @@ $Id$
 */
 
 
-#ifndef KABC_RESOURCESHARPDTM_H
-#define KABC_RESOURCESHARPDTM_H
+
+
+#ifndef KABC_RESOURCEolaccess_H
+#define KABC_RESOURCEolaccess_H
 
 #include <kconfig.h>
 #include <kdirwatch.h>
@@ -37,17 +39,15 @@ $Id$
 #include "resource.h"
 
 
-class SlZDataBase;
-
 namespace KABC {
 
 class ResourceConfigWidget;
-class SharpDTMConverter;
+class OlaccessConverter;
 
 /**
   @internal
 */
-class ResourceSharpDTM : public Resource
+class Resourceolaccess : public Resource
 {
   Q_OBJECT
 
@@ -58,17 +58,17 @@ public:
 
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceSharpDTM( const KConfig *cfg  );
+  Resourceolaccess( const KConfig *cfg  );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceSharpDTM( const QString &fileName  );
+  Resourceolaccess( const QString &fileName  );
 
   /**
    * Destructor.
    */
-  ~ResourceSharpDTM();
+  ~Resourceolaccess();
 
   /**
     Writes the config back.
@@ -133,8 +133,7 @@ protected:
   void unlock( const QString &fileName );
 
 private:
-  SlZDataBase* mAccess;
-  SharpDTMConverter* mConverter;
+  OlaccessConverter* mConverter;
 
   QString mLockUniqueName;
 
diff --git a/kabc/plugins/olaccess/resourceolaccessconfig.cpp b/kabc/plugins/olaccess/resourceolaccessconfig.cpp
index 240f1d7..1fcf1b8 100644
--- a/kabc/plugins/olaccess/resourceolaccessconfig.cpp
+++ b/kabc/plugins/olaccess/resourceolaccessconfig.cpp
@@ -33,19 +33,17 @@ $Id$
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
-#include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
-#include "resourcesharpdtm.h"
+#include "resourceolaccess.h"
 
-#include "resourcesharpdtmconfig.h"
+#include "resourceolaccessconfig.h"
 
-#include <sl/slzdb.h>
 
 using namespace KABC;
 
-ResourceSharpDTMConfig::ResourceSharpDTMConfig( QWidget* parent,  const char* name )
+ResourceolaccessConfig::ResourceolaccessConfig( QWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
 {
   QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
@@ -62,19 +60,19 @@ ResourceSharpDTMConfig::ResourceSharpDTMConfig( QWidget* parent,  const char* na
  
 }
 
-void ResourceSharpDTMConfig::loadSettings( KRES::Resource *res  )
+void ResourceolaccessConfig::loadSettings( KRES::Resource *res  )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
-  ResourceSharpDTM *resource = (ResourceSharpDTM*)( res );
+  Resourceolaccess *resource = (Resourceolaccess*)( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceSharpDTMConfig::loadSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceolaccessConfig::loadSettings(): cast failed" << endl;
     return;
   }
 
   mFileNameEdit->setURL( resource->fileName() );
   if ( mFileNameEdit->url().isEmpty() )
-    mFileNameEdit->setURL( SlZDataBase::addressbookFileName() );
+    ;//mFileNameEdit->setURL( SlZDataBase::addressbookFileName() );
 
   //US Sharp DTM resources are ReadOnly by definition
   emit setPersistentReadOnly( true );
@@ -84,20 +82,20 @@ void ResourceSharpDTMConfig::loadSettings( KRES::Resource *res  )
   
 }
 
-void ResourceSharpDTMConfig::saveSettings( KRES::Resource *res )
+void ResourceolaccessConfig::saveSettings( KRES::Resource *res )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
-  ResourceSharpDTM *resource = (ResourceSharpDTM*)( res );
+  Resourceolaccess *resource = (Resourceolaccess*)( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceSharpDTMConfig::saveSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceolaccessConfig::saveSettings(): cast failed" << endl;
     return;
   }
 
   resource->setFileName( mFileNameEdit->url() );
 }
 
-void ResourceSharpDTMConfig::checkFilePermissions( const QString& fileName )
+void ResourceolaccessConfig::checkFilePermissions( const QString& fileName )
 {
   // If file exist but is not writeable...
 /*US  
diff --git a/kabc/plugins/olaccess/resourceolaccessconfig.h b/kabc/plugins/olaccess/resourceolaccessconfig.h
index 29765c8..38d47ba 100644
--- a/kabc/plugins/olaccess/resourceolaccessconfig.h
+++ b/kabc/plugins/olaccess/resourceolaccessconfig.h
@@ -35,12 +35,12 @@ $Id$
 
 namespace KABC {
 
-class ResourceSharpDTMConfig : public KRES::ConfigWidget
+class ResourceolaccessConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
 
 public:
-  ResourceSharpDTMConfig( QWidget* parent = 0, const char* name = 0 );
+  ResourceolaccessConfig( QWidget* parent = 0, const char* name = 0 );
 
 public slots:
   void loadSettings( KRES::Resource *resource );