summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-10-27 10:46:00 (UTC)
committer zautrix <zautrix>2005-10-27 10:46:00 (UTC)
commitf2d8e3c646f689c3d7b91a987bddf4c1e7f268b8 (patch) (unidiff)
tree3b0647f6b8d5a411d33d128b7365c99d3cb52850
parent29c7448b3c54e8d579732d10f144e12f7167c3c3 (diff)
downloadkdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.zip
kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.tar.gz
kdepimpi-f2d8e3c646f689c3d7b91a987bddf4c1e7f268b8.tar.bz2
commit
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
@@ -1,34 +1,35 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += 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 \
19 olaccessconverter.cpp 20 olaccessconverter.cpp
20 21
21unix : { 22unix : {
22OBJECTS_DIR = obj/unix 23OBJECTS_DIR = obj/unix
23MOC_DIR = moc/unix 24MOC_DIR = moc/unix
24} 25}
25win32: { 26win32: {
26CONFIG += dll 27CONFIG += dll
27DEFINES += _WIN32_ 28DEFINES += _WIN32_
28OBJECTS_DIR = obj/win 29OBJECTS_DIR = obj/win
29MOC_DIR = moc/win 30MOC_DIR = moc/win
30LIBS += ../../../bin/microkdepim.lib 31LIBS += ../../../bin/microkdepim.lib
31LIBS += ../../../bin/microkcal.lib 32LIBS += ../../../bin/microkcal.lib
32LIBS += ../../../bin/microkde.lib 33LIBS += ../../../bin/microkde.lib
33LIBS += ../../../bin/microkabc.lib 34LIBS += ../../../bin/microkabc.lib
34} 35}
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$
33#include <qfileinfo.h> 33#include <qfileinfo.h>
34#include <qregexp.h> 34#include <qregexp.h>
35//US #include <qtimer.h> 35//US #include <qtimer.h>
36 36
37#include <kapplication.h> 37#include <kapplication.h>
38#include <kconfig.h> 38#include <kconfig.h>
39#include <kdebug.h> 39#include <kdebug.h>
40#include <klocale.h> 40#include <klocale.h>
41//US #include <ksavefile.h> 41//US #include <ksavefile.h>
42#include <kstandarddirs.h> 42#include <kstandarddirs.h>
43#include <kmessagebox.h> 43#include <kmessagebox.h>
44 44
45 45
46#include <libkdepim/ksyncprofile.h> 46#include <libkdepim/ksyncprofile.h>
47 47
48#include "resourceolaccessconfig.h" 48#include "resourceolaccessconfig.h"
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 );
71} 72}
72 73
73Resourceolaccess::Resourceolaccess( const QString &fileName ) 74Resourceolaccess::Resourceolaccess( const QString &fileName )
74 : Resource( 0 ) 75 : Resource( 0 )
75{ 76{
76 //mAccess = 0; 77 //mAccess = 0;
77 init( fileName ); 78 init( fileName );
78} 79}
79 80
80void Resourceolaccess::init( const QString &fileName ) 81void Resourceolaccess::init( const QString &fileName )
81{ 82{
82 if (mConverter == 0) { 83 if (mConverter == 0) {
83 mConverter = new OlaccessConverter(); 84 mConverter = new OlaccessConverter();
84 bool res = mConverter->init(); 85 bool res = mConverter->init();
85 if ( !res ) 86 if ( !res )
86 { 87 {
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) :
124 info->descriptionLabel = i18n( "Qtopia PIM Addressbook." ); 124 info->descriptionLabel = i18n( "Qtopia PIM Addressbook." );
125 mTypeMap.insert( "qtopia", info ); 125 mTypeMap.insert( "qtopia", info );
126 } 126 }
127 127
128 //US add sharp plugin only, if the library exists. 128 //US add sharp plugin only, if the library exists.
129 libname = "microkabc_sharpdtm"; 129 libname = "microkabc_sharpdtm";
130 path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); 130 path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
131 if ( !path.isEmpty() ) 131 if ( !path.isEmpty() )
132 { 132 {
133 info = new PluginInfo; 133 info = new PluginInfo;
134 info->library = libname; 134 info->library = libname;
135 info->nameLabel = i18n( "sharp" ); 135 info->nameLabel = i18n( "sharp" );
136 info->descriptionLabel = i18n( "Sharp DTM Addressbook." ); 136 info->descriptionLabel = i18n( "Sharp DTM Addressbook." );
137 mTypeMap.insert( "sharp", info ); 137 mTypeMap.insert( "sharp", info );
138 } 138 }
139 139
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()
157{ 157{
158} 158}
159 159
160QStringList Factory::typeNames() const 160QStringList Factory::typeNames() const
161{ 161{
162//US method QMap::keys() not available yet. SO collect the data manually 162//US method QMap::keys() not available yet. SO collect the data manually
163//US return mTypeMap.keys(); 163//US return mTypeMap.keys();
164 164
165 QStringList result; 165 QStringList result;
166 166
167 QMap<QString, PluginInfo*>::ConstIterator it; 167 QMap<QString, PluginInfo*>::ConstIterator it;
168 for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) { 168 for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) {
169 result << it.key().latin1(); 169 result << it.key().latin1();
170// qDebug("Factory::typeNames() : %s ", it.key().latin1()); 170// qDebug("Factory::typeNames() : %s ", it.key().latin1());
171 171
172 } 172 }
diff --git a/variables.pri b/variables.pri
index 9975cf0..5d3b6cb 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,14 +1,14 @@
1 1
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