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 cd27173bf5
commit 1fd679c63f
27 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -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)

26
aclocal.m4 vendored
Unescape View File

@ -2087,16 +2087,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")
@ -2104,13 +2104,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)")
@ -2559,7 +2559,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
@ -3501,7 +3501,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)

4
kaffeine/src/Makefile.am
Unescape View File

@ -24,10 +24,10 @@ kaffeine_SOURCES = main.cpp \
kaffeineiface.skel \
systemtray.cpp \
instwizard.cpp\
kmultitabbar.cpp \
tdemultitabbar.cpp \
inputmanager.cpp
kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
if with_dvb
DVBLIB = input/dvb/libkaffeinedvb.la

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

@ -25,7 +25,7 @@
#include <dom/dom_exception.h>
#include <dom/dom2_traversal.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <klocale.h>
#include <kinputdialog.h>

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

@ -43,7 +43,7 @@
#include <kpushbutton.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "paranoia.h"
#include "paranoia.moc"

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

@ -21,7 +21,7 @@
#ifndef KAFFEINEAUDIOENCODER_H
#define KAFFEINEAUDIOENCODER_H
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kconfig.h>
#include <tqstring.h>

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

@ -21,7 +21,7 @@
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kpushbutton.h>

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

@ -20,7 +20,7 @@
#include <tqslider.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kiconloader.h>
#include <kpushbutton.h>

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

@ -962,7 +962,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
lab = new TQLabel( i18n("Update scan data:"), gb );
grid->addWidget( lab, 3, 0 );
updateBtn = new KPushButton( gb );
updateBtn->setGuiItem( KGuiItem(i18n("Download"), icon->loadIconSet("khtml_kget", KIcon::Small) ) );
updateBtn->setGuiItem( KGuiItem(i18n("Download"), icon->loadIconSet("tdehtml_kget", KIcon::Small) ) );
grid->addWidget( updateBtn, 3, 1 );
lab = new TQLabel( i18n("Dump epg's events to \n~/kaffeine_dvb_events.tx:"), gb );

2
kaffeine/src/input/dvb/dvbevents.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
#include <ktrader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "dvbevents.h"

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

@ -43,7 +43,7 @@
#include <kfiledialog.h>
#include <ktrader.h>
#include <kxmlguifactory.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "kaffeinedvbplugin.h"
#include "dvbpanel.h"

2
kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
Unescape View File

@ -26,7 +26,7 @@
#include <tqfile.h>
#include <tqobject.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "kaffeinedvbsection.h"

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

@ -24,7 +24,7 @@
#include <tqpopupmenu.h>
#include <tqstring.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kconfig.h>
/*

2
kaffeine/src/inputmanager.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <kkeydialog.h>
#include <klocale.h>
#include "kmultitabbar.h"
#include "tdemultitabbar.h"
#include "kaffeine.h"
#include "kaffeineinput.h"
#include "inputmanager.h"

4
kaffeine/src/kaffeine.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <kaccel.h>
#include <kstdaction.h>
#include <klibloader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kmessagebox.h>
#include <kstatusbar.h>
#include <kmenubar.h>
@ -80,7 +80,7 @@
#endif
#include "cdwidget.h"
#include "inputmanager.h"
#include "kmultitabbar.h"
#include "tdemultitabbar.h"
#include "disc.h"
#define DEFAULT_FILTER "*.anx *.axa *.axv *.vob *.png *.y4m *.rm *.ram *.rmvb *.pva *.nsv *.ogg *.ogm *.spx *.png *.mng *.pes *.iff *.svx *.8svx *.16sv *.ilbm *.pic *.anim *.wav *.vox *.voc *.snd *.au *.ra *.nsf *.flac *.aif *.aiff *.aud *.flv *.fli *.flc *.avi *.asf *.wmv *.wma *.asx *.wvx *.wax *.mkv *.vmd *.4xm *.mjpg *.cpk *.cak *.film *.str *.iki *.ik2 *.dps *.dat *.xa *.xa1 *.xa2 *.xas *.xap *.roq *.mve *.vqa *.mve *.mv8 *.cin *.wve *.mov *.qt *.mp4 *.ts *.m2t *.trp *.mpg *.mpeg *.dv *.dif *.flac *.mp3 *.mp2 *.mpa *.mpega *.ac3 *.aac *.asc *. *.sub *.srt *.smi *.ssa *.mpv *.m4a *.m4v *.mpc *.mp+ *.iso *.ANX *.AXA *.AXV *.VOB *.PNG *.Y4M *.RM *.RAM *.RMVB *.PVA *.NSV *.OGG *.OGM *.SPX *.PNG *.MNG *.PES *.IFF *.SVX *.8SVX *.16SV *.ILBM *.PIC *.ANIM *.WAV *.VOX *.VOC *.SND *.AU *.RA *.NSF *.FLAC *.AIF *.AIFF *.AUD *.FLV *.FLI *.FLC *.AVI *.ASF *.WMV *.WMA *.ASX *.WVX *.WAX *.MKV *.VMD *.4XM *.MJPG *.CPK *.CAK *.FILM *.STR *.IKI *.IK2 *.DPS *.DAT *.XA *.XA1 *.XA2 *.XAS *.XAP *.ROQ *.MVE *.VQA *.MVE *.MV8 *.CIN *.WVE *.MOV *.QT *.MP4 *.TS *.M2T *.TRP *.MPG *.MPEG *.DV *.DIF *.FLAC *.MP3 *.MP2 *.MPA *.MPEGA *.AC3 *.AAC *.ASC *. *.SUB *.SRT *.SMI *.SSA *.MPV *.M4A *.M4V *.MPC *.MP+ *.ISO"

2
kaffeine/src/kaffeine.h
Unescape View File

@ -30,7 +30,7 @@
#include <tqvbox.h>
#include <kmainwindow.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "kaffeineiface.h"

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

@ -145,19 +145,19 @@ LIB_KDED =
LIB_TDEPIM = -ltdepim
LIB_TDEPRINT = -ltdeprint
LIB_TDEUI = -ltdeui
LIB_KDNSSD = -lkdnssd
LIB_KDNSSD = -ltdednssd
LIB_KFILE = -lkio
LIB_KFM =
LIB_KHTML = -lkhtml
LIB_KIMPROXY = -lkimproxy
LIB_KHTML = -ltdehtml
LIB_KIMPROXY = -ltdeimproxy
LIB_KIO = -lkio
LIB_KJS = -lkjs
LIB_KNEWSTUFF = -lknewstuff
LIB_KPARTS = -lkparts
LIB_KSPELL = -lkspell
LIB_KPARTS = -ltdeparts
LIB_KSPELL = -ltdespell
LIB_KSYCOCA = -lkio
LIB_KUNITTEST = -lkunittest
LIB_KUTILS = -lkutils
LIB_KUNITTEST = -ltdeunittest
LIB_KUTILS = -ltdeutils
LIB_LAME = -lmp3lame
LIB_OGGVORBIS = -lvorbisenc -lvorbis -lm -logg
LIB_POLL =

2
kaffeine/src/player-parts/dummy-part/dummy_part.cpp
Unescape View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kaction.h>
#include "dummy_part.h"

2
kaffeine/src/player-parts/dummy-part/dummy_part.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef DUMMYPART_H
#define DUMMYPART_H
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include "kaffeinepart.h"

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

@ -23,7 +23,7 @@
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kaction.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>

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

@ -22,7 +22,7 @@
#ifndef GSTREAMER_PART_H
#define GSTREAMER_PART_H
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include <gst/gst.h>

2
kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef KAFFEINEPART_H
#define KAFFEINEPART_H
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "mrl.h"

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

@ -30,7 +30,7 @@
#include <kinputdialog.h>
#include <kxmlguifactory.h>
#include <kpopupmenu.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kprogress.h>
#include <kio/netaccess.h>
#include <kstandarddirs.h>

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

@ -22,7 +22,7 @@
#define XINEPART_H
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include <tqtimer.h>

10
kaffeine/src/kmultitabbar.cpp → kaffeine/src/tdemultitabbar.cpp
Unescape View File

@ -1,5 +1,5 @@
/*
* kmultitabbar.cpp
* tdemultitabbar.cpp
*
* Copyright (C) 2001,2002,2003 Joseph Wenninger <jowenn@kde.org>
* Copyright (C) 2005 Christophe Thommeret <hftom@free.fr>
@ -23,10 +23,10 @@
#include <config.h>
#endif
#include "kmultitabbar.h"
#include "kmultitabbar.moc"
#include "kmultitabbar_p.h"
#include "kmultitabbar_p.moc"
#include "tdemultitabbar.h"
#include "tdemultitabbar.moc"
#include "tdemultitabbar_p.h"
#include "tdemultitabbar_p.moc"
#include <tqbutton.h>
#include <tqpopupmenu.h>
#include <tqlayout.h>

2
kaffeine/src/kmultitabbar.h → kaffeine/src/tdemultitabbar.h
Unescape View File

@ -1,5 +1,5 @@
/*
* kmultitabbar.h
* tdemultitabbar.h
*
* Copyright (C) 2001,2002,2003 Joseph Wenninger <jowenn@kde.org>
* Copyright (C) 2005 Christophe Thommeret <hftom@free.fr>

4
kaffeine/src/kmultitabbar_p.h → kaffeine/src/tdemultitabbar_p.h
Unescape View File

@ -1,5 +1,5 @@
/*
* kmultitabbar_p.h
* tdemultitabbar_p.h
*
* Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
*
@ -26,7 +26,7 @@
#endif
#include <tqscrollview.h>
#include <kmultitabbar.h>
#include <tdemultitabbar.h>
class KMultiTabBarInternal: public TQScrollView
{
Write Preview
Loading…
Cancel
Save