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

Additional k => tde renaming and fixes

Browse Source
pull/1/head
Slávek Banko 11 years ago
parent 22f700d495
commit 76851de660
11 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File

2
admin

@ -1 +1 @@
Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

2
tderadio3/convert-presets/Makefile.am
Unescape View File

@ -25,7 +25,7 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO
# the library search path.
convert_presets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
convert_presets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
messages: rc.cpp
$(XGETTEXT) *.cpp -o po/tderadio-convert-presets.pot

16
tderadio3/convert-presets/po/Makefile
Unescape View File

@ -154,19 +154,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 =
LIB_LIRC = -llirc_client
LIB_OGG = -logg -lvorbisenc

56
tderadio3/plugins/streaming/streaming-job.cpp
Unescape View File

@ -33,7 +33,7 @@ StreamingJob::StreamingJob()
m_StreamPos(0),
m_StartTime(0),
m_SkipCount(0),
m_KIO_Job(NULL),
m_TDEIO_Job(NULL),
m_capturing(false)
{
}
@ -48,7 +48,7 @@ StreamingJob::StreamingJob(const TQString &_URL, const SoundFormat &_SoundFormat
m_StreamPos(0),
m_StartTime(0),
m_SkipCount(0),
m_KIO_Job(NULL),
m_TDEIO_Job(NULL),
m_capturing(false)
{
}
@ -63,7 +63,7 @@ StreamingJob::StreamingJob(const StreamingJob &c)
m_StreamPos(0),
m_StartTime(0),
m_SkipCount(0),
m_KIO_Job(NULL),
m_TDEIO_Job(NULL),
m_capturing(c.m_capturing)
{
}
@ -77,8 +77,8 @@ void StreamingJob::setURL(const TQString &url)
{
if (m_URL != url) {
m_URL = url;
delete m_KIO_Job;
m_KIO_Job = NULL;
delete m_TDEIO_Job;
m_TDEIO_Job = NULL;
if (!m_capturing) {
startPutJob();
} else {
@ -105,13 +105,13 @@ void StreamingJob::setBufferSize(size_t buffer_size)
bool StreamingJob::startPutJob()
{
m_KIO_Job = TDEIO::put(m_URL, -1, true, false, false);
if (!m_KIO_Job)
m_TDEIO_Job = TDEIO::put(m_URL, -1, true, false, false);
if (!m_TDEIO_Job)
return false;
m_KIO_Job->setAsyncDataEnabled(true);
connect (m_KIO_Job, TQT_SIGNAL(dataReq(TDEIO::Job *job, TQByteArray &data)),
m_TDEIO_Job->setAsyncDataEnabled(true);
connect (m_TDEIO_Job, TQT_SIGNAL(dataReq(TDEIO::Job *job, TQByteArray &data)),
this, TQT_SLOT(slotWriteData (TDEIO::Job *job, TQByteArray &data)));
connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
connect (m_TDEIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
return true;
}
@ -126,10 +126,10 @@ bool StreamingJob::startPlayback()
return false;
m_StartTime = time(NULL);
m_StreamPos = 0;
if (m_KIO_Job->error()) {
emit logStreamError(m_URL, m_KIO_Job->errorString());
if (m_TDEIO_Job->error()) {
emit logStreamError(m_URL, m_TDEIO_Job->errorString());
}
return m_KIO_Job->error() == 0;
return m_TDEIO_Job->error() == 0;
}
else {
return true;
@ -140,8 +140,8 @@ bool StreamingJob::stopPlayback()
{
if (m_OpenCounter) {
if (!--m_OpenCounter) {
delete m_KIO_Job;
m_KIO_Job = NULL;
delete m_TDEIO_Job;
m_TDEIO_Job = NULL;
}
}
return true;
@ -150,13 +150,13 @@ bool StreamingJob::stopPlayback()
bool StreamingJob::startGetJob()
{
m_KIO_Job = TDEIO::get(m_URL, false, false);
if (!m_KIO_Job)
m_TDEIO_Job = TDEIO::get(m_URL, false, false);
if (!m_TDEIO_Job)
return false;
m_KIO_Job->setAsyncDataEnabled(true);
connect (m_KIO_Job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
m_TDEIO_Job->setAsyncDataEnabled(true);
connect (m_TDEIO_Job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotReadData(TDEIO::Job *, const TQByteArray &)));
connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
connect (m_TDEIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
return true;
}
@ -173,10 +173,10 @@ bool StreamingJob::startCapture(const SoundFormat &/*proposed_format*/,
return false;
m_StartTime = time(NULL);
m_StreamPos = 0;
if (m_KIO_Job->error()) {
emit logStreamError(m_URL, m_KIO_Job->errorString());
if (m_TDEIO_Job->error()) {
emit logStreamError(m_URL, m_TDEIO_Job->errorString());
}
return m_KIO_Job->error() == 0;
return m_TDEIO_Job->error() == 0;
}
++m_OpenCounter;
real_format = m_SoundFormat;
@ -188,8 +188,8 @@ bool StreamingJob::stopCapture()
{
if (m_OpenCounter) {
if (!--m_OpenCounter) {
delete m_KIO_Job;
m_KIO_Job = NULL;
delete m_TDEIO_Job;
m_TDEIO_Job = NULL;
}
}
return true;
@ -211,7 +211,7 @@ void StreamingJob::slotReadData (TDEIO::Job */*job*/, const TQByteArray &data
m_StreamPos += free;
if (m_Buffer.getFreeSize() < data.size()) {
m_KIO_Job->suspend();
m_TDEIO_Job->suspend();
}
}
@ -224,7 +224,7 @@ void StreamingJob::slotWriteData (TDEIO::Job */*job*/, TQByteArray &)
size = m_Buffer.takeData(buf, size);
TQByteArray data;
data.assign(buf, size);
m_KIO_Job->sendAsyncData(data);
m_TDEIO_Job->sendAsyncData(data);
m_StreamPos += size;
}
else {
@ -264,7 +264,7 @@ void StreamingJob::removeData(size_t size)
{
m_Buffer.removeData(size);
if (m_Buffer.getFreeSize() > m_Buffer.getSize() / 2) {
m_KIO_Job->resume();
m_TDEIO_Job->resume();
}
}

2
tderadio3/plugins/streaming/streaming-job.h
Unescape View File

@ -92,7 +92,7 @@ protected:
size_t m_SkipCount;
TDEIO::TransferJob *m_KIO_Job;
TDEIO::TransferJob *m_TDEIO_Job;
bool m_capturing;
};

4
tderadio3/src/Makefile.am
Unescape View File

@ -93,9 +93,9 @@ noinst_HEADERS = \
include/utils.h \
include/widgetplugins.h
tderadio_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
tderadio_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
tderadio_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIRC) -Wl,--export-dynamic
tderadio_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIRC) -Wl,--export-dynamic
xdg_apps_DATA = tderadio.desktop

2
tderadio3/src/aboutwidget.cpp
Unescape View File

@ -449,7 +449,7 @@ void TDERadioAboutWidget::setProduct( const TQString &appName,
mIconLabel->setPixmap( kapp->icon() );
TQString msg1 = i18n("%1 %2 (Using KDE %3)").arg(appName).
arg(TQString::fromLatin1(KRADIO_VERSION)).
arg(TQString::fromLatin1(TDERADIO_VERSION)).
arg(TQString::fromLatin1(TDE_VERSION_STRING));
TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('©').arg(year).
arg(author) : TQString::fromLatin1("");

4
tderadio3/src/include/tderadioapp.h
Unescape View File

@ -15,8 +15,8 @@
* *
***************************************************************************/
#ifndef KRADIO_KRADIOAPP_H
#define KRADIO_KRADIOAPP_H
#ifndef TDERADIO_TDERADIOAPP_H
#define TDERADIO_TDERADIOAPP_H
#ifdef HAVE_CONFIG_H
#include <config.h>

6
tderadio3/src/include/tderadioversion.h
Unescape View File

@ -15,9 +15,9 @@
* *
***************************************************************************/
#ifndef KRADIO_VERSION_H
#define KRADIO_VERSION "snapshot-2006-11-12-r497"
#ifndef TDERADIO_VERSION_H
#define TDERADIO_VERSION "snapshot-2006-11-12-r497"
#define KRADIO_VERSION "snapshot-2006-11-12-r497"
#define TDERADIO_VERSION "snapshot-2006-11-12-r497"
#endif

2
tderadio3/src/main.cpp
Unescape View File

@ -34,7 +34,7 @@ int main(int argc, char *argv[])
BlockProfiler profiler_about("main::aboutdata");
TDEAboutData aboutData("tderadio", I18N_NOOP("TDERadio"),
KRADIO_VERSION, "TDERadio", TDEAboutData::License_GPL,
TDERADIO_VERSION, "TDERadio", TDEAboutData::License_GPL,
"(c) 2002-2005 Martin Witte, Klas Kalass, Frank Schwanz",
0,
"http://sourceforge.net/projects/tderadio",

2
tderadio3/src/stationlist.cpp
Unescape View File

@ -413,7 +413,7 @@ TQString StationList::writeXML (const IErrorLogClient &/*logger*/) const
t + xmlOpenTag(StationListElement) +
tt + xmlTag(StationListFormat, STATION_LIST_FORMAT) +
tt + xmlOpenTag(StationListInfo) +
ttt + xmlTag(StationListInfoCreator, "tderadio-" KRADIO_VERSION) +
ttt + xmlTag(StationListInfoCreator, "tderadio-" TDERADIO_VERSION) +
ttt + xmlTag(StationListInfoMaintainer, m_metaData.maintainer) +
ttt + xmlTag(StationListInfoChanged, m_metaData.lastChange.toString(Qt::ISODate)) +
ttt + xmlTag(StationListInfoCountry, m_metaData.country) +

Write Preview
Loading…
Cancel
Save