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

13 files changed, 17 insertions, 17 deletions

diff --git a/kcontrol/ebrowsing/CMakeLists.txt b/kcontrol/ebrowsing/CMakeLists.txt
index 47ebb7e64..bacbce722 100644
--- a/kcontrol/ebrowsing/CMakeLists.txt
+++ b/kcontrol/ebrowsing/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES ebrowsing.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_kurifilt AUTOMOC
   SOURCES filteropts.cpp main.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am
index dfb9fdbe8..72bb632cd 100644
--- a/kcontrol/ebrowsing/Makefile.am
+++ b/kcontrol/ebrowsing/Makefile.am
@@ -11,7 +11,7 @@ kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
 kcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
 kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
 # Don't link this lib to the plugins. They are dlopened and linking to them
-# results in crashes when closing kcmshell.
+# results in crashes when closing tdecmshell.
 # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la
 
 messages: rc.cpp
diff --git a/kcontrol/ebrowsing/ebrowsing.desktop b/kcontrol/ebrowsing/ebrowsing.desktop
index 42319e236..b76532e55 100644
--- a/kcontrol/ebrowsing/ebrowsing.desktop
+++ b/kcontrol/ebrowsing/ebrowsing.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/ebrowsing/index.html
 Icon=enhanced_browsing
-Exec=kcmshell ebrowsing
+Exec=tdecmshell ebrowsing
 
 
 X-TDE-Library=kurifilt
diff --git a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt
index b5c470483..9fffe268e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt
+++ b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_add_kpart( libkuriikwsfilter AUTOMOC
   SOURCES
     kuriikwsfiltereng.cpp kuriikwsfilter.skel
     kuriikwsfilter.cpp searchprovider.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -46,6 +46,6 @@ tde_add_kpart( libkurisearchfilter AUTOMOC
     kurisearchfilter.cpp kurisearchfilter.skel
     kuriikwsfiltereng.cpp ikwsopts.cpp searchproviderdlg.cpp
     searchprovider.cpp searchproviderdlg_ui.ui ikwsopts_ui.ui
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
\ No newline at end of file
diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am
index bb00b6e90..4cdb46d42 100644
--- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am
+++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am
@@ -22,7 +22,7 @@ libkurisearchfilter_la_SOURCES = kurisearchfilter.cpp kurisearchfilter.skel \
       searchproviderdlg_ui.ui ikwsopts_ui.ui
 
 update_DATA = kuriikwsfilter.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 service_DATA = kuriikwsfilter.desktop kurisearchfilter.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 3073250f7..474394108 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -32,7 +32,7 @@
 #include <dcopref.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klocale.h>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
index 4631524e0..e0acab4e4 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
@@ -32,7 +32,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
 
 typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory;
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index c57d3e080..63c61eaf4 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -31,7 +31,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kprotocolinfo.h>
@@ -46,7 +46,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
 
 KURISearchFilterEngine *KURISearchFilterEngine::s_pSelf = 0;
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
index a8c8dbda9..c42a6be0c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
@@ -32,7 +32,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
 
 typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory;
diff --git a/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt b/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt
index df8d0eefa..222b6556d 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt
+++ b/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt
@@ -29,7 +29,7 @@ install( FILES localdomainurifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR}
 
 tde_add_kpart( liblocaldomainurifilter AUTOMOC
   SOURCES localdomainurifilter.cpp localdomainurifilter.skel
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index 8b6da2a99..1fc6ad629 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -33,7 +33,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
  
 LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,
diff --git a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
index c8d25b1bf..4eb1c5441 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
+++ b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES kshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} )
 
 tde_add_kpart( libkshorturifilter AUTOMOC
   SOURCES kshorturifilter.cpp kshorturifilter.skel
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index c394de693..57bc2e92f 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmimetype.h>
 
 #include "kshorturifilter.h"
@@ -48,10 +48,10 @@
  /**
   * IMPORTANT:
   *  If you change anything here, please run the regression test
-  *  tdelibs/kio/tests/kurifiltertest.
+  *  tdelibs/tdeio/tests/kurifiltertest.
   *
   *  If you add anything here, make sure to add a corresponding
-  *  test code to tdelibs/kio/tests/kurifiltertest.
+  *  test code to tdelibs/tdeio/tests/kurifiltertest.
   */
 
 typedef TQMap<TQString,TQString> EntryMap;