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

(limited to 'kcontrol/componentchooser')

diff --git a/kcontrol/componentchooser/CMakeLists.txt b/kcontrol/componentchooser/CMakeLists.txt
index 0a7eef7f5..53a77b2a1 100644
--- a/kcontrol/componentchooser/CMakeLists.txt
+++ b/kcontrol/componentchooser/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_componentchooser AUTOMOC
     componentchooser_ui.ui componentconfig_ui.ui
     emailclientconfig_ui.ui terminalemulatorconfig_ui.ui
     browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/componentchooser/Makefile.am b/kcontrol/componentchooser/Makefile.am
index 3a63947a0..6abd5f414 100644
--- a/kcontrol/componentchooser/Makefile.am
+++ b/kcontrol/componentchooser/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS= . componentservices
-AM_CPPFLAGS  = -I../ -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS  = -I../ -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
 
 METASOURCES = AUTO 
 
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index c2d5305c5..8eab27216 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -262,7 +262,7 @@ void CfgTerminalEmulator::save(TDEConfig *) {
 	delete config;
 
 	KIPC::sendMessageAll(KIPC::SettingsChanged);
-	kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", TQString::null);
+	kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
 
 	emit changed(false);
 }
diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
index d686b7448..5e30df9dc 100644
--- a/kcontrol/componentchooser/componentchooser.desktop
+++ b/kcontrol/componentchooser/componentchooser.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell componentchooser
+Exec=tdecmshell componentchooser
 Icon=misc
 Type=Application
 
-- 
cgit v1.2.1