Rename a number of libraries and executables to avoid conflicts with KDE4

6 files changed, 16 insertions, 16 deletions

diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 9d97712c6..09b04a8ea 100644
--- a/kdoctools/CMakeLists.txt
+++ b/kdoctools/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kioslave
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeioslave
   ${LIBXML2_INCLUDE_DIRS}
   ${LIBXSLT_INCLUDE_DIRS}
 )
@@ -54,7 +54,7 @@ install( FILES man-template.docbook template.docbook DESTINATION ${DATA_INSTALL_
 ##### kbzipfilter_dummy ##############################
 
 tde_add_library( kbzipfilter_dummy STATIC_PIC
-  SOURCES ${CMAKE_SOURCE_DIR}/kioslave/bzip2/kbzip2filter.cpp
+  SOURCES ${CMAKE_SOURCE_DIR}/tdeioslave/bzip2/kbzip2filter.cpp
 )
 
 
@@ -68,7 +68,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} SHARED
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -83,7 +83,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} SHARED
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -102,6 +102,6 @@ set_source_files_properties( xslt_pure.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSL
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index f5aab5ebe..05c3487cd 100644
--- a/kdoctools/Makefile.am
+++ b/kdoctools/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kioslave -I$(top_srcdir)/kioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeioslave -I$(top_srcdir)/tdeioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
 
 noinst_LTLIBRARIES = libkbzipfilter_dummy.la
@@ -38,10 +38,10 @@ METASOURCES = AUTO
 
 update_DATA = kio_help.upd
 update_SCRIPTS = move_kio_help_cache.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_help.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_help.pot
 
 install-data-local:
 	@(for subdir in customization docbook; do \
@@ -59,7 +59,7 @@ uninstall-local:
 	-rm -rf $(DESTDIR)$(kde_datadir)/ksgmltools2/docbook
 
 kbzip2filter.cpp:
-	-$(LN_S) $(srcdir)/../kioslave/bzip2/kbzip2filter.cpp .
+	-$(LN_S) $(srcdir)/../tdeioslave/bzip2/kbzip2filter.cpp .
 
 CLEANFILES = kbzip2filter.cpp xslt_pure.o xslt_pure.cpp checkXML
 
diff --git a/kdoctools/docbook/README.kde b/kdoctools/docbook/README.kde
index df33a8cba..ae080b287 100644
--- a/kdoctools/docbook/README.kde
+++ b/kdoctools/docbook/README.kde
@@ -1,4 +1,4 @@
-README file for tdebase/kioslave/help/docbook
+README file for tdebase/tdeioslave/help/docbook
 =============================================
 
 This are copies of
diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h
index 957a0e2e5..df002df15 100644
--- a/kdoctools/kio_help.h
+++ b/kdoctools/kio_help.h
@@ -15,8 +15,8 @@
 #include <tqvaluelist.h>
 
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 class HelpProtocol : public TDEIO::SlaveBase
 {
diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd
index 2f067b148..cca96f64b 100644
--- a/kdoctools/kio_help.upd
+++ b/kdoctools/kio_help.upd
@@ -1,3 +1,3 @@
-# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help
+# Move kio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help
 Id=trinity_2
 Script=move_kio_help_cache.sh,sh
diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh
index c31331c9e..f1342c5b4 100644
--- a/kdoctools/move_kio_help_cache.sh
+++ b/kdoctools/move_kio_help_cache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-bas=`tde-config --localprefix`share/apps/kio_help
+bas=`tde-config --localprefix`share/apps/tdeio_help
 mv "$bas/cache" "`tde-config --path cache`kio_help"
 rmdir "$bas"
 exit 0