removed references to macro KAB_EMBEDDED

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
@@ -26,5 +26,5 @@ $Id$
 */
 
-#ifndef KAB_EMBEDDED
+/*US
 
 #include <qfile.h>
@@ -37,8 +37,6 @@ $Id$
 
 #include "errorhandler.h"
-
-#else //KAB_EMBEDDED
+*/
 #include <qptrlist.h>
-#endif //KAB_EMBEDDED
 
 #include <kglobal.h>
@@ -48,7 +46,5 @@ $Id$
 #include "resource.h"
 
-#ifndef KAB_EMBEDDED
-#include "addressbook.moc"
-#endif //KAB_EMBEDDED
+//US #include "addressbook.moc"
 
 using namespace KABC;
@@ -61,7 +57,5 @@ struct AddressBook::AddressBookData
   KConfig *mConfig;
   KRES::Manager<Resource> *mManager;
-#ifndef KAB_EMBEDDED
-  ErrorHandler *mErrorHandler;
-#endif //KAB_EMBEDDED
+//US  ErrorHandler *mErrorHandler;
 };
 
@@ -243,7 +237,5 @@ 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" );
   d->mManager->readConfig( d->mConfig );
@@ -254,7 +246,5 @@ 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;
 }
@@ -520,9 +510,6 @@ bool AddressBook::addCustomField( const QString &label, int category,
     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;
@@ -594,5 +581,5 @@ QPtrList<Resource> AddressBook::resources()
 }
 
-#ifndef KAB_EMBEDDED
+/*US
 void AddressBook::setErrorHandler( ErrorHandler *handler )
 {
@@ -600,9 +587,9 @@ void AddressBook::setErrorHandler( ErrorHandler *handler )
   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;
@@ -612,8 +599,7 @@ void AddressBook::error( const QString& msg )
   else
     kdError(5700) << "no error handler defined" << endl;
-#else //KAB_EMBEDDED
+*/
     kdDebug(5700) << "msg" << endl;
     qDebug(msg);
-#endif //KAB_EMBEDDED
 }