1 files changed, 14 insertions, 14 deletions

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 357de392a..a39101b48 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -88,14 +88,14 @@ AddresseeEditorWidget::~AddresseeEditorWidget()
   kdDebug(5720) << "~AddresseeEditorWidget()" << endl;
 }
 
-void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
+void AddresseeEditorWidget::setAddressee( const TDEABC::Addressee &addr )
 {
   if ( mAddressee.uid() == addr.uid() )
     return;
   mAddressee = addr;
 
   bool readOnly = false;
-  if ( KABC::Resource *res = addr.resource() ) {
+  if ( TDEABC::Resource *res = addr.resource() ) {
     if ( res->readOnly() ) {
       readOnly = true;
 
@@ -113,7 +113,7 @@ void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
   load();
 }
 
-const KABC::Addressee &AddresseeEditorWidget::addressee()
+const TDEABC::Addressee &AddresseeEditorWidget::addressee()
 {
   return mAddressee;
 }
@@ -181,7 +181,7 @@ void AddresseeEditorWidget::setupTab1()
   layout->addWidget( button, 0, 1 );
   layout->addWidget( mNameEdit, 0, 2 );
   layout->addWidget( mNameLabel, 0, 2 );
-  label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
+  label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( TDEABC::Addressee::roleLabel() ), tab1 );
   mRoleEdit = new KLineEdit( tab1 );
   connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
@@ -190,7 +190,7 @@ void AddresseeEditorWidget::setupTab1()
   layout->addWidget( mRoleEdit, 1, 2 );
 
   // Organization
-  label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
+  label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( TDEABC::Addressee::organizationLabel() ), tab1 );
   mOrgEdit = new KLineEdit( tab1 );
   label->setBuddy( mOrgEdit );
   connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -256,7 +256,7 @@ void AddresseeEditorWidget::setupTab1()
                                                      TDEIcon::SizeMedium ) );
   homePageLayout->addWidget( label );
 
-  label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
+  label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( TDEABC::Addressee::urlLabel() ), tab1 );
   mURLEdit = new KLineEdit( tab1 );
   connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
@@ -369,7 +369,7 @@ void AddresseeEditorWidget::setupTab2()
   label->setBuddy( mAssistantEdit );
   layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
 
-  label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
+  label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( TDEABC::Addressee::titleLabel() ), tab2 );
   layout->addWidget( label, 2, 3 );
   mTitleEdit = new KLineEdit( tab2 );
   connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -468,7 +468,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
     }
 
     KAB::ContactEditorWidget *widget
-              = manager->factory( i )->createWidget( KABC::StdAddressBook::self( true ),
+              = manager->factory( i )->createWidget( TDEABC::StdAddressBook::self( true ),
                                                      page );
     if ( widget )
       page->addWidget( widget );
@@ -490,7 +490,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
       continue;
 
     ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );
-    AdvancedCustomFields *wdg = new AdvancedCustomFields( *it, KABC::StdAddressBook::self( true ), page );
+    AdvancedCustomFields *wdg = new AdvancedCustomFields( *it, TDEABC::StdAddressBook::self( true ), page );
     if ( wdg ) {
       mTabPages.insert( wdg->pageIdentifier(), page );
       mTabWidget->addTab( page, wdg->pageTitle() );
@@ -662,8 +662,8 @@ void AddresseeEditorWidget::save()
   mAddressee.setEmails( mEmailWidget->emails() );
 
   // Save the phone numbers
-  KABC::PhoneNumber::List phoneNumbers;
-  KABC::PhoneNumber::List::ConstIterator phoneIter;
+  TDEABC::PhoneNumber::List phoneNumbers;
+  TDEABC::PhoneNumber::List::ConstIterator phoneIter;
   phoneNumbers = mAddressee.phoneNumbers();
   for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
         ++phoneIter )
@@ -675,8 +675,8 @@ void AddresseeEditorWidget::save()
     mAddressee.insertPhoneNumber( *phoneIter );
 
   // Save the addresses
-  KABC::Address::List addresses;
-  KABC::Address::List::ConstIterator addressIter;
+  TDEABC::Address::List addresses;
+  TDEABC::Address::List::ConstIterator addressIter;
   addresses = mAddressee.addresses();
   for ( addressIter = addresses.begin(); addressIter != addresses.end();
         ++addressIter )
@@ -741,7 +741,7 @@ void AddresseeEditorWidget::organizationTextChanged( const TQString &text )
 
 void AddresseeEditorWidget::nameBoxChanged()
 {
-  KABC::Addressee addr;
+  TDEABC::Addressee addr;
   AddresseeConfig config( mAddressee );
   if ( config.automaticNameParsing() ) {
     addr.setNameFromString( mNameEdit->text() );