1 files changed, 23 insertions, 23 deletions

diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 3ed815046..0dc741253 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -138,7 +138,7 @@ TQValueList<ContactListItem*> LDAPSearchDialog::Private::selectedItems( TQListVi
   return selected;
 }
 
-LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
+LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core,
                                     TQWidget* parent, const char* name )
   : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 |
                  Cancel, Default, parent, name, false, true ),
@@ -481,9 +481,9 @@ void LDAPSearchDialog::slotSelectAll()
   mResultListView->selectAll( true );
 }
 
-KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs )
+TDEABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs )
 {
-  KABC::Addressee addr;
+  TDEABC::Addressee addr;
 
   // name
   addr.setNameFromString( asUtf8( attrs["cn"].first() ) );
@@ -509,7 +509,7 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::
 #endif
 
   // Address
-  KABC::Address workAddr( KABC::Address::Work );
+  TDEABC::Address workAddr( TDEABC::Address::Work );
 
   workAddr.setStreet( asUtf8( attrs[ "street" ].first()) );
   workAddr.setLocality( asUtf8( attrs[ "l" ].first()) );
@@ -521,24 +521,24 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::
     addr.insertAddress( workAddr );
 
   // phone
-  KABC::PhoneNumber homeNr = asUtf8( attrs[  "homePhone" ].first() );
-  homeNr.setType( KABC::PhoneNumber::Home );
+  TDEABC::PhoneNumber homeNr = asUtf8( attrs[  "homePhone" ].first() );
+  homeNr.setType( TDEABC::PhoneNumber::Home );
   addr.insertPhoneNumber( homeNr );
 
-  KABC::PhoneNumber workNr = asUtf8( attrs[  "telephoneNumber" ].first() );
-  workNr.setType( KABC::PhoneNumber::Work );
+  TDEABC::PhoneNumber workNr = asUtf8( attrs[  "telephoneNumber" ].first() );
+  workNr.setType( TDEABC::PhoneNumber::Work );
   addr.insertPhoneNumber( workNr );
 
-  KABC::PhoneNumber faxNr = asUtf8( attrs[  "facsimileTelephoneNumber" ].first() );
-  faxNr.setType( KABC::PhoneNumber::Fax );
+  TDEABC::PhoneNumber faxNr = asUtf8( attrs[  "facsimileTelephoneNumber" ].first() );
+  faxNr.setType( TDEABC::PhoneNumber::Fax );
   addr.insertPhoneNumber( faxNr );
 
-  KABC::PhoneNumber cellNr = asUtf8( attrs[  "mobile" ].first() );
-  cellNr.setType( KABC::PhoneNumber::Cell );
+  TDEABC::PhoneNumber cellNr = asUtf8( attrs[  "mobile" ].first() );
+  cellNr.setType( TDEABC::PhoneNumber::Cell );
   addr.insertPhoneNumber( cellNr );
 
-  KABC::PhoneNumber pagerNr = asUtf8( attrs[  "pager" ].first() );
-  pagerNr.setType( KABC::PhoneNumber::Pager );
+  TDEABC::PhoneNumber pagerNr = asUtf8( attrs[  "pager" ].first() );
+  pagerNr.setType( TDEABC::PhoneNumber::Pager );
   addr.insertPhoneNumber( pagerNr );
   return addr;
 }
@@ -557,19 +557,19 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList()
 }
 #endif
 
-KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems,
-                                                                       KABC::Resource * const resource )
+TDEABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems,
+                                                                       TDEABC::Resource * const resource )
 {
     const TQDateTime now = TQDateTime::currentDateTime();
     TQStringList importedAddrs;
-    KABC::Addressee::List localAddrs;
+    TDEABC::Addressee::List localAddrs;
 
     KABLock::self( mCore->addressBook() )->lock( resource );
 
     for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) {
       const ContactListItem * const cli = *it;
-      KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
-      const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
+      TDEABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
+      const TDEABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
 
       if ( existing.isEmpty() ) {
         addr.setUid( TDEApplication::randomString( 10 ) );
@@ -608,7 +608,7 @@ void LDAPSearchDialog::slotUser2()
       return;
     }
 	
-    KABC::Resource *resource = mCore->requestResource( this );
+    TDEABC::Resource *resource = mCore->requestResource( this );
     if ( !resource ) return;
 
     KPIM::DistributionList dist = selectDistributionList();
@@ -616,12 +616,12 @@ void LDAPSearchDialog::slotUser2()
       return;
 
 
-    KABC::Addressee::List localAddrs = importContactsUnlessTheyExist( selectedItems, resource );
+    TDEABC::Addressee::List localAddrs = importContactsUnlessTheyExist( selectedItems, resource );
 
     if ( localAddrs.isEmpty() )
       return;
 
-    for ( KABC::Addressee::List::ConstIterator it = localAddrs.begin(); it != localAddrs.end(); ++it ) {
+    for ( TDEABC::Addressee::List::ConstIterator it = localAddrs.begin(); it != localAddrs.end(); ++it ) {
       dist.insertEntry( *it, TQString() );
     }
     KABLock::self( mCore->addressBook() )->lock( resource );
@@ -633,7 +633,7 @@ void LDAPSearchDialog::slotUser2()
 
 void LDAPSearchDialog::slotUser1()
 {
-    KABC::Resource *resource = mCore->requestResource( this );
+    TDEABC::Resource *resource = mCore->requestResource( this );
     if ( !resource ) return;
     const TQValueList<ContactListItem*> selectedItems = d->selectedItems( mResultListView );
     if( selectedItems.isEmpty() )