TDE
/
kmplayer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 3fde821fbc
commit 0aad0edba6
16 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

8
acinclude.m4
Unescape View File

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

32
po/lt.po
Unescape View File

@ -262,7 +262,7 @@ msgid "Ready."
msgstr "" msgstr ""
"#-#-#-#-# kfindpart.po (kfindpart) #-#-#-#-#\n" "#-#-#-#-# kfindpart.po (kfindpart) #-#-#-#-#\n"
"Pasiruošęs\n" "Pasiruošęs\n"
"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n" "#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n"
"Pasirengęs.\n" "Pasirengęs.\n"
"#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" "#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n"
"Pasirengęs.\n" "Pasirengęs.\n"
@ -969,7 +969,7 @@ msgid "Unknown"
msgstr "" msgstr ""
"#-#-#-#-# kcmkclock.po (kcmkclock) #-#-#-#-#\n" "#-#-#-#-# kcmkclock.po (kcmkclock) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
"#-#-#-#-# quicklauncher.po (quicklauncher) #-#-#-#-#\n" "#-#-#-#-# quictdelauncher.po (quictdelauncher) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
"#-#-#-#-# kpartapp.po (kpartapp) #-#-#-#-#\n" "#-#-#-#-# kpartapp.po (kpartapp) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
@ -1005,7 +1005,7 @@ msgstr ""
"Nežinoma\n" "Nežinoma\n"
"#-#-#-#-# kttsd_festivalintplugin.po (kttsd_festivalintplugin) #-#-#-#-#\n" "#-#-#-#-# kttsd_festivalintplugin.po (kttsd_festivalintplugin) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
"#-#-#-#-# kfile_png.po (kfile_png) #-#-#-#-#\n" "#-#-#-#-# tdefile_png.po (tdefile_png) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
"#-#-#-#-# kstars.po (kstars) #-#-#-#-#\n" "#-#-#-#-# kstars.po (kstars) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
@ -1029,7 +1029,7 @@ msgstr ""
"Nežinoma\n" "Nežinoma\n"
"#-#-#-#-# kgpg.po (kgpg) #-#-#-#-#\n" "#-#-#-#-# kgpg.po (kgpg) #-#-#-#-#\n"
"Nežinomas\n" "Nežinomas\n"
"#-#-#-#-# kfile_txt.po (kfile_txt) #-#-#-#-#\n" "#-#-#-#-# tdefile_txt.po (tdefile_txt) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
"#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n"
"Nežinoma\n" "Nežinoma\n"
@ -1251,7 +1251,7 @@ msgstr ""
"Vardas:\n" "Vardas:\n"
"#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n"
"Vardas:\n" "Vardas:\n"
"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n" "#-#-#-#-# tdefileshare.po (tdefileshare) #-#-#-#-#\n"
"Vardas:\n" "Vardas:\n"
"#-#-#-#-# knewsticker.po (knewsticker) #-#-#-#-#\n" "#-#-#-#-# knewsticker.po (knewsticker) #-#-#-#-#\n"
"Pavadinimas:\n" "Pavadinimas:\n"
@ -1338,7 +1338,7 @@ msgstr ""
"Bendri\n" "Bendri\n"
"#-#-#-#-# kcmkonsole.po (kcmkonsole) #-#-#-#-#\n" "#-#-#-#-# kcmkonsole.po (kcmkonsole) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfile_font.po (kfile_font) #-#-#-#-#\n" "#-#-#-#-# tdefile_font.po (tdefile_font) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kcmsmserver.po (kcmsmserver) #-#-#-#-#\n" "#-#-#-#-# kcmsmserver.po (kcmsmserver) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
@ -1352,7 +1352,7 @@ msgstr ""
"Bendros\n" "Bendros\n"
"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" "#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n"
"Bendros\n" "Bendros\n"
"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n" "#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kchart.po (kchart) #-#-#-#-#\n" "#-#-#-#-# kchart.po (kchart) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
@ -1360,11 +1360,11 @@ msgstr ""
"Bendra\n" "Bendra\n"
"#-#-#-#-# pwmanager.po (pwmanager) #-#-#-#-#\n" "#-#-#-#-# pwmanager.po (pwmanager) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfile_rpm.po (kfile_rpm) #-#-#-#-#\n" "#-#-#-#-# tdefile_rpm.po (tdefile_rpm) #-#-#-#-#\n"
"Pagrindai\n" "Pagrindai\n"
"#-#-#-#-# kuser.po (kuser) #-#-#-#-#\n" "#-#-#-#-# kuser.po (kuser) #-#-#-#-#\n"
"Bendrieji\n" "Bendrieji\n"
"#-#-#-#-# kfile_deb.po (kfile_deb) #-#-#-#-#\n" "#-#-#-#-# tdefile_deb.po (tdefile_deb) #-#-#-#-#\n"
"Pagrindai\n" "Pagrindai\n"
"#-#-#-#-# ksnake.po (ksnake) #-#-#-#-#\n" "#-#-#-#-# ksnake.po (ksnake) #-#-#-#-#\n"
"Bendri\n" "Bendri\n"
@ -1376,9 +1376,9 @@ msgstr ""
"Bendrieji\n" "Bendrieji\n"
"#-#-#-#-# kghostview.po (kghostview) #-#-#-#-#\n" "#-#-#-#-# kghostview.po (kghostview) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfile_pdf.po (kfile_pdf) #-#-#-#-#\n" "#-#-#-#-# tdefile_pdf.po (tdefile_pdf) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfile_ps.po (kfile_ps) #-#-#-#-#\n" "#-#-#-#-# tdefile_ps.po (tdefile_ps) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kstars.po (kstars) #-#-#-#-#\n" "#-#-#-#-# kstars.po (kstars) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
@ -1410,11 +1410,11 @@ msgstr ""
"Bendra\n" "Bendra\n"
"#-#-#-#-# kcalc.po (kcalc) #-#-#-#-#\n" "#-#-#-#-# kcalc.po (kcalc) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfile_txt.po (kfile_txt) #-#-#-#-#\n" "#-#-#-#-# tdefile_txt.po (tdefile_txt) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfile_desktop.po (kfile_desktop) #-#-#-#-#\n" "#-#-#-#-# tdefile_desktop.po (tdefile_desktop) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfile_html.po (kfile_html) #-#-#-#-#\n" "#-#-#-#-# tdefile_html.po (tdefile_html) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kcmmediacontrol.po (kcmmediacontrol) #-#-#-#-#\n" "#-#-#-#-# kcmmediacontrol.po (kcmmediacontrol) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
@ -1422,7 +1422,7 @@ msgstr ""
"Bendra\n" "Bendra\n"
"#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n" "#-#-#-#-# tdefileshare.po (tdefileshare) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
"#-#-#-#-# ksirc.po (ksirc) #-#-#-#-#\n" "#-#-#-#-# ksirc.po (ksirc) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
@ -2012,7 +2012,7 @@ msgstr ""
"Formatas\n" "Formatas\n"
"#-#-#-#-# kompare.po (kompare) #-#-#-#-#\n" "#-#-#-#-# kompare.po (kompare) #-#-#-#-#\n"
"Formatas\n" "Formatas\n"
"#-#-#-#-# kfile_txt.po (kfile_txt) #-#-#-#-#\n" "#-#-#-#-# tdefile_txt.po (tdefile_txt) #-#-#-#-#\n"
"Formatas\n" "Formatas\n"
"#-#-#-#-# kaudiocreator.po (kaudiocreator) #-#-#-#-#\n" "#-#-#-#-# kaudiocreator.po (kaudiocreator) #-#-#-#-#\n"
"Formatas" "Formatas"

2
src/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
AM_CPPFLAGS= -I$(kde_includes)/kio $(CFLAGS_GST) $(all_includes) $(LIBCAIRO_CFLAGS) $(LIBNSPR_CFLAGS) $(LIBDBUS_CFLAGS) AM_CPPFLAGS= -I$(kde_includes)/tdeio $(CFLAGS_GST) $(all_includes) $(LIBCAIRO_CFLAGS) $(LIBNSPR_CFLAGS) $(LIBDBUS_CFLAGS)
METASOURCES= AUTO METASOURCES= AUTO

2
src/kmplayer_koffice_part.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaction.h> #include <kaction.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tdeparts/factory.h> #include <tdeparts/factory.h>

2
src/kmplayer_part.cpp
Unescape View File

@ -31,7 +31,7 @@
class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient
#include <klibloader.h> #include <klibloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kaction.h> #include <kaction.h>
#include <kapplication.h> #include <kapplication.h>

4
src/kmplayer_smil.cpp
Unescape View File

@ -34,8 +34,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <kurl.h> #include <kurl.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include "kmplayer_smil.h" #include "kmplayer_smil.h"
#include "kmplayer_rp.h" #include "kmplayer_rp.h"

6
src/kmplayerapp.cpp
Unescape View File

@ -42,13 +42,13 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klineeditdlg.h> #include <klineeditdlg.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopclient.h> #include <dcopclient.h>
@ -1695,7 +1695,7 @@ KDE_NO_EXPORT void KMPlayerApp::startArtsControl () {
TQCString replytype; TQCString replytype;
TQDataStream stream (data, IO_WriteOnly); TQDataStream stream (data, IO_WriteOnly);
stream << TQString ("aRts Control Tool") << args; stream << TQString ("aRts Control Tool") << args;
if (kapp->dcopClient ()->call ("klauncher", "klauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) { if (kapp->dcopClient ()->call ("tdelauncher", "tdelauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) {
int result; int result;
TQDataStream replystream (replydata, IO_ReadOnly); TQDataStream replystream (replydata, IO_ReadOnly);
replystream >> result >> m_dcopName; replystream >> result >> m_dcopName;

2
src/kmplayerbroadcast.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kled.h> #include <kled.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kprocess.h> #include <kprocess.h>
#include <kprocctrl.h> #include <kprocctrl.h>
#include <kmessagebox.h> #include <kmessagebox.h>

2
src/kmplayerconfig.cpp
Unescape View File

@ -34,7 +34,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kurl.h> #include <kurl.h>
#include <kdebug.h> #include <kdebug.h>

2
src/kmplayerconfig.h
Unescape View File

@ -106,7 +106,7 @@ public:
void applyColorSetting (bool only_changed_ones); void applyColorSetting (bool only_changed_ones);
Preferences *configDialog() const { return configdialog; } Preferences *configDialog() const { return configdialog; }
View * defaultView (); View * defaultView ();
TDEConfig * kconfig () { return m_config; } TDEConfig * tdeconfig () { return m_config; }
TQStringList urllist; TQStringList urllist;
TQStringList sub_urllist; TQStringList sub_urllist;

6
src/kmplayerpartbase.cpp
Unescape View File

@ -41,7 +41,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kbookmarkmenu.h> #include <kbookmarkmenu.h>
#include <kbookmarkmanager.h> #include <kbookmarkmanager.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kaction.h> #include <kaction.h>
#include <kprocess.h> #include <kprocess.h>
@ -50,8 +50,8 @@
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kapplication.h> #include <kapplication.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include "kmplayerpartbase.h" #include "kmplayerpartbase.h"
#include "kmplayerview.h" #include "kmplayerview.h"

4
src/kmplayerprocess.cpp
Unescape View File

@ -40,12 +40,12 @@
#include <kdebug.h> #include <kdebug.h>
#include <kprocctrl.h> #include <kprocctrl.h>
#include <kprotocolmanager.h> #include <kprotocolmanager.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kio/job.h> #include <tdeio/job.h>
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
# include <kstaticdeleter.h> # include <kstaticdeleter.h>

2
src/kmplayerprocess.h
Unescape View File

@ -29,7 +29,7 @@
#include <tqregexp.h> #include <tqregexp.h>
#include <kurl.h> #include <kurl.h>
#include <kio/global.h> #include <tdeio/global.h>
#include "kmplayerconfig.h" #include "kmplayerconfig.h"
#include "kmplayersource.h" #include "kmplayersource.h"

2
src/kmplayertvsource.cpp
Unescape View File

@ -39,7 +39,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include "kmplayerpartbase.h" #include "kmplayerpartbase.h"

2
src/kmplayervdr.cpp
Unescape View File

@ -48,7 +48,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kprocess.h> #include <kprocess.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaction.h> #include <kaction.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klistview.h> #include <klistview.h>

2
src/pref.cpp
Unescape View File

@ -44,7 +44,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klineedit.h> #include <klineedit.h>
#include <kiconloader.h> #include <kiconloader.h>

Write Preview
Loading…
Cancel
Save