From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:15 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kaddressbook/addresseditwidget.cpp                 | 2 +-
 kaddressbook/addresseeconfig.h                     | 2 +-
 kaddressbook/addresseeeditorwidget.cpp             | 2 +-
 kaddressbook/common/filter.cpp                     | 2 +-
 kaddressbook/common/filter.h                       | 2 +-
 kaddressbook/common/kabprefs.cpp                   | 2 +-
 kaddressbook/common/kabprefs_base.kcfgc            | 2 +-
 kaddressbook/common/locationmap.cpp                | 2 +-
 kaddressbook/emaileditwidget.cpp                   | 2 +-
 kaddressbook/extensionmanager.cpp                  | 2 +-
 kaddressbook/features/distributionlistwidget.cpp   | 2 +-
 kaddressbook/imagewidget.cpp                       | 4 ++--
 kaddressbook/imeditwidget.cpp                      | 2 +-
 kaddressbook/interfaces/configurewidget.h          | 2 +-
 kaddressbook/kaddressbookview.cpp                  | 2 +-
 kaddressbook/kcmconfigs/addresseewidget.cpp        | 2 +-
 kaddressbook/kcmconfigs/kabconfigwidget.cpp        | 2 +-
 kaddressbook/kcmconfigs/ldapoptionswidget.cpp      | 2 +-
 kaddressbook/keywidget.cpp                         | 4 ++--
 kaddressbook/ldapsearchdialog.cpp                  | 2 +-
 kaddressbook/nameeditdialog.cpp                    | 2 +-
 kaddressbook/phoneeditwidget.cpp                   | 2 +-
 kaddressbook/printing/detailledstyle.cpp           | 2 +-
 kaddressbook/soundwidget.cpp                       | 2 +-
 kaddressbook/thumbnailcreator/Makefile.am          | 2 +-
 kaddressbook/thumbnailcreator/ldifvcardcreator.cpp | 2 +-
 kaddressbook/thumbnailcreator/ldifvcardcreator.h   | 2 +-
 kaddressbook/viewconfigurefilterpage.cpp           | 2 +-
 kaddressbook/viewconfigurewidget.cpp               | 2 +-
 kaddressbook/viewmanager.cpp                       | 2 +-
 kaddressbook/views/configurecardviewdialog.cpp     | 2 +-
 kaddressbook/views/configuretableviewdialog.cpp    | 2 +-
 kaddressbook/views/contactlistview.cpp             | 2 +-
 kaddressbook/views/kaddressbookcardview.cpp        | 2 +-
 kaddressbook/views/kaddressbookiconview.cpp        | 2 +-
 kaddressbook/views/kaddressbooktableview.cpp       | 2 +-
 kaddressbook/xxport/csv_xxport.cpp                 | 4 ++--
 kaddressbook/xxport/csvimportdialog.cpp            | 2 +-
 kaddressbook/xxport/eudora_xxport.cpp              | 4 ++--
 kaddressbook/xxport/kde2_xxport.cpp                | 8 ++++----
 kaddressbook/xxport/ldif_xxport.cpp                | 4 ++--
 kaddressbook/xxport/opera_xxport.cpp               | 4 ++--
 kaddressbook/xxport/pab_xxport.cpp                 | 4 ++--
 kaddressbook/xxport/vcard_xxport.cpp               | 4 ++--
 44 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'kaddressbook')

diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 4e4b6e61..5d17f4ef 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -41,7 +41,7 @@
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h
index a0dcd45a..c267dce1 100644
--- a/kaddressbook/addresseeconfig.h
+++ b/kaddressbook/addresseeconfig.h
@@ -25,7 +25,7 @@
 #define ADDRESSEECONFIG_H
 
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 using namespace KABC;
 
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index e4cd5a3a..c1173b37 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -36,7 +36,7 @@
 #include <kabc/stdaddressbook.h>
 #include <kaccelmanager.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 1872ecea..e312fbcd 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "kabprefs.h"
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index e8518b8e..68df1036 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -29,7 +29,7 @@
 #include <tqvaluelist.h>
 
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /**
   Filter for AddressBook related objects (Addressees)
diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp
index 8a45fc14..1f9e2410 100644
--- a/kaddressbook/common/kabprefs.cpp
+++ b/kaddressbook/common/kabprefs.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 
diff --git a/kaddressbook/common/kabprefs_base.kcfgc b/kaddressbook/common/kabprefs_base.kcfgc
index 75e0d84d..bc54ae65 100644
--- a/kaddressbook/common/kabprefs_base.kcfgc
+++ b/kaddressbook/common/kabprefs_base.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kaddressbook.kcfg
 ClassName=KABPrefsBase
 Singleton=false
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index e1f23e66..11fd2c11 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 3d94d3b7..a04a88a9 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index aa17b625..dea1170e 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ktrader.h>
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index c49deee6..f48b5e96 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -31,7 +31,7 @@
 #include <tqradiobutton.h>
 
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 1d64fde3..9ba87d46 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -24,11 +24,11 @@
 #include <kabc/picture.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp
index 2f40f5de..9f727120 100644
--- a/kaddressbook/imeditwidget.cpp
+++ b/kaddressbook/imeditwidget.cpp
@@ -31,7 +31,7 @@
 #include <tqtooltip.h>
 
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index d1d23c8c..e8df353d 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -26,7 +26,7 @@
 
 #include <tqwidget.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdepimmacros.h>
 
 namespace KABC {
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 15ea63ba..98668618 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -26,7 +26,7 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/distributionlistdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kxmlguifactory.h>
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 6bbc45be..ce58d272 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -32,7 +32,7 @@
 
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 18cb1a90..d63247a4 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 #include <tqcombobox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 0f33eca6..12ff1104 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -31,7 +31,7 @@
 
 #include <kapplication.h>
 #include <kbuttonbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index b3fd9af2..8f0ca7bc 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -29,8 +29,8 @@
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 6537bebe..b9bdd1f6 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 8f70f0f8..1bba99ff 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -34,7 +34,7 @@
 #include <kaccelmanager.h>
 #include <kapplication.h>
 #include <kbuttonbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <kcombobox.h>
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index ff787e12..6d3ef0b9 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -35,7 +35,7 @@
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index a8062651..949c1783 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <tqcheckbox.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kfontcombo.h>
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index f4558258..f7beaf20 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kurlrequester.h>
diff --git a/kaddressbook/thumbnailcreator/Makefile.am b/kaddressbook/thumbnailcreator/Makefile.am
index d0d4c789..2f8ba9c8 100644
--- a/kaddressbook/thumbnailcreator/Makefile.am
+++ b/kaddressbook/thumbnailcreator/Makefile.am
@@ -1,4 +1,4 @@
-# kioslave to generate thumbnails for vCard and LDIF-Files in Konqueror
+# tdeioslave to generate thumbnails for vCard and LDIF-Files in Konqueror
 INCLUDES = $(all_includes)
 
 kde_module_LTLIBRARIES = ldifvcardthumbnail.la
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 7460ad80..4627ebd5 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -20,7 +20,7 @@
 /*
  *  - ldifvcardthumbnail -
  *
- *  kioslave which generates tumbnails for vCard and LDIF files.
+ *  tdeioslave which generates tumbnails for vCard and LDIF files.
  *  The thumbnails are used e.g. by Konqueror or in the file selection
  *  dialog.
  *
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.h b/kaddressbook/thumbnailcreator/ldifvcardcreator.h
index 2de6c7b4..04f78831 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.h
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.h
@@ -22,7 +22,7 @@
 #define VCARD_LDIFCREATOR_H
 
 #include <tqpixmap.h>
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 #include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
 
 class KPixmapSplitter;
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 9602f2d3..3dd0d7d6 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqradiobutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 415430d9..f2153f82 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -25,7 +25,7 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index edafa411..bfb02760 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -29,7 +29,7 @@
 #include <kabc/addressbook.h>
 #include <kabc/vcardconverter.h>
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 347bd423..b1e6233e 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -36,7 +36,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontdialog.h>
 #include <kpushbutton.h>
 
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 987feb17..2551be98 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -36,7 +36,7 @@
 #include <kurlrequester.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "configuretableviewdialog.h"
 
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index c4552232..25c66ac4 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kabc/addressbook.h>
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 30e1ca67..f69ce0c1 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -30,7 +30,7 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index adf3de0e..60bae788 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -28,7 +28,7 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index d951655b..4c39c13b 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -38,7 +38,7 @@
 
 #include <kabc/addressbook.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index f3d47bfc..673a0ec7 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -23,8 +23,8 @@
 
 #include <tqfile.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 40c209dc..4a363e76 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -35,7 +35,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kinputdialog.h>
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index 402665ab..c443cce3 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -23,8 +23,8 @@
 
 #include <tqfile.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index f5abefde..6d8fd80e 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -24,8 +24,8 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
@@ -62,10 +62,10 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
   TDEProcess proc;
 
   if ( result == KMessageBox::Yes ) {
-    proc << "kab2kabc";
+    proc << "tdeab2tdeabc";
     proc << "--override";
   } else if ( result == KMessageBox::No )
-    proc << "kab2kabc";
+    proc << "tdeab2tdeabc";
   else {
     kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
     return KABC::AddresseeList();
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index f0c13e61..67c3684d 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -35,8 +35,8 @@
 
 #include <tqfile.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 800f11fa..f1547481 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -25,8 +25,8 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 911e92de..c4db37a9 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -25,8 +25,8 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 34a6809f..8e219fca 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -30,8 +30,8 @@
 
 #include <kabc/vcardconverter.h>
 #include <kdialogbase.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-- 
cgit v1.2.3