removal of syncresources

12 files changed, 34 insertions, 44 deletions

diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index e58e4f7..e2b7b08 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -59,5 +59,4 @@ $Id$
 #define NO_DIRWATCH
 #include "resourcedir.h"
-#include "syncprefwidget.h"
 
 //#define ALLOW_LOCKING
@@ -75,5 +74,5 @@ __declspec(dllexport)
   void *init_microkabc_dir()
   {
-    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
   }
 #ifndef _WIN32_
@@ -81,6 +80,6 @@ __declspec(dllexport)
 #endif
 
-ResourceDir::ResourceDir( const KConfig *config, bool syncable  )
-    : Resource( config, syncable )
+ResourceDir::ResourceDir( const KConfig *config  )
+    : Resource( config )
 {
   QString path;
diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h
index 77cd18c..6c1e922 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/kabc/plugins/dir/resourcedir.h
@@ -50,5 +50,5 @@ class ResourceDir : public Resource
 
 public:
-  ResourceDir( const KConfig*, bool syncable  );
+  ResourceDir( const KConfig*  );
   ~ResourceDir();
 
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 163f2b4..dc5932f 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -52,5 +52,4 @@ $Id$
 #define NO_DIRWATCH
 #include "resourcefile.h"
-#include "syncprefwidget.h"
 
 //#define ALLOW_LOCKING
@@ -70,5 +69,5 @@ __declspec(dllexport)
   void *init_microkabc_file()
   {
-    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
   }
 #ifndef _WIN32_
@@ -76,12 +75,9 @@ __declspec(dllexport)
 #endif
 
-ResourceFile::ResourceFile( const KConfig *config, bool syncable )
-  : Resource( config, syncable ) , mFormat( 0 )
+ResourceFile::ResourceFile( const KConfig *config )
+  : Resource( config ) , mFormat( 0 )
 {
   QString fileName, formatName, default_fileName;
 
-  if (syncable == true)
-    default_fileName = "/home/polo/kdepim/apps/kabc/localfile.vcf";
-  else
     default_fileName = StdAddressBook::fileName();
 
@@ -98,7 +94,7 @@ ResourceFile::ResourceFile( const KConfig *config, bool syncable )
 }
 
-ResourceFile::ResourceFile( const QString &fileName, bool syncable ,
+ResourceFile::ResourceFile( const QString &fileName ,
                             const QString &formatName )
-  : Resource( 0, syncable )
+  : Resource( 0 )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index 8339340..b4421b2 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -59,10 +59,10 @@ public:
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceFile( const KConfig *cfg, bool syncable );
+  ResourceFile( const KConfig *cfg );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceFile( const QString &fileName, bool syncable , const QString &formatName = "vcard" );
+  ResourceFile( const QString &fileName , const QString &formatName = "vcard" );
 
   /**
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp
index 17f115d..55c43af 100644
--- a/kabc/plugins/ldap/resourceldap.cpp
+++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -37,5 +37,4 @@ $Id$
 #include "resourceldap.h"
 #include "resourceldapconfig.h"
-#include "syncprefwidget.h"
 
 using namespace KABC;
@@ -46,5 +45,5 @@ extern "C"
   void *init_microkabc_ldap()
   {
-    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>();
   }
 }
@@ -53,6 +52,6 @@ void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value );
 
 
-ResourceLDAP::ResourceLDAP( const KConfig *config, bool syncable )
-  : Resource( config, syncable ), mPort( 389 ), mLdap( 0 )
+ResourceLDAP::ResourceLDAP( const KConfig *config )
+  : Resource( config ), mPort( 389 ), mLdap( 0 )
 {
   KConfig *cfg = (KConfig *)config;
diff --git a/kabc/plugins/ldap/resourceldap.h b/kabc/plugins/ldap/resourceldap.h
index 0aad3c1..0625f30 100644
--- a/kabc/plugins/ldap/resourceldap.h
+++ b/kabc/plugins/ldap/resourceldap.h
@@ -44,5 +44,5 @@ class ResourceLDAP : public Resource
 public:
 
-  ResourceLDAP( const KConfig*, bool syncable );
+  ResourceLDAP( const KConfig* );
 
   virtual void writeConfig( KConfig* );
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 22237dc..f610b38 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -51,5 +51,4 @@ $Id$
 #include "resourceopieconfig.h"
 #include "stdaddressbook.h"
-#include "syncprefwidget.h"
 
 #include "opieconverter.h"
@@ -62,10 +61,10 @@ extern "C"
   void *init_microkabc_opie()
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>();
   }
 }
 
-ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
-  : Resource( config, syncable ), mAccess(0), mConverter (0)
+ResourceOpie::ResourceOpie( const KConfig *config )
+  : Resource( config ), mAccess(0), mConverter (0)
 {
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
@@ -80,6 +79,6 @@ ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
 }
 
-ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
-  : Resource( 0, syncable )
+ResourceOpie::ResourceOpie( const QString &fileName  )
+  : Resource( 0 )
 {
   init( fileName );
diff --git a/kabc/plugins/opie/resourceopie.h b/kabc/plugins/opie/resourceopie.h
index d5b4ebd..9d05c70 100644
--- a/kabc/plugins/opie/resourceopie.h
+++ b/kabc/plugins/opie/resourceopie.h
@@ -58,10 +58,10 @@ public:
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceOpie( const KConfig *cfg, bool syncable  );
+  ResourceOpie( const KConfig *cfg  );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceOpie( const QString &fileName, bool syncable  );
+  ResourceOpie( const QString &fileName  );
 
   /**
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index f9cabcb..deb218b 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -50,5 +50,4 @@ $Id$
 
 #include "qtopiaconverter.h"
-#include "syncprefwidget.h"
 
 #include "resourceqtopia.h"
@@ -59,10 +58,10 @@ extern "C"
   void *init_microkabc_qtopia()
   {
-    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
   }
 }
 
-ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
-  : Resource( config, syncable ), mConverter (0)
+ResourceQtopia::ResourceQtopia( const KConfig *config  )
+  : Resource( config ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
@@ -71,6 +70,6 @@ ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
 }
 
-ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable  )
-  : Resource( 0, syncable )
+ResourceQtopia::ResourceQtopia( const QString &fileName  )
+  : Resource( 0 )
 {
   init( fileName );
diff --git a/kabc/plugins/qtopia/resourceqtopia.h b/kabc/plugins/qtopia/resourceqtopia.h
index eace280..ff6350d 100644
--- a/kabc/plugins/qtopia/resourceqtopia.h
+++ b/kabc/plugins/qtopia/resourceqtopia.h
@@ -59,10 +59,10 @@ public:
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceQtopia( const KConfig *cfg, bool syncable );
+  ResourceQtopia( const KConfig *cfg );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceQtopia( const QString &fileName, bool syncable  );
+  ResourceQtopia( const QString &fileName  );
 
   /**
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index c013f52..2cdf4bf 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -51,6 +51,4 @@ $Id$
 #include "resourcesharpdtm.h"
 
-#include "syncprefwidget.h"
-
 #include "stdaddressbook.h"
 
@@ -62,10 +60,10 @@ extern "C"
   void *init_microkabc_sharpdtm()
   {
-    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>();
   }
 }
 
-ResourceSharpDTM::ResourceSharpDTM( const KConfig *config, bool syncable  )
-  : Resource( config, syncable ), mConverter (0)
+ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
+  : Resource( config ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.h b/kabc/plugins/sharpdtm/resourcesharpdtm.h
index f386e69..64d06f9 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.h
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.h
@@ -59,10 +59,10 @@ public:
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceSharpDTM( const KConfig *cfg, bool syncable  );
+  ResourceSharpDTM( const KConfig *cfg  );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceSharpDTM( const QString &fileName, bool syncable  );
+  ResourceSharpDTM( const QString &fileName  );
 
   /**