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

(limited to 'kcontrol/displayconfig')

diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt
index 774743329..dfa45882b 100644
--- a/kcontrol/displayconfig/CMakeLists.txt
+++ b/kcontrol/displayconfig/CMakeLists.txt
@@ -36,6 +36,6 @@ set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CO
 tde_add_kpart( kcm_displayconfig AUTOMOC
   SOURCES
     monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel
-  LINK kio-shared tderandr-shared tdeutils-shared
+  LINK tdeio-shared tderandr-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 017b1537c..34259f425 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -30,7 +30,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kcontrol/displayconfig/displayconfig.desktop b/kcontrol/displayconfig/displayconfig.desktop
index a94a37b97..738d3a293 100644
--- a/kcontrol/displayconfig/displayconfig.desktop
+++ b/kcontrol/displayconfig/displayconfig.desktop
@@ -3,7 +3,7 @@ Categories=Qt;TDE;X-TDE-settings-system;
 Comment=Configure display
 Comment[en_US]=Configure display
 DocPath=kcontrol/displayconfig.html
-Exec=kcmshell displayconfig
+Exec=tdecmshell displayconfig
 GenericName=
 GenericName[en_US]=
 Icon=background
-- 
cgit v1.2.1