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

10 files changed, 23 insertions, 23 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index a7880c7..fed8a6e 100644
--- a/acinclude.m4
+++ b/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)
 
diff --git a/doc/en/kmymoney2.1 b/doc/en/kmymoney2.1
index 3805596..2a9abb6 100644
--- a/doc/en/kmymoney2.1
+++ b/doc/en/kmymoney2.1
@@ -202,10 +202,10 @@ shared over more than one screen.
 Specifies the X display to run KDE on.
 .IP TDESYCOCA
 Specifies and alternative path for the 
-.I ksycoca
+.I tdesycoca
 KDE system configuration cache file.
 The default path is
-/tmp/tde-$USER/ksycoca
+/tmp/tde-$USER/tdesycoca
 .IP DCOPSERVER
 Specifies an alternative path for the DCOP server file. The default
 file is
diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am
index 5b52d1f..aa853fe 100644
--- a/kmymoney2/Makefile.am
+++ b/kmymoney2/Makefile.am
@@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog
 METASOURCES = AUTO
 
 # the library search path.
-kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
+kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS)
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 4c0b456..721dfab 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -65,7 +65,7 @@
 #include <kio/netaccess.h>
 #include <dcopclient.h>
 #include <kstartupinfo.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <krun.h>
 #include <kconfigdialog.h>
 #include <kinputdialog.h>
diff --git a/kmymoney2/plugins/pluginloader.cpp b/kmymoney2/plugins/pluginloader.cpp
index 5e1dcc6..3213781 100644
--- a/kmymoney2/plugins/pluginloader.cpp
+++ b/kmymoney2/plugins/pluginloader.cpp
@@ -26,7 +26,7 @@
 // KDE Includes
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kconfig.h>
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index 3860c04..680b384 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -40,7 +40,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kconfig.h>
 #include <kstdaction.h>
 #include <kmainwindow.h>
diff --git a/kmymoney2/views/khomeview.h b/kmymoney2/views/khomeview.h
index e4a47bb..0afa739 100644
--- a/kmymoney2/views/khomeview.h
+++ b/kmymoney2/views/khomeview.h
@@ -30,7 +30,7 @@ class TQFrame;
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp
index 965a502..90ca8a3 100755
--- a/kmymoney2/views/kreportsview.cpp
+++ b/kmymoney2/views/kreportsview.cpp
@@ -53,7 +53,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
diff --git a/kmymoney2/views/kreportsview.h b/kmymoney2/views/kreportsview.h
index 46f18ff..4b34a5d 100755
--- a/kmymoney2/views/kreportsview.h
+++ b/kmymoney2/views/kreportsview.h
@@ -42,7 +42,7 @@ class TQListViewItem;
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <klistview.h>
 #include <ktabwidget.h>
 
diff --git a/libkgpgfile/Makefile.am b/libkgpgfile/Makefile.am
index 42b835e..b7b2529 100644
--- a/libkgpgfile/Makefile.am
+++ b/libkgpgfile/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES =  libkgpgfile.la
 libkgpgfile_la_SOURCES = kgpgfile.cpp
-libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 #libkgpgfile_la_LIBADD = $(top_builddir)/libtdepim/libtdepim.la
 
 instdir=$(includedir)/kmymoney