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/filetypes/CMakeLists.txt      | 4 ++--
 kcontrol/filetypes/filetypedetails.cpp | 2 +-
 kcontrol/filetypes/filetypes.desktop   | 2 +-
 kcontrol/filetypes/filetypesview.h     | 2 +-
 kcontrol/filetypes/typeslistitem.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcontrol/filetypes')

diff --git a/kcontrol/filetypes/CMakeLists.txt b/kcontrol/filetypes/CMakeLists.txt
index dbcf5e929..c906287d8 100644
--- a/kcontrol/filetypes/CMakeLists.txt
+++ b/kcontrol/filetypes/CMakeLists.txt
@@ -28,7 +28,7 @@ install( FILES filetypes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_filetypes AUTOMOC
   SOURCES control.cpp
-  LINK filetypes-static kio-shared
+  LINK filetypes-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -46,6 +46,6 @@ tde_add_library( filetypes STATIC_PIC AUTOMOC
 
 tde_add_executable( keditfiletype AUTOMOC
   SOURCES keditfiletype.cpp
-  LINK filetypes-static kio-shared
+  LINK filetypes-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index abb973580..a98f68cce 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -5,7 +5,7 @@
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <klineedit.h>
diff --git a/kcontrol/filetypes/filetypes.desktop b/kcontrol/filetypes/filetypes.desktop
index 41a23a1c4..42d2db5cb 100644
--- a/kcontrol/filetypes/filetypes.desktop
+++ b/kcontrol/filetypes/filetypes.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=filetypes
 Type=Application
-Exec=kcmshell filetypes
+Exec=tdecmshell filetypes
 DocPath=kcontrol/filetypes/index.html
 Categories=Qt;TDE;X-TDE-settings-components;
 
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index e7217c4ba..b83158519 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -4,7 +4,7 @@
 #include <tqptrlist.h>
 #include <tqmap.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 
 #include "typeslistitem.h"
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index df59d4b31..bde058d00 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.3