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/icons/CMakeLists.txt | 2 +-
 kcontrol/icons/icons.cpp      | 2 +-
 kcontrol/icons/icons.desktop  | 2 +-
 kcontrol/icons/iconthemes.cpp | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kcontrol/icons')

diff --git a/kcontrol/icons/CMakeLists.txt b/kcontrol/icons/CMakeLists.txt
index 0a7dfbefb..0961b6d62 100644
--- a/kcontrol/icons/CMakeLists.txt
+++ b/kcontrol/icons/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Settings/LookNF
 
 tde_add_kpart( kcm_icons AUTOMOC
   SOURCES iconthemes.cpp icons.cpp main.cpp
-  LINK kio-shared ${LIBART_LIBRARIES}
+  LINK tdeio-shared ${LIBART_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index cd529485c..710927b8a 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -20,7 +20,7 @@
 
 #include <kapplication.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
diff --git a/kcontrol/icons/icons.desktop b/kcontrol/icons/icons.desktop
index 6fd4adec8..721f2830a 100644
--- a/kcontrol/icons/icons.desktop
+++ b/kcontrol/icons/icons.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/icons/index.html
 Icon=icons
-Exec=kcmshell icons
+Exec=tdecmshell icons
 
 
 X-TDE-Library=icons
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 835962ff6..812f382d2 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -41,8 +41,8 @@
 #include <kprogress.h>
 #include <kiconloader.h>
 
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <ktar.h>
 
 #ifdef HAVE_LIBART
-- 
cgit v1.2.1