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

9 files changed, 16 insertions, 16 deletions

diff --git a/tdeparts/CMakeLists.txt b/tdeparts/CMakeLists.txt
index 267d64655..341734461 100644
--- a/tdeparts/CMakeLists.txt
+++ b/tdeparts/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
@@ -59,6 +59,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 2.1.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdeparts/COMMENTS b/tdeparts/COMMENTS
index abf24ca84..32f0be1d9 100644
--- a/tdeparts/COMMENTS
+++ b/tdeparts/COMMENTS
@@ -255,7 +255,7 @@ changes.
 <dfaure> ok :-)
 <weis> dfaure: Can you have a look at tdeparts/COMMENTS ?
 --
-<dfaure> weis: you should have come before. coolo is talking about re-writing libkio.
+<dfaure> weis: you should have come before. coolo is talking about re-writing libtdeio.
 <dfaure> well in fact he started the rewrite
  dfaure having a look
 <weis> dfaure: Unfortunately I am not paid for KDE but for Qt hacking :-( So I fear I have no time for kio anyway.
diff --git a/tdeparts/Makefile.am b/tdeparts/Makefile.am
index 8fea0f517..6796745a9 100644
--- a/tdeparts/Makefile.am
+++ b/tdeparts/Makefile.am
@@ -2,8 +2,8 @@
 
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
 
-INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/libltdl \
-	-I$(top_srcdir)/kfile $(all_includes)
+INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/tdeio/ -I$(top_srcdir)/libltdl \
+	-I$(top_srcdir)/tdefile $(all_includes)
 libtdeparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
 libtdeparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 
diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp
index 4cff3f8a4..f0951b382 100644
--- a/tdeparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -18,9 +18,9 @@
 
 #include "browserrun.h"
 #include <kmessagebox.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
 #include <klocale.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp
index 94d096db5..e0fd4e138 100644
--- a/tdeparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -36,9 +36,9 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdirnotify_stub.h>
 
 #include <stdio.h>
diff --git a/tdeparts/part.h b/tdeparts/part.h
index 6b2051f72..530da61c3 100644
--- a/tdeparts/part.h
+++ b/tdeparts/part.h
@@ -668,7 +668,7 @@ protected:
    * On failure the function should inform the user about the
    * problem with an appropriate message box. Standard error
    * messages can be constructed using TDEIO::buildErrorString()
-   * in combination with the error codes defined in kio/global.h
+   * in combination with the error codes defined in tdeio/global.h
    */
   virtual bool saveFile() = 0;
 
diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp
index 457caa71f..e1469ad1c 100644
--- a/tdeparts/plugin.cpp
+++ b/tdeparts/plugin.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kxmlguifactory.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 
 using namespace KParts;
diff --git a/tdeparts/tests/Makefile.am b/tdeparts/tests/Makefile.am
index df0a2a5be..0e77c3e4c 100644
--- a/tdeparts/tests/Makefile.am
+++ b/tdeparts/tests/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kfile -I$(top_srcdir)/kio $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdeio $(all_includes)
 AM_LDFLAGS = $(all_libraries)
 LDADD = $(LIB_KPARTS)
 
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 5d1bbe5b3..d63002d53 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -3,7 +3,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kcmdlineargs.h>
 #include <klibloader.h>