summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -22,50 +22,44 @@
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
-#ifndef KAB_EMBEDDED
+/*US
#include <qfile.h>
#include <qregexp.h>
#include <qtimer.h>
#include <kapplication.h>
#include <kinstance.h>
#include <kstandarddirs.h>
#include "errorhandler.h"
-
-#else //KAB_EMBEDDED
+*/
#include <qptrlist.h>
-#endif //KAB_EMBEDDED
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
#include "addressbook.h"
#include "resource.h"
-#ifndef KAB_EMBEDDED
-#include "addressbook.moc"
-#endif //KAB_EMBEDDED
+//US #include "addressbook.moc"
using namespace KABC;
struct AddressBook::AddressBookData
{
Addressee::List mAddressees;
Addressee::List mRemovedAddressees;
Field::List mAllFields;
KConfig *mConfig;
KRES::Manager<Resource> *mManager;
-#ifndef KAB_EMBEDDED
- ErrorHandler *mErrorHandler;
-#endif //KAB_EMBEDDED
+//US ErrorHandler *mErrorHandler;
};
struct AddressBook::Iterator::IteratorData
{
Addressee::List::Iterator mIt;
};
@@ -239,26 +233,22 @@ void AddressBook::init(const QString &config)
}
else {
d->mConfig = 0;
// qDebug("AddressBook::init 1 config=0");
}
-#ifndef KAB_EMBEDDED
- d->mErrorHandler = 0;
-#endif //KAB_EMBEDDED
+//US d->mErrorHandler = 0;
d->mManager = new KRES::Manager<Resource>( "contact" );
d->mManager->readConfig( d->mConfig );
}
AddressBook::~AddressBook()
{
delete d->mConfig; d->mConfig = 0;
delete d->mManager; d->mManager = 0;
-#ifndef KAB_EMBEDDED
- delete d->mErrorHandler; d->mErrorHandler = 0;
-#endif //KAB_EMBEDDED
+//US delete d->mErrorHandler; d->mErrorHandler = 0;
delete d; d = 0;
}
bool AddressBook::load()
{
kdDebug(5700) << "AddressBook::load()" << endl;
@@ -516,17 +506,14 @@ Field::List AddressBook::fields( int category )
bool AddressBook::addCustomField( const QString &label, int category,
const QString &key, const QString &app )
{
if ( d->mAllFields.isEmpty() ) {
d->mAllFields = Field::allFields();
}
-#ifndef KAB_EMBEDDED
- QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
-#else //KAB_EMBEDDED
+//US QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
QString a = app.isNull() ? KGlobal::getAppName() : app;
-#endif //KAB_EMBEDDED
QString k = key.isNull() ? label : key;
Field *field = Field::createCustomField( label, category, k, a );
if ( !field ) return false;
@@ -590,34 +577,33 @@ QPtrList<Resource> AddressBook::resources()
for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
list.append( *it );
return list;
}
-#ifndef KAB_EMBEDDED
+/*US
void AddressBook::setErrorHandler( ErrorHandler *handler )
{
delete d->mErrorHandler;
d->mErrorHandler = handler;
}
-#endif //KAB_EMBEDDED
+*/
void AddressBook::error( const QString& msg )
{
-#ifndef KAB_EMBEDDED
+/*US
if ( !d->mErrorHandler ) // create default error handler
d->mErrorHandler = new ConsoleErrorHandler;
if ( d->mErrorHandler )
d->mErrorHandler->error( msg );
else
kdError(5700) << "no error handler defined" << endl;
-#else //KAB_EMBEDDED
+*/
kdDebug(5700) << "msg" << endl;
qDebug(msg);
-#endif //KAB_EMBEDDED
}
void AddressBook::deleteRemovedAddressees()
{
Addressee::List::Iterator it;
for ( it = d->mRemovedAddressees.begin(); it != d->mRemovedAddressees.end(); ++it ) {