enable dynamic loading

1 files changed, 17 insertions, 17 deletions

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
@@ -43,14 +43,14 @@ $Id$
 //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"
@@ -59,11 +59,10 @@ 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>();
   }
 }
 
@@ -99,15 +98,15 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
   mFormatName = formatName;
 
-/*US  FormatFactory *factory = FormatFactory::self();
+  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();
@@ -119,6 +118,7 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
   }
   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() ) );
@@ -217,8 +217,8 @@ bool ResourceFile::save( Ticket *ticket )
    
 /*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;
@@ -286,9 +286,8 @@ bool ResourceFile::lock( const QString &fileName )
   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();
@@ -342,9 +341,9 @@ 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();
@@ -356,6 +355,7 @@ void ResourceFile::setFormat( const QString &format )
   }
   else
     qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
+*/
   
 }