summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:45 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:45 +0200
commit680f2f2c37977b2c243c3f50e4cebfdcaa4e78a8 (patch)
treef207408ab62ab79d9f65f15f8a903349bc5194b8
parent70b2881b47707076e758d6d5f89ecec80147c304 (diff)
downloadkaffeine-680f2f2c37977b2c243c3f50e4cebfdcaa4e78a8.tar.gz
kaffeine-680f2f2c37977b2c243c3f50e4cebfdcaa4e78a8.zip
Additional k => tde renaming and fixes
-rw-r--r--acinclude.m424
-rw-r--r--aclocal.m424
m---------admin0
-rw-r--r--kaffeine/src/Makefile.am4
-rw-r--r--kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp2
-rw-r--r--kaffeine/src/input/disc/plugins/Makefile.am2
-rw-r--r--kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am2
-rw-r--r--kaffeine/src/input/dvb/plugins/epg/Makefile.am2
-rw-r--r--kaffeine/src/input/dvb/plugins/stream/Makefile.am2
-rw-r--r--kaffeine/src/player-parts/dummy-part/Makefile18
-rw-r--r--kaffeine/src/player-parts/dummy-part/Makefile.am2
-rw-r--r--kaffeine/src/player-parts/gstreamer-part/Makefile.am4
-rw-r--r--kaffeine/src/player-parts/kaffeine-part/Makefile.am2
-rw-r--r--kaffeine/src/player-parts/xine-part/Makefile.am2
-rw-r--r--kaffeine/src/player-parts/xine-part/README2
-rw-r--r--kaffeine/src/player-parts/xine-part/xine_part.cpp4
-rw-r--r--kaffeine/src/tdemultitabbar.h12
-rw-r--r--kaffeine/src/tdemultitabbar_p.h6
-rw-r--r--po/ca.po2
-rw-r--r--po/de.po2
-rw-r--r--po/it.po2
-rw-r--r--po/lt.po2
-rw-r--r--po/nl.po2
-rw-r--r--po/pt_BR.po2
-rw-r--r--po/xx.po2
25 files changed, 64 insertions, 64 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index c97b960..1aa2fae 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_KUTILS, "-ltdeutils")
+ AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+ AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-ltdednssd")
- AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+ AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+ AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
- AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/aclocal.m4 b/aclocal.m4
index 6cb4acd..2fd0184 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2082,35 +2082,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_KUTILS, "-ltdeutils")
+ AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+ AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-ltdednssd")
- AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+ AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+ AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
- AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/admin b/admin
-Subproject b4d585c643d92787bfa17b935ce00b09960ee36
+Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46
diff --git a/kaffeine/src/Makefile.am b/kaffeine/src/Makefile.am
index c0b79a8..952b4ed 100644
--- a/kaffeine/src/Makefile.am
+++ b/kaffeine/src/Makefile.am
@@ -27,13 +27,13 @@ kaffeine_SOURCES = main.cpp \
tdemultitabbar.cpp \
inputmanager.cpp
-kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
if with_dvb
DVBLIB = input/dvb/libkaffeinedvb.la
endif
-kaffeine_LDADD = $(LIB_KPARTS) \
+kaffeine_LDADD = $(LIB_TDEPARTS) \
player-parts/kaffeine-part/libkaffeinepart.la \
input/dvbclient/libkaffeinedvbclient.la \
input/audiobrowser/libkaffeineaudiobrowser.la \
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index 40e5804..3250d81 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
@@ -226,7 +226,7 @@ CoverIconViewItem::~CoverIconViewItem()
if(m_job) {
m_job->kill();
- // Drain results issued by KIO before being deleted,
+ // Drain results issued by TDEIO before being deleted,
// and before deleting the job.
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
diff --git a/kaffeine/src/input/disc/plugins/Makefile.am b/kaffeine/src/input/disc/plugins/Makefile.am
index c72ebf2..dab8353 100644
--- a/kaffeine/src/input/disc/plugins/Makefile.am
+++ b/kaffeine/src/input/disc/plugins/Makefile.am
@@ -18,7 +18,7 @@ kaffeineincludedir = $(includedir)/kaffeine
kaffeineinclude_HEADERS = kaffeineaudioencoder.h
libkaffeineaudioencoder_la_SOURCES = kaffeineaudioencoder.cpp
-libkaffeineaudioencoder_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) $(LIB_OGGVORBIS)
+libkaffeineaudioencoder_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) $(LIB_OGGVORBIS)
libkaffeineaudioencoder_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeineaudioencoder.desktop
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am b/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am
index c52f026..90e8338 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am
@@ -10,7 +10,7 @@ noinst_HEADERS = koggenc.h
libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui
libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS)
-libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -avoid-version -no-undefined
+libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -avoid-version -no-undefined
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
diff --git a/kaffeine/src/input/dvb/plugins/epg/Makefile.am b/kaffeine/src/input/dvb/plugins/epg/Makefile.am
index 5ecddb2..33babab 100644
--- a/kaffeine/src/input/dvb/plugins/epg/Makefile.am
+++ b/kaffeine/src/input/dvb/plugins/epg/Makefile.am
@@ -10,7 +10,7 @@ kaffeineincludedir = $(includedir)/kaffeine
kaffeineinclude_HEADERS = kaffeinedvbevents.h kaffeinedvbsection.h
libkaffeineepgplugin_la_SOURCES = kaffeinedvbevents.cpp kaffeinedvbsection.cpp
-libkaffeineepgplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+libkaffeineepgplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
libkaffeineepgplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeineepgplugin.desktop
diff --git a/kaffeine/src/input/dvb/plugins/stream/Makefile.am b/kaffeine/src/input/dvb/plugins/stream/Makefile.am
index 7f288a0..033d4b8 100644
--- a/kaffeine/src/input/dvb/plugins/stream/Makefile.am
+++ b/kaffeine/src/input/dvb/plugins/stream/Makefile.am
@@ -10,7 +10,7 @@ kaffeineincludedir = $(includedir)/kaffeine
kaffeineinclude_HEADERS = kaffeinedvbplugin.h
libkaffeinedvbplugin_la_SOURCES = kaffeinedvbplugin.cpp
-libkaffeinedvbplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT)
+libkaffeinedvbplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
libkaffeinedvbplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeinedvbplugin.desktop
diff --git a/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile
index e7e68d2..1186a8f 100644
--- a/kaffeine/src/player-parts/dummy-part/Makefile
+++ b/kaffeine/src/player-parts/dummy-part/Makefile
@@ -145,19 +145,19 @@ LIB_KDED =
LIB_TDEPIM = -ltdepim
LIB_TDEPRINT = -ltdeprint
LIB_TDEUI = -ltdeui
-LIB_KDNSSD = -ltdednssd
+LIB_TDEDNSSD = -ltdednssd
LIB_TDEFILE = -ltdeio
LIB_KFM =
LIB_TDEHTML = -ltdehtml
-LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -ltdeio
+LIB_TDEIMPROXY = -ltdeimproxy
+LIB_TDEIO = -ltdeio
LIB_KJS = -lkjs
LIB_KNEWSTUFF = -lknewstuff
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUNITTEST = -ltdeunittest
-LIB_KUTILS = -ltdeutils
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
+LIB_TDEUNITTEST = -ltdeunittest
+LIB_TDEUTILS = -ltdeutils
LIB_LAME = -lmp3lame
LIB_OGGVORBIS = -lvorbisenc -lvorbis -lm -logg
LIB_POLL =
@@ -329,7 +329,7 @@ INCLUDES = -I$(top_srcdir)/kaffeine/src/player-parts/ $(all_includes)
noinst_HEADERS = dummy_part.h
libdummypart_la_SOURCES = dummy_part.cpp
-libdummypart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la
+libdummypart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la
#>- libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined
#>+ 1
libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
diff --git a/kaffeine/src/player-parts/dummy-part/Makefile.am b/kaffeine/src/player-parts/dummy-part/Makefile.am
index 3eef3de..5df27f0 100644
--- a/kaffeine/src/player-parts/dummy-part/Makefile.am
+++ b/kaffeine/src/player-parts/dummy-part/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
noinst_HEADERS = dummy_part.h
libdummypart_la_SOURCES = dummy_part.cpp
-libdummypart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la
+libdummypart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la
libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined
# this is where the desktop file will go
diff --git a/kaffeine/src/player-parts/gstreamer-part/Makefile.am b/kaffeine/src/player-parts/gstreamer-part/Makefile.am
index 889d0dc..d10ddca 100644
--- a/kaffeine/src/player-parts/gstreamer-part/Makefile.am
+++ b/kaffeine/src/player-parts/gstreamer-part/Makefile.am
@@ -7,8 +7,8 @@ METASOURCES = AUTO
noinst_HEADERS = gstreamer_part.h timer.h video.h videosettings.h gstreamerconfig.h
libgstreamerpart_la_SOURCES = gstreamer_part.cpp video.cpp timer.cpp videosettings.cpp gstreamerconfig.cpp
-libgstreamerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../kaffeine-part/libkaffeinepart.la
-libgstreamerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_GSTREAMER) -lgstinterfaces-0.10 $(all_libraries) -avoid-version -no-undefined
+libgstreamerpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../kaffeine-part/libkaffeinepart.la
+libgstreamerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_GSTREAMER) -lgstinterfaces-0.10 $(all_libraries) -avoid-version -no-undefined
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
diff --git a/kaffeine/src/player-parts/kaffeine-part/Makefile.am b/kaffeine/src/player-parts/kaffeine-part/Makefile.am
index 95b7b29..7555424 100644
--- a/kaffeine/src/player-parts/kaffeine-part/Makefile.am
+++ b/kaffeine/src/player-parts/kaffeine-part/Makefile.am
@@ -8,5 +8,5 @@ kaffeineinclude_HEADERS = kaffeinepart.h mrl.h
METASOURCES = AUTO
libkaffeinepart_la_SOURCES = kaffeinepart.cpp mrl.cpp playlistimport.cpp
-libkaffeinepart_la_LIBADD = $(LIB_KPARTS) $(all_libraries) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
+libkaffeinepart_la_LIBADD = $(LIB_TDEPARTS) $(all_libraries) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
libkaffeinepart_la_LDFLAGS = -no-undefined -avoid-version
diff --git a/kaffeine/src/player-parts/xine-part/Makefile.am b/kaffeine/src/player-parts/xine-part/Makefile.am
index 103ad1f..b87656b 100644
--- a/kaffeine/src/player-parts/xine-part/Makefile.am
+++ b/kaffeine/src/player-parts/xine-part/Makefile.am
@@ -14,7 +14,7 @@ libxinepart_la_SOURCES = xine_part.cpp kxinewidget.cpp postfilter.cpp deinterlac
videosettings.cpp filterdialog.cpp screenshotpreview.cpp xineconfig.cpp positionslider.cpp \
equalizer.cpp xine_part_iface.skel
libxinepart_la_LIBADD = $(LIB_XINERAMA) $(LIB_XINE) $(LIB_XCB) ../kaffeine-part/libkaffeinepart.la
-libxinepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -avoid-version -no-undefined
+libxinepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -avoid-version -no-undefined
# this is where the desktop file will go
diff --git a/kaffeine/src/player-parts/xine-part/README b/kaffeine/src/player-parts/xine-part/README
index 09e4d43..6b8e280 100644
--- a/kaffeine/src/player-parts/xine-part/README
+++ b/kaffeine/src/player-parts/xine-part/README
@@ -67,7 +67,7 @@ METASOURCES = AUTO
myplayer_SOURCES = myplayer.cpp
myplayer_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-myplayer_LDADD = $(LIB_KPARTS) -lxinepart
+myplayer_LDADD = $(LIB_TDEPARTS) -lxinepart
*******************
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 4887ba1..0f27025 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -243,7 +243,7 @@ bool XinePart::openURL(const MRL& mrl)
kdDebug() << "XinePart: Try loading ram playlist\n";
playlist = PlaylistImport::ram(m_mrl, m_playlist, widget());
}
- /* urls from audiocd kio-slave */
+ /* urls from audiocd tdeio-slave */
if (m_mrl.kurl().protocol() == "audiocd")
{
TQString audioTrack = TQString::number(m_mrl.kurl().fileName().remove( TQRegExp("\\D" ) ).left(2).toUInt());
@@ -297,7 +297,7 @@ void XinePart::slotPlay(bool forcePlay)
MRL mrl = m_playlist[m_current];
/*
- * is protocol supported by xine or not known by KIO?
+ * is protocol supported by xine or not known by TDEIO?
*/
if ((TQString(SUPPORTED_PROTOCOLS).contains(mrl.kurl().protocol()))
|| (!KProtocolInfo::isKnownProtocol(mrl.kurl())))
diff --git a/kaffeine/src/tdemultitabbar.h b/kaffeine/src/tdemultitabbar.h
index 471c6d0..ccb9884 100644
--- a/kaffeine/src/tdemultitabbar.h
+++ b/kaffeine/src/tdemultitabbar.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef KMULTITABBAR_H
-#define KMULTITABBAR_H
+#ifndef TDEMULTITABBAR_H
+#define TDEMULTITABBAR_H
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -50,7 +50,7 @@ class KMultiTabBarInternal;
* should be raisable is left to the "user".
*@author Joseph Wenninger
*/
-class /*KUTILS_EXPORT*/ KMultiTabBar: public TQWidget
+class /*TDEUTILS_EXPORT*/ KMultiTabBar: public TQWidget
{
Q_OBJECT
@@ -153,7 +153,7 @@ private:
/**
* This class should never be created except with the appendButton call of KMultiTabBar
*/
-class /*KUTILS_EXPORT*/ KMultiTabBarButton: public TQPushButton
+class /*TDEUTILS_EXPORT*/ KMultiTabBarButton: public TQPushButton
{
Q_OBJECT
@@ -206,7 +206,7 @@ protected slots:
/**
* This class should never be created except with the appendTab call of KMultiTabBar
*/
-class /*KUTILS_EXPORT*/ KMultiTabBarTab: public KMultiTabBarButton
+class /*TDEUTILS_EXPORT*/ KMultiTabBarTab: public KMultiTabBarButton
{
Q_OBJECT
@@ -248,4 +248,4 @@ public slots:
virtual void setIcon(const TQPixmap&);
};
-#endif /* KMULTITABBAR_H */
+#endif /* TDEMULTITABBAR_H */
diff --git a/kaffeine/src/tdemultitabbar_p.h b/kaffeine/src/tdemultitabbar_p.h
index 4a0a465..c7fe1d8 100644
--- a/kaffeine/src/tdemultitabbar_p.h
+++ b/kaffeine/src/tdemultitabbar_p.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef KMULTITABBAR_P_H
-#define KMULTITABBAR_P_H
+#ifndef TDEMULTITABBAR_P_H
+#define TDEMULTITABBAR_P_H
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -66,4 +66,4 @@ protected:
virtual void resizeEvent(TQResizeEvent *);
};
-#endif /* KMULTITABBAR_P_H */
+#endif /* TDEMULTITABBAR_P_H */
diff --git a/po/ca.po b/po/ca.po
index 69c71d4..ed5ab67 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2006-11-09 08:49+0100\n"
"PO-Revision-Date: 2007-02-26 12:24+0100\n"
"Last-Translator: Antoni Bella Pérez <bella5@teleline.es>\n"
-"Language-Team: Catalan <tde-i18n-ca@kde.org>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de.po b/po/de.po
index 116fff3..5947d28 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,7 +16,7 @@ msgstr ""
"POT-Creation-Date: 2006-11-09 08:49+0100\n"
"PO-Revision-Date: 2007-03-27 13:53+0200\n"
"Last-Translator: Thomas Ohms <t.ohms@freenet.de>\n"
-"Language-Team: German <tde-i18n-de@kde.org>\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it.po b/po/it.po
index 2d977e8..8691d58 100644
--- a/po/it.po
+++ b/po/it.po
@@ -15,7 +15,7 @@ msgstr ""
"POT-Creation-Date: 2006-11-09 08:49+0100\n"
"PO-Revision-Date: 2006-11-10 00:58+0100\n"
"Last-Translator: Vincenzo Reale <smart2128@baslug.org>\n"
-"Language-Team: Italian <tde-i18n-it@mail.kde.org>\n"
+"Language-Team: Italian <kde-i18n-it@mail.kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/lt.po b/po/lt.po
index f30e1d4..8d47ba5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgstr ""
"POT-Creation-Date: 2006-11-09 08:49+0100\n"
"PO-Revision-Date: 2006-03-31 08:03+0300\n"
"Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
-"Language-Team: Lithuanian <tde-i18n-lt@kde.org>\n"
+"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nl.po b/po/nl.po
index 43b36f7..ac752a8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgstr ""
"POT-Creation-Date: 2006-11-09 08:49+0100\n"
"PO-Revision-Date: 2006-11-26 21:53+0100\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
-"Language-Team: Dutch <tde-i18n-nl@kde.org>\n"
+"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1eb8f63..4867b7c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgstr ""
"POT-Creation-Date: 2006-11-09 08:49+0100\n"
"PO-Revision-Date: 2007-02-01 10:28-0300\n"
"Last-Translator: Fábio Henrique de Souza <fabiohsouza@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <tde-i18n-pt_br@mail.kde.org>\n"
+"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/xx.po b/po/xx.po
index bb582ea..c95609b 100644
--- a/po/xx.po
+++ b/po/xx.po
@@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2006-11-09 08:49+0100\n"
"PO-Revision-Date: 2007-06-11 15:59+0000\n"
"Last-Translator: transxx program <null@kde.org>\n"
-"Language-Team: Test Language <tde-i18n-doc@kde.org>\n"
+"Language-Team: Test Language <kde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"