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

acinclude.m4

@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 

po/hu.pot

@@ -494,7 +494,7 @@ msgstr "Az alapoldalra ugráshoz kattintson erre a gombra."
 msgid "&Recent files"
 msgstr "&Legutóbbi fájlok"
 
-#: kchmmainwindow.cpp:507 kchmviewwindow_khtmlpart.cpp:163
+#: kchmmainwindow.cpp:507 kchmviewwindow_tdehtmlpart.cpp:163
 msgid "&Select all"
 msgstr "&Minden kijelölése"
 
@@ -689,7 +689,7 @@ msgid ""
 "For example, search for 'C' will give the same result as searching for 'C++'."
 msgstr ""
 
-#: kchmviewwindow_khtmlpart.cpp:161
+#: kchmviewwindow_tdehtmlpart.cpp:161
 msgid "Editor"
 msgstr "Szerkesztő"
 

src/kchmviewwindowmgr.cpp

@@ -30,7 +30,7 @@
 #include "kchmviewwindow_qtextbrowser.h"
 
 #if defined (USE_KDE)
-	#include "kde/kchmviewwindow_khtmlpart.h"
+	#include "kde/kchmviewwindow_tdehtmlpart.h"
 #endif
 
 

src/kde-qt.h

@@ -37,7 +37,7 @@
 	#include <klocale.h>
 	#include <klistview.h>
 	#include <kfiledialog.h>
-	#include <khtml_part.h>
+	#include <tdehtml_part.h>
 	#include <ktabwidget.h>
 	#include <kpopupmenu.h>
 	#include <kmessagebox.h>

src/kde/Makefile.am

@@ -1,6 +1,6 @@
 lib_LIBRARIES=libkdeextra.a
-libkdeextra_a_SOURCES = kchmdcopiface.cpp kchmdcopiface.skel kchmviewwindow_khtmlpart.cpp
-noinst_HEADERS = kchmdcopiface.h kchmviewwindow_khtmlpart.h
+libkdeextra_a_SOURCES = kchmdcopiface.cpp kchmdcopiface.skel kchmviewwindow_tdehtmlpart.cpp
+noinst_HEADERS = kchmdcopiface.h kchmviewwindow_tdehtmlpart.h
 
 INCLUDES = $(QT_INCLUDES) $(CHM_INCLUDES) $(KDE_INCLUDES) $(LIBCHMFILE_INCLUDES)
 

src/kde/kchmviewwindow_tdehtmlpart.cpp

@@ -21,15 +21,15 @@
 
 #include <tqclipboard.h>
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kfinddialog.h>
 
 #include "kde-qt.h"
 #include "kchmmainwindow.h"
 #include "kchmconfig.h"
-#include "kchmviewwindow_khtmlpart.h"
+#include "kchmviewwindow_tdehtmlpart.h"
 
-#include "kchmviewwindow_khtmlpart.moc"
+#include "kchmviewwindow_tdehtmlpart.moc"
 
 
 TQWidget * KCHMViewWindow_KHTMLPart::getTQWidget()