28 files changed, 91 insertions, 317 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 592d78d..c584c35 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -216,129 +216,129 @@ bool AddressBook::ConstIterator::operator==( const ConstIterator &it )
  return ( d->mIt == it.d->mIt );
 }
 bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 {
  return ( d->mIt != it.d->mIt );
 }
 AddressBook::AddressBook()
 {
  init(0, "contact");
 }
 AddressBook::AddressBook( const QString &config )
 {
  init(config, "contact");
 }
 AddressBook::AddressBook( const QString &config, const QString &family )
 {
  init(config, family);
 }
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
  blockLSEchange = false;
  d = new AddressBookData;
  QString fami = family;
  if (config != 0) {
      if ( family == "syncContact" ) {
          qDebug("creating sync config ");
          fami = "contact";
          KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
          con->setGroup( "General" );
          con->writeEntry( "ResourceKeys", QString("sync") );
          con->writeEntry( "Standard", QString("sync") );
          con->setGroup( "Resource_sync" );
          con->writeEntry( "FileName", config );
          con->writeEntry( "FileFormat", QString("vcard") );
          con->writeEntry( "ResourceIdentifier", QString("sync") );
          con->writeEntry( "ResourceName", QString("sync_res") );
          if ( config.right(4) == ".xml" )
              con->writeEntry( "ResourceType", QString("qtopia") );
          else if (  config == "sharp"            ) {
              con->writeEntry( "ResourceType", QString("sharp") );
          } else {
              con->writeEntry( "ResourceType", QString("file") );
          }
          //con->sync();
          d->mConfig = con;
      }
      else
    d->mConfig = new KConfig( locateLocal("config", config) );
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
  }
  else {
    d->mConfig = 0;
 //    qDebug("AddressBook::init 1  config=0");
  }
 //US  d->mErrorHandler = 0;
-  d->mManager = new KRES::Manager<Resource>( fami, false );
+  d->mManager = new KRES::Manager<Resource>( fami );
  d->mManager->readConfig( d->mConfig );
  if ( family == "syncContact" ) {
      KRES::Manager<Resource> *manager = d->mManager;
      KRES::Manager<Resource>::ActiveIterator it;
      for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
          (*it)->setAddressBook( this );
          if ( !(*it)->open() )
              error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
      }
      Resource *res = standardResource();
      if ( !res ) {
          qDebug("ERROR: no standard resource");
          res = manager->createResource( "file" );
          if ( res )
              {
                  addResource( res );
              }
          else
              qDebug(" No resource available!!!");
      }
      setStandardResource( res );
      manager->writeConfig();
  }
  addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                "X-Department", "KADDRESSBOOK" );
  addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                "X-Profession", "KADDRESSBOOK" );
  addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                "X-AssistantsName", "KADDRESSBOOK" );
  addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                "X-ManagersName", "KADDRESSBOOK" );
  addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                "X-SpousesName", "KADDRESSBOOK" );
  addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                "X-Office", "KADDRESSBOOK" );
  addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                "X-IMAddress", "KADDRESSBOOK" );
  addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                "X-Anniversary", "KADDRESSBOOK" );
  //US added this field to become compatible with Opie/qtopia addressbook
  // values can be "female" or "male" or "". An empty field represents undefined.
  addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                "X-Gender", "KADDRESSBOOK" );
  addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                "X-Children", "KADDRESSBOOK" );
  addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                "X-FreeBusyUrl", "KADDRESSBOOK" );
  addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
                                "X-ExternalID", "KADDRESSBOOK" );
 }
 AddressBook::~AddressBook()
 {
  delete d->mConfig; d->mConfig = 0;
  delete d->mManager; d->mManager = 0;
 //US  delete d->mErrorHandler; d->mErrorHandler = 0;
  delete d; d = 0;
 }
 bool AddressBook::load()
 {
  clear();
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 061909b..96fe39e 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,198 +1,196 @@
        TEMPLATE= lib
 CONFIG += qt warn_on 
 TARGET = kamicrokabc
 INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokdepim 
 #LIBS += -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 #enable the following line if you want to get debugoutput while loading adresses
 #DEFINES += VCARD_DEBUG 
 INTERFACES = \
 HEADERS = \
 address.h \
 addressbook.h \
 addressee.h \
 addresseedialog.h \
 addresseelist.h \
 addresseeview.h \
 agent.h \
 distributionlist.h \
 distributionlistdialog.h \
 distributionlisteditor.h \
 field.h \
 formatfactory.h \
 formatplugin.h \
 geo.h \
 key.h \
 phonenumber.h \
 picture.h \
 plugin.h \
 resource.h \
 secrecy.h \
 sound.h \
 stdaddressbook.h \
- syncprefwidget.h \
 timezone.h \
 tmpaddressbook.h \
 vcardconverter.h \
 vcard21parser.h \
 vcardformatimpl.h \
 vcardformatplugin.h \
 vcardparser/vcardline.h \
 vcardparser/vcard.h \
 vcardparser/vcardtool.h \
 vcardparser/vcardparser.h \
 vcard/include/VCardAdrParam.h \
 vcard/include/VCardAdrValue.h \
 vcard/include/VCardAgentParam.h \
 vcard/include/VCardContentLine.h \
 vcard/include/VCardDateParam.h \
 vcard/include/VCardDateValue.h \
 vcard/include/VCardEmailParam.h \
 vcard/include/VCardGeoValue.h \
 vcard/include/VCardGroup.h \
 vcard/include/VCardImageParam.h \
 vcard/include/VCardImageValue.h \
 vcard/include/VCardLangValue.h \
 vcard/include/VCardNValue.h \
 vcard/include/VCardParam.h \
 vcard/include/VCardPhoneNumberValue.h \
 vcard/include/VCardSourceParam.h \
 vcard/include/VCardTelParam.h \
 vcard/include/VCardTextParam.h \
 vcard/include/VCardTextNSParam.h \
 vcard/include/VCardTextValue.h \
 vcard/include/VCardTextBinParam.h \
 vcard/include/VCardURIValue.h \
 vcard/include/VCardVCard.h \
 vcard/include/VCardEntity.h \
 vcard/include/VCardValue.h \
 vcard/include/VCardSoundValue.h \
 vcard/include/VCardAgentValue.h \
 vcard/include/VCardTelValue.h \
 vcard/include/VCardTextBinValue.h \
 vcard/include/VCardOrgValue.h \
 vcard/include/VCardUTCValue.h \
 vcard/include/VCardClassValue.h \
 vcard/include/VCardFloatValue.h \
 vcard/include/VCardTextListValue.h \
 vcard/include/generated/AdrParam-generated.h \
 vcard/include/generated/AdrValue-generated.h \
 vcard/include/generated/AgentParam-generated.h \
 vcard/include/generated/ContentLine-generated.h \
 vcard/include/generated/DateParam-generated.h \
 vcard/include/generated/DateValue-generated.h \
 vcard/include/generated/EmailParam-generated.h \
 vcard/include/generated/GeoValue-generated.h \
 vcard/include/generated/Group-generated.h \
 vcard/include/generated/ImageParam-generated.h \
 vcard/include/generated/ImageValue-generated.h \
 vcard/include/generated/LangValue-generated.h \
 vcard/include/generated/NValue-generated.h \
 vcard/include/generated/Param-generated.h \
 vcard/include/generated/PhoneNumberValue-generated.h \
 vcard/include/generated/SourceParam-generated.h \
 vcard/include/generated/TelParam-generated.h \
 vcard/include/generated/TextParam-generated.h \
 vcard/include/generated/TextNSParam-generated.h \
 vcard/include/generated/TextValue-generated.h \
 vcard/include/generated/TextBinParam-generated.h \
 vcard/include/generated/URIValue-generated.h \
 vcard/include/generated/VCard-generated.h \
 vcard/include/generated/VCardEntity-generated.h \
 vcard/include/generated/Value-generated.h \
 vcard/include/generated/SoundValue-generated.h \
 vcard/include/generated/AgentValue-generated.h \
 vcard/include/generated/TelValue-generated.h \
 vcard/include/generated/TextBinValue-generated.h \
 vcard/include/generated/OrgValue-generated.h \
 vcard/include/generated/UTCValue-generated.h \
 vcard/include/generated/ClassValue-generated.h \
 vcard/include/generated/FloatValue-generated.h \
 vcard/include/generated/TextListValue-generated.h
 
 
 
 SOURCES = \
 address.cpp \
 addressbook.cpp \
 addressee.cpp \
 addresseedialog.cpp \
 addresseelist.cpp \
 addresseeview.cpp \
 agent.cpp \
 distributionlist.cpp \
 distributionlistdialog.cpp \
 distributionlisteditor.cpp \
 field.cpp \
 formatfactory.cpp \
 geo.cpp \
 key.cpp \
 phonenumber.cpp \
 picture.cpp \
 plugin.cpp \
 resource.cpp \
 secrecy.cpp \
 sound.cpp \
 stdaddressbook.cpp \
- syncprefwidget.cpp \
 timezone.cpp \
 tmpaddressbook.cpp \
 vcardconverter.cpp \
 vcard21parser.cpp \
 vcardformatimpl.cpp \
 vcardformatplugin.cpp \
 vcardparser/vcardline.cpp \
 vcardparser/vcard.cpp \
 vcardparser/vcardtool.cpp \
 vcardparser/vcardparser.cpp \
 vcard/AdrParam.cpp \
 vcard/AdrValue.cpp \
 vcard/AgentParam.cpp \
 vcard/ContentLine.cpp \
 vcard/DateParam.cpp \
 vcard/DateValue.cpp \
 vcard/EmailParam.cpp \
 vcard/Entity.cpp \
 vcard/Enum.cpp \
 vcard/GeoValue.cpp \
 vcard/ImageParam.cpp \
 vcard/ImageValue.cpp \
 vcard/LangValue.cpp \
 vcard/NValue.cpp \
 vcard/Param.cpp \
 vcard/PhoneNumberValue.cpp \
 vcard/RToken.cpp \
 vcard/SourceParam.cpp \
 vcard/TelParam.cpp \
 vcard/TextParam.cpp \
 vcard/TextValue.cpp \
 vcard/TextBinParam.cpp \
 vcard/URIValue.cpp \
 vcard/VCardv.cpp \
 vcard/VCardEntity.cpp \
 vcard/Value.cpp \
 vcard/SoundValue.cpp \
 vcard/AgentValue.cpp \
 vcard/TelValue.cpp \
 vcard/TextBinValue.cpp \
 vcard/OrgValue.cpp \
 vcard/UTCValue.cpp \
 vcard/ClassValue.cpp \
 vcard/FloatValue.cpp \
 vcard/TextListValue.cpp
 # plugins/ldap/resourceldap.cpp \
 # plugins/ldap/resourceldapconfig.cpp \
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
@@ -1,148 +1,147 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qregexp.h>
 #include <qtimer.h>
 #include <qwidget.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 //US #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include "addressbook.h"
 #include "formatfactory.h"
 #include "resourcedirconfig.h"
 #include "stdaddressbook.h"
 //US
 #include <qdir.h>
 #define NO_DIRWATCH
 #include "resourcedir.h"
-#include "syncprefwidget.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
 //US  void *init_kabc_dir()
  void *init_microkabc_dir()
  {
-    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
  }
 #ifndef _WIN32_
 }
 #endif
-ResourceDir::ResourceDir( const KConfig *config, bool syncable  )
+ResourceDir::ResourceDir( const KConfig *config  )
-    : Resource( config, syncable )
+    : Resource( config )
 {
  QString path;
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
 //US     path = config->readEntry( "FilePath" );
     path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
 //US     mFormatName = config->readEntry( "FileFormat" );
     mFormatName = cfg->readEntry( "FileFormat", "vcard" );
  } else {
    path = StdAddressBook::directoryName();
    mFormatName = "vcard";
  }
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
  if ( !mFormat ) {
    mFormatName = "vcard";
    mFormat = factory->format( mFormatName );
  }
 /*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());
 */
 #ifndef NO_DIRWATCH
  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
 #endif
  setPath( path );
 }
 ResourceDir::~ResourceDir()
 {
  delete mFormat;
  mFormat = 0;
 }
 void ResourceDir::writeConfig( KConfig *config )
 {
    config->setGroup( "Resource_" + identifier() );
  Resource::writeConfig( config );
  config->writeEntry( "FilePath", mPath );
  config->writeEntry( "FileFormat", mFormatName );
 }
 Ticket *ResourceDir::requestSaveTicket()
 {
  
  if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
  if ( !lock( mPath ) ) {
    
    return 0;
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
@@ -1,116 +1,116 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_RESOURCEDIR_H
 #define KABC_RESOURCEDIR_H
 #include <kconfig.h>
 #include <kdirwatch.h>
 #include <sys/types.h>
 #include "resource.h"
 class QTimer;
 namespace KABC {
 class FormatPlugin;
 /**
  @internal
 */
 class ResourceDir : public Resource
 {
  Q_OBJECT
 public:
-  ResourceDir( const KConfig*, bool syncable  );
+  ResourceDir( const KConfig*  );
  ~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.
   */
  void setPath( const QString & );
  /**
   * Return path used for loading and saving the address book.
   */
  QString path() const;
  /**
   * 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
   * crashed
   */
  virtual void cleanUp();
 protected slots:
  void pathChanged();
 protected:
  bool lock( const QString &path );
  void unlock( const QString &path );
 private:
  FormatPlugin *mFormat;
 #ifndef  NO_DIRWATCH
  KDirWatch mDirWatch;
 #endif
  QString mPath;
  QString mFormatName;
  QString mLockUniqueName;
 };
 }
 #endif
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
@@ -1,166 +1,162 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include "formatfactory.h"
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 #define NO_DIRWATCH
 #include "resourcefile.h"
-#include "syncprefwidget.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
 //US  void *init_kabc_file()
  void *init_microkabc_file()
  {
-    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
  }
 #ifndef _WIN32_
 }
 #endif
-ResourceFile::ResourceFile( const KConfig *config, bool syncable )
+ResourceFile::ResourceFile( const KConfig *config )
-  : Resource( config, syncable ) , mFormat( 0 )
+  : Resource( config ) , mFormat( 0 )
 {
  QString fileName, formatName, default_fileName;
-  if (syncable == true)
+  default_fileName = StdAddressBook::fileName();
-    default_fileName = "/home/polo/kdepim/apps/kabc/localfile.vcf";
-  else
-    default_fileName = StdAddressBook::fileName();
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
    fileName = cfg->readEntry( "FileName", default_fileName );
    formatName = cfg->readEntry( "FileFormat", "vcard" );
  } else {
    fileName = default_fileName;
    formatName = "vcard";
  }
  init( fileName, formatName );
 }
-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());
  init( fileName, formatName );
 }
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
  mFormatName = formatName;
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
  if ( !mFormat ) {
    mFormatName = "vcard";
    mFormat = factory->format( mFormatName );
  }
 #ifndef NO_DIRWATCH
  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 #endif
  setFileName( fileName );
 }
 ResourceFile::~ResourceFile()
 {
  delete mFormat;
  mFormat = 0;
 }
 void ResourceFile::writeConfig( KConfig *config )
 {
    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;
 #ifdef ALLOW_LOCKING
  if ( !lock( mFileName ) ) {
      qDebug("unablt to lock file ");
    return 0;
  }
 #endif
  return createTicket( this );
 }
 bool ResourceFile::doOpen()
 {
  QFile file( mFileName );
  qDebug("ResourceFile::openfile %s ", mFileName.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
@@ -1,130 +1,130 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_RESOURCEFILE_H
 #define KABC_RESOURCEFILE_H
 #include <kconfig.h>
 #include <kdirwatch.h>
 #include <sys/types.h>
 #include <resource.h>
 class QTimer;
 class FormatPlugin;
 namespace KABC {
 //US class FormatPlugin;
 class ResourceConfigWidget;
 /**
  @internal
 */
 class ResourceFile : public Resource
 {
  Q_OBJECT
 public:
  /**
    Constructor.
    @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" );
  /**
   * Destructor.
   */
  ~ResourceFile();
  /**
    Writes the config back.
   */
  virtual void writeConfig( KConfig *cfg );
  /**
   * Tries to open the file and checks for the proper format.
   * 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.
   */
  virtual bool load();
  /**
   * 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;
  /**
    Sets a new format by name.
   */
  void setFormat( const QString &name );
  /**
    Returns the format name.
   */
  QString format() const;
  /**
   * Remove a addressee from its source.
   * This method is mainly called by KABC::AddressBook.
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
@@ -1,120 +1,119 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kconfig.h>
 #include <kstringhandler.h>
 #include <stdlib.h>
 #include "resourceldap.h"
 #include "resourceldapconfig.h"
-#include "syncprefwidget.h"
 using namespace KABC;
 extern "C"
 {
 //US  void *init_kabc_ldap()
  void *init_microkabc_ldap()
  {
-    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, SyncPrefWidgetContainer>();
+    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>();
  }
 }
 void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value );
-ResourceLDAP::ResourceLDAP( const KConfig *config, bool syncable )
+ResourceLDAP::ResourceLDAP( const KConfig *config )
-  : Resource( config, syncable ), mPort( 389 ), mLdap( 0 )
+  : Resource( config ), 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 );
    mFilter = cfg->readEntry( "LdapFilter" );
    mAnonymous = cfg->readBoolEntry( "LdapAnonymous" );
    QStringList attributes = cfg->readListEntry( "LdapAttributes" );
    for ( uint pos = 0; pos < attributes.count(); pos += 2 )
      mAttributes.insert( attributes[ pos ], attributes[ pos + 1 ] );
  }
  /**
    If you want to add new attributes, append them here, add a
    translation string in the ctor of AttributesDialog and
    handle them in the load() method below.
    These are the default values from
   */
  if ( mAttributes.count() == 0 ) {
    mAttributes.insert( "commonName", "cn" );
    mAttributes.insert( "formattedName", "displayName" );
    mAttributes.insert( "familyName", "sn" );
    mAttributes.insert( "givenName", "givenName" );
    mAttributes.insert( "mail", "mail" );
    mAttributes.insert( "mailAlias", "" );
    mAttributes.insert( "phoneNumber", "telephoneNumber" );
    mAttributes.insert( "uid", "uid" );
  }
 }
 void ResourceLDAP::writeConfig( KConfig *config )
 {
  Resource::writeConfig( config );
  config->writeEntry( "LdapUser", mUser );
  config->writeEntry( "LdapPassword", KStringHandler::obscure( mPassword ) );
  config->writeEntry( "LdapDn", mDn );
  config->writeEntry( "LdapHost", mHost );
  config->writeEntry( "LdapPort", mPort );
  config->writeEntry( "LdapFilter", mFilter );
  config->writeEntry( "LdapAnonymous", mAnonymous );
  QStringList attributes;
  QMap<QString, QString>::Iterator it;
  for ( it = mAttributes.begin(); it != mAttributes.end(); ++it )
    attributes << it.key() << it.data();
  config->writeEntry( "LdapAttributes", attributes );
 }
 Ticket *ResourceLDAP::requestSaveTicket()
 {
  if ( !addressBook() ) {
          kdDebug(5700) << "no addressbook" << endl;
    return 0;
  }
  return createTicket( this );
 }
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
@@ -1,99 +1,99 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_RESOURCELDAP_H
 #define KABC_RESOURCELDAP_H
 #include <lber.h>
 #include <ldap.h>
 #include "addressbook.h"
 #include "resource.h"
 class KConfig;
 namespace KABC {
 class ResourceLDAP : public Resource
 {
 public:
-  ResourceLDAP( const KConfig*, bool syncable );
+  ResourceLDAP( const KConfig* );
  virtual void writeConfig( KConfig* );
  virtual bool doOpen();
  virtual void doClose();
  virtual Ticket *requestSaveTicket();
  virtual bool load();
  virtual bool save( Ticket * );
  virtual void removeAddressee( const Addressee& addr );
  void setUser( const QString &user );
  QString user() const;
  void setPassword( const QString &password );
  QString password() const;
  void setDn( const QString &dn );
  QString dn() const;
  void setHost( const QString &host );
  QString host() const;
  void setPort( int port );
  int port() const;
  void setFilter( const QString &filter );
  QString filter() const;
  void setIsAnonymous( bool value );
  bool isAnonymous() const;
  void setAttributes( const QMap<QString, QString> &attributes );
  QMap<QString, QString> attributes() const;
 private:
  QString mUser;
  QString mPassword;
  QString mDn;
  QString mHost;
  QString mFilter;
  int mPort;
  bool mAnonymous;
  QMap<QString, QString> mAttributes;
  LDAP *mLdap;
 };
 }
 #endif
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
@@ -1,147 +1,146 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 //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 "syncprefwidget.h"
 #include "opieconverter.h"
 #include "resourceopie.h"
 using namespace KABC;
 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 )
+ResourceOpie::ResourceOpie( const KConfig *config )
-  : Resource( config, syncable ), mAccess(0), mConverter (0)
+  : Resource( config ), mAccess(0), mConverter (0)
 {
  QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
    fileName = cfg->readEntry( "FileName", fileName );
  }
  init( fileName );
 }
-ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
+ResourceOpie::ResourceOpie( const QString &fileName  )
-  : Resource( 0, syncable )
+  : Resource( 0 )
 {
  init( fileName );
 }
 void ResourceOpie::init( const QString &fileName )
 {
  qDebug("ResourceOpie::init()");
  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", fileName() );
 }
 Ticket *ResourceOpie::requestSaveTicket()
 {
  kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
  qDebug("ResourceOpie::requestSaveTicket: %s", fileName().latin1());
  if ( !addressBook() ) return 0;
  if ( !lock( fileName() ) ) {
    kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
                  << fileName() << "'" << endl;
    return 0;
  }
  return createTicket( this );
 }
 bool ResourceOpie::doOpen()
 {
  qDebug("ResourceOpie::doOpen: %s", fileName().latin1());
  OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", fileName() );
  mAccess = new OContactAccess("KDEPim/Pi", 0l, backend, false);
  if ( !mAccess ) {
    qDebug("Unable to load file() %s", fileName().latin1());
    return false;
  }
  mAccess->setReadAhead( 32 ); // Use ReadAhead-Cache if available
  if (mConverter == 0)
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
@@ -1,129 +1,129 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_RESOURCEOPIE_H
 #define KABC_RESOURCEOPIE_H
 #include <kconfig.h>
 #include <kdirwatch.h>
 #include <sys/types.h>
 #include "resource.h"
 class OContactAccess;
 namespace KABC {
 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, 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  );
  /**
   * Destructor.
   */
  ~ResourceOpie();
  /**
    Writes the config back.
   */
  virtual void writeConfig( KConfig *cfg );
  /**
   * Tries to open the file and checks for the proper format.
   * 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.
   */
  virtual bool load();
  /**
   * 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.
   */
  virtual void setFileName( const QString & );
  /**
   * This method is called by an error handler if the application
   * crashed
   */
  virtual void cleanUp();
 protected slots:
  void fileChanged();
 protected:
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
@@ -1,138 +1,137 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <qpe/pim/addressbookaccess.h>
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 #include "qtopiaconverter.h"
-#include "syncprefwidget.h"
 #include "resourceqtopia.h"
 using namespace KABC;
 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  )
+ResourceQtopia::ResourceQtopia( const KConfig *config  )
-  : Resource( config, syncable ), mConverter (0)
+  : Resource( config ), 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, bool syncable  )
+ResourceQtopia::ResourceQtopia( const QString &fileName  )
-  : Resource( 0, syncable )
+  : Resource( 0 )
 {
  init( fileName );
 }
 void ResourceQtopia::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 );
 }
 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;
  qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1());
  if ( !addressBook() ) return 0;
  if ( !lock( fileName() ) ) {
    kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
                  << fileName() << "'" << endl;
    return 0;
  }
  return createTicket( this );
 }
 bool ResourceQtopia::doOpen()
 {
  qDebug("ResourceQtopia::doOpen(): %s", fileName().latin1());
  mAccess = new AddressBookAccess();
  if ( !mAccess ) {
    qDebug("Unable to load file() %s", fileName().latin1());
    return false;
  }
  if (mConverter == 0)
  {
    mConverter = new QtopiaConverter();
    bool res = mConverter->init();
    if ( !res )
    {
          QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
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
@@ -1,130 +1,130 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_RESOURCEOPIE_H
 #define KABC_RESOURCEOPIE_H
 #include <kconfig.h>
 #include <kdirwatch.h>
 #include <sys/types.h>
 #include "resource.h"
 class AddressBookAccess;
 namespace KABC {
 //US class FormatPlugin;
 class ResourceConfigWidget;
 class QtopiaConverter;
 /**
  @internal
 */
 class ResourceQtopia : public Resource
 {
  Q_OBJECT
 public:
  /**
    Constructor.
    @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  );
  /**
   * Destructor.
   */
  ~ResourceQtopia();
  /**
    Writes the config back.
   */
  virtual void writeConfig( KConfig *cfg );
  /**
   * Tries to open the file and checks for the proper format.
   * 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.
   */
  virtual bool load();
  /**
   * 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.
   */
  virtual void setFileName( const QString & );
  /**
   * This method is called by an error handler if the application
   * crashed
   */
  virtual void cleanUp();
 protected slots:
  void fileChanged();
 protected:
  void init( 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
@@ -1,133 +1,131 @@
 /*
    This file is part of libkabc.
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <sl/slzdb.h>
 #include <libkdepim/ksyncprofile.h>
 #include "resourcesharpdtmconfig.h"
 #include "resourcesharpdtm.h"
-#include "syncprefwidget.h"
 #include "stdaddressbook.h"
 #include "sharpdtmconverter.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 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  )
+ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
-  : Resource( config, syncable ), mConverter (0)
+  : Resource( config ), 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, bool syncable  )
  : Resource( 0, syncable )
 {
  init( fileName );
 }
 void ResourceSharpDTM::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 );
 }
 ResourceSharpDTM::~ResourceSharpDTM()
 {
  if (mConverter != 0)
    delete mConverter;
  if(mAccess != 0)
    delete mAccess;
 }
 void ResourceSharpDTM::writeConfig( KConfig *config )
 {
  Resource::writeConfig( config );
 }
 Ticket *ResourceSharpDTM::requestSaveTicket()
 {
 
  qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
  if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
  if ( !lock( fileName() ) ) {
      qDebug("ResourceSharpDTM::requestSaveTicket(): Unable to lock file ");
    return 0;
  }
 #endif
  return createTicket( this );
 }
 bool ResourceSharpDTM::doOpen()
 {
  qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1());
  // the last parameter in the SlZDataBase constructor means "readonly"
  mAccess = new SlZDataBase(fileName(),
                        SlZDataBase::addressbookItems(),
                        NULL, false);
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
@@ -1,130 +1,130 @@
 /*
    This file is part of libkabc.
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_RESOURCESHARPDTM_H
 #define KABC_RESOURCESHARPDTM_H
 #include <kconfig.h>
 #include <kdirwatch.h>
 #include <sys/types.h>
 #include "resource.h"
 class SlZDataBase;
 namespace KABC {
 class ResourceConfigWidget;
 class SharpDTMConverter;
 /**
  @internal
 */
 class ResourceSharpDTM : public Resource
 {
  Q_OBJECT
 public:
  /**
    Constructor.
    @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  );
  /**
   * Destructor.
   */
  ~ResourceSharpDTM();
  /**
    Writes the config back.
   */
  virtual void writeConfig( KConfig *cfg );
  /**
   * Tries to open the file and checks for the proper format.
   * 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.
   */
  virtual bool load();
  /**
   * 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.
   */
  virtual void setFileName( const QString & );
  /**
   * This method is called by an error handler if the application
   * crashed
   */
  virtual void cleanUp();
 protected slots:
  void fileChanged();
 protected:
  void init( const QString &fileName );
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index 7b91239..267cdaf 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -1,144 +1,116 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kdebug.h>
-#include <ksyncprofile.h>
 #include "resource.h"
 using namespace KABC;
-Resource::Resource( const KConfig *config, bool syncable )
+Resource::Resource( const KConfig *config )
-    : KRES::Resource( config ), mAddressBook( 0 ), mSyncProfile( 0 )
+    : KRES::Resource( config ), mAddressBook( 0 )
 {
-  if(syncable == true) {
-    mSyncProfile = new KSyncProfile( );
-    mSyncProfile->setName("pending" /*resourceName()*/);
-    mSyncProfile->readConfig( (KConfig *)config );
-  }
 }
 Resource::~Resource()
 {
-  if (mSyncProfile != 0) {
-    delete mSyncProfile;
-  }
 }
 void Resource::writeConfig( KConfig *config )
 {
  KRES::Resource::writeConfig( config );
-  if(mSyncProfile != 0)
-    mSyncProfile->writeConfig( config );
 }
 void Resource::setAddressBook( AddressBook *ab )
 {
  mAddressBook = ab;
 }
 AddressBook *Resource::addressBook()
 {
  return mAddressBook;
 }
 bool Resource::doOpen()
 {
  return true;
 }
 void Resource::doClose()
 {
 }
 Ticket *Resource::requestSaveTicket()
 {
  return 0;
 }
 bool Resource::load()
 {
  return true;
 }
 bool Resource::save( Ticket * )
 {
  return false;
 }
 Ticket *Resource::createTicket( Resource *resource )
 {
  return new Ticket( resource );
 }
 void Resource::removeAddressee( const Addressee& )
 {
  // do nothing
 }
 void Resource::cleanUp()
 {
  // do nothing
 }
-bool Resource::isSyncable() const
-{
-  return (mSyncProfile != 0);
-}
-KSyncProfile* Resource::getSyncProfile()
-{
-  return mSyncProfile;
-}
 QString Resource::fileName() const
 {
  return mFileName;
 }
 void Resource::setFileName( const QString &fileName )
 {
  mFileName = fileName;
 }
 /**
 * Set the name of resource.You can override this method,
 * but also remember to call Resource::setResourceName().
 */
 void Resource::setResourceName( const QString &name )
 {
        KRES::Resource::setResourceName(name);
-    if(mSyncProfile != 0) {
-      mSyncProfile->setName( name );
-    }
 }
diff --git a/kabc/resource.h b/kabc/resource.h
index 2024d2d..e5f0d5d 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -1,171 +1,157 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_RESOURCE_H
 #define KABC_RESOURCE_H
 #include <kresources/resource.h>
 #include "addressbook.h"
-class KSyncProfile;
 namespace KABC {
 /**
 * @short Helper class for handling coordinated save of address books.
 *
 * This class is used as helper class for saving address book.
 * @see requestSaveTicket(), save().
 */
 class Ticket
 {
    friend class Resource;
  public:
    Resource *resource() { return mResource; }
  private:
    Ticket( Resource *resource ) : mResource( resource ) {}
    Resource *mResource;
 };
 /**
 * @internal
 */
 class Resource : public KRES::Resource
 {
-private:
-  /**
-   * make this constructor private to force everybody to use the other one
-   */
-  Resource( const KConfig *config);
 public:
  /**
   * Constructor
   */
-  Resource( const KConfig *config, bool syncable );
+  Resource( const KConfig *config );
  /**
   * Destructor.
   */
  virtual ~Resource();
  /**
   * Sets the address book of the resource.
   */
  void setAddressBook( AddressBook* );
  /**
   * Returns a pointer to the addressbook.
   */
  AddressBook *addressBook();
  /**
   * Writes the resource specific config to file.
   */
  virtual void writeConfig( KConfig *config );
  /**
   * Open the resource and returns if it was successfully
   */
  virtual bool doOpen();
  /**
   * Request a ticket, you have to pass through @ref save() to
   * allow locking.
   */
  virtual Ticket *requestSaveTicket();
  /**
   * Load all addressees to the addressbook
   */
  virtual bool load();
  /**
   * Save all addressees to the addressbook.
   *
   * @param ticket The ticket you get by @ref requestSaveTicket()
   */
  virtual bool save( Ticket *ticket );
  /**
   * Removes a addressee from resource. This method is mainly
   * used by record-based resources like LDAP or SQL.
   */
  virtual void removeAddressee( const Addressee& addr );
  /**
   * This method is called by an error handler if the application
   * crashed
   */
  virtual void cleanUp();
  /**
   * Set name of file to be used for saving.
   */
  virtual void setFileName( const QString & );
  /**
   * Return name of file used for loading and saving the address book.
   */
  virtual QString fileName() const;
-  virtual bool isSyncable() const;
-  virtual KSyncProfile* getSyncProfile();
  /**
   * Set the name of resource.You can override this method,
   * but also remember to call Resource::setResourceName().
   */
  virtual void setResourceName( const QString &name );
 protected:
  Ticket *createTicket( Resource * );
  virtual void doClose();
 private:
  AddressBook *mAddressBook;
-  KSyncProfile *mSyncProfile;
  QString mFileName;
 };
 }
 #endif
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index 4351753..67e8406 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -115,159 +115,159 @@ void XXPortObject::createExportAction( const QString &label, const QString &data
 #ifndef KAB_EMBEDDED
  KAction *action = new KAction( label, 0, d->mExportMapper, SLOT( map() ), actionCollection(), id.latin1() );
 #else //KAB_EMBEDDED
  KAction *action = new KAction( label, 0, d->mExportMapper, SLOT( map() ), kabcore->actionCollection(), id.latin1() );
 #endif //KAB_EMBEDDED
  d->mExportMapper->setMapping( action, ( data.isEmpty() ? QString( "<empty>" ) : data ) );
 #ifndef KAB_EMBEDDED
  setXMLFile( identifier() + "_xxportui.rc" );
 #endif //KAB_EMBEDDED
 #ifdef KAB_EMBEDDED
  action->plug((QWidget*)kabcore->getExportMenu());
 #endif //KAB_EMBEDDED
 }
 KABC::AddressBook *XXPortObject::addressBook() const
 {
  return mAddressBook;
 }
 QWidget *XXPortObject::parentWidget() const
 {
  return mParentWidget;
 }
 void XXPortObject::slotExportActivated( const QString &data )
 {
  emit exportActivated( identifier(), ( data == "<empty>" ? QString::null : data ) );
 }
 void XXPortObject::slotImportActivated( const QString &data )
 {
  emit importActivated( identifier(), ( data == "<empty>" ? QString::null : data ) );
 }
 /********************************************************************
 *
 *******************************************************************/
 XXPortResourceObject::XXPortResourceObject( KABC::AddressBook *ab, QWidget *parent,
                            const char *name )
  : XXPortObject( ab, parent, name ), mFactory(0)
 {
  mFactory = KRES::Factory::self( "tmpcontact" );
 }
 XXPortResourceObject::~XXPortResourceObject()
 {
  //do not delete the factory. It is a singleton, and selfcontained
 }
 bool XXPortResourceObject::isAvailable()
 {
  return (mFactory != 0);
 }
 bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, const QString& identifier, const QString& fileName )
 {
  //create new resource
-  KABC::Resource* mResource = (KABC::Resource*)(mFactory->resource( this->identifier(), 0, false ));
+  KABC::Resource* mResource = (KABC::Resource*)(mFactory->resource( this->identifier(), 0 ));
  if (mResource == 0)
    return false;
  if (fileName != QString::null)
          mResource->setFileName( fileName );
  KABC::TmpAddressBook tmpAB;
  bool res = tmpAB.addResource( mResource );
  if (res == false)
  {
        delete mResource;
        return false;
  }
  res = tmpAB.load();
  if (res == false)
  {
    //removeResource deletes also the resource object, if the linkcount is 0
    tmpAB.removeResource( mResource );
    return false;
  }
  //Now check if the file has already entries, and ask the user if he wants to delete them first.
  if (tmpAB.begin() != tmpAB.end())
  {
    QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
    if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
      // Clean the database..
      tmpAB.clear();
    }
  }
  KABC::Addressee::List::ConstIterator it;
  for ( it = list.begin(); it != list.end(); ++it ) {
    tmpAB.insertAddressee(*it);
  }
  KABC::Ticket * ticket = tmpAB.requestSaveTicket(mResource);
  res = false;
  if (ticket != 0)
    res = tmpAB.save( ticket );
  //removeResource deletes also the resource object, if the linkcount is 0
  tmpAB.removeResource( mResource );
  return res;
 }
 KABC::AddresseeList XXPortResourceObject::_importContacts( const QString& identifier, const QString& fileName ) const
 {
-  KABC::Resource* mResource = (KABC::Resource*)(mFactory->resource( this->identifier(), 0, false ));
+  KABC::Resource* mResource = (KABC::Resource*)(mFactory->resource( this->identifier(), 0 ));
  if (mResource == 0)
    return KABC::AddresseeList();
  KABC::AddresseeList adrlst;
  if (fileName != QString::null)
          mResource->setFileName( fileName );
  KABC::TmpAddressBook tmpAB;
  bool res = tmpAB.addResource( mResource );
  if (res == false)
  {
        delete mResource;
        return KABC::AddresseeList();
  }
  res = tmpAB.load();
  adrlst = tmpAB.allAddressees();
  //remove resource deletes also the Resourceobject, if the linkcount is 0
  tmpAB.removeResource( mResource );
  return adrlst;
 }
 #ifndef KAB_EMBEDDED
 #include "xxportobject.moc"
 #endif //KAB_EMBEDDED
diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp
index 030b547..24e82bc 100644
--- a/microkde/kresources/configdialog.cpp
+++ b/microkde/kresources/configdialog.cpp
@@ -1,246 +1,179 @@
 /*
    This file is part of libkresources.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qvbox.h>
 #include <qcheckbox.h>
 #include <qscrollview.h>
 #include <kbuttonbox.h>
 #include <kdialog.h>
 #include <klineedit.h>
 #include "factory.h"
 #include "configwidget.h"
 #include "configdialog.h"
-#include "syncwidget.h"
 using namespace KRES;
 ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
    Resource* resource, const char *name )
-  : KDialogBase( parent, name, true, resource->isSyncable()?i18n( "Sync Profile Configuration" ):i18n( "Resource Configuration" ),
+  : KDialogBase( parent, name, true, i18n( "Resource Configuration" ),
-    Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget_Settings(0), mSyncWidget_Conflicts(0),mSyncWidget_Remote(0), mResource( resource ), mPersistentReadOnly(false)
+    Ok|Cancel, Ok, true )/*, mConfig( config )*/, mResource( resource ), mPersistentReadOnly(false)
 {
  Factory *factory = Factory::self( resourceFamily );
 //US  resize( 250, 240 );
  resize( KMIN(KGlobal::getDesktopWidth(), 250), KMIN(KGlobal::getDesktopHeight(), 240));
  QFrame *main;
-  if (!mResource->isSyncable())
+  main = plainPage();
-    main = plainPage();
-  else
-    main = addPage("Profile");
  QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() );
  QGroupBox *generalGroupBox = new QGroupBox( 2, Qt::Horizontal, main );
  generalGroupBox->layout()->setSpacing( spacingHint() );
  generalGroupBox->setTitle( i18n( "General Settings" ) );
-  new QLabel( mResource->isSyncable()?i18n( "Profile Name:" ):i18n( "Name:" ), generalGroupBox );
+  new QLabel( i18n( "Name:" ), generalGroupBox );
  mName = new KLineEdit( generalGroupBox );
-  if (!mResource->isSyncable()) {
+  new QLabel("", generalGroupBox );
-    new QLabel("", generalGroupBox );
+  mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox );
-          mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox );
+  mReadOnly->setChecked( mResource->readOnly() );
-    mReadOnly->setChecked( mResource->readOnly() );
-    new QLabel("", generalGroupBox );
+  new QLabel("", generalGroupBox );
-          mIncludeInSync = new QCheckBox( i18n( "Include in sync" ), generalGroupBox );
+  mIncludeInSync = new QCheckBox( i18n( "Include in sync" ), generalGroupBox );
-    mIncludeInSync->setChecked( mResource->includeInSync() );
+  mIncludeInSync->setChecked( mResource->includeInSync() );
-  }
  mName->setText( mResource->resourceName() );
  mainLayout->addWidget( generalGroupBox );
  QGroupBox *resourceGroupBox = new QGroupBox( 2, Qt::Horizontal,  main );
  resourceGroupBox->layout()->setSpacing( spacingHint());
  resourceGroupBox->setTitle( i18n( "%1 Resource Settings" )
                              .arg( factory->typeName( resource->type() ) ) );
  mainLayout->addWidget( resourceGroupBox );
  mainLayout->addStretch();
  mConfigWidget = factory->configWidget( resource->type(), resourceGroupBox );
  if ( mConfigWidget ) {
    connect( mConfigWidget, SIGNAL( setReadOnly( bool ) ),
        SLOT( setReadOnly( bool ) ) );
+    connect( mConfigWidget, SIGNAL( setIncludeInSync( bool ) ),
+        SLOT( setIncludeInSync( bool ) ) );
    connect( mConfigWidget, SIGNAL( setPersistentReadOnly( bool ) ),
        SLOT( setPersistentReadOnly( bool ) ) );
    mConfigWidget->setInEditMode( false );
    mConfigWidget->loadSettings( mResource );
    mConfigWidget->show();
  }
-  if (mResource->isSyncable())
-  {
-    SyncWidgetContainer* c = factory->syncWidgetContainer( resource->type() );
-    QFrame* syncPage = addPage("Settings");
-          QVBoxLayout *syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
-    mSyncWidget_Settings = c->generateSettingsTab(syncPage);
-    syncLayout->addWidget( mSyncWidget_Settings );
-    syncPage = addPage("Conflicts");
-          syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
-    mSyncWidget_Conflicts = c->generateConflictsTab(syncPage);
-    syncLayout->addWidget( mSyncWidget_Conflicts );
-    syncPage = addPage("Remote");
-          syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
-    mSyncWidget_Remote = c->generateRemoteTab(syncPage);
-    syncLayout->addWidget( mSyncWidget_Remote );
-    mSyncWidget_Settings->setInEditMode( false );
-    mSyncWidget_Settings->loadSettings( mResource );
-    mSyncWidget_Settings->show();
-    mSyncWidget_Conflicts->setInEditMode( false );
-    mSyncWidget_Conflicts->loadSettings( mResource );
-    mSyncWidget_Conflicts->show();
-    mSyncWidget_Remote->setInEditMode( false );
-    mSyncWidget_Remote->loadSettings( mResource );
-    mSyncWidget_Remote->show();
-    delete c;
-//    QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal,  syncPage );
-//    syncGroupBox->layout()->setSpacing( spacingHint());
-//    syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) );
-//    syncLayout->addWidget( syncGroupBox );
-//    syncLayout->addStretch();
-/*US
-    mSyncWidget = factory->syncWidget( resource->type(), syncPage );
-    syncLayout->addWidget( mSyncWidget );
-    if ( mSyncWidget ) {
-      mSyncWidget->setInEditMode( false );
-      mSyncWidget->loadSettings( mResource );
-      mSyncWidget->show();
-    }
-    */
-  }
  connect( mName, SIGNAL( textChanged(const QString &)),
      SLOT( slotNameChanged(const QString &)));
  slotNameChanged( mName->text() );
 //US  setMinimumSize( 400, 250 );
  setMinimumSize( KMIN(KGlobal::getDesktopWidth(), 400), KMIN(KGlobal::getDesktopHeight(), 250));
 }
 void ConfigDialog::setInEditMode( bool value )
 {
  if ( mConfigWidget )
    mConfigWidget->setInEditMode( value );
-  if ( mSyncWidget_Settings )
-    mSyncWidget_Settings->setInEditMode( value );
-  if ( mSyncWidget_Conflicts )
-    mSyncWidget_Conflicts->setInEditMode( value );
-  if ( mSyncWidget_Remote )
-    mSyncWidget_Remote->setInEditMode( value );
 }
 void ConfigDialog::slotNameChanged( const QString &text)
 {
  enableButtonOK( !text.isEmpty() );
 }
 void ConfigDialog::setReadOnly( bool value )
 {
-  if (!mResource->isSyncable()) {
    if (mPersistentReadOnly == false)
      mReadOnly->setChecked( value );
    else
      mReadOnly->setChecked( true );
-  }
 }
-void ConfigDialog::setPersistentReadOnly( bool value )
+void ConfigDialog::setIncludeInSync( bool value )
 {
-  if (!mResource->isSyncable()) {
+    if (mPersistentReadOnly == false)
+      mIncludeInSync->setChecked( value );
+    else
+      mIncludeInSync->setChecked( true );
+}
+void ConfigDialog::setPersistentReadOnly( bool value )
+{
    mPersistentReadOnly = value;
-    if (value == true)
+    if (value == true) {
      setReadOnly( true );
+      setIncludeInSync( true );
+    }
    mReadOnly->setEnabled( !value );
-  }
+    mIncludeInSync->setEnabled (!value );
 }
 void ConfigDialog::accept()
 {
  if ( mName->text().isEmpty() ) {
-    KMessageBox::sorry( this, mResource->isSyncable()?i18n( "Please enter a profile name" ):i18n( "Please enter a resource name" ) );
+    KMessageBox::sorry( this, i18n( "Please enter a resource name" ) );
    return;
  }
  mResource->setResourceName( mName->text() );
-  if (!mResource->isSyncable())
+  mResource->setReadOnly( mReadOnly->isChecked() );
-    mResource->setReadOnly( mReadOnly->isChecked() );
+  mResource->setIncludeInSync( mIncludeInSync->isChecked() );
-    mResource->setIncludeInSync( mIncludeInSync->isChecked() );
  if ( mConfigWidget ) {
    // First save generic information
    // Also save setting of specific resource type
    mConfigWidget->saveSettings( mResource );
  }
-  if ( mSyncWidget_Settings )
-    mSyncWidget_Settings->saveSettings( mResource );
-  if ( mSyncWidget_Conflicts )
-    mSyncWidget_Conflicts->saveSettings( mResource );
-  if ( mSyncWidget_Remote )
-    mSyncWidget_Remote->saveSettings( mResource );
  KDialog::accept();
 }
 //US #include "configdialog.moc"
diff --git a/microkde/kresources/configdialog.h b/microkde/kresources/configdialog.h
index ed3ecab..b205975 100644
--- a/microkde/kresources/configdialog.h
+++ b/microkde/kresources/configdialog.h
@@ -1,68 +1,65 @@
 /*
    This file is part of libkresources.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifndef KRESOURCES_CONFIGDIALOG_H
 #define KRESOURCES_CONFIGDIALOG_H
 #include <kdialogbase.h>
 class KLineEdit;
 class QCheckBox;
 class KButtonBox;
 namespace KRES {
  class Resource;
  class ConfigWidget;
-  class SyncWidget;
 class ConfigDialog : public KDialogBase
 {
    Q_OBJECT
  public:
    // Resource=0: create new resource
    ConfigDialog( QWidget *parent, const QString& resourceFamily,
                  Resource* resource, const char *name = 0);
    void setInEditMode( bool value );
  protected slots:
    void accept();
    void setReadOnly( bool value );
+    void setIncludeInSync( bool value );
    void setPersistentReadOnly( bool value );
    void slotNameChanged( const QString &text);
  private:
    ConfigWidget *mConfigWidget;
-    SyncWidget *mSyncWidget_Settings;
-    SyncWidget *mSyncWidget_Conflicts;
-    SyncWidget *mSyncWidget_Remote;
    Resource* mResource;
    KLineEdit *mName;
    QCheckBox *mReadOnly;
    QCheckBox *mIncludeInSync;
 //US add a persistent readonly flag. We need that for opie and qtopia addressbooks.
    bool mPersistentReadOnly;
 };
 }
 #endif
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index 02c5fb1..533be51 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -1,410 +1,389 @@
 /*
    This file is part of libkresources.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <qgroupbox.h>
 #include <qinputdialog.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <klistview.h>
 #include <kbuttonbox.h>
 //US #include <ktrader.h>
 #include "resource.h"
 #include "configdialog.h"
 #include "configpage.h"
 //US
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <kglobal.h>
 using namespace KRES;
-const QString ConfigPage::syncfamily = "syncprofiles";
 class ConfigViewItem : public QCheckListItem
 {
  public:
    ConfigViewItem( QListView *parent, Resource* resource ) :
      QCheckListItem( parent, resource->resourceName(), CheckBox ),
      mResource( resource ),
      mIsStandard( false )
    {
      setText( 1, mResource->type() );
      setOn( mResource->isActive() );
    }
    void setStandard( bool value )
    {
      setText( 2, ( value ? i18n( "Yes" ) : QString::null ) );
      mIsStandard = value;
    }
    bool standard() const { return mIsStandard; }
    bool readOnly() const { return mResource->readOnly(); }
    Resource *resource() { return mResource; }
  private:
    Resource* mResource;
    bool mIsStandard;
 };
 ConfigPage::ConfigPage( QWidget *parent, const char *name )
  : QWidget( parent, name ),
    mCurrentManager( 0 ),
    mCurrentConfig( 0 )
 {
  setCaption( i18n( "Resource Configuration" ) );
  QVBoxLayout *mainLayout = new QVBoxLayout( this );
  QGroupBox *groupBox = new QGroupBox( i18n( "Resources" ), this );
  groupBox->setColumnLayout(0, Qt::Vertical );
  groupBox->layout()->setSpacing( 3 );
  groupBox->layout()->setMargin( 5 );
  QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 4, 2 );
 //US  mFamilyCombo = new KComboBox( false, groupBox );
  mFamilyCombo = new KComboBox( groupBox );
  groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 );
  mListView = new KListView( groupBox );
  mListView->setAllColumnsShowFocus( true );
  mListView->addColumn( i18n( "Name" ) );
  mListView->addColumn( i18n( "Type" ) );
  mListView->addColumn( i18n( "Standard" ) ); 
 //US  groupBoxLayout->addWidget( mListView, 1, 0 );
  groupBoxLayout->addMultiCellWidget( mListView, 1, 1, 0, 1 );
  mAddButton = new QPushButton( i18n( "&Add..." ), groupBox );
  groupBoxLayout->addWidget( mAddButton, 2, 0 );
  mRemoveButton = new QPushButton( i18n( "&Remove" ), groupBox );
  groupBoxLayout->addWidget( mRemoveButton, 2, 1 );
  mEditButton = new QPushButton( i18n( "&Edit..." ), groupBox );
  groupBoxLayout->addWidget( mEditButton, 3, 0 );
  mStandardButton = new QPushButton( i18n( "&Use as Standard" ), groupBox );
  groupBoxLayout->addWidget( mStandardButton, 3, 1 );
  mRemoveButton->setEnabled( false );
  mEditButton->setEnabled( false );
  mStandardButton->setEnabled( false );
  connect( mAddButton, SIGNAL( clicked() ), SLOT(slotAdd()) );
  connect( mRemoveButton, SIGNAL( clicked() ), SLOT(slotRemove()) );
  connect( mEditButton, SIGNAL( clicked() ), SLOT(slotEdit()) );
  connect( mStandardButton, SIGNAL( clicked() ), SLOT(slotStandard()) );
  mainLayout->addWidget( groupBox );
  connect( mFamilyCombo, SIGNAL( activated( int ) ),
           SLOT( slotFamilyChanged( int ) ) );
  connect( mListView, SIGNAL( selectionChanged() ),
           SLOT( slotSelectionChanged() ) );
  connect( mListView, SIGNAL( clicked( QListViewItem * ) ),
           SLOT( slotItemClicked( QListViewItem * ) ) );
  mLastItem = 0;
 //US  mConfig = new KConfig( "kcmkresourcesrc" );
  mConfig = new KConfig( locateLocal( "config", "kcmkresourcesrc")   );
  mConfig->setGroup( "General" );
  load();
 }
 ConfigPage::~ConfigPage()
 {
  QValueList<ResourcePageInfo>::Iterator it;
  for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) {
    (*it).mManager->removeListener( this );
    delete (*it).mManager;
    delete (*it).mConfig;
  }
  mConfig->writeEntry( "CurrentFamily", mFamilyCombo->currentItem() );
  delete mConfig;
  mConfig = 0;
 }
 void ConfigPage::load()
 {
  kdDebug(5650) << "ConfigPage::load()" << endl;
  mListView->clear();
 //US we remove the dynamic pluginloader, and set the one family we need (contact) manually.
 //US  KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin" );
 //US  KTrader::OfferList::ConstIterator it;
 //US  for ( it = plugins.begin(); it != plugins.end(); ++it ) {
 //US    QVariant tmp = (*it)->property( "X-KDE-ResourceFamily" );
 //US    QString family = tmp.toString();
  QStringList families;
-  families << "contact" << syncfamily;
+  families << "contact";
  for ( QStringList::Iterator it = families.begin(); it != families.end(); ++it )
  {
    QString family = (*it);
    if ( !family.isEmpty() ) {
      if ( !mFamilyMap.contains( family ) ) {
-        mCurrentManager = new Manager<Resource>( family, (family == syncfamily) );
+        mCurrentManager = new Manager<Resource>( family );
        if ( mCurrentManager ) {
          mFamilyMap.append( family );
          mCurrentManager->addListener( this );
          ResourcePageInfo info;
          info.mManager = mCurrentManager;
          QString configDir = KGlobal::dirs()->saveLocation( "config" );
          //QString configDir = KStandardDirs::appDir() + "/config";
          if ( family == "contact" && QFile::exists( configDir + "/kabcrc" ) ) {
            info.mConfig = new KConfig( locateLocal( "config", "kabcrc" ) );
          } else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) {
            info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) );
-          } else if ( family == syncfamily && QFile::exists( configDir + "/kabcsyncrc" ) ) {
-            info.mConfig = new KConfig( locateLocal( "config", "kabcsyncrc" ) );
          } else {
            QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) );
            info.mConfig = new KConfig( configFile );
          }
          info.mManager->readConfig( info.mConfig );
          mInfoMap.append( info );
        }
      }
    }
  }
  mCurrentManager = 0;
  mFamilyCombo->insertStringList( mFamilyMap );
  int currentFamily = mConfig->readNumEntry( "CurrentFamily", 0 );
  mFamilyCombo->setCurrentItem( currentFamily );
  slotFamilyChanged( currentFamily );
 }
 void ConfigPage::save()
 {
  saveResourceSettings();
  QValueList<ResourcePageInfo>::Iterator it;
  for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it )
    (*it).mManager->writeConfig( (*it).mConfig );
  emit changed( false );
 }
 void ConfigPage::defaults()
 {
 }
 void ConfigPage::slotFamilyChanged( int pos )
 {
  if ( pos < 0 || pos >= (int)mFamilyMap.count() )
    return;
  saveResourceSettings();
  mFamily = mFamilyMap[ pos ];
 //US  qDebug("ConfigPage::slotFamilyChanged 4 family=%s", mFamily.latin1());
  mCurrentManager = mInfoMap[ pos ].mManager;
  mCurrentConfig = mInfoMap[ pos ].mConfig;
  if ( !mCurrentManager )
    kdDebug(5650) << "ERROR: cannot create ResourceManager<Resource>( mFamily )" << endl;
  mListView->clear();
  if ( mCurrentManager->isEmpty() ) {
 //US    qDebug("ConfigPage::slotFamilyChanged 4.1 mCurrentManager=%ul", mCurrentManager );
    defaults();
  }
  Resource *standardResource = mCurrentManager->standardResource();
 //US    qDebug("ConfigPage::slotFamilyChanged 4.4 resourcename=%s", standardResource->resourceName().latin1());
  Manager<Resource>::Iterator it;
  for ( it = mCurrentManager->begin(); it != mCurrentManager->end(); ++it ) {
    ConfigViewItem *item = new ConfigViewItem( mListView, *it );
    if ( *it == standardResource )
      item->setStandard( true );
  }
  if ( mListView->childCount() == 0 ) {
 //US    qDebug("ConfigPage::slotFamilyChanged 4.5 ");
    defaults();
    emit changed( true );
    mCurrentManager->writeConfig( mCurrentConfig );
  } else {
 //US    qDebug("ConfigPage::slotFamilyChanged 4.6 ");
    if ( !standardResource ) {
      KMessageBox::sorry( this, i18n( "There is no standard resource!<br> Please select one." ) );
 //US    qDebug("ConfigPage::slotFamilyChanged 4.7" );
    }
    emit changed( false );
  }
 }
 void ConfigPage::slotAdd()
 {
  if ( !mCurrentManager )
    return;
  QStringList types = mCurrentManager->resourceTypeNames();
  QStringList descs = mCurrentManager->resourceTypeDescriptions();
  bool ok = false;
  QString desc;
-  if (mFamily == syncfamily)
+  desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
-  {
-          desc = QInputDialog::getItem( i18n( "Sync Configuration" ),
-                    i18n( "Select resource type for the new sync profile:" ), descs, 0,
-                    false, &ok, this );
-  }
-  else
-  {
-    desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
                    i18n( "Select type of the new resource:" ), descs, 0,
                    false, &ok, this );
-  }
  if ( !ok )
    return;
  QString type = types[ descs.findIndex( desc ) ];
  // Create new resource
  Resource *resource = mCurrentManager->createResource( type );
  if ( !resource ) {
    KMessageBox::error( this, i18n("Unable to create resource of type '%1'.")
                              .arg( type ) );
    return;
  }
-  if (mFamily == syncfamily)
+  resource->setResourceName( type + "-resource" );
-  {
-          resource->setResourceName( type + "-syncprofile" );
-  }
-  else
-  {
-          resource->setResourceName( type + "-resource" );
-  }
  ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" );
  if ( dlg.exec() ) {
    mCurrentManager->add( resource );
    ConfigViewItem *item = new ConfigViewItem( mListView, resource );
    mLastItem = item;
    // if there are only read-only resources we'll set this resource
    // as standard resource
    if ( !resource->readOnly() ) {
      bool onlyReadOnly = true;
      QListViewItem *it = mListView->firstChild();
      while ( it != 0 ) {
        ConfigViewItem *confIt = static_cast<ConfigViewItem*>( it );
        if ( !confIt->readOnly() && confIt != item )
          onlyReadOnly = false;
        it = it->itemBelow();
      }
      if ( onlyReadOnly )
        item->setStandard( true );
    }
    emit changed( true );
  } else {
    delete resource;
    resource = 0;
  }
 }
 void ConfigPage::slotRemove()
 {
  if ( !mCurrentManager )
    return;
  QListViewItem *item = mListView->currentItem();
  ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item );
  if ( !confItem )
    return;
  if ( confItem->standard() ) {
    KMessageBox::sorry( this, i18n( "You cannot remove your standard resource!\n Please select a new standard resource first." ) );
    return;
  }
  mCurrentManager->remove( confItem->resource() );
  if ( item == mLastItem )
    mLastItem = 0;
  mListView->takeItem( item );
  delete item;
  emit changed( true );
 }
 void ConfigPage::slotEdit()
 {
  if ( !mCurrentManager )
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index e44fce3..4e4456d 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -126,164 +126,130 @@ Factory::Factory( const QString& resourceFamily) :
  {
    info = new PluginInfo;
    info->library = libname;
    info->nameLabel = i18n( "sharp" );
    info->descriptionLabel = i18n( "Sharp DTM Addressbook." );
    mTypeMap.insert( "sharp", info );
  }
 }
 Factory::~Factory()
 {
 }
 QStringList Factory::typeNames() const
 {
 //US method QMap::keys() not available yet. SO collect the data manually
 //US return mTypeMap.keys();
  QStringList result;
  QMap<QString, PluginInfo*>::ConstIterator it;
  for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) {
    result << it.key().latin1();
 //    qDebug("Factory::typeNames() : %s ", it.key().latin1());
  }
  return result;
 }
 ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent )
 {
  if ( type.isEmpty() || !mTypeMap.contains( type ) )
    return 0;
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
  PluginInfo* pi = mTypeMap[ type ];
  KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
  if ( !factory ) {
    qDebug("KRES::Factory::configWidget(): Factory creation failed for library %s", pi->library.latin1());
    kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl;
    return 0;
  }
  PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
  if ( !pluginFactory ) {
    qDebug("KRES::Factory::configWidget(): no plugin factory for library %s", pi->library.latin1());
    kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl;
    return 0;
  }
  ConfigWidget *wdg = pluginFactory->configWidget( parent );
  if ( !wdg ) {
 //US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
      qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
    return 0;
  }
  return wdg;
 }
-SyncWidgetContainer *Factory::syncWidgetContainer( const QString& type )
-{
-  if ( type.isEmpty() || !mTypeMap.contains( type ) )
-    return 0;
-//US  KService::Ptr ptr = mTypeMap[ type ];
-//US  KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
-  PluginInfo* pi = mTypeMap[ type ];
-  KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
-  if ( !factory ) {
-    qDebug("KRES::Factory::syncWidget(): Factory creation failed for library %s", pi->library.latin1());
-    kdDebug() << "KRES::Factory::syncWidget(): Factory creation failed" << endl;
-    return 0;
-  }
-  PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
-  if ( !pluginFactory ) {
-    qDebug("KRES::Factory::syncWidget(): no plugin factory for library %s", pi->library.latin1());
-    kdDebug() << "KRES::Factory::syncWidget(): no plugin factory." << endl;
-    return 0;
-  }
-  SyncWidgetContainer *wdg = pluginFactory->syncWidgetContainer( );
-  if ( !wdg ) {
-//US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
-      qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
-    return 0;
-  }
-  return wdg;
-}
 QString Factory::typeName( const QString &type ) const
 {
  if ( type.isEmpty() || !mTypeMap.contains( type ) )
    return QString();
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  return ptr->name();
  PluginInfo* pi = mTypeMap[ type ];
  return pi->nameLabel;
 }
 QString Factory::typeDescription( const QString &type ) const
 {
  if ( type.isEmpty() || !mTypeMap.contains( type ) )
    return QString();
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  return ptr->comment();
  PluginInfo* pi = mTypeMap[ type ];
  return pi->descriptionLabel;
 }
-Resource *Factory::resource( const QString& type, const KConfig *config, bool syncable )
+Resource *Factory::resource( const QString& type, const KConfig *config )
 {
  if ( type.isEmpty() || !mTypeMap.contains( type ) )
    return 0;
 /*US load the lib not dynamicly. !!
  KService::Ptr ptr = mTypeMap[ type ];
  KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
  if ( !factory ) {
    kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl;
    return 0;
  }
 */
  PluginInfo* pi = mTypeMap[ type ];
  KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
  if ( !factory ) {
    qDebug("KRES::Factory::resource(): Factory creation failed for library %s", pi->library.latin1());
    kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl;
    return 0;
  }
  PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
  if ( !pluginFactory ) {
    qDebug("KRES::Factory::resource(): no plugin factory for library %s", pi->library.latin1());
    kdDebug() << "KRES::Factory::resource(): no plugin factory." << endl;
    return 0;
  }
-  Resource *resource = pluginFactory->resource( config, syncable );
+  Resource *resource = pluginFactory->resource( config );
  if ( !resource ) {
 //US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
      qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
    return 0;
  }
  resource->setType( type );
  return resource;
 }
diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h
index 0e4231b..ea01b23 100644
--- a/microkde/kresources/factory.h
+++ b/microkde/kresources/factory.h
@@ -1,139 +1,126 @@
 /*
    This file is part of libkresources.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifndef KRESOURCES_FACTORY_H
 #define KRESOURCES_FACTORY_H
 #include <qdict.h>
 #include <qstring.h>
 #include <kconfig.h>
 #include "resource.h"
 namespace KRES {
-class SyncWidgetContainer;
 class ConfigWidget;
 //US
 struct PluginInfo
 {
  QString library;
  QString nameLabel;
  QString descriptionLabel;
 };
 /**
 * Class for loading resource plugins.
 * Do not use this class directly. Use ResourceManager instead
 *
 * Example:
 *
 * <pre>
 * KABC::Factory<Calendar> *factory = KABC::Factory<Calendar>::self();
 *
 * QStringList list = factory->resources();
 * QStringList::Iterator it;
 * for ( it = list.begin(); it != list.end(); ++it ) {
 *   Resource<Calendar> *resource = factory->resource( (*it),
 *        KABC::StdAddressBook::self(), 0 );
 *   // do something with resource
 * }
 * </pre>
 */
 class Factory
 {
  public:
    /**
     * Returns the global resource factory.
     */
    static Factory *self( const QString& resourceFamily );
    ~Factory();
    /**
     * Returns the config widget for the given resource type,
     * or a null pointer if resource type doesn't exist.
     *
     * @param type   The type of the resource, returned by @ref resources()
     * @param resource The resource to be editted.
     * @param parent The parent widget
     */
    ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 );
    /**
-     * Returns the sync widget for the given resource type,
-     * or a null pointer if resource type doesn't exist,
-     * or a null pointer if resource does not support syncing.
-     *
-     * @param type   The type of the resource, returned by @ref resources()
-     * @param resource The resource to be editted.
-     * @param parent The parent widget
-     */
-    SyncWidgetContainer *syncWidgetContainer( const QString& type );
-    /**
     * Returns a pointer to a resource object or a null pointer
     * if resource type doesn't exist.
     *
     * @param type   The type of the resource, returned by @ref resources()
     * @param ab     The address book, the resource should belong to
     * @param config The config object where the resource get it settings from, or 0 if a new resource should be created.
-     * @param syncable If the resource should support syncing capabilities.
     */
-    Resource *resource( const QString& type, const KConfig *config, bool syncable );
+    Resource *resource( const QString& type, const KConfig *config);
    /**
     * Returns a list of all available resource types.
     */
    QStringList typeNames() const;
    /**
     * Returns the name for a special type.
     */
    QString typeName( const QString &type ) const;
    /**
     * Returns the description for a special type.
     */
    QString typeDescription( const QString &type ) const;
  protected:
    Factory( const QString& resourceFamily);
  private:
    static QDict<Factory> *mSelves;
    QString mResourceFamily;
 //US    QMap<QString, KService::Ptr> mTypeMap;
 //US lets store the pluginfo struct as value instead of a KService
    QMap<QString, PluginInfo*> mTypeMap;
 };
 }
 #endif
diff --git a/microkde/kresources/manager.h b/microkde/kresources/manager.h
index 7e9e19a..0e6f838 100644
--- a/microkde/kresources/manager.h
+++ b/microkde/kresources/manager.h
@@ -106,226 +106,220 @@ class Manager : private ManagerImplListener
        {
          mIt = it.mIt;
          mList = it.mList;
        }
        T *operator*() { return static_cast<T *>( *mIt ); }
        ActiveIterator &operator++()
        {
          do { mIt++; } while ( checkActive() );
          return *this;
        }
        ActiveIterator &operator++(int)
        {
          do { mIt++; } while ( checkActive() );
          return *this;
        }
        ActiveIterator &operator--()
        {
          do { mIt--; } while ( checkActive() );
          return *this;
        }
        ActiveIterator &operator--(int)
        {
          do { mIt--; } while ( checkActive() );
          return *this;
        }
        bool operator==( const ActiveIterator &it ) { return mIt == it.mIt; }
        bool operator!=( const ActiveIterator &it ) { return mIt != it.mIt; }
      private:
        /**
          Check if iterator needs to be advanced once more.
        */
        bool checkActive()
        {
          if ( !mList || mIt == mList->end() ) return false;
          return !(*mIt)->isActive();
        }
        Resource::List::Iterator mIt;
        Resource::List *mList;
    };
    ActiveIterator activeBegin()
    {
      ActiveIterator it;
      it.mIt = mImpl->resourceList()->begin();
      it.mList = mImpl->resourceList();
      if ( it.mIt != mImpl->resourceList()->end() ) {
        if ( !(*it)->isActive() ) it++;
      }
      return it;
    }
    ActiveIterator activeEnd()
    {
      ActiveIterator it;
      it.mIt = mImpl->resourceList()->end();
      it.mList = mImpl->resourceList();
      return it;
    }
    bool isEmpty() const { return mImpl->resourceList()->isEmpty(); }
-    /**
+    Manager( const QString &family )
-      Return true, if the manager manages syncable resources.
-    */
-    bool manageSyncable() { return mImpl->manageSyncable(); }
-    Manager( const QString &family, bool syncable )
    {
      mFactory = Factory::self( family );
      // The managerimpl will use the same Factory object as the manager
      // because of the Factory::self() pattern
-      mImpl = new ManagerImpl( family, syncable );
+      mImpl = new ManagerImpl( family );
      mImpl->setListener( this );
      mListeners = new QPtrList<ManagerListener<T> >;
    }
    virtual ~Manager()
    {
      mImpl->setListener( 0 );
      delete mListeners;
      delete mImpl;
    }
    /**
      Recreate Resource objects from configuration file. If cfg is 0, read standard
      configuration file.
    */
    void readConfig( KConfig *cfg = 0 )
    {
      mImpl->readConfig( cfg );
    }
    /**
      Write configuration of Resource objects to configuration file. If cfg is 0, write
      to standard configuration file.
    */
    void writeConfig( KConfig *cfg = 0 )
    {
      mImpl->writeConfig( cfg );
    }
    /**
      Add resource to manager. This passes ownership of the Resource object
      to the manager.
    */
    void add( Resource *resource )
    {
      if ( resource ) mImpl->add( resource );
    }
    void remove( Resource *resource )
    {
      if ( resource ) mImpl->remove( resource );
    }
    T* standardResource()
    {
      return static_cast<T *>( mImpl->standardResource() );
    }
    void setStandardResource( T *resource )
    {
      if ( resource ) mImpl->setStandardResource( resource );
    }
    void setActive( Resource *resource, bool active )
    {
      if ( resource ) mImpl->setActive( resource, active );
    }
    /**
      Returns a list of the names of the reources managed by the
      Manager for this family.
    */
    QStringList resourceNames() const
    {
      return mImpl->resourceNames();
    }
    ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 )
    {
      return mFactory->resourceConfigWidget( type, parent );
    }
    /**
      Creates a new resource of type @param type, with default
      settings. The resource is
      not added to the manager, the application has to do that.
      Returns a pointer to a resource object or a null pointer
      if resource type doesn't exist.
      @param type   The type of the resource, one of those returned
                    by @ref resourceTypeNames()
-     * @param syncable If the resource should support syncing capabilities.
    */
    T *createResource( const QString& type )
    {
-      return (T *)( mFactory->resource( type, 0, mImpl->manageSyncable() ) );
+      return (T *)( mFactory->resource( type, 0 ) );
    }
    /**
      Returns a list of the names of all available resource types.
    */
    QStringList resourceTypeNames() const
    {
      return mFactory->typeNames();
    }
    QStringList resourceTypeDescriptions() const
    {
      QStringList typeDescs;
      QStringList types = mFactory->typeNames();
      for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) {
        QString desc = mFactory->typeName( *it );
        if ( !mFactory->typeDescription( *it ).isEmpty() )
          desc += " (" + mFactory->typeDescription( *it ) + ")";
        typeDescs.append( desc );
      }
      return typeDescs;
    }
    void resourceChanged( T *resource )
    {
      mImpl->resourceChanged( resource );
    }
    void addListener( ManagerListener<T> *listener )
    {
      mListeners->append( listener );
    }
    void removeListener( ManagerListener<T> *listener )
    {
      mListeners->remove( listener );
    }
    virtual void resourceAdded( Resource *res )
    {
      kdDebug(5650) << "Manager::resourceAdded " << res->resourceName() << endl;
      T* resource = (T *)( res );
      ManagerListener<T> *listener;
      for ( listener = mListeners->first(); listener; listener = mListeners->next() )
        listener->resourceAdded( resource );
    }
    virtual void resourceModified( Resource *res )
    {
      kdDebug(5650) << "Manager::resourceModified " << res->resourceName() << endl;
      T* resource = (T *)( res );
      ManagerListener<T> *listener;
      for ( listener = mListeners->first(); listener; listener = mListeners->next() )
        listener->resourceModified( resource );
    }
    virtual void resourceDeleted( Resource *res )
    {
      kdDebug(5650) << "Manager::resourceDeleted " << res->resourceName() << endl;
      T* resource = (T *)( res );
      ManagerListener<T> *listener;
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 3655f50..81bbbec 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -1,109 +1,109 @@
 /*
    This file is part of libkresources.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include "resource.h"
 #include "factory.h"
 #include "managerimpl.h"
 using namespace KRES;
-ManagerImpl::ManagerImpl( const QString &family, bool syncable )
+ManagerImpl::ManagerImpl( const QString &family )
-  : mFamily( family ), mSyncable(syncable), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ),
+  : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ),
    mFactory( 0 )
 {
  kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl;
 }
 ManagerImpl::~ManagerImpl()
 {
  kdDebug(5650) << "ManagerImpl::~ManagerImpl()" << endl;
  Resource::List::ConstIterator it;
  for ( it = mResources.begin(); it != mResources.end(); ++it ) {
    delete *it;
  }
  delete mStdConfig;
 }
 void ManagerImpl::createStandardConfig()
 {
  if ( !mStdConfig ) {
    QString file = locateLocal( "data", KGlobal::getAppName()
                                + "/kresources/" + mFamily + "rc" );
    mStdConfig = new KConfig( file );
  }
  mConfig = mStdConfig;
 }
 void ManagerImpl::readConfig( KConfig *cfg )
 {
  kdDebug(5650) << "ManagerImpl::readConfig()" << endl;
  delete mFactory;
  mFactory = Factory::self( mFamily );
  if ( !cfg ) {
    createStandardConfig();
  } else {
    mConfig = cfg;
  }
  mStandard = 0;
  mConfig->setGroup( "General" );
  QStringList keys = mConfig->readListEntry( "ResourceKeys" );
  keys += mConfig->readListEntry( "PassiveResourceKeys" );
  QString standardKey = mConfig->readEntry( "Standard" );
  for ( QStringList::Iterator it = keys.begin(); it != keys.end(); ++it ) {
    readResourceConfig( *it, false );
  }
 }
 void ManagerImpl::writeConfig( KConfig *cfg )
 {
 //USqDebug("ManagerImpl::writeConfig begin this= %ul cfg=%ul", this, cfg);
@@ -207,168 +207,161 @@ void ManagerImpl::resourceChanged( Resource *resource )
 // DCOP asynchronous functions
 //US since we work from inside the application, we call the methods directly.
 QStringList ManagerImpl::resourceNames()
 {
  QStringList result;
  Resource::List::ConstIterator it;
  for ( it = mResources.begin(); it != mResources.end(); ++it ) {
    result.append( (*it)->resourceName() );
  }
  return result;
 }
 Resource::List *ManagerImpl::resourceList()
 {
  return &mResources;
 }
 QPtrList<Resource> ManagerImpl::resources()
 {
  QPtrList<Resource> result;
  Resource::List::ConstIterator it;
  for ( it = mResources.begin(); it != mResources.end(); ++it ) {
    result.append( *it );
  }
  return result;
 }
 QPtrList<Resource> ManagerImpl::resources( bool active )
 {
  QPtrList<Resource> result;
  Resource::List::ConstIterator it;
  for ( it = mResources.begin(); it != mResources.end(); ++it ) {
    if ( (*it)->isActive() == active ) {
      result.append( *it );
    }
  }
  return result;
 }
 void ManagerImpl::setListener( ManagerImplListener *listener )
 {
  mListener = listener;
 }
 Resource* ManagerImpl::readResourceConfig( const QString& identifier,
                                                   bool checkActive )
 {
  kdDebug() << "ManagerImpl::readResourceConfig() " << identifier << endl;
 //  qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1());
  mConfig->setGroup( "Resource_" + identifier );
 #ifdef _WIN32_
  // we use plugins on win32. the group is stored in a static variable
  // such that gourp info not avail on win32 plugins
  // to fix that, it would be a looooot of work
  mConfig->setTempGroup( "Resource_" + identifier );
 #endif
  QString type = mConfig->readEntry( "ResourceType" );
  QString name = mConfig->readEntry( "ResourceName" );
-  Resource *resource = mFactory->resource( type, mConfig, mSyncable );
+  Resource *resource = mFactory->resource( type, mConfig );
  if ( !resource ) {
      qDebug("Failed to create resource with id %s ",identifier.latin1() );
      return 0;
  }
  if ( resource->identifier().isEmpty() )
    resource->setIdentifier( identifier );
  mConfig->setGroup( "General" );
  QString standardKey = mConfig->readEntry( "Standard" );
  if ( standardKey == identifier ) {
    mStandard = resource;
  }
  if ( checkActive ) {
    QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
    resource->setActive( activeKeys.contains( identifier ) );
  }
  mResources.append( resource );
  return resource;
 }
 void ManagerImpl::writeResourceConfig( Resource *resource,
                                               bool checkActive )
 {
  QString key = resource->identifier();
  kdDebug(5650) << "Saving resource " << key << endl;
  if ( !mConfig ) createStandardConfig();
  mConfig->setGroup( "Resource_" + key );
  resource->writeConfig( mConfig );
  mConfig->setGroup( "General" );
  QString standardKey = mConfig->readEntry( "Standard" );
  if ( resource == mStandard  && standardKey != key )
    mConfig->writeEntry( "Standard", resource->identifier() );
  else if ( resource != mStandard && standardKey == key )
    mConfig->writeEntry( "Standard", "" );
  if ( checkActive ) {
    QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
    if ( resource->isActive() && !activeKeys.contains( key ) ) {
      activeKeys.append( resource->identifier() );
      mConfig->writeEntry( "ResourceKeys", activeKeys );
    } else if ( !resource->isActive() && activeKeys.contains( key ) ) {
      activeKeys.remove( key );
      mConfig->writeEntry( "ResourceKeys", activeKeys );
    }
  }
  mConfig->sync();
 }
 void ManagerImpl::removeResource( Resource *resource )
 {
  QString key = resource->identifier();
  if ( !mConfig ) createStandardConfig();
  mConfig->setGroup( "General" );
  QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
  if ( activeKeys.contains( key ) ) {
    activeKeys.remove( key );
    mConfig->writeEntry( "ResourceKeys", activeKeys );
  } else {
    QStringList passiveKeys = mConfig->readListEntry( "PassiveResourceKeys" );
    passiveKeys.remove( key );
    mConfig->writeEntry( "PassiveResourceKeys", passiveKeys );
  }
  QString standardKey = mConfig->readEntry( "Standard" );
  if ( standardKey == key ) {
    mConfig->writeEntry( "Standard", "" );
  }
  mConfig->deleteGroup( "Resource_" + resource->identifier() );
  mConfig->sync();
 }
 Resource* ManagerImpl::getResource( const QString& identifier )
 {
  Resource::List::ConstIterator it;
  for ( it = mResources.begin(); it != mResources.end(); ++it ) {
    if ( (*it)->identifier() == identifier )
      return *it;
  }
  return 0;
 }
-/**
-  Return true, if the manager manages syncable resources.
-*/
-bool ManagerImpl::manageSyncable() const
-{
-        return mSyncable;
-}
diff --git a/microkde/kresources/managerimpl.h b/microkde/kresources/managerimpl.h
index 0425279..56a2db6 100644
--- a/microkde/kresources/managerimpl.h
+++ b/microkde/kresources/managerimpl.h
@@ -4,123 +4,117 @@
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KRESOURCES_MANAGERIMPL_H
 #define KRESOURCES_MANAGERIMPL_H
 #include <qstring.h>
 #include <qptrlist.h>
 #include <qdict.h>
 //US
 #include <qobject.h>
 #include "resource.h"
 class KConfig;
 namespace KRES {
 class Resource;
 class Factory;
 class ManagerImplListener
 {
  public:
    virtual void resourceAdded( Resource *resource ) = 0;
    virtual void resourceModified( Resource *resource ) = 0;
    virtual void resourceDeleted( Resource *resource ) = 0;
 };
 /**
  @internal
  Do not use this class directly. Use ResourceManager instead
 */
 class ManagerImpl : public QObject
 {
    Q_OBJECT
  public:
-    ManagerImpl( const QString &family, bool syncable);
+    ManagerImpl( const QString &family);
    ~ManagerImpl();
    void readConfig( KConfig * );
    void writeConfig( KConfig * );
    void add( Resource *resource, bool useDCOP = true );
    void remove( Resource *resource, bool useDCOP = true );
    Resource *standardResource();
    void setStandardResource( Resource *resource );
    void setActive( Resource *resource, bool active );
    Resource::List *resourceList();
    QPtrList<Resource> resources();
    // Get only active or passive resources
    QPtrList<Resource> resources( bool active );
    QStringList resourceNames();
    void setListener( ManagerImplListener *listener );
-    /**
-      Return true, if the manager manages syncable resources.
-    */
-    bool manageSyncable() const;
  public slots:
    void resourceChanged( Resource *resource );
  private:
    // dcop calls
  private:
    void createStandardConfig();
    Resource *readResourceConfig( const QString& identifier, bool checkActive );
    void writeResourceConfig( Resource *resource, bool checkActive );
    void removeResource( Resource *resource );
    Resource *getResource( Resource *resource );
    Resource *getResource( const QString& identifier );
    QString mFamily;
-    bool mSyncable;
    KConfig *mConfig;
    KConfig *mStdConfig;
    Resource *mStandard;
    Factory *mFactory;
    Resource::List mResources;
    ManagerImplListener *mListener;
 };
 }
 #endif
diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
index f79bcd0..cccd485 100644
--- a/microkde/kresources/resource.cpp
+++ b/microkde/kresources/resource.cpp
@@ -137,68 +137,69 @@ void Resource::setIdentifier( const QString& identifier )
 }
 QString Resource::identifier() const
 {
  return d->mIdentifier;
 }
 void Resource::setType( const QString& type )
 {
  d->mType = type;
 }
 QString Resource::type() const
 {
  return d->mType;
 }
 void Resource::setIncludeInSync( bool value )
 {
    d->mIncludeInSync = value;
 }
 bool Resource::includeInSync() const
 {
   return  d->mIncludeInSync;
 }
 void Resource::setReadOnly( bool value )
 {
  d->mReadOnly = value;
 }
 bool Resource::readOnly() const
 {
  return d->mReadOnly;
 }
 void Resource::setResourceName( const QString &name )
 {
  d->mName = name;
 }
 QString Resource::resourceName() const
 {
  return d->mName;
 }
 void Resource::setActive( bool value )
 {
  d->mActive = value;
 }
 bool Resource::isActive() const
 {
  return d->mActive;
 }
 void Resource::dump() const
 {
    qDebug("Resource::dump() ");
  kdDebug(5650) << "Resource:" << endl;
  kdDebug(5650) << "  Name: " << d->mName << endl;
  kdDebug(5650) << "  Identifier: " << d->mIdentifier << endl;
  kdDebug(5650) << "  Type: " << d->mType << endl;
  kdDebug(5650) << "  OpenCount: " << d->mOpenCount << endl;
  kdDebug(5650) << "  ReadOnly: " << ( d->mReadOnly ? "yes" : "no" ) << endl;
+  kdDebug(5650) << "  IncludeInSync: " << ( d->mIncludeInSync ? "yes" : "no" ) << endl;
  kdDebug(5650) << "  Active: " << ( d->mActive ? "yes" : "no" ) << endl;
  kdDebug(5650) << "  IsOpen: " << ( d->mIsOpen ? "yes" : "no" ) << endl;
 }
diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
index 70b5613..ed5af96 100644
--- a/microkde/kresources/resource.h
+++ b/microkde/kresources/resource.h
@@ -1,107 +1,106 @@
 /*
    This file is part of libkresources
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifndef KRESOURCES_RESOURCE_H
 #define KRESOURCES_RESOURCE_H
 //US
 #ifdef QT_THREAD_SUPPORT
 #include <qmutex.h>
 #endif //QT_THREAD_SUPPORT
 #include <qvaluelist.h>
 #include <qwidget.h>
 #include <qobject.h>
 #include <klibloader.h>
 class KConfig;
 namespace KRES {
 class ConfigWidget;
-class SyncWidgetContainer;
 /**
 * @internal
 * @libdoc The KDE Resource library
 *
 * NOTE: this library is NOT (YET?) PUBLIC. Do not publish this
 * interface, it is in constant flux.
 *
 * The KDE Resource framework can be used to manage resources of
 * different types, organized in families. The Resource framework
 * is currently used for addressbook resources in libkabc and for
 * calendar resources in libkcal.
 *
 * When you want to use the framework for a new family, you need to
 * <ul><li>Define a name for your resource family</li>
 * <li>subclass Resource and add the fields and method that are needed
 * in your application</li>
 * <li>If needed, override the doOpen() and doClose() methods.
 * <li> Provide a configuration possibility for resources in your
 * new family. You can use @ref ResourcesConfigPage to easily create a
 * KControl applet</li>
 * <li>In your application, you can use @ref ResourceManager to keep track
 * of the resources in your family, and you can use @ref ResourceSelectDialog
 * to let the user select a single resource.</li>
 * </ul>
 *
 * When you want to add a new resource type to an existing resource family,
 * you need to
 * <ul><li>Further subclass the family-specific Resource to implement
 * resource type-specific operation</li>
 * <li>Subclass ResourceConfigWidget to provide a configuration widget
 * for your new resource type</li>
 * <li>Provide a .desktop file so that the new resource type can be found
 * automatically by the ResourceManager</li>
 * </ul>
 *
 * Example:
 *
 <B>resourceexample.h</B>:
 <pre>
 #include <kconfig.h>
 #include <kresources/resource.h>
 class ResourceExample : public KRES::ResourceExample
 {
 public:
  ResourceExample( const KConfig * );
  ~ResourceCalendarExchange();
  void writeConfig( KConfig *config );
 private:
  QString mLocation;
  QString mPassword;
 }
 </pre>
 <B>resourceexample.cpp</B>:
 <pre>
 #include <kconfig.h>
 #include "resourceexample.h"
 ResourceExample::ResourceExample( const KConfig *config )
    : Resource( config )
 {
  if ( config ) {
@@ -171,248 +170,235 @@ ResourceExampleConfig::ResourceExampleConfig( QWidget* parent,  const char* name
  QLabel *label = new QLabel( i18n( "Location:" ), this );
  mHostEdit = new KLineEdit( this );
  mainLayout->addWidget( label, 1, 0 );
  mainLayout->addWidget( mHostEdit, 1, 1 );
  label = new QLabel( i18n( "Password:" ), this );
  mPasswordEdit = new KLineEdit( this );
  mPasswordEdit->setEchoMode( QLineEdit::Password );
  mainLayout->addWidget( label, 2, 0 );
  mainLayout->addWidget( mPasswordEdit, 2, 1 );
 }
 void ResourceExampleConfig::loadSettings( KRES::Resource *resource )
 {
  ResourceExample* res = dynamic_cast<ResourceExample *>( resource );
  if (res) {
    mHostEdit->setText( res->host() );
    mPasswordEdit->setText( res->password() );
  } else
    kdDebug(5700) << "ERROR: ResourceExampleConfig::loadSettings(): no ResourceExample, cast failed" << endl;
 }
 void ResourceExampleConfig::saveSettings( KRES::Resource *resource )
 {
  ResourceExample* res = dynamic_cast<ResourceExample *>( resource );
  if (res) {
    res->setHost(mHostEdit->text());
    res->setPassword(mPasswordEdit->text());
  } else
    kdDebug(5700) << "ERROR: ResourceExampleConfig::saveSettings(): no ResourceExample, cast failed" << endl;
 }
 </pre>
 * <B>resourceexample.desktop</B>:
 <pre>
 [Desktop Entry]
 Type=Service
 [Misc]
 Encoding=UTF-8
 Name=Example Resource
 [Plugin]
 Type=exchange
 X-KDE-Library=resourceexample
 </pre>
 * <B>Makefile.am</B>
 <pre>
 kde_module_LTLIBRARIES = resourceexample.la
 resourceexample_la_SOURCES = resourceexample.cpp resourceexampleconfig.cpp
 resourceexample_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
 resourceexample_la_LIBADD= -lkderesources
 linkdir= $(kde_datadir)/resources/family
 link_DATA= resourceexample.desktop
 </pre>
 *
 *
 */
 /**
 * A @ref Resource  is a ...
 *
 * A subclass should reimplement at least the constructor and the
- * @ref writeConfig method.
+k * @ref writeConfig method.
 *
   */
 class Resource : public QObject
 {
  Q_OBJECT
  public:
    typedef QValueList<Resource *> List;
    /**
     * Constructor. Construct resource from config.
     * @param config Configuration to read persistence information from.
     *               If config==0, create object using default settings.
     */
    Resource( const KConfig* config );
    /**
     * Destructor.
     */
    virtual ~Resource();
    /**
     * Write configuration information for this resource to a configuration
     * file. If you override this method, remember to call Resource::writeConfig
     * or Terrible Things(TM) will happen.
     * @param config Configuration to write persistence information to.
     */
    virtual void writeConfig( KConfig* config );
    /**
     * Open this resource, if it not already open. Increase the open
     * count of this object, and open the resource by calling @ref doOpen().
     * This method may block while another thread is concurrently opening
     * or closing the resource.
     *
     * Returns true if the resource was already opened or if it was opened
     * successfully; returns false if the resource was not opened successfully.
     */
    bool open();
    /**
     * Decrease the open count of this object, and if the count reaches
     * zero, close this resource by calling @ref doClose().
     * This method may block while another thread is concurrently closing
     * or opening the resource.
     */
    void close();
    /**
     * Returns whether the resource is open or not.
     */
    bool isOpen() const;
    /**
     * Returns a unique identifier. The identifier is unique for this resource.
     * It is created when the resource is first created, and it is retained
     * in the resource family configuration file for this resource.
     * @return This resource's identifier
     */
    QString identifier() const;
    /**
     * Returns the type of this resource.
     */
    QString type() const;
    /**
     * Mark the resource as read-only. You can override this method,
     * but also remember to call Resource::setReadOnly().
     */
    virtual void setReadOnly( bool value );
    /**
     * Returns, if the resource is read-only.
     */
    virtual bool readOnly() const;
    void setIncludeInSync( bool value );
    bool includeInSync() const;
    /**
     * Set the name of resource.You can override this method,
     * but also remember to call Resource::setResourceName().
     */
    virtual void setResourceName( const QString &name );
    /**
     * Returns the name of resource.
     */
    virtual QString resourceName() const;
-          virtual bool isSyncable() const = 0;
    /**
      Sets, if the resource is active.
    */
    void setActive( bool active );
    /**
      Return true, if the resource is active.
    */
    bool isActive() const;
    friend class Factory;
    friend class ManagerImpl;
    /**
      Print resource information as debug output.
    */
    virtual void dump() const;
  protected:
    /**
     * Open this resource. When called, the resource must be in
     * a closed state.
     *
     * Returns true if the resource was opened successfully;
     * returns false if the resource was not opened successfully.
     *
     * The result of this call can be accessed later by @ref isOpen()
     */
    virtual bool doOpen() { return true; }
    /**
     * Close this resource. Pre-condition: resource is open.
     * Post-condition: resource is closed.
     */
    virtual void doClose() {}
    void setIdentifier( const QString& identifier );
    void setType( const QString& type );
  private:
    class ResourcePrivate;
    ResourcePrivate *d;
 };
 class PluginFactoryBase : public KLibFactory
 {
  public:
-    virtual Resource *resource( const KConfig *config, bool syncable ) = 0;
+    virtual Resource *resource( const KConfig *config) = 0;
    virtual ConfigWidget *configWidget( QWidget *parent ) = 0;
-    virtual SyncWidgetContainer *syncWidgetContainer() = 0;
  protected:
    virtual QObject* createObject( QObject*, const char*, const char*,
                                   const QStringList & )
    {
      return 0;
    }
 };
-template<class TR,class TC, class TS>
+template<class TR,class TC>
 class PluginFactory : public PluginFactoryBase
 {
  public:
-    Resource *resource( const KConfig *config, bool syncable )
+    Resource *resource( const KConfig *config)
    {
-      return new TR( config, syncable );
+      return new TR( config );
    }
    ConfigWidget *configWidget( QWidget *parent )
    {
      return new TC( parent );
    }
-    SyncWidgetContainer *syncWidgetContainer()
-    {
-      return new TS();
-    }
 };
 }
 #endif
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index df914ce..071ceb3 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -28,152 +28,150 @@ KDGanttMinimizeSplitter.h \
 kconfig.h \
 kdatetbl.h \
 kdebug.h \
 kdialog.h \
 kdialogbase.h \
 keditlistbox.h \
 kemailsettings.h \
 kfiledialog.h \
 kfontdialog.h \
 kglobal.h \
 kglobalsettings.h \
 kiconloader.h \
 klineedit.h \
 klineeditdlg.h \
 kmessagebox.h \
 knotifyclient.h \
 kprinter.h \
 kprocess.h \
 krestrictedline.h \
 krun.h \
 ksimpleconfig.h \
 kstaticdeleter.h \
 ksystemtray.h \
 ktempfile.h \
 ktextedit.h \
 kunload.h \
 kurl.h \
 ofileselector_p.h \
 ofontselector.h \
 oprocctrl.h \   
 oprocess.h \   
 osmartpointer.h \   
 kdeui/kguiitem.h \
 kdeui/kaction.h \
 kdeui/kactionclasses.h \
 kdeui/kactioncollection.h \
 kdeui/kcmodule.h \
 kdeui/kstdaction.h \
 kdeui/kbuttonbox.h \
 kdeui/klistbox.h \
 kdeui/klistview.h \
 kdeui/kjanuswidget.h \
 kdeui/kseparator.h \
 kdeui/kmainwindow.h \
 kdeui/knuminput.h \
 kdeui/knumvalidator.h \
 kdeui/ksqueezedtextlabel.h \
 kdeui/ktoolbar.h \
 kdeui/ktoolbarbutton.h \
 kdeui/ktoolbarhandler.h \
 kdeui/kxmlguiclient.h \
 kio/job.h \
 kio/kio/kdirwatch.h \
 kio/kio/kdirwatch_p.h \
 kio/kfile/kurlrequester.h \
 kresources/resource.h \
 kresources/factory.h \
 kresources/managerimpl.h \
 kresources/manager.h \
 kresources/selectdialog.h \
 kresources/configpage.h \
 kresources/configwidget.h \ 
 kresources/configdialog.h \
 kresources/kcmkresources.h \
- kresources/syncwidget.h \
 kdecore/kmdcodec.h \
 kdecore/kconfigbase.h \
 kdecore/klocale.h \
 kdecore/klibloader.h \
 kdecore/kcatalogue.h \
 kdecore/kprefs.h \
 kdecore/ksharedptr.h \
 kdecore/kshell.h \
 kdecore/kstandarddirs.h \
 kdecore/kstringhandler.h \
 kdecore/kshortcut.h \
 kutils/kcmultidialog.h \
 kidmanager.h    
 
 
 SOURCES = \
 KDGanttMinimizeSplitter.cpp \
 kapplication.cpp \
 kcalendarsystem.cpp \
 kcalendarsystemgregorian.cpp \
 kcolorbutton.cpp \
 kcolordialog.cpp \
 kconfig.cpp \
 kdatetbl.cpp \
 kdialog.cpp \
 kdialogbase.cpp \
 keditlistbox.cpp \
 kemailsettings.cpp \
 kfontdialog.cpp \
 kfiledialog.cpp \
 kglobal.cpp \
 kglobalsettings.cpp \
 kiconloader.cpp \
 kmessagebox.cpp \
 kprocess.cpp \
 krun.cpp \
 ksystemtray.cpp \
 ktempfile.cpp \
 kurl.cpp \
 ktextedit.cpp \
 ofileselector_p.cpp \
 ofontselector.cpp \
 oprocctrl.cpp \   
 oprocess.cpp \ 
 kdecore/kcatalogue.cpp \
 kdecore/klibloader.cpp \
 kdecore/klocale.cpp \
 kdecore/kmdcodec.cpp \
 kdecore/kprefs.cpp \
 kdecore/kshell.cpp \
 kdecore/kstandarddirs.cpp \
 kdecore/kstringhandler.cpp \
 kdeui/kaction.cpp \
 kdeui/kactionclasses.cpp \
 kdeui/kactioncollection.cpp \
 kdeui/kbuttonbox.cpp \
 kdeui/kcmodule.cpp \
 kdeui/kguiitem.cpp \
 kdeui/kjanuswidget.cpp \
 kdeui/klistbox.cpp \
 kdeui/klistview.cpp \
 kdeui/kmainwindow.cpp \
 kdeui/knuminput.cpp \
 kdeui/knumvalidator.cpp \
 kdeui/kseparator.cpp \
 kdeui/kstdaction.cpp \
 kdeui/ksqueezedtextlabel.cpp \
 kdeui/ktoolbar.cpp \
 kdeui/ktoolbarbutton.cpp \
 kdeui/ktoolbarhandler.cpp \
 kdeui/kxmlguiclient.cpp \
 kio/kfile/kurlrequester.cpp \
 kio/kio/kdirwatch.cpp \
 kresources/configpage.cpp \
 kresources/configdialog.cpp \
 kresources/configwidget.cpp \
 kresources/factory.cpp \
 kresources/kcmkresources.cpp \
 kresources/managerimpl.cpp \
 kresources/resource.cpp \
 kresources/selectdialog.cpp \
- kresources/syncwidget.cpp \
 kutils/kcmultidialog.cpp  \
 kidmanager.cpp