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
@@ -25,7 +25,7 @@ Copyright (c) 2004 Ulf Schenk
$Id$
*/
-#ifndef KAB_EMBEDDED
+/*US
#include <qfile.h>
#include <qregexp.h>
@@ -36,10 +36,8 @@ $Id$
#include <kstandarddirs.h>
#include "errorhandler.h"
-
-#else //KAB_EMBEDDED
+*/
#include <qptrlist.h>
-#endif //KAB_EMBEDDED
#include <kglobal.h>
#include <klocale.h>
@@ -47,9 +45,7 @@ $Id$
#include "addressbook.h"
#include "resource.h"
-#ifndef KAB_EMBEDDED
-#include "addressbook.moc"
-#endif //KAB_EMBEDDED
+//US #include "addressbook.moc"
using namespace KABC;
@@ -60,9 +56,7 @@ struct AddressBook::AddressBookData
Field::List mAllFields;
KConfig *mConfig;
KRES::Manager<Resource> *mManager;
-#ifndef KAB_EMBEDDED
- ErrorHandler *mErrorHandler;
-#endif //KAB_EMBEDDED
+//US ErrorHandler *mErrorHandler;
};
struct AddressBook::Iterator::IteratorData
@@ -242,9 +236,7 @@ void AddressBook::init(const QString &config)
// 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 );
}
@@ -253,9 +245,7 @@ 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;
}
@@ -519,11 +509,8 @@ bool AddressBook::addCustomField( const QString &label, int category,
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;
@@ -593,17 +580,17 @@ QPtrList<Resource> AddressBook::resources()
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;
@@ -611,10 +598,9 @@ void AddressBook::error( const QString& msg )
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()