1 files changed, 24 insertions, 24 deletions

diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 291669216..2befdded5 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -36,9 +36,9 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   TQString email;
   TQString name;
 
-  KABC::Addressee::parseEmailAddress( addr, name, email );
+  TDEABC::Addressee::parseEmailAddress( addr, name, email );
 
-  KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true );
 
   // force a reload of the address book file so that changes that were made
   // by other programs are loaded
@@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->findByEmail( email );
+  TDEABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.count() > 0 ) {
     if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
@@ -87,11 +87,11 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
   TQString email;
   TQString name;
 
-  KABC::Addressee::parseEmailAddress( addr, name, email );
+  TDEABC::Addressee::parseEmailAddress( addr, name, email );
 
-  KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true );
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+  ab->setErrorHandler( new TDEABC::GuiErrorHandler( parent ) );
 
   // force a reload of the address book file so that changes that were made
   // by other programs are loaded
@@ -109,10 +109,10 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->findByEmail( email );
+  TDEABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.isEmpty() ) {
-    KABC::Addressee a;
+    TDEABC::Addressee a;
     a.setNameFromString( name );
     a.insertEmail( email, true );
 
@@ -173,14 +173,14 @@ void KAddrBookExternal::addNewAddressee( TQWidget* )
   call.send("newContact()");
 }
 
-bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent )
+bool KAddrBookExternal::addVCard( const TDEABC::Addressee& addressee, TQWidget *parent )
 {
-  KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true );
   bool inserted = false;
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+  ab->setErrorHandler( new TDEABC::GuiErrorHandler( parent ) );
 
-  KABC::Addressee::List addressees =
+  TDEABC::Addressee::List addressees =
       ab->findByEmail( addressee.preferredEmail() );
 
   if ( addressees.isEmpty() ) {
@@ -204,16 +204,16 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa
   return inserted;
 }
 
-bool KAddrBookExternal::addAddressee( const KABC::Addressee& addr )
+bool KAddrBookExternal::addAddressee( const TDEABC::Addressee& addr )
 {
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  KABC::Resource *kabcResource = selectResourceForSaving( addressBook );
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
+  TDEABC::Resource *kabcResource = selectResourceForSaving( addressBook );
   if( !kabcResource ) 
      return false;
-  KABC::Ticket *ticket = addressBook->requestSaveTicket( kabcResource );
+  TDEABC::Ticket *ticket = addressBook->requestSaveTicket( kabcResource );
   bool saved = false;
   if ( ticket ) {
-    KABC::Addressee addressee( addr );
+    TDEABC::Addressee addressee( addr );
     addressee.setResource( kabcResource );
     addressBook->insertAddressee( addressee );
     saved = addressBook->save( ticket );
@@ -232,14 +232,14 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
     return TQString();
 
   const TQString lowerListName = listName.lower();
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
 #ifdef TDEPIM_NEW_DISTRLISTS
   KPIM::DistributionList distrList = KPIM::DistributionList::findByName( addressBook, lowerListName, false );
   if ( !distrList.isEmpty() ) {
     return distrList.emails( addressBook ).join( ", " );
   }
 #else
-  KABC::DistributionListManager manager( addressBook );
+  TDEABC::DistributionListManager manager( addressBook );
   manager.load();
   const TQStringList listNames = manager.listNames();
 
@@ -254,7 +254,7 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
   return TQString();
 }
 
-KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *addressBook )
+TDEABC::Resource* KAddrBookExternal::selectResourceForSaving( TDEABC::AddressBook *addressBook )
 {
 #if KDE_IS_VERSION(3,4,89)
   // This ugly hack will be removed in 4.0
@@ -267,11 +267,11 @@ KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *a
 #endif
 
   // Select a resource
-  TQPtrList<KABC::Resource> kabcResources = addressBook->resources();
+  TQPtrList<TDEABC::Resource> kabcResources = addressBook->resources();
 
   TQPtrList<KRES::Resource> kresResources;
-  TQPtrListIterator<KABC::Resource> resIt( kabcResources );
-  KABC::Resource *kabcResource;
+  TQPtrListIterator<TDEABC::Resource> resIt( kabcResources );
+  TDEABC::Resource *kabcResource;
   while ( ( kabcResource = resIt.current() ) != 0 ) {
     ++resIt;
     if ( !kabcResource->readOnly() ) {
@@ -281,5 +281,5 @@ KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *a
     }
   }
 
-  return static_cast<KABC::Resource*>( KRES::SelectDialog::getResource( kresResources, 0 ) );
+  return static_cast<TDEABC::Resource*>( KRES::SelectDialog::getResource( kresResources, 0 ) );
 }