Rename a number of libraries and executables to avoid conflicts with KDE4

18 files changed, 20 insertions, 20 deletions

diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 670b39b1b..25cf3fda8 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -17,7 +17,7 @@
 #include "app.h"
 
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <stdio.h>
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index 3ebb55575..88c0fae6b 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -17,7 +17,7 @@
 #include "kded.h"
 
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kapplication.h>
 
diff --git a/khotkeys/data/Makefile.am b/khotkeys/data/Makefile.am
index 44be27263..3b64ca69b 100644
--- a/khotkeys/data/Makefile.am
+++ b/khotkeys/data/Makefile.am
@@ -2,6 +2,6 @@ khotkeys_data_DATA = trinity2b1.khotkeys konqueror_gestures_trinity21.khotkeys p
 khotkeys_datadir = $(kde_datadir)/khotkeys
 
 khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_trinity21_update.upd khotkeys_printscreen.upd
-khotkeys_updatedir = $(kde_datadir)/kconf_update
+khotkeys_updatedir = $(kde_datadir)/tdeconf_update
 
 EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA)
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
index 518e45972..c1242f17e 100644
--- a/khotkeys/kcontrol/init.cpp
+++ b/khotkeys/kcontrol/init.cpp
@@ -16,7 +16,7 @@
 
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <stdlib.h>
 
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index ae2411b09..b0ddb16c9 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -26,14 +26,14 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <ksimpleconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <dcopref.h>
 #include <klibloader.h>
 
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index bbd6d1429..0608bce34 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell khotkeys
+Exec=tdecmshell khotkeys
 Icon=khotkeys
 Type=Application
 
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 2533b58a0..31eb7be27 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <kshortcut.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kshortcutlist.h>
 #include <kkeybutton.h>
 #include <kkeydialog.h>
diff --git a/khotkeys/shared/CMakeLists.txt b/khotkeys/shared/CMakeLists.txt
index 2a1de2e1e..27227cd2f 100644
--- a/khotkeys/shared/CMakeLists.txt
+++ b/khotkeys/shared/CMakeLists.txt
@@ -37,6 +37,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kio-shared ${XTEST_LIBRARIES}
+  LINK tdeio-shared ${XTEST_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp
index ff56eb99d..488a18133 100644
--- a/khotkeys/shared/action_data.cpp
+++ b/khotkeys/shared/action_data.cpp
@@ -16,7 +16,7 @@
 
 #include "action_data.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "actions.h"
 
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index 5ce1e1d5a..bc383b926 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -17,7 +17,7 @@
 #include "actions.h"
 
 #include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kurifilter.h>
 #include <kglobal.h>
diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp
index 3132fa01d..6120ca875 100644
--- a/khotkeys/shared/conditions.cpp
+++ b/khotkeys/shared/conditions.cpp
@@ -20,7 +20,7 @@
 #include <typeinfo>
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <assert.h>
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 9481ff762..16e071a1e 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -16,7 +16,7 @@
 
 #include "settings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kaccel.h>
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 27736ed0b..fe167789b 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -17,7 +17,7 @@
 #include "triggers.h"
 
 #include <kglobalaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twinmodule.h>
 #include <klocale.h>
diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp
index 054f66827..c5d6efb53 100644
--- a/khotkeys/shared/voicesignature.cpp
+++ b/khotkeys/shared/voicesignature.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "voicesignature.h"
 #include "sound.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <math.h>
 #ifdef PI
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index ddfc612e2..b27fa3a08 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twinmodule.h>
 #include <twin.h>
diff --git a/khotkeys/update/CMakeLists.txt b/khotkeys/update/CMakeLists.txt
index 13a7dffca..32cbb9fc0 100644
--- a/khotkeys/update/CMakeLists.txt
+++ b/khotkeys/update/CMakeLists.txt
@@ -27,5 +27,5 @@ link_directories(
 tde_add_executable( khotkeys_update
   SOURCES update.cpp
   LINK khotkeys_shared-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/khotkeys/update/Makefile.am b/khotkeys/update/Makefile.am
index 19e725d8a..be0e97f9d 100644
--- a/khotkeys/update/Makefile.am
+++ b/khotkeys/update/Makefile.am
@@ -1,5 +1,5 @@
-kconf_PROGRAMS = khotkeys_update
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = khotkeys_update
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 khotkeys_update_SOURCES = update.cpp
 
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 1d4f26b45..2ed07c991 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -17,7 +17,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>