13 files changed, 34 insertions, 34 deletions
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index 83cdd2b7..62357a59 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -26,7 +26,7 @@
 #include <kbookmarkmanager.h>
 #include <kbookmarkmenu.h>
 #include <kbookmarkdombuilder.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "bookmark_xxport.h"
@@ -41,7 +41,7 @@ BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const c
 
 bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
 {
-  TQString fileName = locateLocal( "data", "kabc/bookmarks.xml" );
+  TQString fileName = locateLocal( "data", "tdeabc/bookmarks.xml" );
 
   KBookmarkManager *mgr = KBookmarkManager::managerForFile( fileName );
   KBookmarkDomBuilder *builder = new KBookmarkDomBuilder( mgr->root(), mgr );
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 673a0ec7..20ed9aac 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -25,9 +25,9 @@
 
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include "csvimportdialog.h"
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 700eceae..93635d25 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -37,9 +37,9 @@
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index bf0cc774..b6b89d7e 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -22,8 +22,8 @@
 #ifndef CSV_IMPORT_DLG_H
 #define CSV_IMPORT_DLG_H
 
-#include <kabc/addressbook.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addresseelist.h>
 #include <kdialogbase.h>
 
 #include <tqvaluelist.h>
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index c443cce3..75f2ea24 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -25,9 +25,9 @@
 
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <kdebug.h>
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 0de310e9..306fbe80 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -46,8 +46,8 @@ extern "C" {
 #include <tqcursor.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kguiitem.h>
 
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 6d8fd80e..730de823 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -26,11 +26,11 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include "xxportmanager.h"
@@ -47,7 +47,7 @@ KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *nam
 
 KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
 {
-  TQString fileName = locateLocal( "data", "kabc/std.vcf" );
+  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();
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 67c3684d..31d3c293 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -37,12 +37,12 @@
 
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kurl.h>
-#include <kabc/ldifconverter.h>
+#include <tdeabc/ldifconverter.h>
 
 #include <kdebug.h>
 
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index f1547481..0a4ac488 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -27,9 +27,9 @@
 
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <kdebug.h>
diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h
index c26cbdf2..910688cc 100644
--- a/kaddressbook/xxport/pab_pablib.h
+++ b/kaddressbook/xxport/pab_pablib.h
@@ -19,7 +19,7 @@
 #ifndef PAB_LIB_HXX
 #define PAB_LIB_HXX
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 #include "pab_mapihd.h"
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index c4db37a9..894adf3d 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -27,11 +27,11 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include "xxportmanager.h"
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index b1e0b0f1..b12779cb 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -28,13 +28,13 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <libtdepim/addresseeview.h>
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index a2aa8be3..b4b03284 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -25,7 +25,7 @@
 #define VCARD_XXPORT_H
 
 #include <xxport.h>
-#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
 
 class VCardXXPort : public KAB::XXPort
 {