From 76b7dd9a43ea8368918fc9e65c2b5e9098be1861 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:09:19 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- ChangeLog | 6 +++--- README | 2 +- acinclude.m4 | 26 +++++++++++++------------- po/lt.po | 2 +- src/DESIGN.txt | 2 +- src/Makefile.am | 8 ++++---- src/kmplayer_koffice_part.cpp | 2 +- src/kmplayer_koffice_part.h | 6 +++--- src/kmplayer_part.cpp | 6 +++--- src/kmplayer_part.h | 2 +- src/kmplayerpartbase.h | 2 +- src/kmplayerview.h | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08d75d7..f478eda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -184,7 +184,7 @@ Changes since version 0.9.1-rc1 Changes since version 0.9.1-pre3 - Show backend's status in application's statusbar and show the play time left as well. -- Add OBJECT's attributes coming from khtml to the document of urlsource, that +- Add OBJECT's attributes coming from tdehtml to the document of urlsource, that might be helpful for web developers (using the 'Show all' feature of playlist) - Add KAction for showing the control or language popup menu - Put colors and font settings on a separate tab, reducing total config @@ -539,7 +539,7 @@ Changes since version 0.7.4b Changes since version 0.7.4a - Height calculation fix when position slider is visible - Q&D fix for mplayer compiled with locale output (,->. for aspect) -- Aspect fix for fullscreen when embedded in khtml +- Aspect fix for fullscreen when embedded in tdehtml - Position slider fix VCD, re-determine length for each track Changes since version 0.7.4 - Fix VCD playing @@ -585,7 +585,7 @@ Changes since version 0.6.5b - Fullscreen mode for part (when embedded) - Small config button shows a popup menu now - Set environment variable http_proxy in mplayer's process when defined -- Use LiveConnect for automatic resizing to movie size when embedded in khtml +- Use LiveConnect for automatic resizing to movie size when embedded in tdehtml fixes movie sizes at http://wwwa.accuweather.com, needs KDE-3.1 from cvs - Typo in application/x-mplayer2 mimetype Changes since version 0.6.5a diff --git a/README b/README index 3a99580..103c2f9 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ KMPlayer, a simple frontend for MPlayer/FFMpeg/Xine. It can play DVD/VCD movies, from file or url and from a video device. If setup right, KMPlayer can embed inside konqueror. Which means if you click on a movie file, the movie is played inside konqueror. -It can also embed inside khtml, enabling movie playback inside a html page. +It can also embed inside tdehtml, enabling movie playback inside a html page. Movie recording using mencoder (part of the mplayer package). No video during recording, but you can always open a new window and play it there. Broadcasting, http streaming, by using ffserver/ffmpeg. For TV sources, you need v4lctl (part of the xawtv package). diff --git a/acinclude.m4 b/acinclude.m4 index 365eb86..e6fcc9b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,16 +2075,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") @@ -2092,13 +2092,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)") @@ -2547,7 +2547,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 @@ -3489,7 +3489,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/po/lt.po b/po/lt.po index 4d6480d..343cdb8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -50,7 +50,7 @@ msgstr "" "&Sustabdyti\n" "#-#-#-#-# kmousetool.po (kmousetool) #-#-#-#-#\n" "&Sustabdyti\n" -"#-#-#-#-# kmid.po (kmid) #-#-#-#-#\n" +"#-#-#-#-# tdemid.po (tdemid) #-#-#-#-#\n" "&Stop\n" "#-#-#-#-# kaboodle.po (kaboodle) #-#-#-#-#\n" "&Stop\n" 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 #include #include -#include +#include #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 -#include -#include -#include +#include +#include +#include #include #ifdef HAVE_KOFFICE #include 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 #include #include -#include +#include #include #include @@ -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 (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 +#include #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 #include -#include +#include #include #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 #include #include -#include +#include #include "kmplayersource.h"