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

8 files changed, 15 insertions, 15 deletions

diff --git a/src/DESIGN.txt b/src/DESIGN.txt
index e0e3a31..6471670 100644
--- a/src/DESIGN.txt
+++ b/src/DESIGN.txt
@@ -2,7 +2,7 @@ The core of kmplayer is in kmplayerpartbase.x. PartBase keeps
 the list of Source objects (dvd/vcd/url/..) and Process objects
 (mplayer/xine/gst/xv), controls the View or respond to its signals. Both
 application as kpart (for plugin) have one PartBase. However, in case of
-plugin for khtml, it's possible one PartBase controls multible View
+plugin for tdehtml, it's possible one PartBase controls multible View
 objects (see tests/controls.html).
 
 The View is the parent of ViewArea, PlayList and InfoWindow. ViewArea is
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a27d8c..fc625fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ lib_LTLIBRARIES= libkmplayercommon.la
 
 libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel
 libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries) $(CFLAGS_XTEST)
-libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_TDECORE) -ltdefx $(LIB_TDEUI) $(LIB_KIO) $(LIB_XTEST)
+libkmplayercommon_la_LIBADD = -ltdemediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_TDECORE) -ltdefx $(LIB_TDEUI) $(LIB_KIO) $(LIB_XTEST)
 
 if include_koffice_support
 kofficeplugin_lib= libkmplayerkofficepart.la
@@ -46,15 +46,15 @@ libkmplayerbackend_la_SOURCES = kmplayer_backend.skel kmplayer_callback.stub
 
 kxineplayer_LDADD= libkmplayerbackend.la $(LIB_XINE) -lDCOP
 kxineplayer_CFLAGS= $(CFLAGS_XINE)
-kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kxineplayer_SOURCES= xineplayer.cpp
 
 kxvplayer_LDADD= libkmplayerbackend.la -lDCOP -lXv
-kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kxvplayer_SOURCES= xvplayer.cpp
 
 kgstplayer_LDADD= libkmplayerbackend.la $(LIB_GST) $(LIB_GST_PLUGINS) -lgstinterfaces-0.10 -lDCOP
-kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kgstplayer_SOURCES= gstplayer.cpp
 
 knpplayer_LDADD= $(LIBNSPR_LIBS)
diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp
index 56b4914..4284c3b 100644
--- a/src/kmplayer_koffice_part.cpp
+++ b/src/kmplayer_koffice_part.cpp
@@ -39,7 +39,7 @@
 #include <kconfig.h>
 #include <kaction.h>
 #include <kstandarddirs.h>
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 #include "kmplayerpartbase.h"
 #include "kmplayer_koffice_part.h"
diff --git a/src/kmplayer_koffice_part.h b/src/kmplayer_koffice_part.h
index 1bcf305..cae4250 100644
--- a/src/kmplayer_koffice_part.h
+++ b/src/kmplayer_koffice_part.h
@@ -20,9 +20,9 @@
 #define KMPLAYER_KOFFICE_PART_H
 
 #include <config.h>
-#include <kmediaplayer/player.h>
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdemediaplayer/player.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 #include <kurl.h>
 #ifdef HAVE_KOFFICE
 #include <koDocument.h>
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index 37ba960..1ba8dbe 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -37,7 +37,7 @@ class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncoll
 #include <kapplication.h>
 #include <klocale.h>
 #include <kinstance.h>
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 #include <kstaticdeleter.h>
 #include <kstatusbar.h>
 
@@ -285,7 +285,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *
             // else showcaptioning/showgotobar/showpositioncontrols/showtracker
             } else if (name == TQString::fromLatin1("console")) {
                 m_group = value.isEmpty() ? TQString::fromLatin1("_anonymous") : value;
-            } else if (name == TQString::fromLatin1("__khtml__pluginbaseurl")) {
+            } else if (name == TQString::fromLatin1("__tdehtml__pluginbaseurl")) {
                 m_docbase = KURL (value);
             } else if (name == TQString::fromLatin1("src")) {
                 m_src_url = value;
@@ -298,7 +298,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *
 	    }
             // volume/clicktoplay/transparentatstart/animationatstart
             // autorewind/displaysize/border
-            if (name.startsWith (TQString::fromLatin1 ("__khtml__")))
+            if (name.startsWith (TQString::fromLatin1 ("__tdehtml__")))
                 name = name.mid (9);
             convertNode <KMPlayer::Element> (urlsource->document ())->setAttribute (name, value);
         }
diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
index faca045..ed196f3 100644
--- a/src/kmplayer_part.h
+++ b/src/kmplayer_part.h
@@ -19,7 +19,7 @@
 #ifndef KMPLAYER_PART_H
 #define KMPLAYER_PART_H
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include "kmplayerpartbase.h"
 #include "kmplayersource.h"
 
diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h
index cbd133f..81f4092 100644
--- a/src/kmplayerpartbase.h
+++ b/src/kmplayerpartbase.h
@@ -29,7 +29,7 @@
 #include <tqmap.h>
 
 #include <dcopobject.h>
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 #include <kurl.h>
 
 #include "kmplayerview.h"
diff --git a/src/kmplayerview.h b/src/kmplayerview.h
index 253b7c0..861324b 100644
--- a/src/kmplayerview.h
+++ b/src/kmplayerview.h
@@ -28,7 +28,7 @@
 #include <kdockwidget.h>
 #include <kurl.h>
 #include <qxembed.h>
-#include <kmediaplayer/view.h>
+#include <tdemediaplayer/view.h>
 
 #include "kmplayersource.h"