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
@@ -4,86 +4,80 @@
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 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;
 };
 
 struct AddressBook::ConstIterator::ConstIteratorData
 {
   Addressee::List::ConstIterator mIt;
 };
 
 AddressBook::Iterator::Iterator()
 {
   d = new IteratorData;
 }
 
 AddressBook::Iterator::Iterator( const AddressBook::Iterator &i )
 {
   d = new IteratorData;
   d->mIt = i.d->mIt;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator=( const AddressBook::Iterator &i )
@@ -221,62 +215,58 @@ bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 
 
 AddressBook::AddressBook()
 {
   init(0);
 }
 
 AddressBook::AddressBook( const QString &config )
 {
   init(config);
 }
 
 void AddressBook::init(const QString &config)
 {
   d = new AddressBookData;
   if (config != 0) {
     d->mConfig = new KConfig( config );
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
   }
   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;
 
   clear();
 
   KRES::Manager<Resource>::ActiveIterator it;
   bool ok = true;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     if ( !(*it)->load() ) {
       error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
       ok = false;
     }
 
   // mark all addressees as unchanged
   Addressee::List::Iterator addrIt;
   for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt )
     (*addrIt).setChanged( false );
 
   return ok;
 }
@@ -498,53 +488,50 @@ QString AddressBook::identifier()
 
 Field::List AddressBook::fields( int category )
 {
   if ( d->mAllFields.isEmpty() ) {
     d->mAllFields = Field::allFields();
   }
   
   if ( category == Field::All ) return d->mAllFields;
   
   Field::List result;
   Field::List::ConstIterator it;
   for( it = d->mAllFields.begin(); it != d->mAllFields.end(); ++it ) {
     if ( (*it)->category() & category ) result.append( *it );
   }
   
   return result;
 }
 
 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;
 
   d->mAllFields.append( field );
 
   return true;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
 {
   if (!ab.d) return s;
 
   return s << ab.d->mAddressees;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
 {
   if (!ab.d) return s;
 
   s >> ab.d->mAddressees;
@@ -572,70 +559,69 @@ bool AddressBook::removeResource( Resource *resource )
   resource->close();
 
   if ( resource == standardResource() )
     d->mManager->setStandardResource( 0 );
 
   resource->setAddressBook( 0 );
 
   d->mManager->remove( resource );
   return true;
 }
 
 QPtrList<Resource> AddressBook::resources()
 {
   QPtrList<Resource> list;
 
 //  qDebug("AddressBook::resources() 1");
   
   KRES::Manager<Resource>::ActiveIterator it;
   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 ) {
     Resource *resource = (*it).resource();
     if ( resource && !resource->readOnly() && resource->isOpen() )
       resource->removeAddressee( *it );
   }
 
   d->mRemovedAddressees.clear();
 }
 
 void AddressBook::setStandardResource( Resource *resource )
 {
 //  qDebug("AddressBook::setStandardResource 1");
   d->mManager->setStandardResource( resource );
 }
 
 Resource *AddressBook::standardResource()
 {
   return d->mManager->standardResource();
 }