summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp36
1 files changed, 11 insertions, 25 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 203efc2..97bd3ef 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -24,9 +24,9 @@ Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28#ifndef KAB_EMBEDDED 28/*US
29 29
30#include <qfile.h> 30#include <qfile.h>
31#include <qregexp.h> 31#include <qregexp.h>
32#include <qtimer.h> 32#include <qtimer.h>
@@ -35,22 +35,18 @@ $Id$
35#include <kinstance.h> 35#include <kinstance.h>
36#include <kstandarddirs.h> 36#include <kstandarddirs.h>
37 37
38#include "errorhandler.h" 38#include "errorhandler.h"
39 39*/
40#else //KAB_EMBEDDED
41#include <qptrlist.h> 40#include <qptrlist.h>
42#endif //KAB_EMBEDDED
43 41
44#include <kglobal.h> 42#include <kglobal.h>
45#include <klocale.h> 43#include <klocale.h>
46#include <kdebug.h> 44#include <kdebug.h>
47#include "addressbook.h" 45#include "addressbook.h"
48#include "resource.h" 46#include "resource.h"
49 47
50#ifndef KAB_EMBEDDED 48//US #include "addressbook.moc"
51#include "addressbook.moc"
52#endif //KAB_EMBEDDED
53 49
54using namespace KABC; 50using namespace KABC;
55 51
56struct AddressBook::AddressBookData 52struct AddressBook::AddressBookData
@@ -59,11 +55,9 @@ struct AddressBook::AddressBookData
59 Addressee::List mRemovedAddressees; 55 Addressee::List mRemovedAddressees;
60 Field::List mAllFields; 56 Field::List mAllFields;
61 KConfig *mConfig; 57 KConfig *mConfig;
62 KRES::Manager<Resource> *mManager; 58 KRES::Manager<Resource> *mManager;
63#ifndef KAB_EMBEDDED 59//US ErrorHandler *mErrorHandler;
64 ErrorHandler *mErrorHandler;
65#endif //KAB_EMBEDDED
66}; 60};
67 61
68struct AddressBook::Iterator::IteratorData 62struct AddressBook::Iterator::IteratorData
69{ 63{
@@ -241,22 +235,18 @@ void AddressBook::init(const QString &config)
241 d->mConfig = 0; 235 d->mConfig = 0;
242// qDebug("AddressBook::init 1 config=0"); 236// qDebug("AddressBook::init 1 config=0");
243 } 237 }
244 238
245#ifndef KAB_EMBEDDED 239//US d->mErrorHandler = 0;
246 d->mErrorHandler = 0;
247#endif //KAB_EMBEDDED
248 d->mManager = new KRES::Manager<Resource>( "contact" ); 240 d->mManager = new KRES::Manager<Resource>( "contact" );
249 d->mManager->readConfig( d->mConfig ); 241 d->mManager->readConfig( d->mConfig );
250} 242}
251 243
252AddressBook::~AddressBook() 244AddressBook::~AddressBook()
253{ 245{
254 delete d->mConfig; d->mConfig = 0; 246 delete d->mConfig; d->mConfig = 0;
255 delete d->mManager; d->mManager = 0; 247 delete d->mManager; d->mManager = 0;
256#ifndef KAB_EMBEDDED 248//US delete d->mErrorHandler; d->mErrorHandler = 0;
257 delete d->mErrorHandler; d->mErrorHandler = 0;
258#endif //KAB_EMBEDDED
259 delete d; d = 0; 249 delete d; d = 0;
260} 250}
261 251
262bool AddressBook::load() 252bool AddressBook::load()
@@ -518,13 +508,10 @@ bool AddressBook::addCustomField( const QString &label, int category,
518{ 508{
519 if ( d->mAllFields.isEmpty() ) { 509 if ( d->mAllFields.isEmpty() ) {
520 d->mAllFields = Field::allFields(); 510 d->mAllFields = Field::allFields();
521 } 511 }
522#ifndef KAB_EMBEDDED 512//US QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
523 QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
524#else //KAB_EMBEDDED
525 QString a = app.isNull() ? KGlobal::getAppName() : app; 513 QString a = app.isNull() ? KGlobal::getAppName() : app;
526#endif //KAB_EMBEDDED
527 514
528 QString k = key.isNull() ? label : key; 515 QString k = key.isNull() ? label : key;
529 516
530 Field *field = Field::createCustomField( label, category, k, a ); 517 Field *field = Field::createCustomField( label, category, k, a );
@@ -592,30 +579,29 @@ QPtrList<Resource> AddressBook::resources()
592 579
593 return list; 580 return list;
594} 581}
595 582
596#ifndef KAB_EMBEDDED 583/*US
597void AddressBook::setErrorHandler( ErrorHandler *handler ) 584void AddressBook::setErrorHandler( ErrorHandler *handler )
598{ 585{
599 delete d->mErrorHandler; 586 delete d->mErrorHandler;
600 d->mErrorHandler = handler; 587 d->mErrorHandler = handler;
601} 588}
602#endif //KAB_EMBEDDED 589*/
603 590
604void AddressBook::error( const QString& msg ) 591void AddressBook::error( const QString& msg )
605{ 592{
606#ifndef KAB_EMBEDDED 593/*US
607 if ( !d->mErrorHandler ) // create default error handler 594 if ( !d->mErrorHandler ) // create default error handler
608 d->mErrorHandler = new ConsoleErrorHandler; 595 d->mErrorHandler = new ConsoleErrorHandler;
609 596
610 if ( d->mErrorHandler ) 597 if ( d->mErrorHandler )
611 d->mErrorHandler->error( msg ); 598 d->mErrorHandler->error( msg );
612 else 599 else
613 kdError(5700) << "no error handler defined" << endl; 600 kdError(5700) << "no error handler defined" << endl;
614#else //KAB_EMBEDDED 601*/
615 kdDebug(5700) << "msg" << endl; 602 kdDebug(5700) << "msg" << endl;
616 qDebug(msg); 603 qDebug(msg);
617#endif //KAB_EMBEDDED
618} 604}
619 605
620void AddressBook::deleteRemovedAddressees() 606void AddressBook::deleteRemovedAddressees()
621{ 607{