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

34 files changed, 50 insertions, 50 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index d6a7783f..235078b5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2099,16 +2099,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")
@@ -2116,13 +2116,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)")
@@ -2571,7 +2571,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
@@ -3514,7 +3514,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/digikam/digikam/albumwidgetstack.cpp b/digikam/digikam/albumwidgetstack.cpp
index 1b8865b9..a83df0c0 100644
--- a/digikam/digikam/albumwidgetstack.cpp
+++ b/digikam/digikam/albumwidgetstack.cpp
@@ -29,7 +29,7 @@
 // KDE includes.
 
 #include <kurl.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 
 // Local includes.
 
diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp
index 250eada9..0bde3d46 100644
--- a/digikam/digikam/mediaplayerview.cpp
+++ b/digikam/digikam/mediaplayerview.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes.
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmimetype.h>
 #include <kuserprofile.h>
 #include <kdialogbase.h>
diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp
index 54ad537c..94654d54 100644
--- a/digikam/digikam/welcomepageview.cpp
+++ b/digikam/digikam/welcomepageview.cpp
@@ -32,8 +32,8 @@
 
 #include <klocale.h>
 #include <kcursor.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h
index 0355b570..dc30110a 100644
--- a/digikam/digikam/welcomepageview.h
+++ b/digikam/digikam/welcomepageview.h
@@ -31,7 +31,7 @@
 
 // KDE includes.
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/coreplugin/Makefile.am b/digikam/imageplugins/coreplugin/Makefile.am
index 7946cd60..d996936d 100644
--- a/digikam/imageplugins/coreplugin/Makefile.am
+++ b/digikam/imageplugins/coreplugin/Makefile.am
@@ -42,7 +42,7 @@ digikamimageplugin_core_la_LIBADD = $(LIB_KPARTS) \
 				    $(top_builddir)/digikam/libs/widgets/common/libcommonwidgets.la \
 				    $(top_builddir)/digikam/libs/widgets/imageplugins/libimagepluginswidgets.la
 
-digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio -lkexiv2 -lkutils
+digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio -lkexiv2 -ltdeutils
 
 kde_services_DATA = digikamimageplugin_core.desktop
 
diff --git a/digikam/libs/curves/Makefile.am b/digikam/libs/curves/Makefile.am
index 970460d2..8f468f57 100644
--- a/digikam/libs/curves/Makefile.am
+++ b/digikam/libs/curves/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libcurves.la
 
 libcurves_la_SOURCES = imagecurves.cpp 
 
-libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/dialogs/Makefile.am b/digikam/libs/dialogs/Makefile.am
index 83b36c76..3855a10a 100644
--- a/digikam/libs/dialogs/Makefile.am
+++ b/digikam/libs/dialogs/Makefile.am
@@ -6,14 +6,14 @@ noinst_LTLIBRARIES = libdialog.la libdialogshowfoto.la
 
 libdialogshowfoto_la_SOURCES = iccprofileinfodlg.cpp imagedialog.cpp rawcameradlg.cpp
 
-libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # Dialogs collection used by digiKam.
 
 libdialog_la_SOURCES = deletedialogbase.ui imagedialog.cpp rawcameradlg.cpp \
 	                   iccprofileinfodlg.cpp deletedialog.cpp dprogressdlg.cpp 
 
-libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/digikam \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/dimg/Makefile.am b/digikam/libs/dimg/Makefile.am
index 65c9eed2..e7fda9ff 100644
--- a/digikam/libs/dimg/Makefile.am
+++ b/digikam/libs/dimg/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libdimg.la
 
 libdimg_la_SOURCES = dimg.cpp dimgscale.cpp dcolor.cpp dcolorcomposer.cpp ddebug.cpp 
 
-libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libdimg_la_LIBADD  = $(top_builddir)/digikam/libs/histogram/libhistogram.la \
 	             $(top_builddir)/digikam/libs/levels/liblevels.la \
diff --git a/digikam/libs/dimg/filters/Makefile.am b/digikam/libs/dimg/filters/Makefile.am
index 19820b44..b535aef8 100644
--- a/digikam/libs/dimg/filters/Makefile.am
+++ b/digikam/libs/dimg/filters/Makefile.am
@@ -6,7 +6,7 @@ libdimgfilters_la_SOURCES = bcgmodifier.cpp hslmodifier.cpp icctransform.cpp \
 	                    dimgimagefilters.cpp dimgthreadedfilter.cpp \
 	                    dimggaussianblur.cpp dimgsharpen.cpp colormodifier.cpp 
 
-libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/levels \
diff --git a/digikam/libs/dmetadata/Makefile.am b/digikam/libs/dmetadata/Makefile.am
index 3faf1a47..1920ec98 100644
--- a/digikam/libs/dmetadata/Makefile.am
+++ b/digikam/libs/dmetadata/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libdmetadata.la
 
 libdmetadata_la_SOURCES = dmetadata.cpp
 
-libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libdmetadata_la_LIBADD  = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) 
 
diff --git a/digikam/libs/greycstoration/Makefile.am b/digikam/libs/greycstoration/Makefile.am
index 48a92629..576eafa5 100644
--- a/digikam/libs/greycstoration/Makefile.am
+++ b/digikam/libs/greycstoration/Makefile.am
@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libgreycstoration.la
 
 libgreycstoration_la_SOURCES = greycstorationiface.cpp greycstorationwidget.cpp
 
-libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
diff --git a/digikam/libs/histogram/Makefile.am b/digikam/libs/histogram/Makefile.am
index 86fdbec8..f3509723 100644
--- a/digikam/libs/histogram/Makefile.am
+++ b/digikam/libs/histogram/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libhistogram.la
 
 libhistogram_la_SOURCES = imagehistogram.cpp  
 
-libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 		-I$(top_srcdir)/digikam/digikam \
diff --git a/digikam/libs/imageproperties/Makefile.am b/digikam/libs/imageproperties/Makefile.am
index dc74ae60..0f77b78d 100644
--- a/digikam/libs/imageproperties/Makefile.am
+++ b/digikam/libs/imageproperties/Makefile.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libimagepropertiesshowfoto.la libimagepropertiesdigikam.la
 
 libimagepropertiescamgui_la_SOURCES = imagepropertiessidebarcamgui.cpp cameraitempropertiestab.cpp
 
-libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # Image Properties SideBar for Showfoto (without digiKam database support).
 
@@ -21,7 +21,7 @@ libimagepropertiesshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/widgets/libw
 	                               $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
 	                               $(top_builddir)/digikam/libs/histogram/libhistogram.la 
 
-libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # Image Properties SideBar for digiKam Main interface and Image Editor (digiKam database support).
 
@@ -31,7 +31,7 @@ libimagepropertiesdigikam_la_SOURCES = imagedescedittab.cpp imagepropertiessideb
 	                               imagepropertiescolorstab.cpp \
 	                               navigatebarwidget.cpp imagepropertiestab.cpp navigatebartab.cpp
 
-libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	   -I$(top_srcdir)/digikam/libs/themeengine \
diff --git a/digikam/libs/jpegutils/Makefile.am b/digikam/libs/jpegutils/Makefile.am
index 7a9e8829..daccbbfb 100644
--- a/digikam/libs/jpegutils/Makefile.am
+++ b/digikam/libs/jpegutils/Makefile.am
@@ -17,6 +17,6 @@ noinst_LTLIBRARIES = libjpegutils.la
 
 libjpegutils_la_SOURCES = jpegutils.cpp transupp.cpp
 
-libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libjpegutils_la_LIBADD  = $(LIBJPEG) 
diff --git a/digikam/libs/levels/Makefile.am b/digikam/libs/levels/Makefile.am
index 2d05679f..90eff926 100644
--- a/digikam/libs/levels/Makefile.am
+++ b/digikam/libs/levels/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = liblevels.la
 
 liblevels_la_SOURCES = imagelevels.cpp 
 
-liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/histogram \
diff --git a/digikam/libs/themeengine/Makefile.am b/digikam/libs/themeengine/Makefile.am
index 7bd1e959..2fed7197 100644
--- a/digikam/libs/themeengine/Makefile.am
+++ b/digikam/libs/themeengine/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthemeengine.la
 
 libthemeengine_la_SOURCES = theme.cpp themeengine.cpp texture.cpp
 
-libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
  	       -I$(top_srcdir)/digikam/digikam \
diff --git a/digikam/libs/threadimageio/Makefile.am b/digikam/libs/threadimageio/Makefile.am
index ec1f4635..76b05c6a 100644
--- a/digikam/libs/threadimageio/Makefile.am
+++ b/digikam/libs/threadimageio/Makefile.am
@@ -12,7 +12,7 @@ libthreadimageio_la_SOURCES = loadsavethread.cpp \
                               loadingcache.cpp \
                               loadingcacheinterface.cpp
 
-libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dimg/loaders \
diff --git a/digikam/libs/thumbbar/Makefile.am b/digikam/libs/thumbbar/Makefile.am
index 58da7073..dfce6a92 100644
--- a/digikam/libs/thumbbar/Makefile.am
+++ b/digikam/libs/thumbbar/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthumbbar.la
 
 libthumbbar_la_SOURCES = thumbbar.cpp thumbnailjob.cpp
 
-libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
diff --git a/digikam/libs/whitebalance/Makefile.am b/digikam/libs/whitebalance/Makefile.am
index d1762bda..e9e0c1fa 100644
--- a/digikam/libs/whitebalance/Makefile.am
+++ b/digikam/libs/whitebalance/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwhitebalance.la
 
 libwhitebalance_la_SOURCES = whitebalance.cpp 
 
-libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	   -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/widgets/Makefile.am b/digikam/libs/widgets/Makefile.am
index 8b4582b8..4f7fe6d9 100644
--- a/digikam/libs/widgets/Makefile.am
+++ b/digikam/libs/widgets/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwidgets.la
 
 libwidgets_la_SOURCES =
 
-libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libwidgets_la_LIBADD = $(top_builddir)/digikam/libs/widgets/metadata/libmetadatawidgets.la \
 	               $(top_builddir)/digikam/libs/widgets/iccprofiles/libiccprofileswidgets.la \
diff --git a/digikam/libs/widgets/common/Makefile.am b/digikam/libs/widgets/common/Makefile.am
index f7d6b6ee..55187c8d 100644
--- a/digikam/libs/widgets/common/Makefile.am
+++ b/digikam/libs/widgets/common/Makefile.am
@@ -7,7 +7,7 @@ libcommonwidgets_la_SOURCES = histogramwidget.cpp colorgradientwidget.cpp curves
                               statuszoombar.cpp statusnavigatebar.cpp statusprogressbar.cpp searchtextbar.cpp \
                               dcursortracker.cpp paniconwidget.cpp previewwidget.cpp splashscreen.cpp statusled.cpp 
 
-libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	       -I$(top_srcdir)/digikam/libs/curves \
diff --git a/digikam/libs/widgets/common/sidebar.h b/digikam/libs/widgets/common/sidebar.h
index 7b79a878..ef7f5440 100644
--- a/digikam/libs/widgets/common/sidebar.h
+++ b/digikam/libs/widgets/common/sidebar.h
@@ -33,7 +33,7 @@
 
 // KDE includes.
 
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 // Local includes.
 
diff --git a/digikam/libs/widgets/iccprofiles/Makefile.am b/digikam/libs/widgets/iccprofiles/Makefile.am
index bda7635b..eb0ef4de 100644
--- a/digikam/libs/widgets/iccprofiles/Makefile.am
+++ b/digikam/libs/widgets/iccprofiles/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libiccprofileswidgets.la
 
 libiccprofileswidgets_la_SOURCES = iccprofilewidget.cpp cietonguewidget.cpp iccpreviewwidget.cpp 
 
-libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libiccprofileswidgets_la_LIBADD = $(top_builddir)/digikam/libs/lprof/liblprof.la 
                  
diff --git a/digikam/libs/widgets/imageplugins/Makefile.am b/digikam/libs/widgets/imageplugins/Makefile.am
index c203ed34..a97ae8e3 100644
--- a/digikam/libs/widgets/imageplugins/Makefile.am
+++ b/digikam/libs/widgets/imageplugins/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libimagepluginswidgets.la
 libimagepluginswidgets_la_SOURCES = imageregionwidget.cpp imagepaniconwidget.cpp imageguidewidget.cpp \
 	                                imagewidget.cpp listboxpreviewitem.cpp imagepanelwidget.cpp
 
-libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
                  
 INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/widgets/metadata/Makefile.am b/digikam/libs/widgets/metadata/Makefile.am
index 73740fbb..623fd2f8 100644
--- a/digikam/libs/widgets/metadata/Makefile.am
+++ b/digikam/libs/widgets/metadata/Makefile.am
@@ -6,7 +6,7 @@ libmetadatawidgets_la_SOURCES = metadatalistview.cpp metadatalistviewitem.cpp me
 	                            iptcwidget.cpp exifwidget.cpp mdkeylistviewitem.cpp \
 	                            makernotewidget.cpp gpswidget.cpp worldmapwidget.cpp
 
-libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/showfoto/setup/Makefile.am b/digikam/showfoto/setup/Makefile.am
index 2f809fac..e90adc64 100644
--- a/digikam/showfoto/setup/Makefile.am
+++ b/digikam/showfoto/setup/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libsetup.la
 
 libsetup_la_SOURCES = setup.cpp setupeditor.cpp setuptooltip.cpp
 
-libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libsetup_la_LIBADD = $(top_builddir)/digikam/utilities/setup/libshowfotosetup.la 
 
diff --git a/digikam/themedesigner/Makefile.am b/digikam/themedesigner/Makefile.am
index 1774c8ef..c0abd0ce 100644
--- a/digikam/themedesigner/Makefile.am
+++ b/digikam/themedesigner/Makefile.am
@@ -16,4 +16,4 @@ digikamthemedesigner_SOURCES = main.cpp mainwindow.cpp themedicongroupitem.cpp \
 digikamthemedesigner_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) \
 	                     $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
+digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS)
diff --git a/digikam/utilities/batch/Makefile.am b/digikam/utilities/batch/Makefile.am
index df9dea25..b670f269 100644
--- a/digikam/utilities/batch/Makefile.am
+++ b/digikam/utilities/batch/Makefile.am
@@ -15,6 +15,6 @@ noinst_LTLIBRARIES = libbatch.la
 libbatch_la_SOURCES = batchthumbsgenerator.cpp batchalbumssyncmetadata.cpp \
 	              imageinfojob.cpp imageinfoalbumsjob.cpp batchsyncmetadata.cpp 
 
-libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 
diff --git a/digikam/utilities/cameragui/Makefile.am b/digikam/utilities/cameragui/Makefile.am
index c2a8e78f..8dc061cf 100644
--- a/digikam/utilities/cameragui/Makefile.am
+++ b/digikam/utilities/cameragui/Makefile.am
@@ -13,7 +13,7 @@ libcameragui_la_SOURCES = gpcamera.cpp cameraui.cpp cameraiconview.cpp  \
 	                  camerainfodialog.cpp albumselectdialog.cpp \
 	                  camerafolderdialog.cpp freespacewidget.cpp 
 
-libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libcameragui_la_LIBADD  = $(top_builddir)/digikam/libs/imageproperties/libimagepropertiescamgui.la \
 	                  $(LIB_GPHOTO) $(LIBJPEG)
diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
index 231c5b57..ca76d7cd 100644
--- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
+++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
@@ -25,7 +25,7 @@
 // KDE includes.
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kxmlguiclient.h>
diff --git a/digikam/utilities/lighttable/Makefile.am b/digikam/utilities/lighttable/Makefile.am
index b8362324..233ee920 100644
--- a/digikam/utilities/lighttable/Makefile.am
+++ b/digikam/utilities/lighttable/Makefile.am
@@ -22,7 +22,7 @@ noinst_LTLIBRARIES = liblighttable.la
 liblighttable_la_SOURCES = lighttablebar.cpp lighttablewindow.cpp lighttablepreview.cpp \
                            lighttableview.cpp 
 
-liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/digikam
 rc_DATA = lighttablewindowui.rc
diff --git a/digikam/utilities/setup/Makefile.am b/digikam/utilities/setup/Makefile.am
index cd7473ee..2bcceb13 100644
--- a/digikam/utilities/setup/Makefile.am
+++ b/digikam/utilities/setup/Makefile.am
@@ -25,5 +25,5 @@ libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_GPHOTO)
 libshowfotosetup_la_SOURCES = setupiofiles.cpp setupdcraw.cpp \
 	                      setupicc.cpp setupslideshow.cpp 
 
-libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
diff --git a/digikam/utilities/slideshow/Makefile.am b/digikam/utilities/slideshow/Makefile.am
index 3875f020..3ae8e6af 100644
--- a/digikam/utilities/slideshow/Makefile.am
+++ b/digikam/utilities/slideshow/Makefile.am
@@ -12,6 +12,6 @@ noinst_LTLIBRARIES = libslideshow.la
 
 libslideshow_la_SOURCES = toolbar.cpp slideshow.cpp 
 
-libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor