| -rw-r--r-- | kabc/addressbook.cpp | 36 |
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 @@ -27,3 +27,3 @@ $Id$ -#ifndef KAB_EMBEDDED +/*US @@ -38,6 +38,4 @@ $Id$ #include "errorhandler.h" - -#else //KAB_EMBEDDED +*/ #include <qptrlist.h> -#endif //KAB_EMBEDDED @@ -49,5 +47,3 @@ $Id$ -#ifndef KAB_EMBEDDED -#include "addressbook.moc" -#endif //KAB_EMBEDDED +//US #include "addressbook.moc" @@ -62,5 +58,3 @@ struct AddressBook::AddressBookData KRES::Manager<Resource> *mManager; -#ifndef KAB_EMBEDDED - ErrorHandler *mErrorHandler; -#endif //KAB_EMBEDDED +//US ErrorHandler *mErrorHandler; }; @@ -244,5 +238,3 @@ void AddressBook::init(const QString &config) -#ifndef KAB_EMBEDDED - d->mErrorHandler = 0; -#endif //KAB_EMBEDDED +//US d->mErrorHandler = 0; d->mManager = new KRES::Manager<Resource>( "contact" ); @@ -255,5 +247,3 @@ AddressBook::~AddressBook() 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; @@ -521,7 +511,4 @@ bool AddressBook::addCustomField( const QString &label, int category, } -#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 @@ -595,3 +582,3 @@ QPtrList<Resource> AddressBook::resources() -#ifndef KAB_EMBEDDED +/*US void AddressBook::setErrorHandler( ErrorHandler *handler ) @@ -601,3 +588,3 @@ void AddressBook::setErrorHandler( ErrorHandler *handler ) } -#endif //KAB_EMBEDDED +*/ @@ -605,3 +592,3 @@ void AddressBook::error( const QString& msg ) { -#ifndef KAB_EMBEDDED +/*US if ( !d->mErrorHandler ) // create default error handler @@ -613,6 +600,5 @@ void AddressBook::error( const QString& msg ) kdError(5700) << "no error handler defined" << endl; -#else //KAB_EMBEDDED +*/ kdDebug(5700) << "msg" << endl; qDebug(msg); -#endif //KAB_EMBEDDED } |