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

acinclude.m4

@@ -2073,16 +2073,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_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   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_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2090,13 +2090,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_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2551,7 +2551,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

kontact_plugin/basket_plugin.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kgenericfactory.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kontact/core.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>

kontact_plugin/basket_plugin.h

@@ -22,7 +22,7 @@
 #define BASKET_PLUGIN_H
 
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kontact/plugin.h>
 #include "uniqueapphandler.h"
 #include "basketdcopiface_stub.h"

src/Makefile.am

@@ -82,7 +82,7 @@ kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
 
 libbasketpart_la_SOURCES = basket_part.cpp
 libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
-libbasketpart_la_LIBADD  = libbasketcommon.la -lkparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
+libbasketpart_la_LIBADD  = libbasketcommon.la -ltdeparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
 
 kcm_basket_la_SOURCES = kcm_basket.cpp
 kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde

src/basket_part.cpp

@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <bnpview.h>
 #include <aboutdata.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
 #include "basketstatusbar.h"
 
 typedef KParts::GenericFactory< BasketPart > BasketFactory;

src/basket_part.h

@@ -21,8 +21,8 @@
 #ifndef _BASKETPART_H_
 #define _BASKETPART_H_
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 class TQWidget;
 class TQPainter;

src/basketstatusbar.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kdebug.h>

src/kiconcanvas.cpp

@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <kimagefilepreview.h>
 #include <kurldrag.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 #include <tqsortedlist.h>
 #include <tqimage.h>

src/notecontent.cpp

@@ -40,7 +40,7 @@
 //#include <kstringhandler.h>
 #include <kfilemetainfo.h>
 #include <tqdatetime.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 #include <tqfileinfo.h>
 //#include <kio/kfileitem.h>

src/notedrag.h

@@ -26,7 +26,7 @@
 #include <tqdatastream.h>
 #include <tqpixmap.h>
 #include <tqvaluelist.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 class TQDataStream;