summaryrefslogtreecommitdiffabout
path: root/kabc/plugins/dir/resourcedir.cpp
Side-by-side diff
Diffstat (limited to 'kabc/plugins/dir/resourcedir.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/dir/resourcedir.cpp33
1 files changed, 14 insertions, 19 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());
-
+*/