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

9 files changed, 13 insertions, 13 deletions

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