TDE
/
kaffeine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine
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 1ddf4884f4
commit 6a2fe24d05
26 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

8
acinclude.m4
Unescape Escape 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
]) ])

8
aclocal.m4 vendored
Unescape Escape View File

@ -614,7 +614,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
@ -1800,7 +1800,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
@ -2106,7 +2106,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")
@ -2116,7 +2116,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
]) ])

2
kaffeine/src/input/audiobrowser/googlefetcher.cpp
Unescape Escape View File

@ -30,7 +30,7 @@
#include <klocale.h> #include <klocale.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "googlefetcher.h" #include "googlefetcher.h"
#include "googlefetcherdialog.h" #include "googlefetcherdialog.h"

2
kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
Unescape Escape View File

@ -19,7 +19,7 @@
*/ */
#include <kapplication.h> #include <kapplication.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <kmessagebox.h>

2
kaffeine/src/input/audiobrowser/googlefetcherdialog.h
Unescape Escape View File

@ -22,7 +22,7 @@
#define GOOGLEFETCHERDIALOG_H #define GOOGLEFETCHERDIALOG_H
#include <kiconview.h> #include <kiconview.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "googlefetcher.h" #include "googlefetcher.h"

8
kaffeine/src/input/audiobrowser/playlist.cpp
Unescape Escape View File

@ -24,15 +24,15 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kprogress.h> #include <kprogress.h>
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include <klineedit.h> #include <klineedit.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kpushbutton.h> #include <kpushbutton.h>

2
kaffeine/src/input/audiobrowser/playlist.h
Unescape Escape View File

@ -24,7 +24,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kdiroperator.h> #include <kdiroperator.h>
#include <kfileiconview.h> #include <tdefileiconview.h>
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>

4
kaffeine/src/input/audiobrowser/urllistview.cpp
Unescape Escape View File

@ -25,7 +25,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kurl.h> #include <kurl.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <tqfontmetrics.h> #include <tqfontmetrics.h>
@ -222,7 +222,7 @@ void UrlListView::slotClicked(TQListViewItem*, const TQPoint&, int)
} }
#include <tqdom.h> #include <tqdom.h>
#include <kio/job.h> #include <tdeio/job.h>
void UrlListView::slotAddSubtitle() void UrlListView::slotAddSubtitle()
{ {

2
kaffeine/src/input/disc/disc.h
Unescape Escape View File

@ -23,7 +23,7 @@
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klistview.h> #include <klistview.h>
#include <tqframe.h> #include <tqframe.h>

2
kaffeine/src/input/disc/paranoia.cpp
Unescape Escape View File

@ -42,7 +42,7 @@
#include <ktrader.h> #include <ktrader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tdeparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include "paranoia.h" #include "paranoia.h"

2
kaffeine/src/input/disc/paranoia.h
Unescape Escape View File

@ -25,7 +25,7 @@
#include <tqthread.h> #include <tqthread.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "kaffeineaudioencoder.h" #include "kaffeineaudioencoder.h"
#include "paranoiasettings.h" #include "paranoiasettings.h"

2
kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
Unescape Escape View File

@ -22,7 +22,7 @@
#define KAFFEINEAUDIOENCODER_H #define KAFFEINEAUDIOENCODER_H
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqwidget.h> #include <tqwidget.h>

2
kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
Unescape Escape View File

@ -23,7 +23,7 @@
#include <lame/lame.h> #include <lame/lame.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "kaffeineaudioencoder.h" #include "kaffeineaudioencoder.h"
#include "lameconfig.h" #include "lameconfig.h"

2
kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
Unescape Escape View File

@ -31,7 +31,7 @@ extern "C"
#include <vorbis/vorbisenc.h> #include <vorbis/vorbisenc.h>
} }
#include <kconfig.h> #include <tdeconfig.h>
#include "kaffeineaudioencoder.h" #include "kaffeineaudioencoder.h"
#include "oggconfig.h" #include "oggconfig.h"

2
kaffeine/src/input/dvb/dvbconfig.cpp
Unescape Escape View File

@ -32,7 +32,7 @@
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <ktar.h> #include <ktar.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

4
kaffeine/src/input/dvb/dvbconfig.h
Unescape Escape View File

@ -32,8 +32,8 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kprogress.h> #include <kprogress.h>
#include <linux/dvb/frontend.h> #include <linux/dvb/frontend.h>

2
kaffeine/src/input/dvb/dvbpanel.cpp
Unescape Escape View File

@ -40,7 +40,7 @@
#include <kicondialog.h> #include <kicondialog.h>
#include <kaction.h> #include <kaction.h>
#include <kprocess.h> #include <kprocess.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <ktrader.h> #include <ktrader.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <tdeparts/componentfactory.h> #include <tdeparts/componentfactory.h>

2
kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
Unescape Escape View File

@ -25,7 +25,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <kconfig.h> #include <tdeconfig.h>
/* /*
* Base-Class for Kaffeine DVB plugins. * Base-Class for Kaffeine DVB plugins.

2
kaffeine/src/input/dvbclient/cdwidget.h
Unescape Escape View File

@ -27,7 +27,7 @@
#include <tqvbox.h> #include <tqvbox.h>
#include <tqsplitter.h> #include <tqsplitter.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "cddump.h" #include "cddump.h"
#include "cdlisten.h" #include "cdlisten.h"

6
kaffeine/src/kaffeine.cpp
Unescape Escape View File

@ -27,9 +27,9 @@
#include <dcopref.h> #include <dcopref.h>
#include <kkeydialog.h> #include <kkeydialog.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kurl.h> #include <kurl.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kaction.h> #include <kaction.h>
@ -49,7 +49,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kprocess.h> #include <kprocess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kinputdialog.h> #include <kinputdialog.h>

2
kaffeine/src/player-parts/dummy-part/Makefile
Unescape Escape View File

@ -95,7 +95,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL} INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config KDECONFIG = /usr/bin/tde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH = KDE_EXTRA_RPATH =

2
kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <ktoolbar.h> #include <ktoolbar.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

2
kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
#include <tqxml.h> #include <tqxml.h>
#include <kdebug.h> #include <kdebug.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "playlistimport.h" #include "playlistimport.h"

2
kaffeine/src/player-parts/xine-part/equalizer.h
Unescape Escape View File

@ -22,7 +22,7 @@
#define EQUALIZER_H #define EQUALIZER_H
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqslider.h> #include <tqslider.h>

4
kaffeine/src/player-parts/xine-part/xine_part.cpp
Unescape Escape View File

@ -25,14 +25,14 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <tdeparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kprogress.h> #include <kprogress.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kprocess.h> #include <kprocess.h>

2
kaffeine/src/pref.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>

Write Preview
Loading…
Cancel
Save