4 files changed, 23 insertions, 22 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,12 +1,12 @@
         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 = \
 
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,12 +1,12 @@
         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
 
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
@@ -54,33 +54,34 @@ $Id$
 #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" );
@@ -98,22 +99,22 @@ ResourceDir::ResourceDir( const KConfig *config )
 
   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 );
 }
@@ -122,14 +123,14 @@ 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 );
 }
 
@@ -238,27 +239,27 @@ 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();
@@ -282,31 +283,31 @@ 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
 {
@@ -319,13 +320,13 @@ void ResourceDir::setFormat( const QString &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
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
@@ -46,20 +46,20 @@ class FormatPlugin;
 */
 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 * );
 
   /**
@@ -78,13 +78,13 @@ public:
   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 );