20 files changed, 419 insertions, 355 deletions

diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 0555484..a7c1503 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_dir
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 DESTDIR = ../../../bin
 #LIBS += -lmicrokde -lmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcedir.h \
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index 729f4ce..9066556 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_dir
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 52863d5..d978e61 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -52,37 +52,38 @@ $Id$
 
 #include "resourcedirconfig.h"
 #include "stdaddressbook.h"
 
 //US
 #include <qdir.h>
 
 #include "resourcedir.h"
+#include "syncwidget.h"
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
-__declspec(dllexport) 
+__declspec(dllexport)
 #else
 {
 #endif
 
 //US  void *init_kabc_dir()
   void *init_microkabc_dir()
   {
-    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, KRES::SyncWidget>();
   }
 #ifndef _WIN32_
 }
 #endif
 
-ResourceDir::ResourceDir( const KConfig *config )
-    : Resource( config )
+ResourceDir::ResourceDir( const KConfig *config, bool syncable  )
+    : Resource( config, syncable )
 {
   QString path;
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
 //US     path = config->readEntry( "FilePath" );
      path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
 //US     mFormatName = config->readEntry( "FileFormat" );
@@ -96,42 +97,42 @@ ResourceDir::ResourceDir( const KConfig *config )
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 
   if ( !mFormat ) {
     mFormatName = "vcard";
     mFormat = factory->format( mFormatName );
   }
 
-/*US  
+/*US
 //US  qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1());
   if (mFormatName == "vcard")
     mFormat = new VCardFormatPlugin2();
   else if (mFormatName == "binary")
     mFormat = new BinaryFormat();
   else
     qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
 */
-  
+
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
 
   setPath( path );
 }
 
 ResourceDir::~ResourceDir()
 {
   delete mFormat;
   mFormat = 0;
 }
 
 void ResourceDir::writeConfig( KConfig *config )
-{ 
-    config->setGroup( "Resource_" + identifier() ); 
+{
+    config->setGroup( "Resource_" + identifier() );
   Resource::writeConfig( config );
 
   config->writeEntry( "FilePath", mPath );
   config->writeEntry( "FileFormat", mFormatName );
 }
 
 Ticket *ResourceDir::requestSaveTicket()
 {
@@ -236,31 +237,31 @@ bool ResourceDir::save( Ticket *ticket )
 bool ResourceDir::lock( const QString &path )
 {
   kdDebug(5700) << "ResourceDir::lock()" << endl;
 
   QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + p + ".lock" );
-  KURL url(p);  
+  KURL url(p);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-  
-  
+
+
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if ( QFile::exists( lockName ) ) return false;
 
   QString lockUniqueName;
   lockUniqueName = p + KApplication::randomString( 8 );
 
-  url = lockUniqueName;  
+  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
-    
+
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
@@ -280,35 +281,35 @@ bool ResourceDir::lock( const QString &path )
 }
 
 void ResourceDir::unlock( const QString &path )
 {
   QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locate( "data", "kabc/lock/" + p + ".lock" );
-  KURL url(p);  
+  KURL url(p);
   QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   ::unlink( QFile::encodeName( lockName ) );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceDir::setPath( const QString &path )
 {
   mDirWatch.stopScan();
   mDirWatch.removeDir( mPath );
-  
+
   mPath = path;
 
   mDirWatch.addDir( mPath, true );
   mDirWatch.startScan();
 
-//US simulate KDirWatch event  
+//US simulate KDirWatch event
 //US  pathChanged();
 
 }
 
 QString ResourceDir::path() const
 {
   return mPath;
 }
@@ -317,17 +318,17 @@ void ResourceDir::setFormat( const QString &format )
 {
   mFormatName = format;
 
   if ( mFormat )
     delete mFormat;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
-/*US 
+/*US
 qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard")
     mFormat = new VCardFormatPlugin2();
   else if (mFormatName == "binary")
     mFormat = new BinaryFormat();
   else
     qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
 */
diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h
index 6e35695..c2aedad 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/kabc/plugins/dir/resourcedir.h
@@ -44,24 +44,24 @@ class FormatPlugin;
 /**
   @internal
 */
 class ResourceDir : public Resource
 {
   Q_OBJECT
 
 public:
-  ResourceDir( const KConfig* );
+  ResourceDir( const KConfig*, bool syncable  );
   ~ResourceDir();
 
   virtual void writeConfig( KConfig* );
 
   virtual bool doOpen();
   virtual void doClose();
-  
+
   virtual Ticket *requestSaveTicket();
 
   virtual bool load();
   virtual bool save( Ticket * );
 
   /**
    * Set path to be used for saving.
    */
@@ -76,17 +76,17 @@ public:
    * Set the format by name.
    */
   void setFormat( const QString &format );
 
   /**
    * Returns the format name.
    */
   QString format() const;
-  
+
   /**
    * Remove a addressee from its source.
    * This method is mainly called by KABC::AddressBook.
    */
   virtual void removeAddressee( const Addressee& addr );
 
   /**
    * This method is called by an error handler if the application
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 32555a2..154ef2a 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_file
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 
 DESTDIR = ../../../bin
 #LIBS += -lmicrokde -lmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index d19a26d..3015806 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_file
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 1d3acec..361b36b 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -46,37 +46,39 @@ $Id$
 
 #include "formatfactory.h"
 
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 
 #include "resourcefile.h"
+#include "syncwidget.h"
+
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
-__declspec(dllexport) 
+__declspec(dllexport)
 #else
 {
 #endif
 
 //US  void *init_kabc_file()
   void *init_microkabc_file()
   {
-    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
+    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, KRES::SyncWidget>();
   }
 #ifndef _WIN32_
 }
 #endif
 
-ResourceFile::ResourceFile( const KConfig *config )
-  : Resource( config ) , mFormat( 0 )
+ResourceFile::ResourceFile( const KConfig *config, bool syncable )
+  : Resource( config, syncable ) , mFormat( 0 )
 {
   QString fileName, formatName;
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() );
     formatName = cfg->readEntry( "FileFormat", "vcard" );
 //  qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() );
@@ -84,19 +86,19 @@ ResourceFile::ResourceFile( const KConfig *config )
     fileName = StdAddressBook::fileName();
     formatName = "vcard";
 //  qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() );
   }
 
   init( fileName, formatName );
 }
 
-ResourceFile::ResourceFile( const QString &fileName,
+ResourceFile::ResourceFile( const QString &fileName, bool syncable ,
                             const QString &formatName )
-  : Resource( 0 )
+  : Resource( 0, syncable )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName, formatName );
 }
 
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
   mFormatName = formatName;
@@ -134,24 +136,24 @@ ResourceFile::~ResourceFile()
 {
   delete mFormat;
   mFormat = 0;
 }
 
 void ResourceFile::writeConfig( KConfig *config )
 {
 
-    config->setGroup( "Resource_" + identifier() ); 
+    config->setGroup( "Resource_" + identifier() );
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", mFileName );
   config->writeEntry( "FileFormat", mFormatName );
-  
+
 //    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  
+
 }
 
 Ticket *ResourceFile::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
@@ -192,98 +194,98 @@ bool ResourceFile::doOpen()
 }
 
 void ResourceFile::doClose()
 {
 }
 
 bool ResourceFile::load()
 {
-  
+
 
   QFile file( mFileName );
   if ( !file.open( IO_ReadOnly ) ) {
     addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) );
     return false;
   }
 
 //    qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  
+
   return mFormat->loadAll( addressBook(), this, &file );
 }
 
 bool ResourceFile::save( Ticket *ticket )
 {
 //    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  
+
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
-   
+
 /*US we use a simpler method to create a backupfile
-    
+
   (void) KSaveFile::backupFile( mFileName, QString::null
   ,extension );
 
   KSaveFile saveFile( mFileName );
   bool ok = false;
   if ( saveFile.status() == 0 && saveFile.file() )
   {
     mFormat->saveAll( addressBook(), this, saveFile.file() );
     ok = saveFile.close();
   }
 */
 
-//US ToDo: write backupfile  
+//US ToDo: write backupfile
   QFile info;
   info.setName( mFileName );
   bool ok = info.open( IO_WriteOnly );
   if ( ok ) {
     mFormat->saveAll( addressBook(), this, &info );
-    
+
     info.close();
     ok = true;
   }
   else {
-  
+
   }
-  
+
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
-  
+
   delete ticket;
   unlock( mFileName );
-  
+
   return ok;
 
   qDebug("ResourceFile::save has to be changed");
   return true;
 }
 
 bool ResourceFile::lock( const QString &fileName )
 {
-  
+
 
   QString fn = fileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
-  
-  KURL url(fn);  
+
+  KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-  
-  
+
+
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
-  
-  url = lockUniqueName;  
+
+  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
@@ -306,80 +308,80 @@ bool ResourceFile::lock( const QString &fileName )
 
 void ResourceFile::unlock( const QString &fileName )
 {
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
-  KURL url(fn);  
+  KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-  
+
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceFile::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
-  
+
   mFileName = fileName;
 
-  
+
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
 
-//US simulate KDirWatch event  
+//US simulate KDirWatch event
 //US  fileChanged();
 }
 
 QString ResourceFile::fileName() const
 {
   return mFileName;
 }
 
 void ResourceFile::setFormat( const QString &format )
 {
   mFormatName = format;
   delete mFormat;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
-/*US  
+/*US
 //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard") {
     mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
   }
   else if (mFormatName == "binary") {
     mFormat = new BinaryFormat();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
   }
   else
     qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
 */
-  
+
 }
 
 QString ResourceFile::format() const
 {
   return mFormatName;
 }
 
 void ResourceFile::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
-    
-  
+
+
   QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 }
 
 void ResourceFile::removeAddressee( const Addressee &addr )
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index 4522d78..0a3027c 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -53,22 +53,22 @@ class ResourceFile : public Resource
 
 public:
 
   /**
     Constructor.
 
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceFile( const KConfig *cfg );
+  ResourceFile( const KConfig *cfg, bool syncable );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceFile( const QString &fileName, const QString &formatName = "vcard" );
+  ResourceFile( const QString &fileName, bool syncable , const QString &formatName = "vcard" );
 
   /**
    * Destructor.
    */
   ~ResourceFile();
 
   /**
     Writes the config back.
@@ -80,17 +80,17 @@ public:
    * This method should be called before @ref load().
    */
   virtual bool doOpen();
 
   /**
    * Closes the file again.
    */
   virtual void doClose();
-  
+
   /**
    * Requests a save ticket, that is used by @ref save()
    */
   virtual Ticket *requestSaveTicket();
 
   /**
    * Loads all addressees from file to the address book.
    * Returns true if all addressees could be loaded otherwise false.
@@ -148,15 +148,15 @@ protected:
 
 private:
   QString mFileName;
   QString mFormatName;
 
   FormatPlugin *mFormat;
 
   QString mLockUniqueName;
-    
+
   KDirWatch mDirWatch;
 };
 
 }
 
 #endif
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro
index f6ca586..2e79fc0 100644
--- a/kabc/plugins/ldap/ldapE.pro
+++ b/kabc/plugins/ldap/ldapE.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_ldap
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp
index 55c43af..4b9dede 100644
--- a/kabc/plugins/ldap/resourceldap.cpp
+++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -31,33 +31,34 @@ $Id$
 #include <klocale.h>
 #include <kconfig.h>
 #include <kstringhandler.h>
 
 #include <stdlib.h>
 
 #include "resourceldap.h"
 #include "resourceldapconfig.h"
+#include "syncwidget.h"
 
 using namespace KABC;
 
 extern "C"
 {
 //US  void *init_kabc_ldap()
   void *init_microkabc_ldap()
   {
-    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>();
+    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, KRES::SyncWidget>();
   }
 }
 
 void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value );
 
 
-ResourceLDAP::ResourceLDAP( const KConfig *config )
-  : Resource( config ), mPort( 389 ), mLdap( 0 )
+ResourceLDAP::ResourceLDAP( const KConfig *config, bool syncable )
+  : Resource( config, syncable ), mPort( 389 ), mLdap( 0 )
 {
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     mUser = cfg->readEntry( "LdapUser" );
     mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) );
     mDn = cfg->readEntry( "LdapDn" );
     mHost = cfg->readEntry( "LdapHost" );
     mPort = cfg->readNumEntry( "LdapPort", 389 );
diff --git a/kabc/plugins/ldap/resourceldap.h b/kabc/plugins/ldap/resourceldap.h
index 0625f30..0aad3c1 100644
--- a/kabc/plugins/ldap/resourceldap.h
+++ b/kabc/plugins/ldap/resourceldap.h
@@ -38,17 +38,17 @@ $Id$
 class KConfig;
 
 namespace KABC {
 
 class ResourceLDAP : public Resource
 {
 public:
 
-  ResourceLDAP( const KConfig* );
+  ResourceLDAP( const KConfig*, bool syncable );
 
   virtual void writeConfig( KConfig* );
 
   virtual bool doOpen();
   virtual void doClose();
 
   virtual Ticket *requestSaveTicket();
 
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index 8d45c3d..912e596 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 #release debug
 TARGET = microkabc_opie
 
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index aaee801..1222242 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -45,269 +45,238 @@ $Id$
 //US #include "formatfactory.h"
 //US #include <qpe/qpeapplication.h>
 
 #include <opie/ocontactaccess.h>
 #include <opie/ocontactaccessbackend_xml.h>
 
 #include "resourceopieconfig.h"
 #include "stdaddressbook.h"
+#include "syncwidget.h"
 
 #include "opieconverter.h"
 
 #include "resourceopie.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_opie()
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>();
+    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, KRES::SyncWidget>();
   }
 }
 
-ResourceOpie::ResourceOpie( const KConfig *config )
-  : Resource( config ), mConverter (0)
+ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
+  : Resource( config, syncable ), mAccess(0), mConverter (0)
 {
   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 )
-  : Resource( 0 )
+ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
+  : Resource( 0, syncable )
 {
 //  qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
   init( fileName );
 }
 
 void ResourceOpie::init( const QString &fileName )
 {
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
- 
+
 
   setFileName( fileName );
- 
+
 }
 
 ResourceOpie::~ResourceOpie()
 {
   if (mConverter != 0)
     delete mConverter;
+
+  if(mAccess != 0)
+    delete mAccess;
+
 }
 
 void ResourceOpie::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 
-  config->writeEntry( "FileName", mFileName );
-  
-//    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  
+  config->writeEntry( "FileName", fileName() );
 }
 
 Ticket *ResourceOpie::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
 
+  qDebug("ResourceOpie::requestSaveTicket: %s", fileName().latin1());
+
   if ( !addressBook() ) return 0;
 
-  if ( !lock( mFileName ) ) {
+  if ( !lock( fileName() ) ) {
     kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
-                  << mFileName << "'" << endl;
+                  << fileName() << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceOpie::doOpen()
 {
-//  qDebug("ResourceOpie::doOpen() %s", mFileName.latin1());
-/*US  
-  QFile file( mFileName );
-
-  if ( !file.exists() ) {
-    // try to create the file
-    bool ok = file.open( IO_WriteOnly );
-    if ( ok )
-      file.close();
-
-    return ok;
-  } else {
-    if ( !file.open( IO_ReadWrite ) )
-      return false;
-
-    if ( file.size() == 0 ) {
-      file.close();
-      return true;
-    }
+  qDebug("ResourceOpie::doOpen: %s", fileName().latin1());
 
-//US    bool ok = mFormat->checkFormat( &file );
-    bool ok = true;
-    
-    file.close();
+  OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", fileName() );
+  mAccess = new OContactAccess("KDEPim/Pi", 0l, backend, false);
 
-    return ok;
+  if ( !mAccess ) {
+    qDebug("Unable to load file() %s", fileName().latin1());
+    return false;
   }
-*/
-  qDebug("ResourceOpie::doOpen() has to be fixed - %s", mFileName.latin1());
-  return true;  
-}
 
-void ResourceOpie::doClose()
-{
-//  qDebug("ResourceOpie::doClose() %s", mFileName.latin1());
-}
+  mAccess->setReadAhead( 32 ); // Use ReadAhead-Cache if available
 
-bool ResourceOpie::load()
-{
-//  qDebug("ResourceOpie::load() %s", mFileName.latin1());
-  kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl;
-
-  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());
-    addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
-    return false;
-  }
-  
-  access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
 
-  bool res = false;
   if (mConverter == 0)
   {
     mConverter = new OpieConverter();
-    res = mConverter->init();
+    bool 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" ) );
-      delete access;
+      delete mAccess;
+      mAccess = 0;
       return false;
     }
   }
 
 
-	OContactAccess::List::Iterator it;
-  OContactAccess::List allList = access->allRecords();
+
+  return true;
+}
+
+void ResourceOpie::doClose()
+{
+  qDebug("ResourceOpie::doClose: %s", fileName().latin1());
+
+  if(mAccess)
+  {
+    delete mAccess;
+    mAccess = 0;
+  }
+  // it seems so, that deletion of access deletes backend as well
+  //delete backend;
+
+  return;
+
+}
+
+
+bool ResourceOpie::load()
+{
+  qDebug("ResourceOpie::load: %s", fileName().latin1());
+
+  bool res = false;
+
+  OContactAccess::List::Iterator it;
+  OContactAccess::List allList = mAccess->allRecords();
   for ( it = allList.begin(); it != allList.end(); ++it )
   {
     const OContact c = (*it);
-    
+
     KABC::Addressee addressee;
-    
-    res = mConverter->opieToAddressee( c, addressee );    
-    
+
+    res = mConverter->opieToAddressee( c, 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 )
 {
-  qDebug("ResourceOpie::save() has to be fixed - %s", mFileName.latin1());
-/*US  
-  
-  qDebug("ResourceOpie::save %s", mFileName.latin1());
-  kdDebug(5700) << "ResourceOpie::save()" << endl;
-
-  // create backup file
-  QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
-*/   
-/*US we use a simpler method to create a backupfile
-    
-  (void) KSaveFile::backupFile( mFileName, QString::null
-  ,extension );
-
-  KSaveFile saveFile( mFileName );
-  bool ok = false;
-  if ( saveFile.status() == 0 && saveFile.file() )
-  {
-    mFormat->saveAll( addressBook(), this, saveFile.file() );
-    ok = saveFile.close();
-  }
-*/
-/*US
-//US ToDo: write backupfile  
-  QFile info;
-  info.setName( mFileName );
-  bool ok = info.open( IO_WriteOnly );
-  if ( ok ) {
-//US    mFormat->saveAll( addressBook(), this, &info );
-    
-    info.close();
-    ok = true;
-  }
-  else {
-  
+  qDebug("ResourceOpie::save: %s", fileName().latin1());
+
+
+
+  KABC::AddressBook::Iterator it;
+  bool res;
+
+  for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
+    OContact c;
+    KABC::Addressee addressee = (*it);
+
+    res = mConverter->addresseeToOpie( *it, c );
+    if (res == true)
+    {
+      res = mAccess->add(c);
+      if (res == false)
+        qDebug("Unable to append Contact %s", c.fullName().latin1());
+    }
+    else
+    {
+      qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
+    }
   }
-  
-  if ( !ok )
-    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
-  
+
+  mAccess->save();
+
   delete ticket;
-  unlock( mFileName );
-  
-  return ok;
+  unlock( fileName() );
 
-  qDebug("ResourceOpie::save has to be changed");
-*/  
   return true;
-  
+
 }
 
-bool ResourceOpie::lock( const QString &fileName )
+bool ResourceOpie::lock( const QString &lockfileName )
 {
+  qDebug("ResourceOpie::lock: %s", fileName().latin1());
+
+
 //  qDebug("ResourceOpie::lock() %s", fileName.latin1());
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
 
-  QString fn = fileName;
+  QString fn = lockfileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
-  
-  KURL url(fn);  
+
+  KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-  
+
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
-  
-  url = lockUniqueName;  
+
+  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
@@ -325,71 +294,98 @@ bool ResourceOpie::lock( const QString &fileName )
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceOpie::unlock( const QString &fileName )
 {
-//  qDebug("ResourceOpie::unlock() %s", fileName.latin1());
-  
+  qDebug("ResourceOpie::unlock() %s", fileName.latin1());
+
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
-  KURL url(fn);  
+  KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-  
+
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
-void ResourceOpie::setFileName( const QString &fileName )
+void ResourceOpie::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
-  mDirWatch.removeFile( mFileName );
-  
-  mFileName = fileName;
-  
-  mDirWatch.addFile( mFileName );
+  mDirWatch.removeFile( fileName() );
+
+  Resource::setFileName( newFileName );
+
+  mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
 
-//US simulate KDirWatch event  
-//US  fileChanged();
 }
 
-QString ResourceOpie::fileName() const
-{
-  return mFileName;
-}
 
 void ResourceOpie::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
-  
-  QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+
+  QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
-  
+
   load();
   addressBook()->emitAddressBookChanged();
 }
 
 void ResourceOpie::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceOpie::cleanUp()
 {
 //  qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
 
-  unlock( mFileName );
+  unlock( fileName() );
+}
+
+
+/**
+ * This method returns the number of elements that are currently in the resource.
+ */
+int ResourceOpie::count() const
+{
+  qDebug("ResourceOpie::count: %x", mAccess);
+
+  if (mAccess != 0)
+  {
+    OContactAccess::List contactList = mAccess->allRecords();
+    return contactList.count();
+  }
+  else
+    return 0;
+}
+
+
+/**
+ * This method removes all elements from the resource!! (Not from the addressbook)
+ */
+bool ResourceOpie::clear()
+{
+  if (mAccess != 0) {
+    mAccess->clear();
+    return true;
+  }
+  else
+	return false;
 }
 
+
+
 //US #include "resourceopie.moc"
diff --git a/kabc/plugins/opie/resourceopie.h b/kabc/plugins/opie/resourceopie.h
index 9db9485..ca30fee 100644
--- a/kabc/plugins/opie/resourceopie.h
+++ b/kabc/plugins/opie/resourceopie.h
@@ -32,44 +32,42 @@ $Id$
 #include <kconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>
 
 #include "resource.h"
 
 
-//class QTimer;
-//class FormatPlugin;
+class OContactAccess;
 
 namespace KABC {
 
-//US class FormatPlugin;
 class ResourceConfigWidget;
 class OpieConverter;
 /**
   @internal
 */
 class ResourceOpie : public Resource
 {
   Q_OBJECT
 
 public:
 
   /**
     Constructor.
 
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceOpie( const KConfig *cfg );
+  ResourceOpie( const KConfig *cfg, bool syncable  );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceOpie( const QString &fileName );
+  ResourceOpie( const QString &fileName, bool syncable  );
 
   /**
    * Destructor.
    */
   ~ResourceOpie();
 
   /**
     Writes the config back.
@@ -81,17 +79,17 @@ public:
    * This method should be called before @ref load().
    */
   virtual bool doOpen();
 
   /**
    * Closes the file again.
    */
   virtual void doClose();
-  
+
   /**
    * Requests a save ticket, that is used by @ref save()
    */
   virtual Ticket *requestSaveTicket();
 
   /**
    * Loads all addressees from file to the address book.
    * Returns true if all addressees could be loaded otherwise false.
@@ -101,52 +99,58 @@ public:
   /**
    * Saves all addresses from address book to file.
    * Returns true if all addressees could be saved otherwise false.
    *
    * @param ticket  The ticket returned by @ref requestSaveTicket()
    */
   virtual bool save( Ticket *ticket );
 
-  /**
-   * Set name of file to be used for saving.
-   */
-  void setFileName( const QString & );
-
-  /**
-   * Return name of file used for loading and saving the address book.
-   */
-  QString fileName() const;
 
   /**
    * Remove a addressee from its source.
    * This method is mainly called by KABC::AddressBook.
    */
   virtual void removeAddressee( const Addressee& addr );
 
   /**
+   * Set name of file to be used for saving.
+   */
+  virtual void setFileName( const QString & );
+
+  /**
    * This method is called by an error handler if the application
    * crashed
    */
   virtual void cleanUp();
 
+  /**
+   * This method returns the number of elements that are currently in the resource.
+   */
+  virtual int count() const;
+
+  /**
+   * This method removes all elements from the resource!! (Not from the addressbook)
+   */
+  virtual bool clear();
+
+
 protected slots:
   void fileChanged();
 
 protected:
   void init( const QString &fileName );
 
   bool lock( const QString &fileName );
   void unlock( const QString &fileName );
 
 private:
+  OContactAccess* mAccess;
   OpieConverter* mConverter;
-  
-  QString mFileName;
 
   QString mLockUniqueName;
-    
+
   KDirWatch mDirWatch;
 };
 
 }
 
 #endif
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index 56eae87..d956519 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 
 TARGET = microkabc_qtopia
 
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpepim
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 7e10e46..dc88272 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -44,39 +44,40 @@ $Id$
 
 #include <qpe/pim/addressbookaccess.h>
 
 
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
+#include "syncwidget.h"
 
 #include "resourceqtopia.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_qtopia()
   {
-    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
+    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, KRES::SyncWidget>();
   }
 }
 
-ResourceQtopia::ResourceQtopia( const KConfig *config )
-  : Resource( config ), mConverter (0)
+ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
+  : Resource( config, syncable ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
 
   init( fileName );
 }
 
-ResourceQtopia::ResourceQtopia( const QString &fileName )
-  : Resource( 0 )
+ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable  )
+  : Resource( 0, syncable )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
 
 void ResourceQtopia::init( const QString &fileName )
 {
 
@@ -87,123 +88,107 @@ void ResourceQtopia::init( const QString &fileName )
   setFileName( fileName );
 }
 
 ResourceQtopia::~ResourceQtopia()
 {
   if (mConverter != 0)
     delete mConverter;
 
+  if(mAccess != 0)
+    delete mAccess;
 }
 
 void ResourceQtopia::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 }
 
 Ticket *ResourceQtopia::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
-  if ( !lock( mFileName ) ) {
+  if ( !lock( fileName() ) ) {
     kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
-                  << mFileName << "'" << endl;
+                  << fileName() << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceQtopia::doOpen()
 {
-/*US
-  QFile file( mFileName );
-
-  if ( !file.exists() ) {
-    // try to create the file
-    bool ok = file.open( IO_WriteOnly );
-    if ( ok )
-      file.close();
-
-    return ok;
-  } else {
-    if ( !file.open( IO_ReadWrite ) )
-      return false;
-
-    if ( file.size() == 0 ) {
-      file.close();
-      return true;
-    }
-
-//US    bool ok = mFormat->checkFormat( &file );
-    bool ok = true;
-
-    file.close();
-
-    return ok;
-  }
-*/
-  return true;
-}
-
-void ResourceQtopia::doClose()
-{
-}
+  qDebug("ResourceQtopia::doOpen(): %s", fileName().latin1());
 
-bool ResourceQtopia::load()
-{
-  kdDebug(5700) << "ResourceQtopia::load(): '" << mFileName << "'" << endl;
-
-//  qDebug("ResourceQtopia::load: Try to load file() %s", mFileName.latin1());
+  mAccess = new AddressBookAccess();
 
-  AddressBookAccess* access = new AddressBookAccess();
-
-  if ( !access ) {
-    qDebug("Unable to load file() %s", mFileName.latin1());
-    addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
+  if ( !mAccess ) {
+    qDebug("Unable to load file() %s", fileName().latin1());
     return false;
   }
 
   bool res = false;
   if (mConverter == 0)
   {
     mConverter = new QtopiaConverter();
     res = mConverter->init();
     if ( !res )
     {
 	  QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
       qDebug(msg);
-      addressBook()->error( i18n( msg ) );
-      delete access;
+      delete mAccess;
+      mAccess = 0;
       return false;
     }
   }
 
-  { //create a new scope
-    AddressBookIterator it(*access);
-    const PimContact* contact;
+  return true;
+}
 
-    for (contact=it.toFirst(); it.current(); ++it) {
-      contact = it.current();
+void ResourceQtopia::doClose()
+{
+  qDebug("ResourceQtopia::doClose: %s", fileName().latin1());
 
-      KABC::Addressee addressee;
+  if(mAccess)
+  {
+    delete mAccess;
+    mAccess = 0;
+  }
+  // it seems so, that deletion of access deletes backend as well
+  //delete backend;
+
+  return;
+}
+
+bool ResourceQtopia::load()
+{
+  qDebug("ResourceQtopia::load: %s", fileName().latin1());
 
-      res = mConverter->qtopiaToAddressee( (*contact), addressee );
+  AddressBookIterator it(*mAccess);
+  const PimContact* contact;
+  bool res;
+
+  for (contact=it.toFirst(); it.current(); ++it)
+  {
+    contact = it.current();
 
-      if ( !addressee.isEmpty() && res )
-      {
-        addressee.setResource( this );
-        addressBook()->insertAddressee( addressee );
-      }
+    KABC::Addressee addressee;
+
+    res = mConverter->qtopiaToAddressee( (*contact), addressee );
+
+    if ( !addressee.isEmpty() && res )
+    {
+      addressee.setResource( this );
+      addressBook()->insertAddressee( addressee );
     }
   }
 
-  delete access;
   return true;
 }
 
 bool ResourceQtopia::save( Ticket *ticket )
 {
 /*US
 //    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
   kdDebug(5700) << "ResourceQtopia::save()" << endl;
@@ -244,17 +229,22 @@ bool ResourceQtopia::save( Ticket *ticket )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
 
   delete ticket;
   unlock( mFileName );
 
   return ok;
 
   qDebug("ResourceQtopia::save has to be changed");
+
+
+  access->save();
+
 */
+
   return true;
 }
 
 bool ResourceQtopia::lock( const QString &fileName )
 {
   kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
   QString fn = fileName;
@@ -307,51 +297,87 @@ void ResourceQtopia::unlock( const QString &fileName )
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
-void ResourceQtopia::setFileName( const QString &fileName )
+void ResourceQtopia::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
-  mDirWatch.removeFile( mFileName );
+  mDirWatch.removeFile( fileName() );
 
-  mFileName = fileName;
+  Resource::setFileName( newFileName );
 
-  mDirWatch.addFile( mFileName );
+  mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
-
-//US simulate KDirWatch event
-//US  fileChanged();
 }
 
-QString ResourceQtopia::fileName() const
-{
-  return mFileName;
-}
 
 void ResourceQtopia::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
 
-  QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 }
 
 void ResourceQtopia::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceQtopia::cleanUp()
 {
-  unlock( mFileName );
+  unlock( fileName() );
 }
 
+
+
+/**
+ * This method returns the number of elements that are currently in the resource.
+ */
+int ResourceQtopia::count() const
+{
+  if (mAccess != 0)
+  {
+    int counter = 0;
+    AddressBookIterator it2(*mAccess);
+    for (it2.toFirst(); it2.current(); ++it2) {
+      counter++;
+    }
+
+   	return counter;
+  }
+  else
+    return 0;
+}
+
+
+/**
+ * This method removes all elements from the resource!! (Not from the addressbook)
+ */
+bool ResourceQtopia::clear()
+{
+  if (mAccess != 0)
+  {
+    AddressBookIterator it2(*mAccess);
+    for (it2.toFirst(); it2.current(); ++it2) {
+      mAccess->removeContact(*it2.current());
+    }
+    return true;
+  }
+  else
+	return false;
+}
+
+
+
+
+
 //US #include "resourceqtopia.moc"
diff --git a/kabc/plugins/qtopia/resourceqtopia.h b/kabc/plugins/qtopia/resourceqtopia.h
index bf9dd45..90ab1f4 100644
--- a/kabc/plugins/qtopia/resourceqtopia.h
+++ b/kabc/plugins/qtopia/resourceqtopia.h
@@ -31,16 +31,17 @@ $Id$
 
 #include <kconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>
 
 #include "resource.h"
 
+class AddressBookAccess;
 
 namespace KABC {
 
 //US class FormatPlugin;
 class ResourceConfigWidget;
 class QtopiaConverter;
 
 /**
@@ -52,22 +53,22 @@ class ResourceQtopia : public Resource
 
 public:
 
   /**
     Constructor.
 
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceQtopia( const KConfig *cfg );
+  ResourceQtopia( const KConfig *cfg, bool syncable );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceQtopia( const QString &fileName );
+  ResourceQtopia( const QString &fileName, bool syncable  );
 
   /**
    * Destructor.
    */
   ~ResourceQtopia();
 
   /**
     Writes the config back.
@@ -79,17 +80,17 @@ public:
    * This method should be called before @ref load().
    */
   virtual bool doOpen();
 
   /**
    * Closes the file again.
    */
   virtual void doClose();
-  
+
   /**
    * Requests a save ticket, that is used by @ref save()
    */
   virtual Ticket *requestSaveTicket();
 
   /**
    * Loads all addressees from file to the address book.
    * Returns true if all addressees could be loaded otherwise false.
@@ -100,51 +101,55 @@ public:
    * Saves all addresses from address book to file.
    * Returns true if all addressees could be saved otherwise false.
    *
    * @param ticket  The ticket returned by @ref requestSaveTicket()
    */
   virtual bool save( Ticket *ticket );
 
   /**
+   * Remove a addressee from its source.
+   * This method is mainly called by KABC::AddressBook.
+   */
+  virtual void removeAddressee( const Addressee& addr );
+
+  /**
    * Set name of file to be used for saving.
    */
-  void setFileName( const QString & );
+  virtual void setFileName( const QString & );
 
   /**
-   * Return name of file used for loading and saving the address book.
+   * This method is called by an error handler if the application
+   * crashed
    */
-  QString fileName() const;
+  virtual void cleanUp();
 
   /**
-   * Remove a addressee from its source.
-   * This method is mainly called by KABC::AddressBook.
+   * This method returns the number of elements that are currently in the resource.
    */
-  virtual void removeAddressee( const Addressee& addr );
+  virtual int count() const;
 
   /**
-   * This method is called by an error handler if the application
-   * crashed
+   * This method removes all elements from the resource!! (Not from the addressbook)
    */
-  virtual void cleanUp();
+  virtual bool clear();
 
 protected slots:
   void fileChanged();
 
 protected:
   void init( const QString &fileName );
 
   bool lock( const QString &fileName );
   void unlock( const QString &fileName );
 
 private:
+  AddressBookAccess* mAccess;
   QtopiaConverter* mConverter;
-  
-  QString mFileName;
 
   QString mLockUniqueName;
-    
+
   KDirWatch mDirWatch;
 };
 
 }
 
 #endif
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 31b99ca..7b909de 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -1,11 +1,11 @@
 /*
     This file is part of libkabc.
-    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (c) 2004 Ulf Schenk
 
     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
@@ -57,27 +57,27 @@ using namespace KABC;
 extern "C"
 {
   void *init_microkabc_sharpdtm()
   {
     return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>();
   }
 }
 
-ResourceSharpDTM::ResourceSharpDTM( const KConfig *config )
-  : Resource( config ), mConverter (0)
+ResourceSharpDTM::ResourceSharpDTM( const KConfig *config, bool syncable  )
+  : Resource( config, syncable ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
 
   QString fileName = SlZDataBase::addressbookFileName();
   init( fileName );
 }
 
-ResourceSharpDTM::ResourceSharpDTM( const QString &fileName )
-  : Resource( 0 )
+ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable  )
+  : Resource( 0, syncable )
 {
 //  qDebug("ResourceFile::ResourceSharpDTM : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
 
 void ResourceSharpDTM::init( const QString &fileName )
 {
 
@@ -350,8 +350,33 @@ void ResourceSharpDTM::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceSharpDTM::cleanUp()
 {
   unlock( mFileName );
 }
 
+/**
+ * This method returns the number of elements that are currently in the resource.
+ */
+int ResourceSharpDTM::count() const
+{
+  if (mAccess != 0)
+	return mAccess->count();
+  else
+    return 0;
+}
+
+
+/**
+ * This method removes all elements from the resource!! (Not from the addressbook)
+ */
+bool ResourceSharpDTM::clear()
+{
+  if (mAccess != 0)
+    return mAccess->deleteCard(0, SlZDataBase::AllCard );
+  else
+	return false;
+}
+
+
+
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.h b/kabc/plugins/sharpdtm/resourcesharpdtm.h
index d2e2a52..f495e9d 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.h
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.h
@@ -1,11 +1,11 @@
 /*
     This file is part of libkabc.
-    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (c) 2004 Ulf Schenk
 
     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
@@ -51,22 +51,22 @@ class ResourceSharpDTM : public Resource
 
 public:
 
   /**
     Constructor.
 
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceSharpDTM( const KConfig *cfg );
+  ResourceSharpDTM( const KConfig *cfg, bool syncable  );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceSharpDTM( const QString &fileName );
+  ResourceSharpDTM( const QString &fileName, bool syncable  );
 
   /**
    * Destructor.
    */
   ~ResourceSharpDTM();
 
   /**
     Writes the config back.
@@ -99,51 +99,55 @@ public:
    * Saves all addresses from address book to file.
    * Returns true if all addressees could be saved otherwise false.
    *
    * @param ticket  The ticket returned by @ref requestSaveTicket()
    */
   virtual bool save( Ticket *ticket );
 
   /**
+   * Remove a addressee from its source.
+   * This method is mainly called by KABC::AddressBook.
+   */
+  virtual void removeAddressee( const Addressee& addr );
+
+  /**
    * Set name of file to be used for saving.
    */
-  void setFileName( const QString & );
+  virtual void setFileName( const QString & );
 
   /**
-   * Return name of file used for loading and saving the address book.
+   * This method is called by an error handler if the application
+   * crashed
    */
-  QString fileName() const;
+  virtual void cleanUp();
 
   /**
-   * Remove a addressee from its source.
-   * This method is mainly called by KABC::AddressBook.
+   * This method returns the number of elements that are currently in the resource.
    */
-  virtual void removeAddressee( const Addressee& addr );
+  virtual int count() const;
 
   /**
-   * This method is called by an error handler if the application
-   * crashed
+   * This method removes all elements from the resource!! (Not from the addressbook)
    */
-  virtual void cleanUp();
+  virtual bool clear();
+
 
 protected slots:
   void fileChanged();
 
 protected:
   void init( const QString &fileName );
 
   bool lock( const QString &fileName );
   void unlock( const QString &fileName );
 
 private:
   SharpDTMConverter* mConverter;
 
-  QString mFileName;
-
   QString mLockUniqueName;
 
   KDirWatch mDirWatch;
 };
 
 }
 
 #endif
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 54ef083..52bc10f 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,13 +1,13 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 TARGET = microkabc_sharpdtm
 
-INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 
+INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include 
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib