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

10 files changed, 24 insertions, 24 deletions

diff --git a/knewstuff/CMakeLists.txt b/knewstuff/CMakeLists.txt
index 50350f29f..4493ee385 100644
--- a/knewstuff/CMakeLists.txt
+++ b/knewstuff/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${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(
@@ -38,7 +38,7 @@ install( FILES
 ##### other data ################################
 
 install( FILES types DESTINATION ${DATA_INSTALL_DIR}/knewstuff )
-install( FILES khotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdehotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
 tde_install_icons( )
 
 
@@ -55,17 +55,17 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### khotnewstuff ##############################
+##### tdehotnewstuff ##############################
 
-set( target khotnewstuff )
+set( target tdehotnewstuff )
 
 set( ${target}_SRCS
-  khotnewstuff.cpp
+  tdehotnewstuff.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC
diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am
index 0f0bc9676..c15716c8e 100644
--- a/knewstuff/Makefile.am
+++ b/knewstuff/Makefile.am
@@ -10,11 +10,11 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
   knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
 
-bin_PROGRAMS = khotnewstuff
+bin_PROGRAMS = tdehotnewstuff
 
-khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-khotnewstuff_LDADD = libknewstuff.la
-khotnewstuff_SOURCES = khotnewstuff.cpp
+tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdehotnewstuff_LDADD = libknewstuff.la
+tdehotnewstuff_SOURCES = tdehotnewstuff.cpp
 
 EXTRA_PROGRAMS = testnewstuff ghns
 
@@ -29,7 +29,7 @@ ghns_SOURCES = ghns.cpp
 knewstuffdir = $(kde_datadir)/knewstuff
 knewstuff_DATA = types
 
-kde_conf_DATA = khotnewstuffrc
+kde_conf_DATA = tdehotnewstuffrc
 
 knsdir = $(includedir)/knewstuff
 kns_HEADERS = downloaddialog.h engine.h entry.h knewstuffgeneric.h knewstuff.h providerdialog.h provider.h uploaddialog.h knewstuffbutton.h knewstuffsecure.h
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index f8e03295c..3cc476254 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -24,11 +24,11 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index 7152a0ccd..063c2c7b9 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -24,7 +24,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index 1e4e6ecc3..be1d404b2 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <ktar.h>
diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp
index f467530c8..b61924243 100644
--- a/knewstuff/knewstuffsecure.cpp
+++ b/knewstuff/knewstuffsecure.cpp
@@ -16,10 +16,10 @@
 #include <tqfileinfo.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp
index a29183532..d5da6bdde 100644
--- a/knewstuff/provider.cpp
+++ b/knewstuff/provider.cpp
@@ -18,9 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp
index 67c6c70b2..7b8ceae9c 100644
--- a/knewstuff/khotnewstuff.cpp
+++ b/knewstuff/tdehotnewstuff.cpp
@@ -35,7 +35,7 @@ static const KCmdLineOptions op[] =
 
 int main(int argc, char **argv)
 {
-	TDEAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
+	TDEAboutData about("tdehotnewstuff", "KHotNewStuff", "0.2");
 	TDECmdLineArgs *args;
 
 	TDECmdLineArgs::init(argc, argv, &about);
diff --git a/knewstuff/khotnewstuffrc b/knewstuff/tdehotnewstuffrc
index 737ad61c2..737ad61c2 100644
--- a/knewstuff/khotnewstuffrc
+++ b/knewstuff/tdehotnewstuffrc
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index f82e466ff..69c823fd0 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kuser.h>