| -rw-r--r-- | kabc/plugins/olaccess/olaccess.pro | 1 | ||||
| -rw-r--r-- | kabc/plugins/olaccess/resourceolaccess.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro index 4416d0c..9b95015 100644 --- a/kabc/plugins/olaccess/olaccess.pro +++ b/kabc/plugins/olaccess/olaccess.pro @@ -1,34 +1,35 @@ TEMPLATE = lib CONFIG += qt warn_on TARGET = microkabc_olaccess include( ../../../variables.pri ) INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat INTERFACES = \ +DESTDIR = ../../../bin HEADERS = \ resourceolaccess.h \ resourceolaccessconfig.h \ olaccessconverter.h SOURCES = \ resourceolaccess.cpp \ resourceolaccessconfig.cpp \ olaccessconverter.cpp unix : { OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } win32: { CONFIG += dll DEFINES += _WIN32_ OBJECTS_DIR = obj/win MOC_DIR = moc/win LIBS += ../../../bin/microkdepim.lib LIBS += ../../../bin/microkcal.lib LIBS += ../../../bin/microkde.lib LIBS += ../../../bin/microkabc.lib } diff --git a/kabc/plugins/olaccess/resourceolaccess.cpp b/kabc/plugins/olaccess/resourceolaccess.cpp index 7113e0e..c7c9874 100644 --- a/kabc/plugins/olaccess/resourceolaccess.cpp +++ b/kabc/plugins/olaccess/resourceolaccess.cpp @@ -33,54 +33,55 @@ $Id$ #include <qfileinfo.h> #include <qregexp.h> //US #include <qtimer.h> #include <kapplication.h> #include <kconfig.h> #include <kdebug.h> #include <klocale.h> //US #include <ksavefile.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <libkdepim/ksyncprofile.h> #include "resourceolaccessconfig.h" #include "resourceolaccess.h" #include "stdaddressbook.h" #include "olaccessconverter.h" //#define ALLOW_LOCKING using namespace KABC; extern "C" -{ +__declspec(dllexport) + void *init_microkabc_olaccess() { return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>(); } -} + Resourceolaccess::Resourceolaccess( const KConfig *config ) : Resource( config ), mConverter (0) { // we can not choose the filename. Therefore use the default to display //mAccess = 0; QString fileName;// = SlZDataBase::addressbookFileName(); init( fileName ); } Resourceolaccess::Resourceolaccess( const QString &fileName ) : Resource( 0 ) { //mAccess = 0; init( fileName ); } void Resourceolaccess::init( const QString &fileName ) { if (mConverter == 0) { mConverter = new OlaccessConverter(); bool res = mConverter->init(); if ( !res ) { |