Rename KABC namespace

16 files changed, 112 insertions, 112 deletions

diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 4fc680853..f96fdc40e 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
         ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
         ../libkcal/libkcal.la \
-        $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_KABC)
+        $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_TDEABC)
 
 kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
 libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
@@ -180,7 +180,7 @@ dcoptest_LDADD = $(LIB_KIO)
 dcoptest_LDFLAGS = $(all_libraries)
 
 recipienteditortest_SOURCES = recipientseditortest.cpp
-recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_KABC)
+recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_TDEABC)
 recipienteditortest_LDFLAGS = $(all_libraries)
 
 kmailIface_DCOPIDLNG = true
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 010fdd9be..031e9108c 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -51,19 +51,19 @@ class DistributionListItem : public TQCheckListItem
     {
     }
 
-    void setAddressee( const KABC::Addressee &a, const TQString &email )
+    void setAddressee( const TDEABC::Addressee &a, const TQString &email )
     {
       mIsTransient = false;
       init( a, email );
     }
 
-    void setTransientAddressee( const KABC::Addressee &a, const TQString &email )
+    void setTransientAddressee( const TDEABC::Addressee &a, const TQString &email )
     {
       mIsTransient = true;
       init( a, email );
     }
 
-    void init( const KABC::Addressee &a, const TQString &email )
+    void init( const TDEABC::Addressee &a, const TQString &email )
     {
       mAddressee = a;
       mEmail = email;
@@ -71,7 +71,7 @@ class DistributionListItem : public TQCheckListItem
       setText( 2, mEmail );
     }
 
-    KABC::Addressee addressee() const
+    TDEABC::Addressee addressee() const
     {
       return mAddressee;
     }
@@ -87,7 +87,7 @@ class DistributionListItem : public TQCheckListItem
     }
     
   private:
-    KABC::Addressee mAddressee;
+    TDEABC::Addressee mAddressee;
     TQString mEmail;
     bool mIsTransient;
 };
@@ -127,19 +127,19 @@ void DistributionListDialog::setRecipients( const Recipient::List &recipients )
     for( it2 = emails.begin(); it2 != emails.end(); ++it2 ) {
       TQString name;
       TQString email;
-      KABC::Addressee::parseEmailAddress( *it2, name, email );
+      TDEABC::Addressee::parseEmailAddress( *it2, name, email );
       if ( !email.isEmpty() ) {
         DistributionListItem *item = new DistributionListItem( mRecipientsList );
-        KABC::Addressee::List addressees =
-          KABC::StdAddressBook::self( true )->findByEmail( email );
+        TDEABC::Addressee::List addressees =
+          TDEABC::StdAddressBook::self( true )->findByEmail( email );
         if ( addressees.isEmpty() ) {
-          KABC::Addressee a;
+          TDEABC::Addressee a;
           a.setNameFromString( name );
           a.insertEmail( email );
           item->setTransientAddressee( a, email );
           item->setOn( true );
         } else {
-          KABC::Addressee::List::ConstIterator it3;
+          TDEABC::Addressee::List::ConstIterator it3;
           for( it3 = addressees.begin(); it3 != addressees.end(); ++it3 ) {
             item->setAddressee( *it3, email );
             if ( it3 == addressees.begin() ) item->setOn( true );
@@ -173,7 +173,7 @@ void DistributionListDialog::slotUser1()
   }
 
 #ifndef TDEPIM_NEW_DISTRLISTS
-  KABC::DistributionListManager manager( ab );
+  TDEABC::DistributionListManager manager( ab );
   manager.load();
 #endif
 
@@ -187,7 +187,7 @@ void DistributionListDialog::slotUser1()
       return;
   }
 
-  KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true );
 
 #ifdef TDEPIM_NEW_DISTRLISTS
   if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) {
@@ -200,13 +200,13 @@ void DistributionListDialog::slotUser1()
     return;
   }
 
-  KABC::Resource* const resource = KAddrBookExternal::selectResourceForSaving( ab );
+  TDEABC::Resource* const resource = KAddrBookExternal::selectResourceForSaving( ab );
   if ( !resource )
     return;
 
   // Ask for a save ticket here, we use it for inserting the recipients into the addressbook and
   // also for saving the addressbook, see https://issues.kolab.org/issue4281
-  KABC::Ticket *ticket = ab->requestSaveTicket( resource );
+  TDEABC::Ticket *ticket = ab->requestSaveTicket( resource );
   if ( !ticket ) {
     kdWarning(5006) << "Unable to get save ticket!" << endl;
     return;
@@ -235,7 +235,7 @@ void DistributionListDialog::slotUser1()
 
   resource->insertAddressee( dlist );
 #else
-  KABC::DistributionList *dlist = new KABC::DistributionList( &manager, name );
+  TDEABC::DistributionList *dlist = new TDEABC::DistributionList( &manager, name );
   i = mRecipientsList->firstChild();
   while( i ) {
     DistributionListItem *item = static_cast<DistributionListItem *>( i );
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 2f86cdad6..6b2e85fc4 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -133,7 +133,7 @@ void KMail::ACLEntryDialog::slotChanged()
   enableButtonOK( !mUserIdLineEdit->text().isEmpty() && mButtonGroup->selected() != 0 );
 }
 
-static TQString addresseeToUserId( const KABC::Addressee& addr, IMAPUserIdFormat userIdFormat )
+static TQString addresseeToUserId( const TDEABC::Addressee& addr, IMAPUserIdFormat userIdFormat )
 {
   TQString email = addr.preferredEmail();
   if ( userIdFormat == FullEmail )
@@ -156,9 +156,9 @@ void KMail::ACLEntryDialog::slotSelectAddresses()
 
   const TQStringList distrLists = dlg.toDistributionLists();
   TQString txt = distrLists.join( ", " );
-  const KABC::Addressee::List lst = dlg.toAddresses();
+  const TDEABC::Addressee::List lst = dlg.toAddresses();
   if ( !lst.isEmpty() ) {
-    for( TQValueList<KABC::Addressee>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+    for( TQValueList<TDEABC::Addressee>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
       if ( !txt.isEmpty() )
         txt += ", ";
       txt += addresseeToUserId( *it, mUserIdFormat );
@@ -205,9 +205,9 @@ public:
   void load( const ACLListEntry& entry );
   void save( ACLList& list,
 #ifdef TDEPIM_NEW_DISTRLISTS
-             KABC::AddressBook* abook,
+             TDEABC::AddressBook* abook,
 #else
-             KABC::DistributionListManager& manager,
+             TDEABC::DistributionListManager& manager,
 #endif
              IMAPUserIdFormat userIdFormat );
 
@@ -271,9 +271,9 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
 
 void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
 #ifdef TDEPIM_NEW_DISTRLISTS
-                                                 KABC::AddressBook* addressBook,
+                                                 TDEABC::AddressBook* addressBook,
 #else
-                                                 KABC::DistributionListManager& manager,
+                                                 TDEABC::DistributionListManager& manager,
 #endif
                                                  IMAPUserIdFormat userIdFormat )
 {
@@ -287,11 +287,11 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
     // (we share for loop with the old-distrlist-code)
 #else
   // kaddrbook.cpp has a strange two-pass case-insensitive lookup; is it ok to be case sensitive?
-  KABC::DistributionList* list = manager.list( userId() );
+  TDEABC::DistributionList* list = manager.list( userId() );
   if ( list ) {
     Q_ASSERT( mModified ); // it has to be new, it couldn't be stored as a distr list name....
-    KABC::DistributionList::Entry::List entryList = list->entries();
-    KABC::DistributionList::Entry::List::ConstIterator it; // nice number of "::"!
+    TDEABC::DistributionList::Entry::List entryList = list->entries();
+    TDEABC::DistributionList::Entry::List::ConstIterator it; // nice number of "::"!
 #endif
     for( it = entryList.begin(); it != entryList.end(); ++it ) {
       TQString email = (*it).email;
@@ -674,9 +674,9 @@ bool KMail::FolderDiaACLTab::save()
   // Now, how to expand them? Playing with listviewitem iterators and inserting
   // listviewitems at the same time sounds dangerous, so let's just save into
   // ACLList and reload that.
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
 #ifndef TDEPIM_NEW_DISTRLISTS
-  KABC::DistributionListManager manager( addressBook );
+  TDEABC::DistributionListManager manager( addressBook );
   manager.load();
 #endif
   ACLList aclList;
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 5f04982d4..7d0d6fc4b 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -279,8 +279,8 @@ namespace KMail {
     TQString kabcUid;
     if ( strategy->showHeader( "status" ) )
     {
-      KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-      KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+      TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
+      TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
       ::KIMProxy *imProxy = KMKernel::self()->imProxy();
       kabcUid = addresses[0].uid();
       presence = imProxy->presenceString( kabcUid );
@@ -477,8 +477,8 @@ namespace KMail {
 
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
     TQString kabcUid;
-    KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-    KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+    TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
+    TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
     TQString photoURL;
     int photoWidth = 60;
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 55459dd2a..1aa6f8772 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -1769,11 +1769,11 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference
   if ( it != d->mContactPreferencesMap.end() )
     return it->second;
 
-  KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  const KABC::Addressee::List res = ab->findByEmail( address );
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true );
+  const TDEABC::Addressee::List res = ab->findByEmail( address );
   ContactPreferences pref;
   if ( !res.isEmpty() ) {
-    KABC::Addressee addr = res.first();
+    TDEABC::Addressee addr = res.first();
     TQString encryptPref = addr.custom( "KADDRESSBOOK", "CRYPTOENCRYPTPREF" );
     pref.encryptionPreference = Kleo::stringToEncryptionPreference( encryptPref );
     TQString signPref = addr.custom( "KADDRESSBOOK", "CRYPTOSIGNPREF" );
@@ -1791,10 +1791,10 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference
 void Kleo::KeyResolver::saveContactPreference( const TQString& email, const ContactPreferences& pref ) const
 {
   d->mContactPreferencesMap.insert( std::make_pair( email, pref ) );
-  KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  KABC::Addressee::List res = ab->findByEmail( email );
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true );
+  TDEABC::Addressee::List res = ab->findByEmail( email );
 
-  KABC::Addressee addr;
+  TDEABC::Addressee addr;
   if ( res.isEmpty() ) {
      bool ok = true;
      TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok );
@@ -1813,7 +1813,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
   addr.insertCustom( "KADDRESSBOOK", "SMIMEFP", pref.smimeCertFingerprints.join( "," ) );
 
   ab->insertAddressee( addr );
-  KABC::Ticket *ticket = ab->requestSaveTicket( addr.resource() );
+  TDEABC::Ticket *ticket = ab->requestSaveTicket( addr.resource() );
   if ( ticket )
     ab->save( ticket );
 
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 0772ccfba..6b7747382 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -37,8 +37,8 @@ void KabcBridge::addresses(TQStringList& result) // includes lists
 {
   KCursorSaver busy(KBusyPtr::busy()); // loading might take a while
 
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  KABC::AddressBook::ConstIterator it;
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
+  TDEABC::AddressBook::ConstIterator it;
   for( it = addressBook->begin(); it != addressBook->end(); ++it ) {
     const TQStringList emails = (*it).emails();
     TQString n = (*it).prefix() + " " +
@@ -76,7 +76,7 @@ void KabcBridge::addresses(TQStringList& result) // includes lists
       }
     }
   }
-  KABC::DistributionListManager manager( addressBook );
+  TDEABC::DistributionListManager manager( addressBook );
   manager.load();
   result += manager.listNames();
 
@@ -86,9 +86,9 @@ void KabcBridge::addresses(TQStringList& result) // includes lists
 TQStringList KabcBridge::addresses()
 {
     TQStringList entries;
-    KABC::AddressBook::ConstIterator it;
+    TDEABC::AddressBook::ConstIterator it;
 
-    const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
+    const TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
     for( it = addressBook->begin(); it != addressBook->end(); ++it ) {
         entries += (*it).fullEmail();
     }
@@ -102,8 +102,8 @@ TQString KabcBridge::expandNickName( const TQString& nickName )
     return TQString();
 
   const TQString lowerNickName = nickName.lower();
-  const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  for( KABC::AddressBook::ConstIterator it = addressBook->begin();
+  const TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
+  for( TDEABC::AddressBook::ConstIterator it = addressBook->begin();
        it != addressBook->end(); ++it ) {
     if ( (*it).nickName().lower() == lowerNickName )
       return (*it).fullEmail();
@@ -116,11 +116,11 @@ TQString KabcBridge::expandNickName( const TQString& nickName )
 
 TQStringList KabcBridge::categories()
 {
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  KABC::Addressee::List addresses = addressBook->allAddressees();
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
+  TDEABC::Addressee::List addresses = addressBook->allAddressees();
   TQStringList allcategories, aux;
 
-  for ( KABC::Addressee::List::Iterator it = addresses.begin();
+  for ( TDEABC::Addressee::List::Iterator it = addresses.begin();
         it != addresses.end(); ++it ) {
     aux = ( *it ).categories();
     for ( TQStringList::ConstIterator itAux = aux.begin();
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 8005ca838..e3be3b119 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -2986,8 +2986,8 @@ KMCommand::Result KMIMChatCommand::execute()
   kdDebug( 5006 ) << k_funcinfo << " URL is: " << mUrl << endl;
   TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() );
   // find UID for mail address
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  KABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ;
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
+  TDEABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ;
 
   // start chat
   if( addressees.count() == 1 ) {
@@ -3005,8 +3005,8 @@ KMCommand::Result KMIMChatCommand::execute()
     {
       apology = i18n( "More than one Address Book entry uses this email address:\n %1\n it is not possible to determine who to chat with." );
       TQStringList nameList;
-      KABC::AddresseeList::const_iterator it = addressees.begin();
-      KABC::AddresseeList::const_iterator end = addressees.end();
+      TDEABC::AddresseeList::const_iterator it = addressees.begin();
+      TDEABC::AddresseeList::const_iterator end = addressees.end();
       for ( ; it != end; ++it )
       {
           nameList.append( (*it).realName() );
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 80cd3fd95..fdd444b46 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -47,14 +47,14 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare
 
 void KMFilterActionWithAddressWidget::slotAddrBook()
 {
-  KABC::Addressee::List lst = KABC::AddresseeDialog::getAddressees( this );
+  TDEABC::Addressee::List lst = TDEABC::AddresseeDialog::getAddressees( this );
 
   if ( lst.empty() )
     return;
 
   TQStringList addrList;
 
-  for( KABC::Addressee::List::const_iterator it = lst.begin(); it != lst.end(); ++it )
+  for( TDEABC::Addressee::List::const_iterator it = lst.begin(); it != lst.end(); ++it )
     addrList << (*it).fullEmail();
 
   TQString txt = mLineEdit->text().stripWhiteSpace();
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index 7d26495a9..20421ec90 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -91,10 +91,10 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
   // Case one: The user dropped a text/directory (i.e. vcard), so decode its
   //           contents
   if ( KVCardDrag::canDecode( event ) ) {
-   KABC::Addressee::List list;
+   TDEABC::Addressee::List list;
     KVCardDrag::decode( event, list );
 
-    KABC::Addressee::List::Iterator ait;
+    TDEABC::Addressee::List::Iterator ait;
     for ( ait = list.begin(); ait != list.end(); ++ait ){
       insertEmails( (*ait).emails() );
     }
@@ -105,19 +105,19 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
   // and for other Urls, download the Url and assume it points to a vCard
   else if ( KURLDrag::decode( event, urls ) ) {
     KURL::List::Iterator it = urls.begin();
-    KABC::Addressee::List list;
+    TDEABC::Addressee::List list;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
 
       // First, let's deal with mailto Urls. The path() part contains the
       // email-address.
       if ( (*it).protocol() == "mailto" ) {
-        KABC::Addressee addressee;
+        TDEABC::Addressee addressee;
         addressee.insertEmail( KMail::StringUtil::decodeMailtoUrl( (*it).path() ), true /* preferred */ );
         list += addressee;
       }
       // Otherwise, download the vCard to which the Url points
       else {
-        KABC::VCardConverter converter;
+        TDEABC::VCardConverter converter;
         TQString fileName;
         if ( TDEIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
           TQFile file( fileName );
@@ -137,7 +137,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
         }
       }
       // Now, let the user choose which addressee to add.
-      KABC::Addressee::List::Iterator ait;
+      TDEABC::Addressee::List::Iterator ait;
       for ( ait = list.begin(); ait != list.end(); ++ait )
         insertEmails( (*ait).emails() );
     }
@@ -193,7 +193,7 @@ void KMLineEdit::loadContacts()
       int weight = config.readEntry( "Recent Addresses", "10" ).toInt();
       int idx = addCompletionSource( i18n( "Recent Addresses" ), weight );
       for ( ; it != recent.end(); ++it ) {
-        KABC::Addressee addr;
+        TDEABC::Addressee addr;
         KPIM::getNameAndMail(*it, name, email);
         name = KPIM::quoteNameIfNecessary( name );
         if ( ( name[0] == '"' ) && ( name[name.length() - 1] == '"' ) ) {
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index fc93be5e4..7d370f5ee 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1533,7 +1533,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   if( vCardNode ) {
     // ### FIXME: We should only do this if the vCard belongs to the sender,
     // ### i.e. if the sender's email address is contained in the vCard.
-    KABC::VCardConverter t;
+    TDEABC::VCardConverter t;
 #if defined(KABC_VCARD_ENCODING_FIX)
     const TQByteArray vcard = vCardNode->msgPart().bodyDecodedBinary();
     if ( !t.parseVCardsRaw( vcard.data() ).empty() ) {
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 90bc22a72..d1d47daf0 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -449,7 +449,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
       return ( TQString::compare( msgContents.lower(), contents().lower() ) >= 0 );
 
   case FuncIsInAddressbook: {
-    KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true );
+    TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true );
     TQStringList addressList =
       KPIM::splitEmailAddrList( msgContents.lower() );
     for( TQStringList::ConstIterator it = addressList.begin();
@@ -462,7 +462,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
   }
 
   case FuncIsNotInAddressbook: {
-    KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true );
+    TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true );
     TQStringList addressList =
       KPIM::splitEmailAddrList( msgContents.lower() );
     for( TQStringList::ConstIterator it = addressList.begin();
@@ -477,13 +477,13 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
   case FuncIsInCategory: {
     TQString category = contents();
     TQStringList addressList =  KPIM::splitEmailAddrList( msgContents.lower() );
-    KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true );
+    TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true );
 
     for( TQStringList::ConstIterator it = addressList.begin();
       it != addressList.end(); ++it ) {
-        KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+        TDEABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
 
-          for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
+          for ( TDEABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
               if ( (*itAd).hasCategory(category) )
                 return true;
 
@@ -494,13 +494,13 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     case FuncIsNotInCategory: {
       TQString category = contents();
       TQStringList addressList =  KPIM::splitEmailAddrList( msgContents.lower() );
-      KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true );
+      TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true );
 
       for( TQStringList::ConstIterator it = addressList.begin();
         it != addressList.end(); ++it ) {
-          KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+          TDEABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
 
-            for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
+            for ( TDEABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
                 if ( (*itAd).hasCategory(category) )
                   return false;
 
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 0b43795e8..26fe72135 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -47,7 +47,7 @@
 #include <tqlabel.h>
 
 #ifdef TDEPIM_NEW_DISTRLISTS
-RecipientItem::RecipientItem( KABC::AddressBook *ab )
+RecipientItem::RecipientItem( TDEABC::AddressBook *ab )
   : mAddressBook( ab )
 {
 }
@@ -76,7 +76,7 @@ void RecipientItem::setDistributionList( KPIM::DistributionList &list )
   mTooltip = createTooltip( list );
 }
 #else
-void RecipientItem::setDistributionList( KABC::DistributionList *list )
+void RecipientItem::setDistributionList( TDEABC::DistributionList *list )
 {
   mDistributionList = list;
 
@@ -94,7 +94,7 @@ void RecipientItem::setDistributionList( KABC::DistributionList *list )
 }
 #endif
 
-void RecipientItem::setAddressee( const KABC::Addressee &a,
+void RecipientItem::setAddressee( const TDEABC::Addressee &a,
   const TQString &email )
 {
   mAddressee = a;
@@ -147,7 +147,7 @@ KPIM::DistributionList& RecipientItem::distributionList() {
   return mDistributionList;
 }
 #else
-KABC::DistributionList * RecipientItem::distributionList() {
+TDEABC::DistributionList * RecipientItem::distributionList() {
   return mDistributionList;
 }
 #endif
@@ -176,14 +176,14 @@ TQString RecipientItem::createTooltip( KPIM::DistributionList &distributionList
   return txt;
 }
 #else
-TQString RecipientItem::createTooltip( KABC::DistributionList *distributionList ) const
+TQString RecipientItem::createTooltip( TDEABC::DistributionList *distributionList ) const
 {
   TQString txt = "<qt>";
 
   txt += "<b>" + i18n("Distribution List %1" ).arg ( distributionList->name() ) + "</b>";
   txt += "<ul>";
-  KABC::DistributionList::Entry::List entries = distributionList->entries();
-  KABC::DistributionList::Entry::List::ConstIterator it;
+  TDEABC::DistributionList::Entry::List entries = distributionList->entries();
+  TDEABC::DistributionList::Entry::List::ConstIterator it;
   for( it = entries.begin(); it != entries.end(); ++it ) {
     txt += "<li>";
     txt += (*it).addressee.realName() + ' ';
@@ -427,8 +427,8 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
   connect( closeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
 
   {
-    using namespace KABC;
-    mAddressBook = KABC::StdAddressBook::self( true );
+    using namespace TDEABC;
+    mAddressBook = TDEABC::StdAddressBook::self( true );
     connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ),
              this, TQT_SLOT( insertAddressBook( AddressBook * ) ) );
   }
@@ -478,12 +478,12 @@ void RecipientsPicker::initCollections()
   rebuildAllRecipientsList();
 }
 
-void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
+void RecipientsPicker::insertAddressBook( TDEABC::AddressBook *addressbook )
 {
-  TQMap<KABC::Resource *,RecipientsCollection *> collectionMap;
+  TQMap<TDEABC::Resource *,RecipientsCollection *> collectionMap;
 
-  TQPtrList<KABC::Resource> resources = addressbook->resources();
-  KABC::Resource *res;
+  TQPtrList<TDEABC::Resource> resources = addressbook->resources();
+  TDEABC::Resource *res;
   for( res = resources.first(); res; res = resources.next() ) {
     RecipientsCollection *collection = new RecipientsCollection( res->identifier() );
     collectionMap.insert( res, collection );
@@ -492,7 +492,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
 
   TQMap<TQString,RecipientsCollection *> categoryMap;
 
-  KABC::AddressBook::Iterator it;
+  TDEABC::AddressBook::Iterator it;
   for( it = addressbook->begin(); it != addressbook->end(); ++it ) {
     TQStringList emails = (*it).emails();
     TQStringList::ConstIterator it3;
@@ -504,7 +504,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
 #endif
       item->setAddressee( *it, *it3 );
 
-      TQMap<KABC::Resource *,RecipientsCollection *>::ConstIterator collIt;
+      TQMap<TDEABC::Resource *,RecipientsCollection *>::ConstIterator collIt;
       collIt = collectionMap.find( it->resource() );
       if ( collIt != collectionMap.end() ) {
         (*collIt)->addItem( item );
@@ -528,7 +528,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
     }
   }
 
-  TQMap<KABC::Resource *,RecipientsCollection *>::ConstIterator it2;
+  TQMap<TDEABC::Resource *,RecipientsCollection *>::ConstIterator it2;
   for( it2 = collectionMap.begin(); it2 != collectionMap.end(); ++it2 ) {
     insertCollection( *it2 );
   }
@@ -557,7 +557,7 @@ void RecipientsPicker::insertDistributionLists()
 #else
   delete mDistributionListManager;
   mDistributionListManager =
-    new KABC::DistributionListManager( KABC::StdAddressBook::self( true ) );
+    new TDEABC::DistributionListManager( TDEABC::StdAddressBook::self( true ) );
 
   mDistributionListManager->load();
 
@@ -565,7 +565,7 @@ void RecipientsPicker::insertDistributionLists()
 
   TQStringList::Iterator listIt;
   for ( listIt = lists.begin(); listIt != lists.end(); ++listIt ) {
-    KABC::DistributionList *list = mDistributionListManager->list( *listIt );
+    TDEABC::DistributionList *list = mDistributionListManager->list( *listIt );
     RecipientItem *item = new RecipientItem;
     item->setDistributionList( list );
     mDistributionLists->addItem( item );
@@ -578,10 +578,10 @@ void RecipientsPicker::insertRecentAddresses()
   RecipientsCollection *collection = new RecipientsCollection( i18n("Recent Addresses") );
 
   TDEConfig config( "kmailrc" );
-  KABC::Addressee::List recents =
+  TDEABC::Addressee::List recents =
     TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses();
 
-  KABC::Addressee::List::ConstIterator it;
+  TDEABC::Addressee::List::ConstIterator it;
   for( it = recents.begin(); it != recents.end(); ++it ) {
 #ifdef TDEPIM_NEW_DISTRLISTS
     RecipientItem *item = new RecipientItem( mAddressBook );
@@ -654,10 +654,10 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients )
 #endif
 
     if ( !item ) {
-      KABC::Addressee a;
+      TDEABC::Addressee a;
       TQString name;
       TQString email;
-      KABC::Addressee::parseEmailAddress( (*it).email(), name, email );
+      TDEABC::Addressee::parseEmailAddress( (*it).email(), name, email );
       a.setNameFromString( name );
       a.insertEmail( email );
 
@@ -862,7 +862,7 @@ void RecipientsPicker::ldapSearchResult()
         TQString name;
         TQString email;
         KPIM::getNameAndMail( (*it), name, email );
-        KABC::Addressee ad;
+        TDEABC::Addressee ad;
         ad.setNameFromString( name );
         ad.insertEmail( email );
 #ifdef TDEPIM_NEW_DISTRLISTS
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 38d36a980..d9dc22930 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -39,7 +39,7 @@ class TQComboBox;
 #ifdef TDEPIM_NEW_DISTRLISTS
 #include <libtdepim/distributionlist.h>
 #else
-namespace KABC {
+namespace TDEABC {
 class DistributionList;
 class DistributionListManager;
 }
@@ -55,15 +55,15 @@ class RecipientItem
     typedef TQValueList<RecipientItem *> List;
 
 #ifdef TDEPIM_NEW_DISTRLISTS
-    RecipientItem( KABC::AddressBook *ab );
+    RecipientItem( TDEABC::AddressBook *ab );
     void setDistributionList( KPIM::DistributionList& );
     KPIM::DistributionList& distributionList();
 #else
     RecipientItem();
-    void setDistributionList( KABC::DistributionList * );
-    KABC::DistributionList * distributionList();
+    void setDistributionList( TDEABC::DistributionList * );
+    TDEABC::DistributionList * distributionList();
 #endif
-    void setAddressee( const KABC::Addressee &, const TQString &email );
+    void setAddressee( const TDEABC::Addressee &, const TQString &email );
 
     void setRecipientType( const TQString &type );
     TQString recipientType() const;
@@ -82,18 +82,18 @@ class RecipientItem
 #ifdef TDEPIM_NEW_DISTRLISTS
     TQString createTooltip( KPIM::DistributionList & ) const;
 #else
-    TQString createTooltip( KABC::DistributionList * ) const;
+    TQString createTooltip( TDEABC::DistributionList * ) const;
 #endif
 
-    KABC::Addressee mAddressee;
+    TDEABC::Addressee mAddressee;
     TQString mName;
     TQString mEmail;
     TQString mRecipient;
 #ifdef TDEPIM_NEW_DISTRLISTS
     KPIM::DistributionList mDistributionList;
-    KABC::AddressBook *mAddressBook;
+    TDEABC::AddressBook *mAddressBook;
 #else
-    KABC::DistributionList *mDistributionList;
+    TDEABC::DistributionList *mDistributionList;
 #endif
     TQString mType;
     TQString mTooltip;
@@ -174,7 +174,7 @@ class SearchLine : public TDEListViewSearchLine
     void keyPressEvent( TQKeyEvent * );
 };
 
-using namespace KABC;
+using namespace TDEABC;
 
 class RecipientsPicker : public TQDialog
 {
@@ -222,7 +222,7 @@ class RecipientsPicker : public TQDialog
     void slotSearchLDAP();
     void ldapSearchResult();
   private:
-    KABC::StdAddressBook *mAddressBook;
+    TDEABC::StdAddressBook *mAddressBook;
 
     TQComboBox *mCollectionCombo;
     TDEListView *mRecipientList;
@@ -241,7 +241,7 @@ class RecipientsPicker : public TQDialog
     RecipientsCollection *mSelectedRecipients;
 
 #ifndef TDEPIM_NEW_DISTRLISTS
-    KABC::DistributionListManager *mDistributionListManager;
+    TDEABC::DistributionListManager *mDistributionListManager;
 #endif
 
     Recipient::Type mDefaultType;
diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp
index 41d6705c9..c1743b264 100644
--- a/kmail/vcardviewer.cpp
+++ b/kmail/vcardviewer.cpp
@@ -30,8 +30,8 @@ using KPIM::AddresseeView;
 
 #include <tdeabc/vcardconverter.h>
 #include <tdeabc/addressee.h>
-using KABC::VCardConverter;
-using KABC::Addressee;
+using TDEABC::VCardConverter;
+using TDEABC::Addressee;
 
 #include <tdelocale.h>
 
diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h
index a5460f992..abd888203 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -53,9 +53,9 @@ class VCardViewer : public KDialogBase
 
   private:
     KPIM::AddresseeView *mAddresseeView;
-    KABC::Addressee::List mAddresseeList;
+    TDEABC::Addressee::List mAddresseeList;
 
-    TQValueListIterator<KABC::Addressee> itAddresseeList;
+    TQValueListIterator<TDEABC::Addressee> itAddresseeList;
 };
 
 }
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index e27b192ec..ed56b0d59 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -50,7 +50,7 @@ using namespace TDEIO;
 using namespace KPIM;
 #include <tdeabc/stdaddressbook.h>
 #include <tdeabc/addressee.h>
-using namespace KABC;
+using namespace TDEABC;
 
 #include <tqbitmap.h>
 #include <tqcheckbox.h>