summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/dir/resourcedir.cpp33
-rw-r--r--kabc/plugins/file/resourcefile.cpp36
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
@@ -47,15 +47,15 @@ $Id$
#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"
@@ -63,11 +63,10 @@ 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>();
}
}
@@ -89,15 +88,15 @@ ResourceDir::ResourceDir( const KConfig *config )
}
-/*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();
@@ -105,7 +104,7 @@ ResourceDir::ResourceDir( const KConfig *config )
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() ) );
@@ -261,13 +260,9 @@ bool ResourceDir::lock( const QString &path )
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;
@@ -322,9 +317,9 @@ 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();
@@ -332,7 +327,7 @@ qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
mFormat = new BinaryFormat();
else
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
@@ -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();
- 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();
@@ -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());
+*/
}