commit

1 files changed, 35 insertions, 34 deletions

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
@@ -29,3 +29,2 @@ $Id$
 #include <sys/stat.h>
-#include <unistd.h>
 
@@ -45,3 +44,2 @@ $Id$
 
-#include <sl/slzdb.h>
 
@@ -49,4 +47,4 @@ $Id$
 
-#include "resourcesharpdtmconfig.h"
-#include "resourcesharpdtm.h"
+#include "resourceolaccessconfig.h"
+#include "resourceolaccess.h"
 
@@ -54,3 +52,3 @@ $Id$
 
-#include "sharpdtmconverter.h"
+#include "olaccessconverter.h"
 //#define ALLOW_LOCKING
@@ -59,5 +57,5 @@ extern "C"
 {
-  void *init_microkabc_sharpdtm()
+  void *init_microkabc_olaccess()
   {
-    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>();
+    return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>();
   }
@@ -65,3 +63,3 @@ extern "C"
 
-ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
+Resourceolaccess::Resourceolaccess( const KConfig *config  )
   : Resource( config ), mConverter (0)
@@ -69,4 +67,4 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
   // 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 );
@@ -74,6 +72,6 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
 
-ResourceSharpDTM::ResourceSharpDTM( const QString &fileName  )
+Resourceolaccess::Resourceolaccess( const QString &fileName  )
   : Resource( 0 )
 {
-    mAccess = 0;
+  //mAccess = 0;
     init( fileName );
@@ -81,6 +79,6 @@ ResourceSharpDTM::ResourceSharpDTM( const QString &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(); 
@@ -96,3 +94,3 @@ void ResourceSharpDTM::init( const QString &fileName )
 
-ResourceSharpDTM::~ResourceSharpDTM()
+Resourceolaccess::~Resourceolaccess()
 {
@@ -101,7 +99,7 @@ ResourceSharpDTM::~ResourceSharpDTM()
 
-  if(mAccess != 0)
-    delete mAccess;
+  //if(mAccess != 0)
+  //delete mAccess;
 }
 
-void ResourceSharpDTM::writeConfig( KConfig *config )
+void Resourceolaccess::writeConfig( KConfig *config )
 {
@@ -110,6 +108,6 @@ void ResourceSharpDTM::writeConfig( KConfig *config )
 
-Ticket *ResourceSharpDTM::requestSaveTicket()
+Ticket *Resourceolaccess::requestSaveTicket()
 {
 
-  qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
+  qDebug("Resourceolaccess::requestSaveTicket: %s", fileName().latin1());
 
@@ -120,3 +118,3 @@ Ticket *ResourceSharpDTM::requestSaveTicket()
 
-bool ResourceSharpDTM::doOpen()
+bool Resourceolaccess::doOpen()
 { 
@@ -127,3 +125,3 @@ bool ResourceSharpDTM::doOpen()
 
-void ResourceSharpDTM::doClose()
+void Resourceolaccess::doClose()
 {
@@ -132,3 +130,3 @@ void ResourceSharpDTM::doClose()
 
-bool ResourceSharpDTM::load()
+bool Resourceolaccess::load()
 {
@@ -136,3 +134,4 @@ bool ResourceSharpDTM::load()
         return false;
-    QString fileN = SlZDataBase::addressbookFileName();
+    QString fileN ;//= SlZDataBase::addressbookFileName();
+#if 0
     if ( ! mAccess  ) {
@@ -145,3 +144,3 @@ bool ResourceSharpDTM::load()
 
-    qDebug("ResourceSharpDTM:: %x load: %s",this, fileName().latin1());
+    qDebug("Resourceolaccess:: %x load: %s",this, fileName().latin1());
     bool res = false;
@@ -162,3 +161,3 @@ bool ResourceSharpDTM::load()
     mAccess = 0;
-
+#endif
     return true;
@@ -166,4 +165,5 @@ bool ResourceSharpDTM::load()
 
-bool ResourceSharpDTM::save( Ticket *ticket )
+bool Resourceolaccess::save( Ticket *ticket )
 {  
+#if 0
     if (!mConverter)
@@ -178,3 +178,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
         return false;
-    qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
+    qDebug("Resourceolaccess::save: %s", fileName().latin1());
     KABC::AddressBook::Iterator it;
@@ -269,2 +269,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
     mAccess = 0;
+#endif
     return true;
@@ -272,3 +273,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
 
-bool ResourceSharpDTM::lock( const QString &lockfileName )
+bool Resourceolaccess::lock( const QString &lockfileName )
 {
@@ -277,3 +278,3 @@ bool ResourceSharpDTM::lock( const QString &lockfileName )
 
-void ResourceSharpDTM::unlock( const QString &fileName )
+void Resourceolaccess::unlock( const QString &fileName )
 {
@@ -282,3 +283,3 @@ void ResourceSharpDTM::unlock( const QString &fileName )
 
-void ResourceSharpDTM::setFileName( const QString &newFileName )
+void Resourceolaccess::setFileName( const QString &newFileName )
 {
@@ -287,3 +288,3 @@ void ResourceSharpDTM::setFileName( const QString &newFileName )
 
-void ResourceSharpDTM::fileChanged()
+void Resourceolaccess::fileChanged()
 {
@@ -292,3 +293,3 @@ void ResourceSharpDTM::fileChanged()
 
-void ResourceSharpDTM::removeAddressee( const Addressee &addr )
+void Resourceolaccess::removeAddressee( const Addressee &addr )
 {
@@ -296,3 +297,3 @@ void ResourceSharpDTM::removeAddressee( const Addressee &addr )
 
-void ResourceSharpDTM::cleanUp()
+void Resourceolaccess::cleanUp()
 {