summaryrefslogtreecommitdiffabout
path: root/kabc/plugins
Unidiff
Diffstat (limited to 'kabc/plugins') (more/less context) (show 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
7 files changed, 94 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
@@ -4,7 +4,7 @@ TARGET = 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
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
@@ -29,46 +29,48 @@ $Id$
29#include <qregexp.h> 29#include <qregexp.h>
30 30
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>
36//US #include <qpe/categoryselect.h> 35//US #include <qpe/categoryselect.h>
37 36
38 37
39using namespace KABC; 38using namespace KABC;
40using namespace SlCategory;
41 39
42SharpDTMConverter::SharpDTMConverter() : catDB(0) 40OlaccessConverter::OlaccessConverter()
43{ 41{
44} 42}
45 43
46SharpDTMConverter::~SharpDTMConverter() 44OlaccessConverter::~OlaccessConverter()
47{ 45{
48 deinit(); 46 deinit();
49} 47}
50 48
51bool SharpDTMConverter::init() 49bool OlaccessConverter::init()
52{ 50{
51#if 0
53 catDB = new SlCategory::SlCategories(); 52 catDB = new SlCategory::SlCategories();
54 53
55 if (!catDB) 54 if (!catDB)
56 return false; 55 return false;
57 56
58// catDB->load( categoryFileName() ); 57// catDB->load( categoryFileName() );
58#endif
59 return true; 59 return true;
60} 60}
61 61
62void SharpDTMConverter::deinit() 62void OlaccessConverter::deinit()
63{ 63{
64#if 0
64 if (catDB) 65 if (catDB)
65 { 66 {
66 delete catDB; 67 delete catDB;
67 catDB = 0; 68 catDB = 0;
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{
73 SlZDataBase* db = (SlZDataBase*)database; 75 SlZDataBase* db = (SlZDataBase*)database;
74 76
@@ -79,7 +81,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
79 81
80 82
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));
84 //addr.setName(db->readField(ZdbAdrs::FullName)); 86 //addr.setName(db->readField(ZdbAdrs::FullName));
85 87
@@ -94,7 +96,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
94 emailstr.replace( QRegExp(","), " " ); 96 emailstr.replace( QRegExp(","), " " );
95 emailstr.replace( QRegExp(";"), " " ); 97 emailstr.replace( QRegExp(";"), " " );
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());
99 bool defE = false; 101 bool defE = false;
100 bool found = false; 102 bool found = false;
@@ -221,8 +223,8 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
221 addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) ); 223 addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) );
222 224
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")
227 addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); 229 addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
228 else if (gen == "2") 230 else if (gen == "2")
@@ -264,7 +266,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
264//US QString groups() const { return find( Qtopia::Groups ); } 266//US QString groups() const { return find( Qtopia::Groups ); }
265//US QStringList groupList() const; 267//US QStringList groupList() const;
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();
269 QString cat; 271 QString cat;
270 272
@@ -279,7 +281,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
279 return true; 281 return true;
280} 282}
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{
284 bool cellHome = false, cellWork = false; 286 bool cellHome = false, cellWork = false;
285 // name 287 // name
@@ -289,7 +291,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
289 database->writeField(ZdbAdrs::Title, addr.prefix()); 291 database->writeField(ZdbAdrs::Title, addr.prefix());
290 database->writeField(ZdbAdrs::Suffix, addr.suffix()); 292 database->writeField(ZdbAdrs::Suffix, addr.suffix());
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();
294 if ( formattedName.isEmpty() ) { 296 if ( formattedName.isEmpty() ) {
295 if ( !addr.familyName().isEmpty() ) { 297 if ( !addr.familyName().isEmpty() ) {
@@ -305,8 +307,8 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
305 database->writeField(ZdbAdrs::FullName, formattedName); 307 database->writeField(ZdbAdrs::FullName, formattedName);
306 308
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(" ");
311 database->writeField(ZdbAdrs::Emails, emails ); 313 database->writeField(ZdbAdrs::Emails, emails );
312 314
@@ -373,9 +375,9 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
373 database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" )); 375 database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" ));
374 376
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")
380 database->writeField(ZdbAdrs::Gender, "1"); 382 database->writeField(ZdbAdrs::Gender, "1");
381 else if (gt == "female") 383 else if (gt == "female")
@@ -405,13 +407,13 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
405//US QStringList groupList() const; 407//US QStringList groupList() const;
406 408
407 409
408 //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); 410 //qDebug("OlaccessConverter::addresseeToSharp please check if category transformation works");
409 411
410 return true; 412 return true;
411} 413}
412 414
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{
416 QStringList list = addr.categories(); 418 QStringList list = addr.categories();
417 419
@@ -431,12 +433,12 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
431 bool res ; 433 bool res ;
432 434
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
436 return res; 438 return res;
437} 439}
438 440#endif
439QDate SharpDTMConverter::convertDate( QString s) 441QDate OlaccessConverter::convertDate( QString s)
440{ 442{
441 QDate dt = KGlobal::locale()->readDate( s ); 443 QDate dt = KGlobal::locale()->readDate( s );
442 return dt; 444 return dt;
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
@@ -29,31 +29,25 @@ $Id$
29 29
30#include <qstring.h> 30#include <qstring.h>
31 31
32#include <sl/slzdb.h>
33 32
34#include "addressee.h" 33#include "addressee.h"
35 34
36namespace SlCategory {
37 class SlCategories;
38}
39
40class SlZDataBase;
41 35
42namespace KABC { 36namespace KABC {
43 37
44class SharpDTMConverter 38class OlaccessConverter
45{ 39{
46public: 40public:
47 41
48 /** 42 /**
49 * Constructor. 43 * Constructor.
50 */ 44 */
51 SharpDTMConverter(); 45 OlaccessConverter();
52 46
53 /** 47 /**
54 * Destructor. 48 * Destructor.
55 */ 49 */
56 virtual ~SharpDTMConverter(); 50 virtual ~OlaccessConverter();
57 51
58 bool init(); 52 bool init();
59 void deinit(); 53 void deinit();
@@ -65,7 +59,7 @@ public:
65 * @param database The sharp database pointer we use for the conversion 59 * @param database The sharp database pointer we use for the conversion
66 * @param addr The addressee. 60 * @param addr The addressee.
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
70 /** 64 /**
71 * Converts an addressee to a sharp dtm contact. 65 * Converts an addressee to a sharp dtm contact.
@@ -74,11 +68,11 @@ public:
74 * @param database The sharp database pointer we use for the conversion 68 * @param database The sharp database pointer we use for the conversion
75 * @param contact The sharp card id, eventhough it might be 0, if the contact is a new one. 69 * @param contact The sharp card id, eventhough it might be 0, if the contact is a new one.
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 );
83 77
84 78
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
@@ -27,7 +27,6 @@ $Id$
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30#include <unistd.h>
31 30
32#include <qdir.h> 31#include <qdir.h>
33#include <qfile.h> 32#include <qfile.h>
@@ -43,46 +42,45 @@ $Id$
43#include <kstandarddirs.h> 42#include <kstandarddirs.h>
44#include <kmessagebox.h> 43#include <kmessagebox.h>
45 44
46#include <sl/slzdb.h>
47 45
48#include <libkdepim/ksyncprofile.h> 46#include <libkdepim/ksyncprofile.h>
49 47
50#include "resourcesharpdtmconfig.h" 48#include "resourceolaccessconfig.h"
51#include "resourcesharpdtm.h" 49#include "resourceolaccess.h"
52 50
53#include "stdaddressbook.h" 51#include "stdaddressbook.h"
54 52
55#include "sharpdtmconverter.h" 53#include "olaccessconverter.h"
56//#define ALLOW_LOCKING 54//#define ALLOW_LOCKING
57using namespace KABC; 55using namespace KABC;
58extern "C" 56extern "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 }
64} 62}
65 63
66ResourceSharpDTM::ResourceSharpDTM( const KConfig *config ) 64Resourceolaccess::Resourceolaccess( const KConfig *config )
67 : Resource( config ), mConverter (0) 65 : Resource( config ), mConverter (0)
68{ 66{
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 );
73} 71}
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 );
80} 78}
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();
87 if ( !res ) 85 if ( !res )
88 { 86 {
@@ -94,47 +92,48 @@ void ResourceSharpDTM::init( const QString &fileName )
94 setFileName( fileName ); 92 setFileName( fileName );
95} 93}
96 94
97ResourceSharpDTM::~ResourceSharpDTM() 95Resourceolaccess::~Resourceolaccess()
98{ 96{
99 if (mConverter != 0) 97 if (mConverter != 0)
100 delete mConverter; 98 delete mConverter;
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{
108 Resource::writeConfig( config ); 106 Resource::writeConfig( config );
109} 107}
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
116 if ( !addressBook() ) return 0; 114 if ( !addressBook() ) return 0;
117 return createTicket( this ); 115 return createTicket( this );
118} 116}
119 117
120 118
121bool ResourceSharpDTM::doOpen() 119bool Resourceolaccess::doOpen()
122{ 120{
123 if (!mConverter) 121 if (!mConverter)
124 return false; 122 return false;
125 return true; 123 return true;
126} 124}
127 125
128void ResourceSharpDTM::doClose() 126void Resourceolaccess::doClose()
129{ 127{
130 return; 128 return;
131} 129}
132 130
133bool ResourceSharpDTM::load() 131bool Resourceolaccess::load()
134{ 132{
135 if (!mConverter) 133 if (!mConverter)
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 ) {
139 mAccess = new SlZDataBase(fileN, 138 mAccess = new SlZDataBase(fileN,
140 SlZDataBase::addressbookItems(), 139 SlZDataBase::addressbookItems(),
@@ -143,7 +142,7 @@ bool ResourceSharpDTM::load()
143 if(mAccess == 0) 142 if(mAccess == 0)
144 return false; 143 return false;
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;
148 CardId id; 147 CardId id;
149 for (bool res=mAccess->first(); res == true; res=mAccess->next()) 148 for (bool res=mAccess->first(); res == true; res=mAccess->next())
@@ -160,12 +159,13 @@ bool ResourceSharpDTM::load()
160 if(mAccess != 0) 159 if(mAccess != 0)
161 delete mAccess; 160 delete mAccess;
162 mAccess = 0; 161 mAccess = 0;
163 162#endif
164 return true; 163 return true;
165} 164}
166 165
167bool ResourceSharpDTM::save( Ticket *ticket ) 166bool Resourceolaccess::save( Ticket *ticket )
168{ 167{
168#if 0
169 if (!mConverter) 169 if (!mConverter)
170 return false; 170 return false;
171 QString fileN = SlZDataBase::addressbookFileName(); 171 QString fileN = SlZDataBase::addressbookFileName();
@@ -176,7 +176,7 @@ bool ResourceSharpDTM::save( Ticket *ticket )
176 } 176 }
177 if(mAccess == 0) 177 if(mAccess == 0)
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;
181 bool res; 181 bool res;
182 KABC::Addressee::List changedAddressees; 182 KABC::Addressee::List changedAddressees;
@@ -267,34 +267,35 @@ bool ResourceSharpDTM::save( Ticket *ticket )
267 if(mAccess != 0) 267 if(mAccess != 0)
268 delete mAccess; 268 delete mAccess;
269 mAccess = 0; 269 mAccess = 0;
270#endif
270 return true; 271 return true;
271} 272}
272 273
273bool ResourceSharpDTM::lock( const QString &lockfileName ) 274bool Resourceolaccess::lock( const QString &lockfileName )
274{ 275{
275 return true; 276 return true;
276} 277}
277 278
278void ResourceSharpDTM::unlock( const QString &fileName ) 279void Resourceolaccess::unlock( const QString &fileName )
279{ 280{
280 281
281} 282}
282 283
283void ResourceSharpDTM::setFileName( const QString &newFileName ) 284void Resourceolaccess::setFileName( const QString &newFileName )
284{ 285{
285 Resource::setFileName( newFileName ); 286 Resource::setFileName( newFileName );
286} 287}
287 288
288void ResourceSharpDTM::fileChanged() 289void Resourceolaccess::fileChanged()
289{ 290{
290 291
291} 292}
292 293
293void ResourceSharpDTM::removeAddressee( const Addressee &addr ) 294void Resourceolaccess::removeAddressee( const Addressee &addr )
294{ 295{
295} 296}
296 297
297void ResourceSharpDTM::cleanUp() 298void Resourceolaccess::cleanUp()
298{ 299{
299 300
300} 301}
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
@@ -26,8 +26,10 @@ $Id$
26*/ 26*/
27 27
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
32#include <kconfig.h> 34#include <kconfig.h>
33#include <kdirwatch.h> 35#include <kdirwatch.h>
@@ -37,17 +39,15 @@ $Id$
37#include "resource.h" 39#include "resource.h"
38 40
39 41
40class SlZDataBase;
41
42namespace KABC { 42namespace KABC {
43 43
44class ResourceConfigWidget; 44class ResourceConfigWidget;
45class SharpDTMConverter; 45class OlaccessConverter;
46 46
47/** 47/**
48 @internal 48 @internal
49*/ 49*/
50class ResourceSharpDTM : public Resource 50class Resourceolaccess : public Resource
51{ 51{
52 Q_OBJECT 52 Q_OBJECT
53 53
@@ -58,17 +58,17 @@ public:
58 58
59 @param cfg The config object where custom resource settings are stored. 59 @param cfg The config object where custom resource settings are stored.
60 */ 60 */
61 ResourceSharpDTM( const KConfig *cfg ); 61 Resourceolaccess( const KConfig *cfg );
62 62
63 /** 63 /**
64 Construct file resource on file @arg fileName using format @arg formatName. 64 Construct file resource on file @arg fileName using format @arg formatName.
65 */ 65 */
66 ResourceSharpDTM( const QString &fileName ); 66 Resourceolaccess( const QString &fileName );
67 67
68 /** 68 /**
69 * Destructor. 69 * Destructor.
70 */ 70 */
71 ~ResourceSharpDTM(); 71 ~Resourceolaccess();
72 72
73 /** 73 /**
74 Writes the config back. 74 Writes the config back.
@@ -133,8 +133,7 @@ protected:
133 void unlock( const QString &fileName ); 133 void unlock( const QString &fileName );
134 134
135private: 135private:
136 SlZDataBase* mAccess; 136 OlaccessConverter* mConverter;
137 SharpDTMConverter* mConverter;
138 137
139 QString mLockUniqueName; 138 QString mLockUniqueName;
140 139
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
@@ -33,19 +33,17 @@ $Id$
33#include <kstandarddirs.h> 33#include <kstandarddirs.h>
34#include <kdialog.h> 34#include <kdialog.h>
35 35
36#include <unistd.h>
37 36
38#include <qdir.h> 37#include <qdir.h>
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
46using namespace KABC; 44using 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 )
50{ 48{
51 QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0, 49 QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
@@ -62,19 +60,19 @@ ResourceSharpDTMConfig::ResourceSharpDTMConfig( QWidget* parent, const char* na
62 60
63} 61}
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;
73 } 71 }
74 72
75 mFileNameEdit->setURL( resource->fileName() ); 73 mFileNameEdit->setURL( resource->fileName() );
76 if ( mFileNameEdit->url().isEmpty() ) 74 if ( mFileNameEdit->url().isEmpty() )
77 mFileNameEdit->setURL( SlZDataBase::addressbookFileName() ); 75 ;//mFileNameEdit->setURL( SlZDataBase::addressbookFileName() );
78 76
79 //US Sharp DTM resources are ReadOnly by definition 77 //US Sharp DTM resources are ReadOnly by definition
80 emit setPersistentReadOnly( true ); 78 emit setPersistentReadOnly( true );
@@ -84,20 +82,20 @@ void ResourceSharpDTMConfig::loadSettings( KRES::Resource *res )
84 82
85} 83}
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;
95 } 93 }
96 94
97 resource->setFileName( mFileNameEdit->url() ); 95 resource->setFileName( mFileNameEdit->url() );
98} 96}
99 97
100void ResourceSharpDTMConfig::checkFilePermissions( const QString& fileName ) 98void ResourceolaccessConfig::checkFilePermissions( const QString& fileName )
101{ 99{
102 // If file exist but is not writeable... 100 // If file exist but is not writeable...
103/*US 101/*US
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
@@ -35,12 +35,12 @@ $Id$
35 35
36namespace KABC { 36namespace KABC {
37 37
38class ResourceSharpDTMConfig : public KRES::ConfigWidget 38class ResourceolaccessConfig : public KRES::ConfigWidget
39{ 39{
40 Q_OBJECT 40 Q_OBJECT
41 41
42public: 42public:
43 ResourceSharpDTMConfig( QWidget* parent = 0, const char* name = 0 ); 43 ResourceolaccessConfig( QWidget* parent = 0, const char* name = 0 );
44 44
45public slots: 45public slots:
46 void loadSettings( KRES::Resource *resource ); 46 void loadSettings( KRES::Resource *resource );