summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/olaccess/olaccess.pro1
-rw-r--r--kabc/plugins/olaccess/resourceolaccess.cpp5
-rw-r--r--microkde/kresources/factory.cpp2
-rw-r--r--variables.pri2
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
@@ -3,16 +3,17 @@ CONFIG += qt warn_on
3TARGET = microkabc_olaccess 3TARGET = microkabc_olaccess
4 4
5include( ../../../variables.pri ) 5include( ../../../variables.pri )
6 6
7INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat 7INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
8 8
9INTERFACES = \ 9INTERFACES = \
10 10
11DESTDIR = ../../../bin
11HEADERS = \ 12HEADERS = \
12 resourceolaccess.h \ 13 resourceolaccess.h \
13 resourceolaccessconfig.h \ 14 resourceolaccessconfig.h \
14 olaccessconverter.h 15 olaccessconverter.h
15 16
16SOURCES = \ 17SOURCES = \
17 resourceolaccess.cpp \ 18 resourceolaccess.cpp \
18 resourceolaccessconfig.cpp \ 19 resourceolaccessconfig.cpp \
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
@@ -49,22 +49,23 @@ $Id$
49#include "resourceolaccess.h" 49#include "resourceolaccess.h"
50 50
51#include "stdaddressbook.h" 51#include "stdaddressbook.h"
52 52
53#include "olaccessconverter.h" 53#include "olaccessconverter.h"
54//#define ALLOW_LOCKING 54//#define ALLOW_LOCKING
55using namespace KABC; 55using namespace KABC;
56extern "C" 56extern "C"
57{ 57__declspec(dllexport)
58
58 void *init_microkabc_olaccess() 59 void *init_microkabc_olaccess()
59 { 60 {
60 return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>(); 61 return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>();
61 } 62 }
62} 63
63 64
64Resourceolaccess::Resourceolaccess( const KConfig *config ) 65Resourceolaccess::Resourceolaccess( const KConfig *config )
65 : Resource( config ), mConverter (0) 66 : Resource( config ), mConverter (0)
66{ 67{
67 // we can not choose the filename. Therefore use the default to display 68 // we can not choose the filename. Therefore use the default to display
68 //mAccess = 0; 69 //mAccess = 0;
69 QString fileName;// = SlZDataBase::addressbookFileName(); 70 QString fileName;// = SlZDataBase::addressbookFileName();
70 init( fileName ); 71 init( fileName );
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
@@ -140,17 +140,17 @@ Factory::Factory( const QString& resourceFamily) :
140 140
141 //LR add ol plugin only, if the library exists. 141 //LR add ol plugin only, if the library exists.
142 libname = "microkabc_olaccess"; 142 libname = "microkabc_olaccess";
143 path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); 143 path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
144 if ( !path.isEmpty() ) 144 if ( !path.isEmpty() )
145 { 145 {
146 info = new PluginInfo; 146 info = new PluginInfo;
147 info->library = libname; 147 info->library = libname;
148 info->nameLabel = i18n( "sharp" ); 148 info->nameLabel = i18n( "olaccess" );
149 info->descriptionLabel = i18n( "Outlook Addressbook." ); 149 info->descriptionLabel = i18n( "Outlook Addressbook." );
150 mTypeMap.insert( "olaccess", info ); 150 mTypeMap.insert( "olaccess", info );
151 } 151 }
152 152
153 153
154} 154}
155 155
156Factory::~Factory() 156Factory::~Factory()
diff --git a/variables.pri b/variables.pri
index 9975cf0..5d3b6cb 100644
--- a/variables.pri
+++ b/variables.pri
@@ -2,13 +2,13 @@
2# variables settings for compilation for Linux desktop and Qt 3.x.x 2# variables settings for compilation for Linux desktop and Qt 3.x.x
3 3
4unix { 4unix {
5#for statically linking 5#for statically linking
6#CONFIG += staticlib 6#CONFIG += staticlib
7} 7}
8win32 { 8win32 {
9#disable importol to make it running on windows ME/98 9#disable importol to make it running on windows ME/98
10#CONFIG += importol 10CONFIG += importol
11 11
12} 12}
13CONFIG += thread 13CONFIG += thread
14CONFIG += release 14CONFIG += release