Browse Source

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

pull/1/head
Timothy Pearson 8 years ago
parent
commit
0aad0edba6
16 changed files with 40 additions and 40 deletions
  1. +4
    -4
      acinclude.m4
  2. +16
    -16
      po/lt.po
  3. +1
    -1
      src/Makefile.am
  4. +1
    -1
      src/kmplayer_koffice_part.cpp
  5. +1
    -1
      src/kmplayer_part.cpp
  6. +2
    -2
      src/kmplayer_smil.cpp
  7. +3
    -3
      src/kmplayerapp.cpp
  8. +1
    -1
      src/kmplayerbroadcast.cpp
  9. +1
    -1
      src/kmplayerconfig.cpp
  10. +1
    -1
      src/kmplayerconfig.h
  11. +3
    -3
      src/kmplayerpartbase.cpp
  12. +2
    -2
      src/kmplayerprocess.cpp
  13. +1
    -1
      src/kmplayerprocess.h
  14. +1
    -1
      src/kmplayertvsource.cpp
  15. +1
    -1
      src/kmplayervdr.cpp
  16. +1
    -1
      src/pref.cpp

+ 4
- 4
acinclude.m4 View File

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
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)])
fi
if test -n "$trinity3ornewer"; then
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(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)")
fi
])


+ 16
- 16
po/lt.po View File

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


+ 1
- 1
src/Makefile.am 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


+ 1
- 1
src/kmplayer_koffice_part.cpp View File

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


+ 1
- 1
src/kmplayer_part.cpp View File

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


+ 2
- 2
src/kmplayer_smil.cpp View File

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


+ 3
- 3
src/kmplayerapp.cpp View File

@ -42,13 +42,13 @@
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klineeditdlg.h>
#include <kmenubar.h>
#include <kstatusbar.h>
#include <kurldrag.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstdaction.h>
#include <kdebug.h>
#include <dcopclient.h>
@ -1695,7 +1695,7 @@ KDE_NO_EXPORT void KMPlayerApp::startArtsControl () {
TQCString replytype;
TQDataStream stream (data, IO_WriteOnly);
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;
TQDataStream replystream (replydata, IO_ReadOnly);
replystream >> result >> m_dcopName;


+ 1
- 1
src/kmplayerbroadcast.cpp View File

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


+ 1
- 1
src/kmplayerconfig.cpp View File

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


+ 1
- 1
src/kmplayerconfig.h View File

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


+ 3
- 3
src/kmplayerpartbase.cpp View File

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


+ 2
- 2
src/kmplayerprocess.cpp View File

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


+ 1
- 1
src/kmplayerprocess.h View File

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


+ 1
- 1
src/kmplayertvsource.cpp View File

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


+ 1
- 1
src/kmplayervdr.cpp View File

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


+ 1
- 1
src/pref.cpp View File

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


Loading…
Cancel
Save