2 files changed, 32 insertions, 37 deletions

diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index f354a9e..be19821 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -46,29 +46,28 @@ $Id$
 #include <kurlrequester.h>
 
 #include "addressbook.h"
 
-//US #include "formatfactory.h"
+#include "formatfactory.h"
 
 #include "resourcedirconfig.h"
 #include "stdaddressbook.h"
 
 //US
 #include <qdir.h>
-#include <formats/vcardformatplugin2.h>
-#include <formats/binaryformat.h>
+//US #include "../../formats/vcardformatplugin2.h"
+//US #include "../../formats/binaryformat.h"
 
 #include "resourcedir.h"
 
 using namespace KABC;
 
 extern "C"
 {
-  void *init_kabc_dir()
+//US  void *init_kabc_dir()
+  void *init_microkabc_dir()
   {
-  qDebug("resourcedir.cpp : init_kabc_dir  has to be changed");
-//US    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
-  return 0;
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
   }
 }
 
 
@@ -88,25 +87,25 @@ ResourceDir::ResourceDir( const KConfig *config )
     mFormatName = "vcard";
   }
 
 
-/*US  FormatFactory *factory = FormatFactory::self();
+  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());
-
+*/
   
 /*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
@@ -260,15 +259,11 @@ bool ResourceDir::lock( const QString &path )
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
-#ifdef _WIN32_
-  int result = 0;
-  qDebug("WARNING: ResourceDir::lock cannot link ");
-#else
   int result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
-#endif
+
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
@@ -321,19 +316,19 @@ void ResourceDir::setFormat( const QString &format )
 
   if ( mFormat )
     delete mFormat;
 
-//US  FormatFactory *factory = FormatFactory::self();
-//US  mFormat = factory->format( mFormatName );
-
+  FormatFactory *factory = FormatFactory::self();
+  mFormat = factory->format( mFormatName );
+/*US 
 qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard")
     mFormat = new VCardFormatPlugin2();
   else if (mFormatName == "binary")
     mFormat = new BinaryFormat();
   else
     qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
-
+*/
 
 }
 
 QString ResourceDir::format() const
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index d30ed2f..80af841 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -42,29 +42,28 @@ $Id$
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 
-//US #include "formatfactory.h"
+#include "formatfactory.h"
 
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 
-#include <formats/vcardformatplugin2.h>
-#include <formats/binaryformat.h>
+//US #include "../../formats/vcardformatplugin2.h"
+//US #include "../../formats/binaryformat.h"
 
 
 #include "resourcefile.h"
 
 using namespace KABC;
 
 extern "C"
 {
-  void *init_kabc_file()
+//US  void *init_kabc_file()
+  void *init_microkabc_file()
   {
-  qDebug("!!!resourcefile.cpp : init_kabc_file  has to be changed");
-//US    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
-  return 0;
+    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
   }
 }
 
 
@@ -98,17 +97,17 @@ ResourceFile::ResourceFile( const QString &fileName,
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
   mFormatName = formatName;
 
-/*US  FormatFactory *factory = FormatFactory::self();
-      mFormat = factory->format( mFormatName );
+  FormatFactory *factory = FormatFactory::self();
+  mFormat = factory->format( mFormatName );
 
   if ( !mFormat ) {
     mFormatName = "vcard";
     mFormat = factory->format( mFormatName );
   }
-*/
 
+/*US
 //US  qDebug("ResourceFile::init initialized with format %s ", formatName.latin1());
   if (mFormatName == "vcard") {
     mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::init format VCardFormatPlugin2");
@@ -118,8 +117,9 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
 //    qDebug("ResourceFile::init format BinaryFormat");
   }
   else
     qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
+*/
 
 /*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
@@ -216,10 +216,10 @@ bool ResourceFile::save( Ticket *ticket )
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
    
 /*US we use a simpler method to create a backupfile
     
-  (void) KSaveFile::backupFile( mFileName, QString::null /*directory*/
-/*US  ,extension );
+  (void) KSaveFile::backupFile( mFileName, QString::null
+  ,extension );
 
   KSaveFile saveFile( mFileName );
   bool ok = false;
   if ( saveFile.status() == 0 && saveFile.file() )
@@ -285,11 +285,10 @@ bool ResourceFile::lock( const QString &fileName )
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
-  int result = 0;//::link( QFile::encodeName( mLockUniqueName ),
-  //                   QFile::encodeName( lockName ) );
-  qDebug("lock files %s, %s needs to be fixed", mLockUniqueName.latin1(), lockName.latin1() );
+  int result = ::link( QFile::encodeName( mLockUniqueName ),
+                       QFile::encodeName( lockName ) );
 
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
@@ -341,11 +340,11 @@ void ResourceFile::setFormat( const QString &format )
 {
   mFormatName = format;
   delete mFormat;
 
-//US  FormatFactory *factory = FormatFactory::self();
-//US  mFormat = factory->format( mFormatName );
-  
+  FormatFactory *factory = FormatFactory::self();
+  mFormat = factory->format( mFormatName );
+/*US  
 //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard") {
     mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
@@ -355,8 +354,9 @@ void ResourceFile::setFormat( const QString &format )
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
   }
   else
     qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
+*/
   
 }
 
 QString ResourceFile::format() const