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

10 files changed, 11 insertions, 11 deletions

diff --git a/kioslave/gzip/Makefile.am b/kioslave/gzip/Makefile.am
index 3da565fb7..0ec2e03c9 100644
--- a/kioslave/gzip/Makefile.am
+++ b/kioslave/gzip/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/kio $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kgzipfilter.la
diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index 51bcfe092..c093df483 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -64,6 +64,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK httpfilter-static kntlm-shared kio-shared
+  LINK httpfilter-static tdentlm-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am
index f8e099140..5946fc9f8 100644
--- a/kioslave/http/Makefile.am
+++ b/kioslave/http/Makefile.am
@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kio_http.la
 
 kio_http_la_SOURCES = http.cc
 kio_http_la_METASOURCES = AUTO
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
+kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/tdentlm/libtdentlm.la
 kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
 
 kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
diff --git a/kioslave/http/TODO b/kioslave/http/TODO
index 12a929525..9dbf60a3e 100644
--- a/kioslave/http/TODO
+++ b/kioslave/http/TODO
@@ -20,7 +20,7 @@ features such as locking.
 This might involve an external program to parse the labels, and something to
 configure access accordingly.  There is only some basic things that need to be
 added to kio_http to support this.  The majority of the work has to be done at the
-application level.  A khtml plugin in tdeaddons to do this might be a nice idea.
+application level.  A tdehtml plugin in tdeaddons to do this might be a nice idea.
 
 - P3P support:
 This can also be implemented as a plugin to konqueror and does
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index 0973b0b3b..e1eefa595 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -88,7 +88,7 @@
 
 #endif /* HAVE_LIBGSSAPI */
 
-#include <misc/kntlm/kntlm.h>
+#include <misc/tdentlm/tdentlm.h>
 
 using namespace TDEIO;
 
@@ -3982,7 +3982,7 @@ void HTTPProtocol::httpClose( bool keepAlive )
   // Only allow persistent connections for GET requests.
   // NOTE: we might even want to narrow this down to non-form
   // based submit requests which will require a meta-data from
-  // khtml.
+  // tdehtml.
   if (keepAlive && (!m_bUseProxy ||
       m_bPersistentProxyConnection || m_bIsTunneled))
   {
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt
index eef5e9654..289daa4f0 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/kioslave/http/kcookiejar/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 
 install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 install( FILES kcookiescfg.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/khtml )
+install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
 
 
 ##### kcookiejar ################################
diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am
index 3cfb540fb..431502c12 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/kioslave/http/kcookiejar/Makefile.am
@@ -27,5 +27,5 @@ update_DATA = kcookiescfg.upd
 updatedir = $(kde_datadir)/kconf_update
 
 cookie_DATA = domain_info
-cookiedir = $(kde_datadir)/khtml
+cookiedir = $(kde_datadir)/tdehtml
 
diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp
index f115a6da6..12d92a8df 100644
--- a/kioslave/http/kcookiejar/kcookiejar.cpp
+++ b/kioslave/http/kcookiejar/kcookiejar.cpp
@@ -257,7 +257,7 @@ KCookieJar::KCookieJar()
     m_configChanged = false;
     m_cookiesChanged = false;
     
-    TDEConfig cfg("khtml/domain_info", true, false, "data");
+    TDEConfig cfg("tdehtml/domain_info", true, false, "data");
     TQStringList countries = cfg.readListEntry("twoLevelTLD");
     for(TQStringList::ConstIterator it = countries.begin();
         it != countries.end(); ++it)
diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am
index 44a453feb..4059cdcd1 100644
--- a/kioslave/http/kcookiejar/tests/Makefile.am
+++ b/kioslave/http/kcookiejar/tests/Makefile.am
@@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
 
 kcookiejartest_SOURCES = kcookiejartest.cpp 
 kcookiejartest_LDADD   = $(LIB_KIO)
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 check-local: kcookiejartest
 	./kcookiejartest $(srcdir)/cookie.test
diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am
index e2de616c6..c1d1d295e 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/kioslave/metainfo/Makefile.am
@@ -2,7 +2,7 @@
 ## Makefile.am of tdebase/kioslave/metainfo
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kio_metainfo.la