1 files changed, 23 insertions, 23 deletions

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