author | zautrix <zautrix> | 2005-10-27 10:46:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-27 10:46:00 (UTC) |
commit | f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8 (patch) (unidiff) | |
tree | 3b0647f6b8d5a411d33d128b7365c99d3cb52850 | |
parent | 29c7448b3c54e8d579732d10f144e12f7167c3c3 (diff) | |
download | kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.zip kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.tar.gz kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.tar.bz2 |
commit
-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 | |||
@@ -5,12 +5,13 @@ TARGET = microkabc_olaccess | |||
5 | include( ../../../variables.pri ) | 5 | include( ../../../variables.pri ) |
6 | 6 | ||
7 | INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat | 7 | INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat |
8 | 8 | ||
9 | INTERFACES = \ | 9 | INTERFACES = \ |
10 | 10 | ||
11 | DESTDIR = ../../../bin | ||
11 | HEADERS = \ | 12 | HEADERS = \ |
12 | resourceolaccess.h \ | 13 | resourceolaccess.h \ |
13 | resourceolaccessconfig.h \ | 14 | resourceolaccessconfig.h \ |
14 | olaccessconverter.h | 15 | olaccessconverter.h |
15 | 16 | ||
16 | SOURCES = \ | 17 | SOURCES = \ |
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 | |||
@@ -51,18 +51,19 @@ $Id$ | |||
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 |
55 | using namespace KABC; | 55 | using namespace KABC; |
56 | extern "C" | 56 | extern "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 | ||
64 | Resourceolaccess::Resourceolaccess( const KConfig *config ) | 65 | Resourceolaccess::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; |
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 | |||
@@ -142,13 +142,13 @@ Factory::Factory( const QString& resourceFamily) : | |||
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 | } |
diff --git a/variables.pri b/variables.pri index 9975cf0..5d3b6cb 100644 --- a/variables.pri +++ b/variables.pri | |||
@@ -4,11 +4,11 @@ | |||
4 | unix { | 4 | unix { |
5 | #for statically linking | 5 | #for statically linking |
6 | #CONFIG += staticlib | 6 | #CONFIG += staticlib |
7 | } | 7 | } |
8 | win32 { | 8 | win32 { |
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 | 10 | CONFIG += importol |
11 | 11 | ||
12 | } | 12 | } |
13 | CONFIG += thread | 13 | CONFIG += thread |
14 | CONFIG += release | 14 | CONFIG += release |