| -rw-r--r-- | kabc/plugins/olaccess/olaccess.pro | 1 | ||||
| -rw-r--r-- | kabc/plugins/olaccess/resourceolaccess.cpp | 5 | ||||
| -rw-r--r-- | microkde/kresources/factory.cpp | 2 | ||||
| -rw-r--r-- | variables.pri | 2 |
4 files changed, 6 insertions, 4 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 ) { diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp index 4843ce0..86b22b2 100644 --- a/microkde/kresources/factory.cpp +++ b/microkde/kresources/factory.cpp @@ -124,49 +124,49 @@ Factory::Factory( const QString& resourceFamily) : info->descriptionLabel = i18n( "Qtopia PIM Addressbook." ); mTypeMap.insert( "qtopia", info ); } //US add sharp plugin only, if the library exists. libname = "microkabc_sharpdtm"; path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); if ( !path.isEmpty() ) { info = new PluginInfo; info->library = libname; info->nameLabel = i18n( "sharp" ); info->descriptionLabel = i18n( "Sharp DTM Addressbook." ); mTypeMap.insert( "sharp", info ); } //LR add ol plugin only, if the library exists. libname = "microkabc_olaccess"; path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); if ( !path.isEmpty() ) { info = new PluginInfo; info->library = libname; - info->nameLabel = i18n( "sharp" ); + info->nameLabel = i18n( "olaccess" ); info->descriptionLabel = i18n( "Outlook Addressbook." ); mTypeMap.insert( "olaccess", info ); } } Factory::~Factory() { } QStringList Factory::typeNames() const { //US method QMap::keys() not available yet. SO collect the data manually //US return mTypeMap.keys(); QStringList result; QMap<QString, PluginInfo*>::ConstIterator it; for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) { result << it.key().latin1(); // qDebug("Factory::typeNames() : %s ", it.key().latin1()); } diff --git a/variables.pri b/variables.pri index 9975cf0..5d3b6cb 100644 --- a/variables.pri +++ b/variables.pri @@ -1,14 +1,14 @@ # variables settings for compilation for Linux desktop and Qt 3.x.x unix { #for statically linking #CONFIG += staticlib } win32 { #disable importol to make it running on windows ME/98 -#CONFIG += importol +CONFIG += importol } CONFIG += thread CONFIG += release |