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

10 files changed, 26 insertions, 26 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index f7629e5..2ce29ad 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2066,16 +2066,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")
@@ -2083,13 +2083,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)")
@@ -2535,7 +2535,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
@@ -3477,7 +3477,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/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp
index 9e72b86..d48b59d 100644
--- a/src/app/vtabwidget.cpp
+++ b/src/app/vtabwidget.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqwidgetstack.h>
 
 // KDE
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 namespace Gwenview {
 
diff --git a/src/gvcore/Makefile.am b/src/gvcore/Makefile.am
index a2130e8..f0eb7e2 100644
--- a/src/gvcore/Makefile.am
+++ b/src/gvcore/Makefile.am
@@ -7,7 +7,7 @@ libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 libgwenviewcore_la_LIBADD   = \
 	$(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \
 	$(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -ltdefx \
-	-lkmediaplayer ../imageutils/libgvimageutils.la \
+	-ltdemediaplayer ../imageutils/libgvimageutils.la \
 	../tsthread/libtsthread.la
 
 libgwenviewcore_la_METASOURCES = AUTO
diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index 8416224..17f592d 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -32,11 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 #include <kmimetype.h>
 #include <ktoolbar.h>
 #include <kuserprofile.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kxmlguibuilder.h>
 #include <kxmlguifactory.h>
 
diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp
index ce18820..c401090 100644
--- a/src/gvcore/jpegformattype.cpp
+++ b/src/gvcore/jpegformattype.cpp
@@ -1,4 +1,4 @@
-/* This file is based on tdelibs-3.2.0/khtml/misc/loader_jpeg.cpp. Original
+/* This file is based on tdelibs-3.2.0/tdehtml/misc/loader_jpeg.cpp. Original
  * copyright follows.
  */
 /*
diff --git a/src/gvcore/jpegformattype.h b/src/gvcore/jpegformattype.h
index afb9e85..bcc3b00 100644
--- a/src/gvcore/jpegformattype.h
+++ b/src/gvcore/jpegformattype.h
@@ -1,4 +1,4 @@
-/* This file is based on tdelibs-3.2.0/khtml/misc/loader_jpeg.h. Original
+/* This file is based on tdelibs-3.2.0/tdehtml/misc/loader_jpeg.h. Original
  * copyright follows.
  */
 /*
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index d525d33..3ff3f71 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
-#include <kparts/browserextension.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/genericfactory.h>
 #include <kio/job.h>
 
 #include <gvcore/fileoperation.h>
diff --git a/src/gvdirpart/gvdirpart.h b/src/gvdirpart/gvdirpart.h
index 40401ff..dc5b667 100644
--- a/src/gvdirpart/gvdirpart.h
+++ b/src/gvdirpart/gvdirpart.h
@@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __gvdirpart_h__
 #define __gvdirpart_h__
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 
 // Forward declarations
 class TQPoint;
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index f36796c..e7b7a09 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 
 #include <gvcore/cache.h>
 #include <gvcore/document.h>
diff --git a/src/gvimagepart/gvimagepart.h b/src/gvimagepart/gvimagepart.h
index 759f9a9..53c02dd 100644
--- a/src/gvimagepart/gvimagepart.h
+++ b/src/gvimagepart/gvimagepart.h
@@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __gvimagepart_h__
 #define __gvimagepart_h__
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <ktempfile.h>
 
 // Forward declarations