From 45e371f7ffece317ed9466f032cb0fe9520461f1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:55:17 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 ChangeLog                                      |  4 ++--
 conduits/abbrowserconduit/abbrowser-conduit.cc |  2 +-
 conduits/docconduit/CMakeLists.txt             |  2 +-
 conduits/docconduit/Makefile.am                |  2 +-
 conduits/docconduit/doc-conduit.cc             |  2 +-
 conduits/docconduit/doc-setup.cc               |  2 +-
 conduits/docconduit/kpalmdoc_dlg.cc            |  2 +-
 conduits/knotes/knotes-action.cc               |  2 +-
 conduits/knotes/knotes-setup.cc                |  2 +-
 conduits/malconduit/mal-conduit.cc             |  2 +-
 conduits/malconduit/mal-setup.cc               |  2 +-
 conduits/memofileconduit/memofile-conduit.cc   |  2 +-
 conduits/memofileconduit/memofile-factory.cc   |  2 +-
 conduits/notepadconduit/notepad-factory.cc     |  2 +-
 conduits/null/null-conduit.cc                  |  2 +-
 conduits/null/null-factory.cc                  |  2 +-
 conduits/popmail/popmail-conduit.cc            |  2 +-
 conduits/popmail/setupDialog.cc                |  4 ++--
 conduits/recordconduit/factory.cc              |  2 +-
 conduits/sysinfoconduit/sysinfo-conduit.cc     |  2 +-
 conduits/timeconduit/time-conduit.cc           |  2 +-
 conduits/vcalconduit/cleanupstate.cc           |  2 +-
 conduits/vcalconduit/vcal-conduitbase.cc       |  2 +-
 kpilot/CMakeLists.txt                          |  2 +-
 kpilot/Makefile-standalone                     |  8 ++++----
 kpilot/Makefile.am                             |  2 +-
 kpilot/addressWidget.cc                        |  2 +-
 kpilot/conduitConfigDialog.cc                  |  2 +-
 kpilot/fileInstallWidget.cc                    |  2 +-
 kpilot/fileInstaller.cc                        |  2 +-
 kpilot/kpilot.cc                               |  2 +-
 kpilot/kpilotConfig.cc                         |  4 ++--
 kpilot/kpilotConfigDialog.cc                   |  2 +-
 kpilot/kpilotConfigWizard.cc                   |  2 +-
 kpilot/kpilotProbeDialog.cc                    |  2 +-
 kpilot/logWidget.cc                            |  2 +-
 kpilot/memoWidget.cc                           | 12 ++++++------
 lib/idmapper.h                                 |  2 +-
 lib/kpilotdevicelink.cc                        |  4 ++--
 lib/kpilotlink.cc                              |  4 ++--
 lib/kpilotlocallink.cc                         |  4 ++--
 lib/options.cc                                 |  2 +-
 lib/syncAction.cc                              |  2 +-
 tests/exportdatebook.cc                        |  2 +-
 tests/mergecalendars.cc                        |  2 +-
 45 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fa0b44..86fb1b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -608,7 +608,7 @@ TODO: only re-write a local database if it is changed.
 
 2004-04-10  Reinhold Kainhofer
 * Split kpilot's configuration into several files, one for each conduit.
-  Also wrote a kconf_update script so the old settings are preserved.
+  Also wrote a tdeconf_update script so the old settings are preserved.
   We still need to sort out the remaining settings written to kpilotrc.
 * Corrected all path variables in the .kcfg files from type String to Path
 * The configuration wizard now also sets the conduits' settings to sensitive
@@ -805,7 +805,7 @@ TODO: only re-write a local database if it is changed.
 * New DCOP functions in the daemon to query its state and settings
 * the kontact plugin also detects if the daemon is quit
 * Use a QSplitter in the config dialog instead of the QHBox layout
-* implemented the kconf_update scripts to move groupless entries to the
+* implemented the tdeconf_update scripts to move groupless entries to the
   [General] group
 * Still missing:
     o) TDEConfig sync between the three processes working on the
diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc
index 9e677d0..93e15ac 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@@ -40,7 +40,7 @@
 
 #include <kabc/stdaddressbook.h>
 #include <kabc/resourcefile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ksavefile.h>
 
 #include <pilotSerialDatabase.h>
diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt
index be3119b..8793b28 100644
--- a/conduits/docconduit/CMakeLists.txt
+++ b/conduits/docconduit/CMakeLists.txt
@@ -81,7 +81,7 @@ install(
 
 install(
 	FILES kpalmdoc.upd
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update
+	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update
 )
 
 add_subdirectory(Icons)
diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am
index b0d56b0..40b1a11 100644
--- a/conduits/docconduit/Makefile.am
+++ b/conduits/docconduit/Makefile.am
@@ -36,5 +36,5 @@ servicetypedir = $(kde_servicetypesdir)
 kde_kcfg_DATA = docconduit.kcfg kpalmdoc.kcfg
 
 update_DATA = kpalmdoc.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc
index 31a075b..294b31a 100644
--- a/conduits/docconduit/doc-conduit.cc
+++ b/conduits/docconduit/doc-conduit.cc
@@ -39,7 +39,7 @@
 #include <tqtimer.h>
 #include <tqdir.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmdcodec.h>
 
 #include <pilotLocalDatabase.h>
diff --git a/conduits/docconduit/doc-setup.cc b/conduits/docconduit/doc-setup.cc
index 4269c9e..d0951c5 100644
--- a/conduits/docconduit/doc-setup.cc
+++ b/conduits/docconduit/doc-setup.cc
@@ -33,7 +33,7 @@
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <kcharsets.h>
 
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc
index 02cfed1..f4a480c 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@@ -39,7 +39,7 @@
 #include <tqcombobox.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutapplication.h>
 #include <kapplication.h>
 #include <kurlrequester.h>
diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc
index 29a2e32..00880c6 100644
--- a/conduits/knotes/knotes-action.cc
+++ b/conduits/knotes/knotes-action.cc
@@ -39,7 +39,7 @@
 #include <kstandarddirs.h>
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 //#include <dcopclient.h>
 
 #include <time.h>  // required by pilot-link includes
diff --git a/conduits/knotes/knotes-setup.cc b/conduits/knotes/knotes-setup.cc
index 1127011..93c4f71 100644
--- a/conduits/knotes/knotes-setup.cc
+++ b/conduits/knotes/knotes-setup.cc
@@ -34,7 +34,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "setup_base.h"
 
diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc
index 5aa5883..cddf09f 100644
--- a/conduits/malconduit/mal-conduit.cc
+++ b/conduits/malconduit/mal-conduit.cc
@@ -35,7 +35,7 @@
 #include "options.h"
 
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "mal-factory.h"
diff --git a/conduits/malconduit/mal-setup.cc b/conduits/malconduit/mal-setup.cc
index 61441f0..57f07c4 100644
--- a/conduits/malconduit/mal-setup.cc
+++ b/conduits/malconduit/mal-setup.cc
@@ -43,7 +43,7 @@
 #include <kpassdlg.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #include "mal-setup_dialog.h"
diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc
index 1334b10..ec373fd 100644
--- a/conduits/memofileconduit/memofile-conduit.cc
+++ b/conduits/memofileconduit/memofile-conduit.cc
@@ -45,7 +45,7 @@
 #include <tqdir.h>
 #include <tqtextcodec.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "pilotRecord.h"
diff --git a/conduits/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc
index c20da01..30789f8 100644
--- a/conduits/memofileconduit/memofile-factory.cc
+++ b/conduits/memofileconduit/memofile-factory.cc
@@ -32,7 +32,7 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
 #include <kurlrequester.h>
diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc
index b68eff2..36ae5f9 100644
--- a/conduits/notepadconduit/notepad-factory.cc
+++ b/conduits/notepadconduit/notepad-factory.cc
@@ -28,7 +28,7 @@
 
 #include "options.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
 #include <kurlrequester.h>
diff --git a/conduits/null/null-conduit.cc b/conduits/null/null-conduit.cc
index c8e0b3a..c0d50fc 100644
--- a/conduits/null/null-conduit.cc
+++ b/conduits/null/null-conduit.cc
@@ -40,7 +40,7 @@
 //
 #include <time.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "pilotSerialDatabase.h"
diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc
index aeed7c9..30f6f00 100644
--- a/conduits/null/null-factory.cc
+++ b/conduits/null/null-factory.cc
@@ -32,7 +32,7 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
 
diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc
index 1fbaf71..057a07c 100644
--- a/conduits/popmail/popmail-conduit.cc
+++ b/conduits/popmail/popmail-conduit.cc
@@ -67,7 +67,7 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API;
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <ksock.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <dcopclient.h>
 #include <ktempfile.h>
diff --git a/conduits/popmail/setupDialog.cc b/conduits/popmail/setupDialog.cc
index ea8b113..eb7a89c 100644
--- a/conduits/popmail/setupDialog.cc
+++ b/conduits/popmail/setupDialog.cc
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
 #include <kaboutdata.h>
@@ -46,7 +46,7 @@
 #include <tqdir.h>
 #include <tqcombobox.h>
 
-#include "kfiledialog.h"
+#include "tdefiledialog.h"
 
 #include <kurlrequester.h>
 
diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc
index bf23de7..22b14c8 100644
--- a/conduits/recordconduit/factory.cc
+++ b/conduits/recordconduit/factory.cc
@@ -32,7 +32,7 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
 
diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc
index 5ed758f..08c0f14 100644
--- a/conduits/sysinfoconduit/sysinfo-conduit.cc
+++ b/conduits/sysinfoconduit/sysinfo-conduit.cc
@@ -33,7 +33,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <pilotSysInfo.h>
diff --git a/conduits/timeconduit/time-conduit.cc b/conduits/timeconduit/time-conduit.cc
index 76798db..6020ffe 100644
--- a/conduits/timeconduit/time-conduit.cc
+++ b/conduits/timeconduit/time-conduit.cc
@@ -31,7 +31,7 @@
 
 #include <pilotSysInfo.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "time-factory.h"
diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc
index 200a9df..bac22ce 100644
--- a/conduits/vcalconduit/cleanupstate.cc
+++ b/conduits/vcalconduit/cleanupstate.cc
@@ -28,7 +28,7 @@
 
 #include <options.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 
 #include "pilotDatabase.h"
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index a6cc86f..a21aabb 100644
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "libkcal/calendar.h"
 #include "libkcal/calendarlocal.h"
diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt
index 9934d04..8f10499 100644
--- a/kpilot/CMakeLists.txt
+++ b/kpilot/CMakeLists.txt
@@ -170,7 +170,7 @@ install(
 
 install ( 
 	FILES kpilot.upd 
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update
+	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update
 )
 
 install(
diff --git a/kpilot/Makefile-standalone b/kpilot/Makefile-standalone
index a9ff3ac..7eb8dd0 100644
--- a/kpilot/Makefile-standalone
+++ b/kpilot/Makefile-standalone
@@ -27,7 +27,7 @@ CONFIG_MOCS=kpilotConfigDialog_base.moc kpilotConfigDialog.moc \
 	conduitConfigDialog.moc conduitConfigDialog_base.moc
 	
 CONFIG_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui
-CONFIG_LIBS=-ltdeui -lkfile -ltdecore -lqt -lkpilot
+CONFIG_LIBS=-ltdeui -ltdefile -ltdecore -lqt -lkpilot
 
 TEST_DISTDIR=kpilotTest-0.2
 TEST_OBJS=kpilotConfig.o \
@@ -36,7 +36,7 @@ TEST_OBJS=kpilotConfig.o \
 TEST_MOCS= pilotComponent.moc logWidget.moc \
 	interactiveSync.moc hotSync.moc
 TEST_EXTRA=pilotUser.h
-TEST_LIBS=-lkpilot -lkfile -ltdeui -lqt -lpisock 
+TEST_LIBS=-lkpilot -ltdefile -ltdeui -lqt -lpisock 
 
 KPILOT_DISTDIR=kpilot-4.2.9
 KPILOT_OBJS= pilotDaemonDCOP_stub.o \
@@ -56,7 +56,7 @@ KPILOT_MOCS=pilotComponent.moc logWidget.moc memoWidget.moc addressWidget.moc \
 KPILOT_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui \
 	pilotDaemonDCOP.h kpilotDCOP.h \
 	pilotAppCategory.h pilotDatabase.h kpilot_on_pp.h
-KPILOT_LIBS=-lkfile -ltdeui -lqt -lkpilot -lpisock
+KPILOT_LIBS=-ltdefile -ltdeui -lqt -lkpilot -lpisock
 
 DAEMON_DISTDIR=kpilotDaemon-4.2.9
 DAEMON_OBJS= pilotDaemonDCOP_skel.o kpilotDCOP_stub.o \
@@ -67,7 +67,7 @@ DAEMON_MOCS=pilotDaemon.moc \
 	fileInstaller.moc
 DAEMON_EXTRA=pilotDaemonDCOP.h kpilotDCOP.h pilotUser.h \
 	hotsync.h busysync.h
-DAEMON_LIBS=-lkfile -ltdeui -lqt -lkpilot -lpisock
+DAEMON_LIBS=-ltdefile -ltdeui -lqt -lkpilot -lpisock
 
 DISTFILES=kpilotConfig.tar.gz kpilotTest.tar.gz kpilot.tar.gz kpilotDaemon.tar.gz
 
diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am
index 9425369..0426112 100644
--- a/kpilot/Makefile.am
+++ b/kpilot/Makefile.am
@@ -93,7 +93,7 @@ rcdir = $(kde_datadir)/kpilot
 rc_DATA = kpilotui.rc
 
 update_DATA = kpilot.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 DOXYGEN_REFERENCES = tdeui kpilot/lib
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kpilot/addressWidget.cc b/kpilot/addressWidget.cc
index b174e24..878f743 100644
--- a/kpilot/addressWidget.cc
+++ b/kpilot/addressWidget.cc
@@ -55,7 +55,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "kpilotConfig.h"
 #include "listItems.h"
diff --git a/kpilot/conduitConfigDialog.cc b/kpilot/conduitConfigDialog.cc
index 0f26ea5..818f12a 100644
--- a/kpilot/conduitConfigDialog.cc
+++ b/kpilot/conduitConfigDialog.cc
@@ -52,7 +52,7 @@
 #include <kstandarddirs.h>
 #include <klibloader.h>
 #include <kseparator.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdialogbase.h>
 
 #include "plugin.h"
diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc
index 42eba9d..7cf4133 100644
--- a/kpilot/fileInstallWidget.cc
+++ b/kpilot/fileInstallWidget.cc
@@ -45,7 +45,7 @@
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
 #include <kiconview.h>
diff --git a/kpilot/fileInstaller.cc b/kpilot/fileInstaller.cc
index 608879c..ffe9b8f 100644
--- a/kpilot/fileInstaller.cc
+++ b/kpilot/fileInstaller.cc
@@ -41,7 +41,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 
 #include "fileInstaller.moc"
diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc
index eba6203..0878a98 100644
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@@ -41,7 +41,7 @@
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <kcombobox.h>
 #include <kmenubar.h>
diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc
index 23c4107..c5ba033 100644
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kcmdlineargs.h>
 #include <kmessagebox.h>
@@ -296,7 +296,7 @@ static void update443()
 
 	int res = 0;
 	unsigned int fileVersion = KPilotSettings::configVersion();
-	// FIXME better config handling -> Move the config entries using kconf_update
+	// FIXME better config handling -> Move the config entries using tdeconf_update
 
 	// It's OK if we're already at the required level.
 	if (fileVersion >= KPilotConfig::ConfigurationVersion)
diff --git a/kpilot/kpilotConfigDialog.cc b/kpilot/kpilotConfigDialog.cc
index cafdcb0..27a7f6f 100644
--- a/kpilot/kpilotConfigDialog.cc
+++ b/kpilot/kpilotConfigDialog.cc
@@ -49,7 +49,7 @@
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "kpilotConfig.h"
 #include "kpilotSettings.h"
diff --git a/kpilot/kpilotConfigWizard.cc b/kpilot/kpilotConfigWizard.cc
index 761098b..94176f0 100644
--- a/kpilot/kpilotConfigWizard.cc
+++ b/kpilot/kpilotConfigWizard.cc
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 
 #include "kpilotConfig.h"
 #include "options.h"
diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc
index e91070d..1bcb39b 100644
--- a/kpilot/kpilotProbeDialog.cc
+++ b/kpilot/kpilotProbeDialog.cc
@@ -40,7 +40,7 @@
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kapplication.h>
 #include <kprogress.h>
 
diff --git a/kpilot/logWidget.cc b/kpilot/logWidget.cc
index 2b22d19..a570f04 100644
--- a/kpilot/logWidget.cc
+++ b/kpilot/logWidget.cc
@@ -45,7 +45,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include <pi-version.h>
diff --git a/kpilot/memoWidget.cc b/kpilot/memoWidget.cc
index e22047c..e8f475a 100644
--- a/kpilot/memoWidget.cc
+++ b/kpilot/memoWidget.cc
@@ -50,7 +50,7 @@
 
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeversion.h>
 #include <ktextedit.h>
 
@@ -640,11 +640,11 @@ void MemoWidget::slotExportMemo()
 	const TQString filter = CSL1("*|Plain text output\n*.xml|XML output");
 	TQString fileName;
 
-	KFileDialog kfile( TQString() , filter, fExportButton , "memoSave" , true );
-	kfile.setOperationMode( KFileDialog::Saving );
+	KFileDialog tdefile( TQString() , filter, fExportButton , "memoSave" , true );
+	tdefile.setOperationMode( KFileDialog::Saving );
 
-	if ( kfile.exec() == TQDialog::Accepted ) {
-		fileName = kfile.selectedFile();
+	if ( tdefile.exec() == TQDialog::Accepted ) {
+		fileName = tdefile.selectedFile();
 	}
 
 	if (fileName.isEmpty())
@@ -658,7 +658,7 @@ void MemoWidget::slotExportMemo()
 		}
 	}
 
-	if (kfile.currentFilter() == CSL1("*.xml") )
+	if (tdefile.currentFilter() == CSL1("*.xml") )
 	{
 		MemoWidget::saveAsXML( fileName , menu_items );
 	}
diff --git a/lib/idmapper.h b/lib/idmapper.h
index b2ff0ef..8344fe2 100644
--- a/lib/idmapper.h
+++ b/lib/idmapper.h
@@ -31,7 +31,7 @@
 
 #include "pi-macros.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class IDMapperPrivate;
 
diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc
index 84e26da..bd751c2 100644
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@@ -51,11 +51,11 @@
 #include <tqthread.h>
 #include <tqsocketnotifier.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "pilotUser.h"
 #include "pilotSysInfo.h"
diff --git a/lib/kpilotlink.cc b/lib/kpilotlink.cc
index 42e78ed..098b688 100644
--- a/lib/kpilotlink.cc
+++ b/lib/kpilotlink.cc
@@ -52,11 +52,11 @@
 #include <tqdatetime.h>
 #include <tqthread.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "pilotUser.h"
 #include "pilotSysInfo.h"
diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc
index 5f93a47..cf301c7 100644
--- a/lib/kpilotlocallink.cc
+++ b/lib/kpilotlocallink.cc
@@ -52,11 +52,11 @@
 #include <tqdatetime.h>
 #include <tqthread.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "pilotSerialDatabase.h"
 #include "pilotLocalDatabase.h"
diff --git a/lib/options.cc b/lib/options.cc
index 84474c6..ad755c9 100644
--- a/lib/options.cc
+++ b/lib/options.cc
@@ -35,7 +35,7 @@
 
 #include <tqsize.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 
diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 444226e..2ca7361 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -49,7 +49,7 @@
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include "syncAction.moc"
diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc
index 11c7879..6afaeb9 100644
--- a/tests/exportdatebook.cc
+++ b/tests/exportdatebook.cc
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/calendarlocal.h>
diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc
index c499a7d..274decd 100644
--- a/tests/mergecalendars.cc
+++ b/tests/mergecalendars.cc
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/calendarlocal.h>