summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/olaccess/olaccess.pro2
-rw-r--r--kabc/plugins/olaccess/olaccessconverter.cpp54
-rw-r--r--kabc/plugins/olaccess/olaccessconverter.h20
-rw-r--r--kabc/plugins/olaccess/resourceolaccess.cpp69
-rw-r--r--kabc/plugins/olaccess/resourceolaccess.h21
-rw-r--r--kabc/plugins/olaccess/resourceolaccessconfig.cpp24
-rw-r--r--kabc/plugins/olaccess/resourceolaccessconfig.h4
-rw-r--r--kdepim-desktop.pro4
8 files changed, 98 insertions, 100 deletions
diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro
index ca0a6a8..4416d0c 100644
--- a/kabc/plugins/olaccess/olaccess.pro
+++ b/kabc/plugins/olaccess/olaccess.pro
@@ -6,3 +6,3 @@ include( ../../../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
diff --git a/kabc/plugins/olaccess/olaccessconverter.cpp b/kabc/plugins/olaccess/olaccessconverter.cpp
index 4adcae4..e95f3cb 100644
--- a/kabc/plugins/olaccess/olaccessconverter.cpp
+++ b/kabc/plugins/olaccess/olaccessconverter.cpp
@@ -31,5 +31,4 @@ $Id$
31 31
32#include "sharpdtmconverter.h" 32#include "olaccessconverter.h"
33 33
34#include <sl/slcategories.h>
35#include <libkdepim/ksyncprofile.h> 34#include <libkdepim/ksyncprofile.h>
@@ -39,5 +38,4 @@ $Id$
39using namespace KABC; 38using namespace KABC;
40using namespace SlCategory;
41 39
42SharpDTMConverter::SharpDTMConverter() : catDB(0) 40OlaccessConverter::OlaccessConverter()
43{ 41{
@@ -45,3 +43,3 @@ SharpDTMConverter::SharpDTMConverter() : catDB(0)
45 43
46SharpDTMConverter::~SharpDTMConverter() 44OlaccessConverter::~OlaccessConverter()
47{ 45{
@@ -50,4 +48,5 @@ SharpDTMConverter::~SharpDTMConverter()
50 48
51bool SharpDTMConverter::init() 49bool OlaccessConverter::init()
52{ 50{
51#if 0
53 catDB = new SlCategory::SlCategories(); 52 catDB = new SlCategory::SlCategories();
@@ -58,2 +57,3 @@ bool SharpDTMConverter::init()
58// catDB->load( categoryFileName() ); 57// catDB->load( categoryFileName() );
58#endif
59 return true; 59 return true;
@@ -61,4 +61,5 @@ bool SharpDTMConverter::init()
61 61
62void SharpDTMConverter::deinit() 62void OlaccessConverter::deinit()
63{ 63{
64#if 0
64 if (catDB) 65 if (catDB)
@@ -68,5 +69,6 @@ void SharpDTMConverter::deinit()
68 } 69 }
70#endif
69} 71}
70 72#if 0
71bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) 73bool OlaccessConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr )
72{ 74{
@@ -81,3 +83,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
81 // name 83 // name
82 //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); 84 //qDebug("OlaccessConverter::sharpToAddressee check if the fileAs transformation works!!");
83 addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); 85 addr.setFormattedName(db->readField(ZdbAdrs::FileAs));
@@ -96,3 +98,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
96 emailstr.replace( QRegExp(":"), " " ); 98 emailstr.replace( QRegExp(":"), " " );
97 //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); 99 //qDebug("OlaccessConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1());
98 QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); 100 QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace());
@@ -223,4 +225,4 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
223 QString gen = db->readField(ZdbAdrs::Gender); 225 QString gen = db->readField(ZdbAdrs::Gender);
224 //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); 226 //qDebug("OlaccessConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1());
225 //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); 227 //qDebug("OlaccessConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited");
226 if (gen == "1") 228 if (gen == "1")
@@ -266,3 +268,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
266 268
267 //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" ); 269 //qDebug("OlaccessConverter::sharpToAddressee please check that the categories will be converted" );
268 QArray<int> catArray = db->readCategories(); 270 QArray<int> catArray = db->readCategories();
@@ -281,3 +283,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
281 283
282bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) 284bool OlaccessConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact )
283{ 285{
@@ -291,3 +293,3 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
291 293
292 //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); 294 //qDebug("OlaccessConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() );
293 QString formattedName = addr.formattedName(); 295 QString formattedName = addr.formattedName();
@@ -307,4 +309,4 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
307 // email 309 // email
308 //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!"); 310 //qDebug("OlaccessConverter::addresseeToSharp check which seperator we need here for the emails!!");
309 //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee"); 311 //qDebug("OlaccessConverter::addresseeToSharp its probably the same from sharpToAddressee");
310 QString emails = addr.emails().join(" "); 312 QString emails = addr.emails().join(" ");
@@ -375,5 +377,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
375 QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); 377 QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" );
376 //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); 378 //qDebug("OlaccessConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1());
377 //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); 379 //qDebug("OlaccessConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?");
378 //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); 380 //qDebug("OlaccessConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
379 if (gt == "male") 381 if (gt == "male")
@@ -407,3 +409,3 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
407 409
408 //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); 410 //qDebug("OlaccessConverter::addresseeToSharp please check if category transformation works");
409 411
@@ -413,3 +415,3 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
413 415
414bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact ) 416bool OlaccessConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact )
415{ 417{
@@ -433,3 +435,3 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
433 if ( !(res = database->updateCategories(contact, ids) )) 435 if ( !(res = database->updateCategories(contact, ids) ))
434 qDebug("SharpDTMConverter::Error updating categories"); 436 qDebug("OlaccessConverter::Error updating categories");
435 437
@@ -437,4 +439,4 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
437} 439}
438 440#endif
439QDate SharpDTMConverter::convertDate( QString s) 441QDate OlaccessConverter::convertDate( QString s)
440{ 442{
diff --git a/kabc/plugins/olaccess/olaccessconverter.h b/kabc/plugins/olaccess/olaccessconverter.h
index db1bf2d..48a255d 100644
--- a/kabc/plugins/olaccess/olaccessconverter.h
+++ b/kabc/plugins/olaccess/olaccessconverter.h
@@ -31,3 +31,2 @@ $Id$
31 31
32#include <sl/slzdb.h>
33 32
@@ -35,7 +34,2 @@ $Id$
35 34
36namespace SlCategory {
37 class SlCategories;
38}
39
40class SlZDataBase;
41 35
@@ -43,3 +37,3 @@ namespace KABC {
43 37
44class SharpDTMConverter 38class OlaccessConverter
45{ 39{
@@ -50,3 +44,3 @@ public:
50 */ 44 */
51 SharpDTMConverter(); 45 OlaccessConverter();
52 46
@@ -55,3 +49,3 @@ public:
55 */ 49 */
56 virtual ~SharpDTMConverter(); 50 virtual ~OlaccessConverter();
57 51
@@ -67,3 +61,3 @@ public:
67 */ 61 */
68 bool sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ); 62 //bool sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr );
69 63
@@ -76,7 +70,7 @@ public:
76 */ 70 */
77 bool addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ); 71 //bool addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact );
78 bool setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact ); 72 //bool setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact );
79 73
80 private: 74 private:
81 SlCategory::SlCategories* catDB; 75 //SlCategory::SlCategories* catDB;
82 QDate convertDate( QString ); 76 QDate convertDate( QString );
diff --git a/kabc/plugins/olaccess/resourceolaccess.cpp b/kabc/plugins/olaccess/resourceolaccess.cpp
index e8f8bdd..7113e0e 100644
--- a/kabc/plugins/olaccess/resourceolaccess.cpp
+++ b/kabc/plugins/olaccess/resourceolaccess.cpp
@@ -29,3 +29,2 @@ $Id$
29#include <sys/stat.h> 29#include <sys/stat.h>
30#include <unistd.h>
31 30
@@ -45,3 +44,2 @@ $Id$
45 44
46#include <sl/slzdb.h>
47 45
@@ -49,4 +47,4 @@ $Id$
49 47
50#include "resourcesharpdtmconfig.h" 48#include "resourceolaccessconfig.h"
51#include "resourcesharpdtm.h" 49#include "resourceolaccess.h"
52 50
@@ -54,3 +52,3 @@ $Id$
54 52
55#include "sharpdtmconverter.h" 53#include "olaccessconverter.h"
56//#define ALLOW_LOCKING 54//#define ALLOW_LOCKING
@@ -59,5 +57,5 @@ extern "C"
59{ 57{
60 void *init_microkabc_sharpdtm() 58 void *init_microkabc_olaccess()
61 { 59 {
62 return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>(); 60 return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>();
63 } 61 }
@@ -65,3 +63,3 @@ extern "C"
65 63
66ResourceSharpDTM::ResourceSharpDTM( const KConfig *config ) 64Resourceolaccess::Resourceolaccess( const KConfig *config )
67 : Resource( config ), mConverter (0) 65 : Resource( config ), mConverter (0)
@@ -69,4 +67,4 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config )
69 // we can not choose the filename. Therefore use the default to display 67 // we can not choose the filename. Therefore use the default to display
70 mAccess = 0; 68 //mAccess = 0;
71 QString fileName = SlZDataBase::addressbookFileName(); 69 QString fileName;// = SlZDataBase::addressbookFileName();
72 init( fileName ); 70 init( fileName );
@@ -74,6 +72,6 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config )
74 72
75ResourceSharpDTM::ResourceSharpDTM( const QString &fileName ) 73Resourceolaccess::Resourceolaccess( const QString &fileName )
76 : Resource( 0 ) 74 : Resource( 0 )
77{ 75{
78 mAccess = 0; 76 //mAccess = 0;
79 init( fileName ); 77 init( fileName );
@@ -81,6 +79,6 @@ ResourceSharpDTM::ResourceSharpDTM( const QString &fileName )
81 79
82void ResourceSharpDTM::init( const QString &fileName ) 80void Resourceolaccess::init( const QString &fileName )
83{ 81{
84 if (mConverter == 0) { 82 if (mConverter == 0) {
85 mConverter = new SharpDTMConverter(); 83 mConverter = new OlaccessConverter();
86 bool res = mConverter->init(); 84 bool res = mConverter->init();
@@ -96,3 +94,3 @@ void ResourceSharpDTM::init( const QString &fileName )
96 94
97ResourceSharpDTM::~ResourceSharpDTM() 95Resourceolaccess::~Resourceolaccess()
98{ 96{
@@ -101,7 +99,7 @@ ResourceSharpDTM::~ResourceSharpDTM()
101 99
102 if(mAccess != 0) 100 //if(mAccess != 0)
103 delete mAccess; 101 //delete mAccess;
104} 102}
105 103
106void ResourceSharpDTM::writeConfig( KConfig *config ) 104void Resourceolaccess::writeConfig( KConfig *config )
107{ 105{
@@ -110,6 +108,6 @@ void ResourceSharpDTM::writeConfig( KConfig *config )
110 108
111Ticket *ResourceSharpDTM::requestSaveTicket() 109Ticket *Resourceolaccess::requestSaveTicket()
112{ 110{
113 111
114 qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1()); 112 qDebug("Resourceolaccess::requestSaveTicket: %s", fileName().latin1());
115 113
@@ -120,3 +118,3 @@ Ticket *ResourceSharpDTM::requestSaveTicket()
120 118
121bool ResourceSharpDTM::doOpen() 119bool Resourceolaccess::doOpen()
122{ 120{
@@ -127,3 +125,3 @@ bool ResourceSharpDTM::doOpen()
127 125
128void ResourceSharpDTM::doClose() 126void Resourceolaccess::doClose()
129{ 127{
@@ -132,3 +130,3 @@ void ResourceSharpDTM::doClose()
132 130
133bool ResourceSharpDTM::load() 131bool Resourceolaccess::load()
134{ 132{
@@ -136,3 +134,4 @@ bool ResourceSharpDTM::load()
136 return false; 134 return false;
137 QString fileN = SlZDataBase::addressbookFileName(); 135 QString fileN ;//= SlZDataBase::addressbookFileName();
136#if 0
138 if ( ! mAccess ) { 137 if ( ! mAccess ) {
@@ -145,3 +144,3 @@ bool ResourceSharpDTM::load()
145 144
146 qDebug("ResourceSharpDTM:: %x load: %s",this, fileName().latin1()); 145 qDebug("Resourceolaccess:: %x load: %s",this, fileName().latin1());
147 bool res = false; 146 bool res = false;
@@ -162,3 +161,3 @@ bool ResourceSharpDTM::load()
162 mAccess = 0; 161 mAccess = 0;
163 162#endif
164 return true; 163 return true;
@@ -166,4 +165,5 @@ bool ResourceSharpDTM::load()
166 165
167bool ResourceSharpDTM::save( Ticket *ticket ) 166bool Resourceolaccess::save( Ticket *ticket )
168{ 167{
168#if 0
169 if (!mConverter) 169 if (!mConverter)
@@ -178,3 +178,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
178 return false; 178 return false;
179 qDebug("ResourceSharpDTM::save: %s", fileName().latin1()); 179 qDebug("Resourceolaccess::save: %s", fileName().latin1());
180 KABC::AddressBook::Iterator it; 180 KABC::AddressBook::Iterator it;
@@ -269,2 +269,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
269 mAccess = 0; 269 mAccess = 0;
270#endif
270 return true; 271 return true;
@@ -272,3 +273,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
272 273
273bool ResourceSharpDTM::lock( const QString &lockfileName ) 274bool Resourceolaccess::lock( const QString &lockfileName )
274{ 275{
@@ -277,3 +278,3 @@ bool ResourceSharpDTM::lock( const QString &lockfileName )
277 278
278void ResourceSharpDTM::unlock( const QString &fileName ) 279void Resourceolaccess::unlock( const QString &fileName )
279{ 280{
@@ -282,3 +283,3 @@ void ResourceSharpDTM::unlock( const QString &fileName )
282 283
283void ResourceSharpDTM::setFileName( const QString &newFileName ) 284void Resourceolaccess::setFileName( const QString &newFileName )
284{ 285{
@@ -287,3 +288,3 @@ void ResourceSharpDTM::setFileName( const QString &newFileName )
287 288
288void ResourceSharpDTM::fileChanged() 289void Resourceolaccess::fileChanged()
289{ 290{
@@ -292,3 +293,3 @@ void ResourceSharpDTM::fileChanged()
292 293
293void ResourceSharpDTM::removeAddressee( const Addressee &addr ) 294void Resourceolaccess::removeAddressee( const Addressee &addr )
294{ 295{
@@ -296,3 +297,3 @@ void ResourceSharpDTM::removeAddressee( const Addressee &addr )
296 297
297void ResourceSharpDTM::cleanUp() 298void Resourceolaccess::cleanUp()
298{ 299{
diff --git a/kabc/plugins/olaccess/resourceolaccess.h b/kabc/plugins/olaccess/resourceolaccess.h
index 64d06f9..0066331 100644
--- a/kabc/plugins/olaccess/resourceolaccess.h
+++ b/kabc/plugins/olaccess/resourceolaccess.h
@@ -28,4 +28,6 @@ $Id$
28 28
29#ifndef KABC_RESOURCESHARPDTM_H 29
30#define KABC_RESOURCESHARPDTM_H 30
31#ifndef KABC_RESOURCEolaccess_H
32#define KABC_RESOURCEolaccess_H
31 33
@@ -39,4 +41,2 @@ $Id$
39 41
40class SlZDataBase;
41
42namespace KABC { 42namespace KABC {
@@ -44,3 +44,3 @@ namespace KABC {
44class ResourceConfigWidget; 44class ResourceConfigWidget;
45class SharpDTMConverter; 45class OlaccessConverter;
46 46
@@ -49,3 +49,3 @@ class SharpDTMConverter;
49*/ 49*/
50class ResourceSharpDTM : public Resource 50class Resourceolaccess : public Resource
51{ 51{
@@ -60,3 +60,3 @@ public:
60 */ 60 */
61 ResourceSharpDTM( const KConfig *cfg ); 61 Resourceolaccess( const KConfig *cfg );
62 62
@@ -65,3 +65,3 @@ public:
65 */ 65 */
66 ResourceSharpDTM( const QString &fileName ); 66 Resourceolaccess( const QString &fileName );
67 67
@@ -70,3 +70,3 @@ public:
70 */ 70 */
71 ~ResourceSharpDTM(); 71 ~Resourceolaccess();
72 72
@@ -135,4 +135,3 @@ protected:
135private: 135private:
136 SlZDataBase* mAccess; 136 OlaccessConverter* mConverter;
137 SharpDTMConverter* mConverter;
138 137
diff --git a/kabc/plugins/olaccess/resourceolaccessconfig.cpp b/kabc/plugins/olaccess/resourceolaccessconfig.cpp
index 240f1d7..1fcf1b8 100644
--- a/kabc/plugins/olaccess/resourceolaccessconfig.cpp
+++ b/kabc/plugins/olaccess/resourceolaccessconfig.cpp
@@ -35,3 +35,2 @@ $Id$
35 35
36#include <unistd.h>
37 36
@@ -39,7 +38,6 @@ $Id$
39#include <qfile.h> 38#include <qfile.h>
40#include "resourcesharpdtm.h" 39#include "resourceolaccess.h"
41 40
42#include "resourcesharpdtmconfig.h" 41#include "resourceolaccessconfig.h"
43 42
44#include <sl/slzdb.h>
45 43
@@ -47,3 +45,3 @@ using namespace KABC;
47 45
48ResourceSharpDTMConfig::ResourceSharpDTMConfig( QWidget* parent, const char* name ) 46ResourceolaccessConfig::ResourceolaccessConfig( QWidget* parent, const char* name )
49 : ConfigWidget( parent, name ) 47 : ConfigWidget( parent, name )
@@ -64,9 +62,9 @@ ResourceSharpDTMConfig::ResourceSharpDTMConfig( QWidget* parent, const char* na
64 62
65void ResourceSharpDTMConfig::loadSettings( KRES::Resource *res ) 63void ResourceolaccessConfig::loadSettings( KRES::Resource *res )
66{ 64{
67//US ResourceFile *resource = dynamic_cast<ResourceFile*>( res ); 65//US ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
68 ResourceSharpDTM *resource = (ResourceSharpDTM*)( res ); 66 Resourceolaccess *resource = (Resourceolaccess*)( res );
69 67
70 if ( !resource ) { 68 if ( !resource ) {
71 kdDebug(5700) << "ResourceSharpDTMConfig::loadSettings(): cast failed" << endl; 69 kdDebug(5700) << "ResourceolaccessConfig::loadSettings(): cast failed" << endl;
72 return; 70 return;
@@ -76,3 +74,3 @@ void ResourceSharpDTMConfig::loadSettings( KRES::Resource *res )
76 if ( mFileNameEdit->url().isEmpty() ) 74 if ( mFileNameEdit->url().isEmpty() )
77 mFileNameEdit->setURL( SlZDataBase::addressbookFileName() ); 75 ;//mFileNameEdit->setURL( SlZDataBase::addressbookFileName() );
78 76
@@ -86,9 +84,9 @@ void ResourceSharpDTMConfig::loadSettings( KRES::Resource *res )
86 84
87void ResourceSharpDTMConfig::saveSettings( KRES::Resource *res ) 85void ResourceolaccessConfig::saveSettings( KRES::Resource *res )
88{ 86{
89//US ResourceFile *resource = dynamic_cast<ResourceFile*>( res ); 87//US ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
90 ResourceSharpDTM *resource = (ResourceSharpDTM*)( res ); 88 Resourceolaccess *resource = (Resourceolaccess*)( res );
91 89
92 if ( !resource ) { 90 if ( !resource ) {
93 kdDebug(5700) << "ResourceSharpDTMConfig::saveSettings(): cast failed" << endl; 91 kdDebug(5700) << "ResourceolaccessConfig::saveSettings(): cast failed" << endl;
94 return; 92 return;
@@ -99,3 +97,3 @@ void ResourceSharpDTMConfig::saveSettings( KRES::Resource *res )
99 97
100void ResourceSharpDTMConfig::checkFilePermissions( const QString& fileName ) 98void ResourceolaccessConfig::checkFilePermissions( const QString& fileName )
101{ 99{
diff --git a/kabc/plugins/olaccess/resourceolaccessconfig.h b/kabc/plugins/olaccess/resourceolaccessconfig.h
index 29765c8..38d47ba 100644
--- a/kabc/plugins/olaccess/resourceolaccessconfig.h
+++ b/kabc/plugins/olaccess/resourceolaccessconfig.h
@@ -37,3 +37,3 @@ namespace KABC {
37 37
38class ResourceSharpDTMConfig : public KRES::ConfigWidget 38class ResourceolaccessConfig : public KRES::ConfigWidget
39{ 39{
@@ -42,3 +42,3 @@ class ResourceSharpDTMConfig : public KRES::ConfigWidget
42public: 42public:
43 ResourceSharpDTMConfig( QWidget* parent = 0, const char* name = 0 ); 43 ResourceolaccessConfig( QWidget* parent = 0, const char* name = 0 );
44 44
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index df1c6cb..a42a8cb 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -14,2 +14,6 @@ SUBDIRS += gammu/emb/common gammu/emb/gammu
14SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia 14SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia
15win32:{
16SUBDIRS += kabc/plugins/olaccess
17
18}
15} 19}