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/locale/CMakeLists.txt   | 2 +-
 kcontrol/locale/language.desktop | 2 +-
 kcontrol/locale/toplevel.cpp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/locale')

diff --git a/kcontrol/locale/CMakeLists.txt b/kcontrol/locale/CMakeLists.txt
index c990ab669..c604cf551 100644
--- a/kcontrol/locale/CMakeLists.txt
+++ b/kcontrol/locale/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_locale AUTOMOC
   SOURCES
     main.cpp toplevel.cpp kcmlocale.cpp klocalesample.cpp
     localenum.cpp localemon.cpp localetime.cpp localeother.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/locale/language.desktop b/kcontrol/locale/language.desktop
index dcd38c1de..55d6babde 100644
--- a/kcontrol/locale/language.desktop
+++ b/kcontrol/locale/language.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell language
+Exec=tdecmshell language
 Icon=locale
 Type=Application
 DocPath=kcontrol/language/index.html
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 01e189fd4..e3a50847c 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -29,7 +29,7 @@
 #include <tqvgroupbox.h>
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kmessagebox.h>
-- 
cgit v1.2.1