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

---
 konqueror/client/CMakeLists.txt | 6 +++---
 konqueror/client/Makefile.am    | 2 +-
 konqueror/client/kfmclient.cc   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'konqueror/client')

diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt
index 558a5d7f9..3ae477d32 100644
--- a/konqueror/client/CMakeLists.txt
+++ b/konqueror/client/CMakeLists.txt
@@ -23,8 +23,8 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
+install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### kfmclient (tdeinit) #######################
@@ -39,5 +39,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index bef42b01c..059bfa8ec 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -18,6 +18,6 @@ KDesktopIface_DIR = $(top_srcdir)/kdesktop
 messages:
 	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kfmclient_3_2.upd
 update_SCRIPTS = kfmclient_3_2_update.sh
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 649115d5c..6e8ccc2ac 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -25,7 +25,7 @@
 
 #include <tqdir.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kcmdlineargs.h>
 #include <kpropertiesdialog.h>
 #include <klocale.h>
@@ -35,7 +35,7 @@
 #include <kopenwith.h>
 #include <kurlrequesterdlg.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kservice.h>
-- 
cgit v1.2.1