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

---
 kcontrol/keys/CMakeLists.txt | 2 +-
 kcontrol/keys/Makefile.am    | 2 +-
 kcontrol/keys/keys.desktop   | 2 +-
 kcontrol/keys/modifiers.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/keys')

diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt
index 219fb03a5..739cd47f2 100644
--- a/kcontrol/keys/CMakeLists.txt
+++ b/kcontrol/keys/CMakeLists.txt
@@ -38,6 +38,6 @@ tde_add_kpart( kcm_keys AUTOMOC
   SOURCES
     shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp
     treeview.cpp commandShortcuts.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am
index e2d897c64..0f07b43a5 100644
--- a/kcontrol/keys/Makefile.am
+++ b/kcontrol/keys/Makefile.am
@@ -14,7 +14,7 @@ messages:
 
 update_DATA = kaccel.upd
 update_SCRIPTS = convertShortcuts.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 xdg_apps_DATA = keys.desktop
 
diff --git a/kcontrol/keys/keys.desktop b/kcontrol/keys/keys.desktop
index 5ab196a6e..92fdd7bdd 100644
--- a/kcontrol/keys/keys.desktop
+++ b/kcontrol/keys/keys.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell keys
+Exec=tdecmshell keys
 Icon=key_bindings
 Type=Application
 DocPath=kcontrol/keys/index.html
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 6da5c94f1..15cad733a 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -7,7 +7,7 @@
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kkeynative.h>
-- 
cgit v1.2.1