Rename KABC namespace

23 files changed, 280 insertions, 280 deletions

diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am
index bdf1e86f5..ecf0372c4 100644
--- a/kaddressbook/xxport/Makefile.am
+++ b/kaddressbook/xxport/Makefile.am
@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
          $(top_builddir)/libtdepim/libtdepim.la
 
 libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) \
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \
                                     $(top_builddir)/kaddressbook/libkaddressbook.la \
                                     $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la
 
 libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
 
 noinst_HEADERS = csvimportdialog.h
 
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index 62357a599..39c709b3e 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -33,13 +33,13 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort )
 
-BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+BookmarkXXPort::BookmarkXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createExportAction( i18n( "Export Bookmarks Menu..." ) );
 }
 
-bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
+bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& )
 {
   TQString fileName = locateLocal( "data", "tdeabc/bookmarks.xml" );
 
@@ -47,7 +47,7 @@ bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQSt
   KBookmarkDomBuilder *builder = new KBookmarkDomBuilder( mgr->root(), mgr );
   builder->connectImporter( this );
 
-  KABC::AddresseeList::ConstIterator it;
+  TDEABC::AddresseeList::ConstIterator it;
   emit newFolder( i18n( "AddressBook" ), false, "" );
   for ( it = list.begin(); it != list.end(); ++it ) {
     if ( !(*it).url().isEmpty() ) {
diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h
index 3c74dc68c..fde6fe4dc 100644
--- a/kaddressbook/xxport/bookmark_xxport.h
+++ b/kaddressbook/xxport/bookmark_xxport.h
@@ -33,12 +33,12 @@ class BookmarkXXPort : public KAB::XXPort
   
 
   public:
-    BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    BookmarkXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "bookmark"; }
 
   public slots:
-    bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
+    bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
 
   signals:
     /**
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 20ed9aac7..a0a85ab27 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -36,14 +36,14 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort )
 
-CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+CSVXXPort::CSVXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createImportAction( i18n( "Import CSV List..." ) );
   createExportAction( i18n( "Export CSV List..." ) );
 }
 
-bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
+bool CSVXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& )
 {
   KURL url = KFileDialog::getSaveURL( "addressbook.csv" );
   if ( url.isEmpty() )
@@ -84,23 +84,23 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
   }
 }
 
-KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const
 {
   CSVImportDialog dlg( addressBook(), parentWidget() );
   if ( dlg.exec() )
     return dlg.contacts();
   else
-    return KABC::AddresseeList();
+    return TDEABC::AddresseeList();
 }
 
-void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
+void CSVXXPort::doExport( TQFile *fp, const TDEABC::AddresseeList &list )
 {
   TQTextStream t( fp );
   t.setEncoding( TQTextStream::Locale );
 
-  KABC::AddresseeList::ConstIterator iter;
-  KABC::Field::List fields = addressBook()->fields();
-  KABC::Field::List::Iterator fieldIter;
+  TDEABC::AddresseeList::ConstIterator iter;
+  TDEABC::Field::List fields = addressBook()->fields();
+  TDEABC::Field::List::Iterator fieldIter;
   bool first = true;
 
   // First output the column headings
@@ -114,7 +114,7 @@ void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
   t << "\n";
 
   // Then all the addressee objects
-  KABC::Addressee addr;
+  TDEABC::Addressee addr;
   for ( iter = list.begin(); iter != list.end(); ++iter ) {
     addr = *iter;
     first = true;
diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h
index c7bea01b5..f0a28fdec 100644
--- a/kaddressbook/xxport/csv_xxport.h
+++ b/kaddressbook/xxport/csv_xxport.h
@@ -32,16 +32,16 @@ class CSVXXPort : public KAB::XXPort
   
 
   public:
-    CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    CSVXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "csv"; }
 
   public slots:
-    bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 
   private:
-    void doExport( TQFile *fp, const KABC::AddresseeList &list );
+    void doExport( TQFile *fp, const TDEABC::AddresseeList &list );
 };
 
 #endif
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 93635d25a..091d277f9 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -50,7 +50,7 @@
 
 enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 };
 
-CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
+CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent,
                                   const char * name )
   : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 |
                  User2, Ok, parent, name, true, true ),
@@ -63,59 +63,59 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
   initGUI();
 
   mTypeMap.insert( i18n( "Undefined" ), Undefined );
-  mTypeMap.insert( KABC::Addressee::formattedNameLabel(), FormattedName );
-  mTypeMap.insert( KABC::Addressee::familyNameLabel(), FamilyName );
-  mTypeMap.insert( KABC::Addressee::givenNameLabel(), GivenName );
-  mTypeMap.insert( KABC::Addressee::additionalNameLabel(), AdditionalName );
-  mTypeMap.insert( KABC::Addressee::prefixLabel(), Prefix );
-  mTypeMap.insert( KABC::Addressee::suffixLabel(), Suffix );
-  mTypeMap.insert( KABC::Addressee::nickNameLabel(), NickName );
-  mTypeMap.insert( KABC::Addressee::birthdayLabel(), Birthday );
-
-  mTypeMap.insert( KABC::Addressee::homeAddressStreetLabel(), HomeAddressStreet );
-  mTypeMap.insert( KABC::Addressee::homeAddressLocalityLabel(),
+  mTypeMap.insert( TDEABC::Addressee::formattedNameLabel(), FormattedName );
+  mTypeMap.insert( TDEABC::Addressee::familyNameLabel(), FamilyName );
+  mTypeMap.insert( TDEABC::Addressee::givenNameLabel(), GivenName );
+  mTypeMap.insert( TDEABC::Addressee::additionalNameLabel(), AdditionalName );
+  mTypeMap.insert( TDEABC::Addressee::prefixLabel(), Prefix );
+  mTypeMap.insert( TDEABC::Addressee::suffixLabel(), Suffix );
+  mTypeMap.insert( TDEABC::Addressee::nickNameLabel(), NickName );
+  mTypeMap.insert( TDEABC::Addressee::birthdayLabel(), Birthday );
+
+  mTypeMap.insert( TDEABC::Addressee::homeAddressStreetLabel(), HomeAddressStreet );
+  mTypeMap.insert( TDEABC::Addressee::homeAddressLocalityLabel(),
                    HomeAddressLocality );
-  mTypeMap.insert( KABC::Addressee::homeAddressRegionLabel(), HomeAddressRegion );
-  mTypeMap.insert( KABC::Addressee::homeAddressPostalCodeLabel(),
+  mTypeMap.insert( TDEABC::Addressee::homeAddressRegionLabel(), HomeAddressRegion );
+  mTypeMap.insert( TDEABC::Addressee::homeAddressPostalCodeLabel(),
                    HomeAddressPostalCode );
-  mTypeMap.insert( KABC::Addressee::homeAddressCountryLabel(),
+  mTypeMap.insert( TDEABC::Addressee::homeAddressCountryLabel(),
                    HomeAddressCountry );
-  mTypeMap.insert( KABC::Addressee::homeAddressLabelLabel(), HomeAddressLabel );
+  mTypeMap.insert( TDEABC::Addressee::homeAddressLabelLabel(), HomeAddressLabel );
 
-  mTypeMap.insert( KABC::Addressee::businessAddressStreetLabel(),
+  mTypeMap.insert( TDEABC::Addressee::businessAddressStreetLabel(),
                    BusinessAddressStreet );
-  mTypeMap.insert( KABC::Addressee::businessAddressLocalityLabel(),
+  mTypeMap.insert( TDEABC::Addressee::businessAddressLocalityLabel(),
                    BusinessAddressLocality );
-  mTypeMap.insert( KABC::Addressee::businessAddressRegionLabel(),
+  mTypeMap.insert( TDEABC::Addressee::businessAddressRegionLabel(),
                    BusinessAddressRegion );
-  mTypeMap.insert( KABC::Addressee::businessAddressPostalCodeLabel(),
+  mTypeMap.insert( TDEABC::Addressee::businessAddressPostalCodeLabel(),
                    BusinessAddressPostalCode );
-  mTypeMap.insert( KABC::Addressee::businessAddressCountryLabel(),
+  mTypeMap.insert( TDEABC::Addressee::businessAddressCountryLabel(),
                    BusinessAddressCountry );
-  mTypeMap.insert( KABC::Addressee::businessAddressLabelLabel(),
+  mTypeMap.insert( TDEABC::Addressee::businessAddressLabelLabel(),
                    BusinessAddressLabel );
 
-  mTypeMap.insert( KABC::Addressee::homePhoneLabel(), HomePhone );
-  mTypeMap.insert( KABC::Addressee::businessPhoneLabel(), BusinessPhone );
-  mTypeMap.insert( KABC::Addressee::mobilePhoneLabel(), MobilePhone );
-  mTypeMap.insert( KABC::Addressee::homeFaxLabel(), HomeFax );
-  mTypeMap.insert( KABC::Addressee::businessFaxLabel(), BusinessFax );
-  mTypeMap.insert( KABC::Addressee::carPhoneLabel(), CarPhone );
-  mTypeMap.insert( KABC::Addressee::isdnLabel(), Isdn );
-  mTypeMap.insert( KABC::Addressee::pagerLabel(), Pager );
-  mTypeMap.insert( KABC::Addressee::emailLabel(), Email );
-  mTypeMap.insert( KABC::Addressee::mailerLabel(), Mailer );
-  mTypeMap.insert( KABC::Addressee::titleLabel(), Title );
-  mTypeMap.insert( KABC::Addressee::roleLabel(), Role );
-  mTypeMap.insert( KABC::Addressee::organizationLabel(), Organization );
-  mTypeMap.insert( KABC::Addressee::noteLabel(), Note );
-  mTypeMap.insert( KABC::Addressee::urlLabel(), URL );
+  mTypeMap.insert( TDEABC::Addressee::homePhoneLabel(), HomePhone );
+  mTypeMap.insert( TDEABC::Addressee::businessPhoneLabel(), BusinessPhone );
+  mTypeMap.insert( TDEABC::Addressee::mobilePhoneLabel(), MobilePhone );
+  mTypeMap.insert( TDEABC::Addressee::homeFaxLabel(), HomeFax );
+  mTypeMap.insert( TDEABC::Addressee::businessFaxLabel(), BusinessFax );
+  mTypeMap.insert( TDEABC::Addressee::carPhoneLabel(), CarPhone );
+  mTypeMap.insert( TDEABC::Addressee::isdnLabel(), Isdn );
+  mTypeMap.insert( TDEABC::Addressee::pagerLabel(), Pager );
+  mTypeMap.insert( TDEABC::Addressee::emailLabel(), Email );
+  mTypeMap.insert( TDEABC::Addressee::mailerLabel(), Mailer );
+  mTypeMap.insert( TDEABC::Addressee::titleLabel(), Title );
+  mTypeMap.insert( TDEABC::Addressee::roleLabel(), Role );
+  mTypeMap.insert( TDEABC::Addressee::organizationLabel(), Organization );
+  mTypeMap.insert( TDEABC::Addressee::noteLabel(), Note );
+  mTypeMap.insert( TDEABC::Addressee::urlLabel(), URL );
 
   mCustomCounter = mTypeMap.count();
   int count = mCustomCounter;
 
-  KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory );
-  KABC::Field::List::Iterator it;
+  TDEABC::Field::List fields = mAddressBook->fields( TDEABC::Field::CustomCategory );
+  TDEABC::Field::List::Iterator it;
   for ( it = fields.begin(); it != fields.end(); ++it, ++count )
     mTypeMap.insert( (*it)->label(), count );
 
@@ -155,10 +155,10 @@ CSVImportDialog::~CSVImportDialog()
   mCodecs.clear();
 }
 
-KABC::AddresseeList CSVImportDialog::contacts() const
+TDEABC::AddresseeList CSVImportDialog::contacts() const
 {
   DateParser dateParser( mDatePatternEdit->text() );
-  KABC::AddresseeList contacts;
+  TDEABC::AddresseeList contacts;
 
   KProgressDialog progressDialog( mPage );
   progressDialog.setAutoClose( true );
@@ -169,10 +169,10 @@ KABC::AddresseeList CSVImportDialog::contacts() const
   kapp->processEvents();
 
   for ( int row = 1; row < mTable->numRows(); ++row ) {
-    KABC::Addressee a;
+    TDEABC::Addressee a;
     bool emptyRow = true;
-    KABC::Address addrHome( KABC::Address::Home );
-    KABC::Address addrWork( KABC::Address::Work );
+    TDEABC::Address addrHome( TDEABC::Address::Home );
+    TDEABC::Address addrWork( TDEABC::Address::Work );
     for ( int col = 0; col < mTable->numCols(); ++col ) {
       TQComboTableItem *item = static_cast<TQComboTableItem*>( mTable->item( 0,
                                                              col ) );
@@ -242,51 +242,51 @@ KABC::AddresseeList CSVImportDialog::contacts() const
 
         case HomePhone:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Home );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Home );
             a.insertPhoneNumber( number );
           }
           break;
         case BusinessPhone:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Work );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Work );
             a.insertPhoneNumber( number );
           }
           break;
         case MobilePhone:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Cell );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Cell );
             a.insertPhoneNumber( number );
           }
           break;
         case HomeFax:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Home |
-                                             KABC::PhoneNumber::Fax );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Home |
+                                             TDEABC::PhoneNumber::Fax );
             a.insertPhoneNumber( number );
           }
           break;
         case BusinessFax:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Work |
-                                             KABC::PhoneNumber::Fax );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Work |
+                                             TDEABC::PhoneNumber::Fax );
             a.insertPhoneNumber( number );
           }
           break;
         case CarPhone:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Car );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Car );
             a.insertPhoneNumber( number );
           }
           break;
         case Isdn:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Isdn );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Isdn );
             a.insertPhoneNumber( number );
           }
           break;
         case Pager:
           if ( !value.isEmpty() ) {
-            KABC::PhoneNumber number( value, KABC::PhoneNumber::Pager );
+            TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Pager );
             a.insertPhoneNumber( number );
           }
           break;
@@ -329,8 +329,8 @@ KABC::AddresseeList CSVImportDialog::contacts() const
           addrWork.setLabel( value );
           break;
         default:
-          KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory );
-          KABC::Field::List::Iterator it;
+          TDEABC::Field::List fields = mAddressBook->fields( TDEABC::Field::CustomCategory );
+          TDEABC::Field::List::Iterator it;
 
           int counter = 0;
           for ( it = fields.begin(); it != fields.end(); ++it ) {
@@ -347,7 +347,7 @@ KABC::AddresseeList CSVImportDialog::contacts() const
     kapp->processEvents();
 
     if ( progressDialog.wasCancelled() )
-      return KABC::AddresseeList();
+      return TDEABC::AddresseeList();
 
     progressDialog.progressBar()->advance( 1 );
 
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index b6b89d7ec..da91c019a 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -44,11 +44,11 @@ class CSVImportDialog : public KDialogBase
   
 
   public:
-    CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
+    CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent,
                      const char *name = 0 );
     ~CSVImportDialog();
 
-    KABC::AddresseeList contacts() const;
+    TDEABC::AddresseeList contacts() const;
 
   protected slots:
     virtual void slotOk();
@@ -116,7 +116,7 @@ class CSVImportDialog : public KDialogBase
     TQString mDelimiter;
     TQByteArray mFileArray;
     TQMap<TQString, uint> mTypeMap;
-    KABC::AddressBook *mAddressBook;
+    TDEABC::AddressBook *mAddressBook;
     int mCustomCounter;
     bool mClearTypeStore;
     TQValueList<int> mTypeStore;
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index 75f2ea24d..f310cb598 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -38,29 +38,29 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort )
 
-EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+EudoraXXPort::EudoraXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createImportAction( i18n( "Import Eudora Addressbook..." ) );
 }
 
-KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
 {
   TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(),
 		"*.[tT][xX][tT]|" + i18n("Eudora Light Addressbook (*.txt)"), 0 );
   if ( fileName.isEmpty() )
-    return KABC::AddresseeList();
+    return TDEABC::AddresseeList();
 
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) )
-    return KABC::AddresseeList();
+    return TDEABC::AddresseeList();
 
   TQString line;
   TQTextStream stream( &file );
-  KABC::Addressee *a = 0;
+  TDEABC::Addressee *a = 0;
   int bytesRead = 0;
 
-  KABC::AddresseeList list;
+  TDEABC::AddresseeList list;
 
   while( !stream.eof() ) {
     line = stream.readLine();
@@ -72,9 +72,9 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
         list << *a;
         delete a;
         a = 0;
-        a = new KABC::Addressee();
+        a = new TDEABC::Addressee();
       } else
-        a = new KABC::Addressee();
+        a = new TDEABC::Addressee();
 
       tmp = key( line ).stripWhiteSpace();
       if ( !tmp.isEmpty() )
@@ -97,7 +97,7 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
 
       tmp = get( line, "address" ).stripWhiteSpace();
       if ( !tmp.isEmpty() ) {
-        KABC::Address addr;
+        TDEABC::Address addr;
         kdDebug(5720) << tmp << endl; // dump complete address
         addr.setLabel( tmp );
         a->insertAddress( addr );
@@ -105,7 +105,7 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
 
       tmp = get( line, "phone" ).stripWhiteSpace();
       if ( !tmp.isEmpty() )
-         a->insertPhoneNumber( KABC::PhoneNumber( tmp, KABC::PhoneNumber::Home ) );
+         a->insertPhoneNumber( TDEABC::PhoneNumber( tmp, TDEABC::PhoneNumber::Home ) );
     }
   }
 
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index b1b6ebf8e..b6b346022 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -32,12 +32,12 @@ class EudoraXXPort : public KAB::XXPort
   
 
   public:
-    EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    EudoraXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "eudora"; }
 
   public slots:
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 
   private:
     TQString get( const TQString& line, const TQString& key ) const;
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 306fbe808..5755784af 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -77,7 +77,7 @@ static KProgressDialog *m_progressDlg;
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort )
 
-GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+GNOKIIXXPort::GNOKIIXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
 	this_filter = this;
@@ -187,7 +187,7 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 
 // read and evaluate all phone entries
 static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memtype,
-			KABC::AddresseeList *addrList )
+			TDEABC::AddresseeList *addrList )
 {
   gn_error error;
 
@@ -204,7 +204,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
   error = read_phone_memstat(memtype, &memstat);
 
   TQStringList addrlist;
-  KABC::Address *addr;
+  TDEABC::Address *addr;
   TQString s, country;
 
   progress->setTotalSteps(memstat.used);
@@ -237,7 +237,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 			.arg(GN_FROM(name)).arg(GN_FROM(number))
 			.arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state))
 			.arg(subentries_count));
-		KABC::Addressee *a = new KABC::Addressee();
+		TDEABC::Addressee *a = new TDEABC::Addressee();
 
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(name).simplifyWhiteSpace();
@@ -280,8 +280,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		a->setRevision(datetime);
 
 		if (!subentries_count)
-		  a->insertPhoneNumber(KABC::PhoneNumber(number,
-				KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref));
+		  a->insertPhoneNumber(TDEABC::PhoneNumber(number,
+				TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref));
 
 		/* scan sub-entries */
 		if (subentries_count)
@@ -307,7 +307,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 			break;
 		   case GN_PHONEBOOK_ENTRY_Postal:
 			addrlist = TQStringList::split(';', s, true);
-			addr = new KABC::Address(KABC::Address::Work);
+			addr = new TDEABC::Address(TDEABC::Address::Work);
 			if (addrlist.count() <= 1) {
 				addrlist = TQStringList::split(',', s, true);
 				if (addrlist.count() > 1 ) {
@@ -341,18 +341,18 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 			a->setNote(a->note()+s);
 			break;
 		   case GN_PHONEBOOK_ENTRY_Number:
-			enum KABC::PhoneNumber::Types phonetype;
+			enum TDEABC::PhoneNumber::Types phonetype;
 			switch (number_type) {
-			 case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break;
-			 case GN_PHONEBOOK_NUMBER_Fax:    phonetype = KABC::PhoneNumber::Fax;  break;
+			 case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break;
+			 case GN_PHONEBOOK_NUMBER_Fax:    phonetype = TDEABC::PhoneNumber::Fax;  break;
 			 case GN_PHONEBOOK_NUMBER_General:
-			 case GN_PHONEBOOK_NUMBER_Work:   phonetype = KABC::PhoneNumber::Work; break;
+			 case GN_PHONEBOOK_NUMBER_Work:   phonetype = TDEABC::PhoneNumber::Work; break;
 			 default:
-			 case GN_PHONEBOOK_NUMBER_Home:   phonetype = KABC::PhoneNumber::Home; break;
+			 case GN_PHONEBOOK_NUMBER_Home:   phonetype = TDEABC::PhoneNumber::Home; break;
 			}
 			//if (s == entry.number)
-			//  type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref);
-			a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype));
+			//  type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref);
+			a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype));
 			break;
 		   case GN_PHONEBOOK_ENTRY_URL:
 			a->setUrl(s);
@@ -388,7 +388,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 // export to phone
 
 static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type memtype,
-			const KABC::Addressee *addr)
+			const TDEABC::Addressee *addr)
 {
 	TQString s;
 
@@ -398,13 +398,13 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 	gn_lib_set_pb_location(state, phone_location);
 
 	gn_lib_set_pb_name(state, GN_TO(addr->realName()));
-	s = addr->phoneNumber(KABC::PhoneNumber::Pref).number();
+	s = addr->phoneNumber(TDEABC::PhoneNumber::Pref).number();
 	if (s.isEmpty())
-		s = addr->phoneNumber(KABC::PhoneNumber::Work).number();
+		s = addr->phoneNumber(TDEABC::PhoneNumber::Work).number();
 	if (s.isEmpty())
-		s = addr->phoneNumber(KABC::PhoneNumber::Home).number();
+		s = addr->phoneNumber(TDEABC::PhoneNumber::Home).number();
 	if (s.isEmpty())
-		s = addr->phoneNumber(KABC::PhoneNumber::Cell).number();
+		s = addr->phoneNumber(TDEABC::PhoneNumber::Cell).number();
 	if (s.isEmpty() && addr->phoneNumbers().count()>0)
 		s = (*addr->phoneNumbers().at(0)).number();
 	s = makeValidPhone(s);
@@ -428,25 +428,25 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 	GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
 		.arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state))));
 
-	const KABC::Address homeAddr = addr->address(KABC::Address::Home);
-	const KABC::Address workAddr = addr->address(KABC::Address::Work);
+	const TDEABC::Address homeAddr = addr->address(TDEABC::Address::Home);
+	const TDEABC::Address workAddr = addr->address(TDEABC::Address::Work);
 
 	// add all phone numbers
-	const KABC::PhoneNumber::List phoneList = addr->phoneNumbers();
-	KABC::PhoneNumber::List::ConstIterator it;
+	const TDEABC::PhoneNumber::List phoneList = addr->phoneNumbers();
+	TDEABC::PhoneNumber::List::ConstIterator it;
 	for ( it = phoneList.begin(); it != phoneList.end(); ++it ) {
-		const KABC::PhoneNumber *phonenumber = &(*it);
+		const TDEABC::PhoneNumber *phonenumber = &(*it);
 		s = phonenumber->number();
 		if (s.isEmpty()) continue;
 		gn_phonebook_number_type type;
 		int pn_type = phonenumber->type();
-		if ((pn_type & KABC::PhoneNumber::Cell))
+		if ((pn_type & TDEABC::PhoneNumber::Cell))
 			type = GN_PHONEBOOK_NUMBER_Mobile;
-		else if ((pn_type & KABC::PhoneNumber::Fax))
+		else if ((pn_type & TDEABC::PhoneNumber::Fax))
 			type = GN_PHONEBOOK_NUMBER_Fax;
-		else if ((pn_type & KABC::PhoneNumber::Home))
+		else if ((pn_type & TDEABC::PhoneNumber::Home))
 			type = GN_PHONEBOOK_NUMBER_Home;
-		else if ((pn_type & KABC::PhoneNumber::Work))
+		else if ((pn_type & TDEABC::PhoneNumber::Work))
 			type = GN_PHONEBOOK_NUMBER_Work;
 		else type = GN_PHONEBOOK_NUMBER_General;
 		gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
@@ -474,10 +474,10 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 			GN_PHONEBOOK_ENTRY_Email, GN_PHONEBOOK_NUMBER_General, GN_TO(s));
 	}
 	// add Adresses
-	const KABC::Address::List addresses = addr->addresses();
-	KABC::Address::List::ConstIterator it2;
+	const TDEABC::Address::List addresses = addr->addresses();
+	TDEABC::Address::List::ConstIterator it2;
 	for ( it2 = addresses.begin(); it2 != addresses.end(); ++it2 ) {
-		const KABC::Address *Addr = &(*it2);
+		const TDEABC::Address *Addr = &(*it2);
 		if (Addr->isEmpty()) continue;
 		TQStringList a;
 		TQChar sem(';');
@@ -524,9 +524,9 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me
 }
 
 
-KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
-	KABC::AddresseeList addrList;
+	TDEABC::AddresseeList addrList;
 
 	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -573,7 +573,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 }
 
 
-bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
+bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & )
 {
 	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -597,7 +597,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 
 	KProgress* progress = (KProgress*)m_progressDlg->progressBar();
 
-	KABC::AddresseeList::ConstIterator it;
+	TDEABC::AddresseeList::ConstIterator it;
 	TQStringList failedList;
 
 	gn_error error;
@@ -663,7 +663,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	// Now run the loop...
 	phone_entry_no = 1;
 	for ( it = list.begin(); it != list.end(); ++it ) {
-		const KABC::Addressee *addr = &(*it);
+		const TDEABC::Addressee *addr = &(*it);
 		if (addr->isEmpty())
 			continue;
 		// don't write back SIM-card entries !
@@ -966,7 +966,7 @@ static TQString buildMemoryTypeString( gn_memory_type memtype )
 
 // read and evaluate all phone entries
 static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memtype,
-			KABC::AddresseeList *addrList )
+			TDEABC::AddresseeList *addrList )
 {
   gn_error error;
 
@@ -984,7 +984,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 
   gn_phonebook_entry entry;
   TQStringList addrlist;
-  KABC::Address *addr;
+  TDEABC::Address *addr;
   TQString s, country;
 
   progress->setTotalSteps(memstat.used);
@@ -1010,7 +1010,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 	if (error == GN_ERR_NONE) {
 		GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name))
 			.arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count));
-		KABC::Addressee *a = new KABC::Addressee();
+		TDEABC::Addressee *a = new TDEABC::Addressee();
 
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(entry.name).simplifyWhiteSpace();
@@ -1052,7 +1052,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		a->setRevision(datetime);
 
 		if (!entry.subentries_count)
-		  a->insertPhoneNumber(KABC::PhoneNumber(entry.number, KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref));
+		  a->insertPhoneNumber(TDEABC::PhoneNumber(entry.number, TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref));
 
 		/* scan sub-entries */
 		if (entry.subentries_count)
@@ -1072,7 +1072,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 			break;
 		   case GN_PHONEBOOK_ENTRY_Postal:
 			addrlist = TQStringList::split(';', s, true);
-			addr = new KABC::Address(KABC::Address::Work);
+			addr = new TDEABC::Address(TDEABC::Address::Work);
 			if (addrlist.count() <= 1) {
 				addrlist = TQStringList::split(',', s, true);
 				if (addrlist.count() > 1 ) {
@@ -1106,18 +1106,18 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 			a->setNote(a->note()+s);
 			break;
 		   case GN_PHONEBOOK_ENTRY_Number:
-			enum KABC::PhoneNumber::Types phonetype;
+			enum TDEABC::PhoneNumber::Types phonetype;
 			switch (entry.subentries[n].number_type) {
-			 case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break;
-			 case GN_PHONEBOOK_NUMBER_Fax:    phonetype = KABC::PhoneNumber::Fax;  break;
+			 case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break;
+			 case GN_PHONEBOOK_NUMBER_Fax:    phonetype = TDEABC::PhoneNumber::Fax;  break;
 			 case GN_PHONEBOOK_NUMBER_General:
-			 case GN_PHONEBOOK_NUMBER_Work:   phonetype = KABC::PhoneNumber::Work; break;
+			 case GN_PHONEBOOK_NUMBER_Work:   phonetype = TDEABC::PhoneNumber::Work; break;
 			 default:
-			 case GN_PHONEBOOK_NUMBER_Home:   phonetype = KABC::PhoneNumber::Home; break;
+			 case GN_PHONEBOOK_NUMBER_Home:   phonetype = TDEABC::PhoneNumber::Home; break;
 			}
 			//if (s == entry.number)
-			//  type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref);
-			a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype));
+			//  type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref);
+			a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype));
 			break;
 		   case GN_PHONEBOOK_ENTRY_URL:
 			a->setUrl(s);
@@ -1154,20 +1154,20 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 // export to phone
 
 static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type memtype,
-			const KABC::Addressee *addr)
+			const TDEABC::Addressee *addr)
 {
 	gn_phonebook_entry entry;
 	TQString s;
 
 	memset(&entry, 0, sizeof(entry));
 	strncpy(entry.name, GN_TO(addr->realName()), sizeof(entry.name)-1);
-	s = addr->phoneNumber(KABC::PhoneNumber::Pref).number();
+	s = addr->phoneNumber(TDEABC::PhoneNumber::Pref).number();
 	if (s.isEmpty())
-		s = addr->phoneNumber(KABC::PhoneNumber::Work).number();
+		s = addr->phoneNumber(TDEABC::PhoneNumber::Work).number();
 	if (s.isEmpty())
-		s = addr->phoneNumber(KABC::PhoneNumber::Home).number();
+		s = addr->phoneNumber(TDEABC::PhoneNumber::Home).number();
 	if (s.isEmpty())
-		s = addr->phoneNumber(KABC::PhoneNumber::Cell).number();
+		s = addr->phoneNumber(TDEABC::PhoneNumber::Cell).number();
 	if (s.isEmpty() && addr->phoneNumbers().count()>0)
 		s = (*addr->phoneNumbers().at(0)).number();
 	s = makeValidPhone(s);
@@ -1194,28 +1194,28 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 	GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
 					.arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number)));
 
-	const KABC::Address homeAddr = addr->address(KABC::Address::Home);
-	const KABC::Address workAddr = addr->address(KABC::Address::Work);
+	const TDEABC::Address homeAddr = addr->address(TDEABC::Address::Home);
+	const TDEABC::Address workAddr = addr->address(TDEABC::Address::Work);
 
 	entry.subentries_count = 0;
 	gn_phonebook_subentry *subentry = &entry.subentries[0];
 	// add all phone numbers
-	const KABC::PhoneNumber::List phoneList = addr->phoneNumbers();
-	KABC::PhoneNumber::List::ConstIterator it;
+	const TDEABC::PhoneNumber::List phoneList = addr->phoneNumbers();
+	TDEABC::PhoneNumber::List::ConstIterator it;
 	for ( it = phoneList.begin(); it != phoneList.end(); ++it ) {
-		const KABC::PhoneNumber *phonenumber = &(*it);
+		const TDEABC::PhoneNumber *phonenumber = &(*it);
 		s = phonenumber->number();
 		if (s.isEmpty()) continue;
 		subentry->entry_type  = GN_PHONEBOOK_ENTRY_Number;
 		gn_phonebook_number_type type;
 		int pn_type = phonenumber->type();
-		if ((pn_type & KABC::PhoneNumber::Cell))
+		if ((pn_type & TDEABC::PhoneNumber::Cell))
 			type = GN_PHONEBOOK_NUMBER_Mobile;
-		else if ((pn_type & KABC::PhoneNumber::Fax))
+		else if ((pn_type & TDEABC::PhoneNumber::Fax))
 			type = GN_PHONEBOOK_NUMBER_Fax;
-		else if ((pn_type & KABC::PhoneNumber::Home))
+		else if ((pn_type & TDEABC::PhoneNumber::Home))
 			type = GN_PHONEBOOK_NUMBER_Home;
-		else if ((pn_type & KABC::PhoneNumber::Work))
+		else if ((pn_type & TDEABC::PhoneNumber::Work))
 			type = GN_PHONEBOOK_NUMBER_Work;
 		else type = GN_PHONEBOOK_NUMBER_General;
 		subentry->number_type = type;
@@ -1253,12 +1253,12 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		subentry++;
 	}
 	// add Adresses
-	const KABC::Address::List addresses = addr->addresses();
-	KABC::Address::List::ConstIterator it2;
+	const TDEABC::Address::List addresses = addr->addresses();
+	TDEABC::Address::List::ConstIterator it2;
 	for ( it2 = addresses.begin(); it2 != addresses.end(); ++it2 ) {
 		if (entry.subentries_count >= GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER)
 			break; // Phonebook full
-		const KABC::Address *Addr = &(*it2);
+		const TDEABC::Address *Addr = &(*it2);
 		if (Addr->isEmpty()) continue;
 		subentry->entry_type  = GN_PHONEBOOK_ENTRY_Postal;
 		TQStringList a;
@@ -1315,9 +1315,9 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me
 	return error;
 }
 
-KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
-	KABC::AddresseeList addrList;
+	TDEABC::AddresseeList addrList;
 
 	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -1364,7 +1364,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 }
 
 
-bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
+bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & )
 {
 	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -1388,7 +1388,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 
 	KProgress* progress = (KProgress*)m_progressDlg->progressBar();
 
-	KABC::AddresseeList::ConstIterator it;
+	TDEABC::AddresseeList::ConstIterator it;
 	TQStringList failedList;
 
 	gn_error error;
@@ -1454,7 +1454,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	// Now run the loop...
 	phone_entry_no = 1;
 	for ( it = list.begin(); it != list.end(); ++it ) {
-		const KABC::Addressee *addr = &(*it);
+		const TDEABC::Addressee *addr = &(*it);
 		if (addr->isEmpty())
 			continue;
 		// don't write back SIM-card entries !
@@ -1572,15 +1572,15 @@ finish:
 
 #else  /* no gnokii installed */
 
-KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
-	KABC::AddresseeList addrList;
+	TDEABC::AddresseeList addrList;
 	KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
 		"Please ask your distributor to add gnokii at compile time."));
 	return addrList;
 }
 
-bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
+bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & )
 {
 	Q_UNUSED(list);
 	KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h
index 898d1600f..b41aace12 100644
--- a/kaddressbook/xxport/gnokii_xxport.h
+++ b/kaddressbook/xxport/gnokii_xxport.h
@@ -32,13 +32,13 @@ class GNOKIIXXPort : public KAB::XXPort
   
 
   public:
-    GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    GNOKIIXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "gnokii"; }
 
   public slots:
-    bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 };
 
 #endif
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 730de8237..58ae2afdf 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -39,25 +39,25 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort )
 
-KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+KDE2XXPort::KDE2XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createImportAction( i18n( "Import KDE 2 Addressbook..." ) );
 }
 
-KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
 {
   TQString fileName = locateLocal( "data", "tdeabc/std.vcf" );
   if ( !TQFile::exists( fileName ) ) {
     KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
-    return KABC::AddresseeList();
+    return TDEABC::AddresseeList();
   }
 
   int result = KMessageBox::questionYesNoCancel( parentWidget(),
       i18n( "Override previously imported entries?" ),
       i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") );
 
-  if ( !result ) return KABC::AddresseeList();
+  if ( !result ) return TDEABC::AddresseeList();
 
   TDEProcess proc;
 
@@ -68,13 +68,13 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
     proc << "tdeab2tdeabc";
   else {
     kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
-    return KABC::AddresseeList();
+    return TDEABC::AddresseeList();
   }
   proc.start( TDEProcess::Block );
 
   addressBook()->load();
 
-  return KABC::AddresseeList();
+  return TDEABC::AddresseeList();
 }
 
 #include "kde2_xxport.moc"
diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h
index b66440df5..694b0b1ba 100644
--- a/kaddressbook/xxport/kde2_xxport.h
+++ b/kaddressbook/xxport/kde2_xxport.h
@@ -32,12 +32,12 @@ class KDE2XXPort : public KAB::XXPort
   
 
   public:
-    KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    KDE2XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "kde2"; }
 
   public slots:
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 };
 
 #endif
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 31d3c2936..8a68c481a 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -50,7 +50,7 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort )
 
-LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+LDIFXXPort::LDIFXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createImportAction( i18n( "Import LDIF Addressbook..." ) );
@@ -59,9 +59,9 @@ LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *nam
 
 /* import */
 
-KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
 {
-  KABC::AddresseeList addrList;
+  TDEABC::AddresseeList addrList;
 
   TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(),
                       "text/x-ldif", 0 );
@@ -81,7 +81,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
   TQDateTime dtDefault = TQFileInfo(file).lastModified();
   file.close();
 
-  KABC::LDIFConverter::LDIFToAddressee( wholeFile, addrList, dtDefault );
+  TDEABC::LDIFConverter::LDIFToAddressee( wholeFile, addrList, dtDefault );
 
   return addrList;
 }
@@ -89,7 +89,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
 
 /* export */
 
-bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
+bool LDIFXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& )
 {
   KURL url = KFileDialog::getSaveURL( TQDir::homeDirPath() + "/addressbook.ldif",
 			"text/x-ldif" );
@@ -132,10 +132,10 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
   }
 }
 
-void LDIFXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
+void LDIFXXPort::doExport( TQFile *fp, const TDEABC::AddresseeList &list )
 {
   TQString str;
-  KABC::LDIFConverter::addresseeToLDIF( list, str );
+  TDEABC::LDIFConverter::addresseeToLDIF( list, str );
 
   TQTextStream t( fp );
   t.setEncoding( TQTextStream::UnicodeUTF8 );
diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h
index 06c3c9155..1e8282a83 100644
--- a/kaddressbook/xxport/ldif_xxport.h
+++ b/kaddressbook/xxport/ldif_xxport.h
@@ -33,16 +33,16 @@ class LDIFXXPort : public KAB::XXPort
   
 
   public:
-    LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    LDIFXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "ldif"; }
 
   public slots:
-    bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 
   private:
-    void doExport( TQFile *fp, const KABC::AddresseeList &list );
+    void doExport( TQFile *fp, const TDEABC::AddresseeList &list );
 };
 
 #endif
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 0a4ac4886..0332d9acc 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -38,15 +38,15 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort )
 
-OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+OperaXXPort::OperaXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createImportAction( i18n( "Import Opera Addressbook..." ) );
 }
 
-KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
 {
-  KABC::AddresseeList addrList;
+  TDEABC::AddresseeList addrList;
 
   TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) );
   if ( fileName.isEmpty() )
@@ -63,7 +63,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
   stream.setEncoding( TQTextStream::UnicodeUTF8 );
   TQString line, key, value;
   bool parseContact = false;
-  KABC::Addressee addr;
+  TDEABC::Addressee addr;
 
   TQRegExp separator( "\x02\x02" );
 
@@ -72,13 +72,13 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
     line = line.stripWhiteSpace();
     if ( line == TQString::fromLatin1( "#CONTACT" ) ) {
       parseContact = true;
-      addr = KABC::Addressee();
+      addr = TDEABC::Addressee();
       continue;
     } else if ( line.isEmpty() ) {
       parseContact = false;
       if ( !addr.isEmpty() ) {
         addrList.append( addr );
-        addr = KABC::Addressee();
+        addr = TDEABC::Addressee();
       }
       continue;
     }
@@ -99,12 +99,12 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
           preferred = false;
         }
       } else if ( key == TQString::fromLatin1( "phone" ) )
-        addr.insertPhoneNumber( KABC::PhoneNumber( value ) );
+        addr.insertPhoneNumber( TDEABC::PhoneNumber( value ) );
       else if ( key == TQString::fromLatin1( "fax" ) )
-        addr.insertPhoneNumber( KABC::PhoneNumber( value,
-                              KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) );
+        addr.insertPhoneNumber( TDEABC::PhoneNumber( value,
+                              TDEABC::PhoneNumber::Fax | TDEABC::PhoneNumber::Home ) );
       else if ( key == TQString::fromLatin1( "postaladdress" ) ) {
-        KABC::Address address( KABC::Address::Home );
+        TDEABC::Address address( TDEABC::Address::Home );
         address.setLabel( value.replace( separator, "\n" ) );
         addr.insertAddress( address );
       } else if ( key == TQString::fromLatin1( "description" ) )
@@ -112,7 +112,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
       else if ( key == TQString::fromLatin1( "url" ) )
         addr.setUrl( KURL( value ) );
       else if ( key == TQString::fromLatin1( "pictureurl" ) ) {
-        KABC::Picture pic( value );
+        TDEABC::Picture pic( value );
         addr.setPhoto( pic );
       }
     }
diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h
index 730e4972d..ce0a33ec4 100644
--- a/kaddressbook/xxport/opera_xxport.h
+++ b/kaddressbook/xxport/opera_xxport.h
@@ -33,12 +33,12 @@ class OperaXXPort : public KAB::XXPort
   
 
   public:
-    OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    OperaXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "opera"; }
 
   public slots:
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 };
 
 #endif
diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp
index 6d61cb339..9f1879b87 100644
--- a/kaddressbook/xxport/pab_mapihd.cpp
+++ b/kaddressbook/xxport/pab_mapihd.cpp
@@ -286,8 +286,8 @@ content_t pabfields_t::order(int k)
 return tags[k].order();
 }
 
-KABC::Addressee pabfields_t::get() {
-  KABC::Addressee a;
+TDEABC::Addressee pabfields_t::get() {
+  TDEABC::Addressee a;
   if (!givenName.isEmpty()) a.setFormattedName(givenName);
   if (!email.isEmpty()) a.insertEmail(email);
   if (!title.isEmpty()) a.setTitle(title);
@@ -295,7 +295,7 @@ KABC::Addressee pabfields_t::get() {
   if (!additionalName.isEmpty()) a.setAdditionalName(additionalName);
   if (!lastName.isEmpty()) a.setFamilyName(lastName);
 
-  KABC::Address addr;
+  TDEABC::Address addr;
   if (!address.isEmpty()) addr.setStreet(address);
   if (!town.isEmpty()) addr.setLocality(town);
   if (!zip.isEmpty()) addr.setPostalCode(zip);
@@ -306,10 +306,10 @@ KABC::Addressee pabfields_t::get() {
   if (!organization.isEmpty()) a.setOrganization(organization);
   if (!department.isEmpty()) a.setRole(department);
   // Miss out department, subDep, job
-  if (!tel.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( tel, KABC::PhoneNumber::Voice ) );
-  if (!fax.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( fax, KABC::PhoneNumber::Fax ) );
-  if (!mobile.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( mobile, KABC::PhoneNumber::Cell ) );
-  if (!modem.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( modem, KABC::PhoneNumber::Modem ) );
+  if (!tel.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( tel, TDEABC::PhoneNumber::Voice ) );
+  if (!fax.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( fax, TDEABC::PhoneNumber::Fax ) );
+  if (!mobile.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( mobile, TDEABC::PhoneNumber::Cell ) );
+  if (!modem.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( modem, TDEABC::PhoneNumber::Modem ) );
   if (!homepage.isEmpty()) a.setUrl(KURL( homepage ));
   // Miss out talk
   if (!comment.isEmpty()) a.setNote(comment);
diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h
index c54be4500..2df9953cc 100644
--- a/kaddressbook/xxport/pab_mapihd.h
+++ b/kaddressbook/xxport/pab_mapihd.h
@@ -107,7 +107,7 @@
    public:
      pabfields_t(pabrec & R, TQWidget *parent);
    public:
-     KABC::Addressee get( );
+     TDEABC::Addressee get( );
      bool isOK(void)     { return OK; }
      bool isUsable(void) { return givenName!=""; }
  };
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 894adf3d5..21070acfb 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -40,15 +40,15 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort )
 
-PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+PABXXPort::PABXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") );
 }
 
-KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
 {
-  KABC::AddresseeList addrList;
+  TDEABC::AddresseeList addrList;
 
   TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(),
       		"*.[pP][aA][bB]|" + i18n("MS Exchange Personal Address Book Files (*.pab)"), 0 );
diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h
index 04395f416..796894a06 100644
--- a/kaddressbook/xxport/pab_xxport.h
+++ b/kaddressbook/xxport/pab_xxport.h
@@ -33,15 +33,15 @@ class PABXXPort : public KAB::XXPort
   
 
   public:
-    PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    PABXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "pab"; }
 
   public slots:
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 
   private:
-    void doExport( TQFile *fp, const KABC::AddresseeList &list );
+    void doExport( TQFile *fp, const TDEABC::AddresseeList &list );
 };
 
 
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index b12779cbb..293879cc5 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -55,10 +55,10 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_vcard_xxport, VCardXXPort )
 class VCardViewerDialog : public KDialogBase
 {
   public:
-    VCardViewerDialog( const KABC::Addressee::List &list,
+    VCardViewerDialog( const TDEABC::Addressee::List &list,
                        TQWidget *parent, const char *name = 0 );
 
-    KABC::Addressee::List contacts() const;
+    TDEABC::Addressee::List contacts() const;
 
   protected:
     void slotUser1();
@@ -71,8 +71,8 @@ class VCardViewerDialog : public KDialogBase
 
     KPIM::AddresseeView *mView;
 
-    KABC::Addressee::List mContacts;
-    KABC::Addressee::List::Iterator mIt;
+    TDEABC::Addressee::List mContacts;
+    TDEABC::Addressee::List::Iterator mIt;
 };
 
 class VCardExportSelectionDialog : public KDialogBase
@@ -93,7 +93,7 @@ class VCardExportSelectionDialog : public KDialogBase
     TQCheckBox *mEncryptionKeys;
 };
 
-VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+VCardXXPort::VCardXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
 {
   createImportAction( i18n( "Import vCard..." ) );
@@ -101,11 +101,11 @@ VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *n
   createExportAction( i18n( "Export vCard 3.0..." ), "v30" );
 }
 
-bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQString &data )
+bool VCardXXPort::exportContacts( const TDEABC::AddresseeList &addrList, const TQString &data )
 {
-  KABC::VCardConverter converter;
+  TDEABC::VCardConverter converter;
   KURL url;
-  KABC::AddresseeList list;
+  TDEABC::AddresseeList list;
 
   list = filterContacts( addrList );
 
@@ -119,13 +119,13 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
 
     if ( data == "v21" )
 #if defined(KABC_VCARD_ENCODING_FIX)
-      ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) );
+      ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v2_1 ) );
     else
-      ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) );
+      ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 ) );
 #else
-      ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) );
+      ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v2_1 ) );
     else
-      ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) );
+      ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v3_0 ) );
 #endif
   } else {
     TQString msg = i18n( "You have selected a list of contacts, shall they be "
@@ -137,7 +137,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
         if ( baseUrl.isEmpty() )
           return true;
 
-        KABC::AddresseeList::ConstIterator it;
+        TDEABC::AddresseeList::ConstIterator it;
         uint counter = 0;
         for ( it = list.begin(); it != list.end(); ++it ) {
           TQString testUrl;
@@ -153,18 +153,18 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
             url = testUrl + ".vcf";
 
           bool tmpOk;
-          KABC::AddresseeList tmpList;
+          TDEABC::AddresseeList tmpList;
           tmpList.append( *it );
 
           if ( data == "v21" )
 #if defined(KABC_VCARD_ENCODING_FIX)
-            tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v2_1 ) );
+            tmpOk = doExport( url, converter.createVCardsRaw( tmpList, TDEABC::VCardConverter::v2_1 ) );
           else
-            tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v3_0 ) );
+            tmpOk = doExport( url, converter.createVCardsRaw( tmpList, TDEABC::VCardConverter::v3_0 ) );
 #else
-            tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v2_1 ) );
+            tmpOk = doExport( url, converter.createVCards( tmpList, TDEABC::VCardConverter::v2_1 ) );
           else
-            tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v3_0 ) );
+            tmpOk = doExport( url, converter.createVCards( tmpList, TDEABC::VCardConverter::v3_0 ) );
 #endif
           ok = ok && tmpOk;
         }
@@ -178,13 +178,13 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
 
         if ( data == "v21" )
 #if defined(KABC_VCARD_ENCODING_FIX)
-          ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) );
+          ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v2_1 ) );
         else
-          ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) );
+          ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 ) );
 #else
-          ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) );
+          ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v2_1 ) );
         else
-          ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) );
+          ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v3_0 ) );
 #endif
       }
     }
@@ -193,10 +193,10 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
   return ok;
 }
 
-KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 {
   TQString fileName;
-  KABC::AddresseeList addrList;
+  TDEABC::AddresseeList addrList;
   KURL::List urls;
 
   if ( !XXPortManager::importData.isEmpty() ) {
@@ -283,9 +283,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 }
 
 #if defined(KABC_VCARD_ENCODING_FIX)
-KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const
+TDEABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const
 {
-  KABC::VCardConverter converter;
+  TDEABC::VCardConverter converter;
 
   return converter.parseVCardsRaw( data.data() );
 }
@@ -305,9 +305,9 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
   return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
 }
 #else
-KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
+TDEABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
 {
-  KABC::VCardConverter converter;
+  TDEABC::VCardConverter converter;
 
   return converter.parseVCards( data );
 }
@@ -331,9 +331,9 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
 }
 #endif
 
-KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addrList )
+TDEABC::AddresseeList VCardXXPort::filterContacts( const TDEABC::AddresseeList &addrList )
 {
-  KABC::AddresseeList list;
+  TDEABC::AddresseeList list;
 
   if ( addrList.isEmpty() )
     return addrList;
@@ -342,9 +342,9 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
   if ( !dlg.exec() )
     return list;
 
-  KABC::AddresseeList::ConstIterator it;
+  TDEABC::AddresseeList::ConstIterator it;
   for ( it = addrList.begin(); it != addrList.end(); ++it ) {
-    KABC::Addressee addr;
+    TDEABC::Addressee addr;
 
     addr.setUid( (*it).uid() );
     addr.setFormattedName( (*it).formattedName() );
@@ -378,38 +378,38 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
 
       addr.setLogo( (*it).logo() );
 
-      KABC::PhoneNumber::List phones = (*it).phoneNumbers( KABC::PhoneNumber::Work );
-      KABC::PhoneNumber::List::Iterator phoneIt;
+      TDEABC::PhoneNumber::List phones = (*it).phoneNumbers( TDEABC::PhoneNumber::Work );
+      TDEABC::PhoneNumber::List::Iterator phoneIt;
       for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt )
         addr.insertPhoneNumber( *phoneIt );
 
-      KABC::Address::List addresses = (*it).addresses( KABC::Address::Work );
-      KABC::Address::List::Iterator addrIt;
+      TDEABC::Address::List addresses = (*it).addresses( TDEABC::Address::Work );
+      TDEABC::Address::List::Iterator addrIt;
       for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt )
         addr.insertAddress( *addrIt );
     }
 
-    KABC::PhoneNumber::List phones = (*it).phoneNumbers();
-    KABC::PhoneNumber::List::Iterator phoneIt;
+    TDEABC::PhoneNumber::List phones = (*it).phoneNumbers();
+    TDEABC::PhoneNumber::List::Iterator phoneIt;
     for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
       int type = (*phoneIt).type();
 
-      if ( type & KABC::PhoneNumber::Home && dlg.exportPrivateFields() )
+      if ( type & TDEABC::PhoneNumber::Home && dlg.exportPrivateFields() )
         addr.insertPhoneNumber( *phoneIt );
-      else if ( type & KABC::PhoneNumber::Work && dlg.exportBusinessFields() )
+      else if ( type & TDEABC::PhoneNumber::Work && dlg.exportBusinessFields() )
         addr.insertPhoneNumber( *phoneIt );
       else if ( dlg.exportOtherFields() )
         addr.insertPhoneNumber( *phoneIt );
     }
 
-    KABC::Address::List addresses = (*it).addresses();
-    KABC::Address::List::Iterator addrIt;
+    TDEABC::Address::List addresses = (*it).addresses();
+    TDEABC::Address::List::Iterator addrIt;
     for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) {
       int type = (*addrIt).type();
 
-      if ( type & KABC::Address::Home && dlg.exportPrivateFields() )
+      if ( type & TDEABC::Address::Home && dlg.exportPrivateFields() )
         addr.insertAddress( *addrIt );
-      else if ( type & KABC::Address::Work && dlg.exportBusinessFields() )
+      else if ( type & TDEABC::Address::Work && dlg.exportBusinessFields() )
         addr.insertAddress( *addrIt );
       else if ( dlg.exportOtherFields() )
         addr.insertAddress( *addrIt );
@@ -419,8 +419,8 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
       addr.setCustoms( (*it).customs() );
 
     if ( dlg.exportEncryptionKeys() ) {
-      addKey( addr, KABC::Key::PGP );
-      addKey( addr, KABC::Key::X509 );
+      addKey( addr, TDEABC::Key::PGP );
+      addKey( addr, TDEABC::Key::X509 );
     }
 
     list.append( addr );
@@ -429,10 +429,10 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
   return list;
 }
 
-void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
+void VCardXXPort::addKey( TDEABC::Addressee &addr, TDEABC::Key::Types type )
 {
   TQString fingerprint = addr.custom( "KADDRESSBOOK",
-                                     (type == KABC::Key::PGP ? "OPENPGPFP" : "SMIMEFP") );
+                                     (type == TDEABC::Key::PGP ? "OPENPGPFP" : "SMIMEFP") );
   if ( fingerprint.isEmpty() )
     return;
 
@@ -455,7 +455,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
     return;
   }
 
-  KABC::Key key;
+  TDEABC::Key key;
   key.setType( type );
   key.setBinaryData( dataProvider.data() );
 
@@ -464,7 +464,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
 
 // ---------- VCardViewer Dialog ---------------- //
 
-VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
+VCardViewerDialog::VCardViewerDialog( const TDEABC::Addressee::List &list,
                                       TQWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes,
                  parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ),
@@ -491,7 +491,7 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
   updateView();
 }
 
-KABC::Addressee::List VCardViewerDialog::contacts() const
+TDEABC::Addressee::List VCardViewerDialog::contacts() const
 {
   return mContacts;
 }
@@ -500,7 +500,7 @@ void VCardViewerDialog::updateView()
 {
   mView->setAddressee( *mIt );
 
-  KABC::Addressee::List::Iterator it = mIt;
+  TDEABC::Addressee::List::Iterator it = mIt;
   actionButton( Apply )->setEnabled( (++it) != mContacts.end() );
 }
 
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index b4b03284f..c5f66f930 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -33,25 +33,25 @@ class VCardXXPort : public KAB::XXPort
   
 
   public:
-    VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    VCardXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
 
     TQString identifier() const { return "vcard"; }
 
   public slots:
-    bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
-    KABC::AddresseeList importContacts( const TQString &data ) const;
+    bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+    TDEABC::AddresseeList importContacts( const TQString &data ) const;
 
   private:
 #if defined(KABC_VCARD_ENCODING_FIX)
-    KABC::AddresseeList parseVCard( const TQByteArray &data ) const;
+    TDEABC::AddresseeList parseVCard( const TQByteArray &data ) const;
     bool doExport( const KURL &url, const TQByteArray &data );
 #else
-  KABC::AddresseeList parseVCard( const TQString &data ) const;
+  TDEABC::AddresseeList parseVCard( const TQString &data ) const;
   bool doExport( const KURL &url, const TQString &data );
 #endif
-    void addKey( KABC::Addressee &addr, KABC::Key::Types type );
+    void addKey( TDEABC::Addressee &addr, TDEABC::Key::Types type );
 
-    KABC::AddresseeList filterContacts( const KABC::AddresseeList& );
+    TDEABC::AddresseeList filterContacts( const TDEABC::AddresseeList& );
 };
 
 #endif