enable dynamic loading

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
@@ -49,3 +49,3 @@ $Id$
 
-//US #include "formatfactory.h"
+#include "formatfactory.h"
 
@@ -56,4 +56,4 @@ $Id$
 #include <qdir.h>
-#include <formats/vcardformatplugin2.h>
-#include <formats/binaryformat.h>
+//US #include "../../formats/vcardformatplugin2.h"
+//US #include "../../formats/binaryformat.h"
 
@@ -65,7 +65,6 @@ 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>();
   }
@@ -91,3 +90,3 @@ ResourceDir::ResourceDir( const KConfig *config )
 
-/*US  FormatFactory *factory = FormatFactory::self();
+  FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
@@ -98,4 +97,4 @@ ResourceDir::ResourceDir( const KConfig *config )
   }
-*/
 
+/*US  
 //US  qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1());
@@ -107,3 +106,3 @@ ResourceDir::ResourceDir( const KConfig *config )
     qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
-
+*/
   
@@ -263,9 +262,5 @@ bool ResourceDir::lock( const QString &path )
   // 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 ) {
@@ -324,5 +319,5 @@ void ResourceDir::setFormat( const QString &format )
 
-//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());
@@ -334,3 +329,3 @@ qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
     qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
-
+*/
 
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
@@ -45,3 +45,3 @@ $Id$
 
-//US #include "formatfactory.h"
+#include "formatfactory.h"
 
@@ -51,4 +51,4 @@ $Id$
 
-#include <formats/vcardformatplugin2.h>
-#include <formats/binaryformat.h>
+//US #include "../../formats/vcardformatplugin2.h"
+//US #include "../../formats/binaryformat.h"
 
@@ -61,7 +61,6 @@ 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>();
   }
@@ -101,4 +100,4 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
 
-/*US  FormatFactory *factory = FormatFactory::self();
-      mFormat = factory->format( mFormatName );
+  FormatFactory *factory = FormatFactory::self();
+  mFormat = factory->format( mFormatName );
 
@@ -108,4 +107,4 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
   }
-*/
 
+/*US
 //US  qDebug("ResourceFile::init initialized with format %s ", formatName.latin1());
@@ -121,2 +120,3 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
     qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
+*/
 
@@ -219,4 +219,4 @@ bool ResourceFile::save( Ticket *ticket )
     
-  (void) KSaveFile::backupFile( mFileName, QString::null /*directory*/
-/*US  ,extension );
+  (void) KSaveFile::backupFile( mFileName, QString::null
+  ,extension );
 
@@ -288,5 +288,4 @@ bool ResourceFile::lock( const QString &fileName )
   // 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 ) );
 
@@ -344,5 +343,5 @@ void ResourceFile::setFormat( const QString &format )
 
-//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());
@@ -358,2 +357,3 @@ void ResourceFile::setFormat( const QString &format )
     qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
+*/