summaryrefslogtreecommitdiffstats
path: root/kradio3/src
diff options
context:
space:
mode:
Diffstat (limited to 'kradio3/src')
-rw-r--r--kradio3/src/aboutwidget.cpp4
-rw-r--r--kradio3/src/errorlog-interfaces.cpp32
-rw-r--r--kradio3/src/fileringbuffer.cpp14
-rw-r--r--kradio3/src/frequencyradiostation.cpp6
-rw-r--r--kradio3/src/include/interfaces.h8
-rw-r--r--kradio3/src/include/soundstreamclient_interfaces.h4
-rw-r--r--kradio3/src/include/soundstreamid.h2
-rw-r--r--kradio3/src/internetradiostation.cpp2
-rw-r--r--kradio3/src/kradioapp.cpp12
-rw-r--r--kradio3/src/pluginmanager.cpp8
-rw-r--r--kradio3/src/soundstreamid.cpp2
-rw-r--r--kradio3/src/standardscandialog.cpp2
-rw-r--r--kradio3/src/stationlist.cpp22
-rw-r--r--kradio3/src/stationlistxmlhandler.cpp18
-rw-r--r--kradio3/src/widgetplugins.cpp8
15 files changed, 72 insertions, 72 deletions
diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index fed81f5..690159e 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -448,10 +448,10 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
if ( kapp )
mIconLabel->setPixmap( kapp->icon() );
- TQString msg1 = i18n("%1 %2 (Using KDE %3)").tqarg(appName).
+ TQString msg1 = i18n("%1 %2 (Using KDE %3)").arg(appName).
arg(TQString::fromLatin1(KRADIO_VERSION)).
arg(TQString::fromLatin1(TDE_VERSION_STRING));
- TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").tqarg('�').tqarg(year).
+ TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('�').arg(year).
arg(author) : TQString::fromLatin1("");
mVersionLabel->setText( msg1 );
diff --git a/kradio3/src/errorlog-interfaces.cpp b/kradio3/src/errorlog-interfaces.cpp
index 5b55fdb..ec18402 100644
--- a/kradio3/src/errorlog-interfaces.cpp
+++ b/kradio3/src/errorlog-interfaces.cpp
@@ -41,8 +41,8 @@ IErrorLog::~IErrorLog()
int IErrorLogClient::sendLogError(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Error: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
IF_SEND_MESSAGE(logError(s));
}
@@ -50,8 +50,8 @@ int IErrorLogClient::sendLogError(const TQString &s) const
int IErrorLogClient::sendLogWarning(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Warning: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
IF_SEND_MESSAGE(logWarning(s));
}
@@ -59,8 +59,8 @@ int IErrorLogClient::sendLogWarning(const TQString &s) const
int IErrorLogClient::sendLogInfo(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Information: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
IF_SEND_MESSAGE(logInfo(s));
}
@@ -68,16 +68,16 @@ int IErrorLogClient::sendLogInfo(const TQString &s) const
int IErrorLogClient::sendLogDebug(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Debug: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
IF_SEND_MESSAGE(logDebug(s));
}
void IErrorLogClient::staticLogError (const TQString &s)
{
kdDebug() << TQString(i18n("%1 Error: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
if (staticLogger)
staticLogger->logError(s);
}
@@ -85,8 +85,8 @@ void IErrorLogClient::staticLogError (const TQString &s)
void IErrorLogClient::staticLogWarning(const TQString &s)
{
kdDebug() << TQString(i18n("%1 Warning: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
if (staticLogger)
staticLogger->logWarning(s);
}
@@ -94,8 +94,8 @@ void IErrorLogClient::staticLogWarning(const TQString &s)
void IErrorLogClient::staticLogInfo (const TQString &s)
{
kdDebug() << TQString(i18n("%1 Information: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
if (staticLogger)
staticLogger->logInfo(s);
}
@@ -103,8 +103,8 @@ void IErrorLogClient::staticLogInfo (const TQString &s)
void IErrorLogClient::staticLogDebug (const TQString &s)
{
kdDebug() << TQString(i18n("%1 Debug: %2\n"))
- .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
- .tqarg(s);
+ .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
+ .arg(s);
if (staticLogger)
staticLogger->logDebug(s);
}
diff --git a/kradio3/src/fileringbuffer.cpp b/kradio3/src/fileringbuffer.cpp
index 584b8c2..a31e007 100644
--- a/kradio3/src/fileringbuffer.cpp
+++ b/kradio3/src/fileringbuffer.cpp
@@ -32,7 +32,7 @@ FileRingBuffer::FileRingBuffer(const TQString &filename, TQ_UINT64 max_size)
m_FillSize = 0;
m_Start = 0;
m_error = m_File == NULL;
- m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").tqarg(filename);
+ m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").arg(filename);
}
@@ -65,7 +65,7 @@ bool FileRingBuffer::resize(const TQString &filename, TQ_UINT64 new_max_size)
m_FileName = m_BaseFileName + "_" + TQString::number(++m_FileIdx);
m_File = fopen(m_FileName.ascii(), "w+");
m_error = m_File == NULL;
- m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").tqarg(filename);
+ m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").arg(filename);
}
if (new_max_size >= m_RealSize) {
@@ -90,13 +90,13 @@ bool FileRingBuffer::resize(const TQString &filename, TQ_UINT64 new_max_size)
newFill += tmp_size;
} else {
m_error = true;
- m_errorString += i18n("FileRingbuffer::resize: Writing to tmpfile %1 failed. ").tqarg(tmp_file_name);
+ m_errorString += i18n("FileRingbuffer::resize: Writing to tmpfile %1 failed. ").arg(tmp_file_name);
}
}
}
} else {
m_error = true;
- m_errorString += i18n("FileRingbuffer::resize: Opening tmpfile %1 failed. ").tqarg(tmp_file_name);
+ m_errorString += i18n("FileRingbuffer::resize: Opening tmpfile %1 failed. ").arg(tmp_file_name);
}
if (!m_error) {
@@ -124,7 +124,7 @@ size_t FileRingBuffer::addData (const char *src, size_t size)
fseek(m_File, m_Start + m_FillSize, SEEK_SET);
if (rest > 0 && fwrite(src, rest, 1, m_File) <= 0) {
m_error = true;
- m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").tqarg(m_FileName);
+ m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").arg(m_FileName);
} else {
m_FillSize += rest;
if (m_Start + m_FillSize > m_RealSize)
@@ -142,7 +142,7 @@ size_t FileRingBuffer::addData (const char *src, size_t size)
fseek(m_File, m_Start + m_FillSize - m_RealSize, SEEK_SET);
if (fwrite(src, rest, 1, m_File) <= 0) {
m_error = true;
- m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").tqarg(m_FileName);
+ m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").arg(m_FileName);
} else {
m_FillSize += rest;
written += rest;
@@ -165,7 +165,7 @@ size_t FileRingBuffer::takeData(char *dst, size_t size)
fseek(m_File, m_Start, SEEK_SET);
if (fread(dst+read, n, 1, m_File) <= 0) {
m_error = true;
- m_errorString += i18n("FileRingBuffer::takeData: failed reading data to file %1.").tqarg(m_FileName);
+ m_errorString += i18n("FileRingBuffer::takeData: failed reading data to file %1.").arg(m_FileName);
} else {
m_FillSize -= n;
m_Start += n;
diff --git a/kradio3/src/frequencyradiostation.cpp b/kradio3/src/frequencyradiostation.cpp
index d2c9eb3..75257b2 100644
--- a/kradio3/src/frequencyradiostation.cpp
+++ b/kradio3/src/frequencyradiostation.cpp
@@ -117,7 +117,7 @@ TQString FrequencyRadioStation::longName() const
{
TQString longN = name();
if (!longN.isEmpty()) {
- longN = i18n("%1, %2").tqarg(longN).tqarg(description());
+ longN = i18n("%1, %2").arg(longN).arg(description());
} else {
longN = description();
}
@@ -131,9 +131,9 @@ TQString FrequencyRadioStation::description() const
float cf = frequency();
TQString f;
if (cf >= 10)
- f = i18n("%1 MHz").tqarg(KGlobal::locale()->formatNumber(cf, 2));
+ f = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(cf, 2));
else
- f = i18n("%1 kHz").tqarg(KGlobal::locale()->formatNumber(cf * 1000, 0));
+ f = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber(cf * 1000, 0));
return f;
}
diff --git a/kradio3/src/include/interfaces.h b/kradio3/src/include/interfaces.h
index 7e53a24..c698521 100644
--- a/kradio3/src/include/interfaces.h
+++ b/kradio3/src/include/interfaces.h
@@ -145,7 +145,7 @@
- sending Messages
Declare a virtual constant method with return value "int" and the desired
- parameters. The return value will indicate how many tqreceivers have handled
+ parameters. The return value will indicate how many receivers have handled
the message:
virtual bool SendingMessages(int any_or_non_param) const;
@@ -168,7 +168,7 @@
The method has to be implemented by a derived class. The current item of the
- tqreceivers conntions list is set to the sender.
+ receivers conntions list is set to the sender.
- querying queries
@@ -195,7 +195,7 @@
IF_ANSWER( AnsweringQueries(int another_param) )
The method has to be implemented by a derived class. The current item of the
- tqreceivers conntions list is set to the sender.
+ receivers conntions list is set to the sender.
At last a note on maxConnections. This member is set on initialization by
@@ -216,7 +216,7 @@
int ComplementaryInterface::SendingMessages(int any_or_non_param) const
{
IF_SEND_MESSAGE( ReceivingMessages(any_or_non_param) )
- // macro includes "return #tqreceivers"
+ // macro includes "return #receivers"
}
int ComplementaryInterface::QueryingQueries(int another_param) const
diff --git a/kradio3/src/include/soundstreamclient_interfaces.h b/kradio3/src/include/soundstreamclient_interfaces.h
index 310d42a..3f53ac5 100644
--- a/kradio3/src/include/soundstreamclient_interfaces.h
+++ b/kradio3/src/include/soundstreamclient_interfaces.h
@@ -107,7 +107,7 @@ SENDERS:
IF_SENDER_FINE ( queryIsMuted, (SoundStreamID /*id*/, bool &) )
- // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers
+ // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers
IF_SENDER_FINE ( sendReleasePlayback, (SoundStreamID id) )
IF_SENDER_FINE ( sendReleaseCapture, (SoundStreamID id) )
@@ -315,7 +315,7 @@ SENDERS:
CALL_SNDSTR_SERVER ( queryIsMuted, (SoundStreamID id, bool &v), (id, v) )
- // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers
+ // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers
CALL_SNDSTR_SERVER ( sendReleasePlayback, (SoundStreamID id), (id) )
CALL_SNDSTR_SERVER ( sendReleaseCapture, (SoundStreamID id), (id) )
diff --git a/kradio3/src/include/soundstreamid.h b/kradio3/src/include/soundstreamid.h
index 4133103..e7aa4d5 100644
--- a/kradio3/src/include/soundstreamid.h
+++ b/kradio3/src/include/soundstreamid.h
@@ -44,7 +44,7 @@ public:
bool HasSamePhysicalID(const SoundStreamID &x) const { return m_PhysicalID == x.m_PhysicalID; }
bool isValid() const { return m_ID != 0; } // m_PhysicalID is not checked!
- void tqinvalidate();
+ void invalidate();
static const SoundStreamID InvalidID;
diff --git a/kradio3/src/internetradiostation.cpp b/kradio3/src/internetradiostation.cpp
index 6bec8d2..04cd9f9 100644
--- a/kradio3/src/internetradiostation.cpp
+++ b/kradio3/src/internetradiostation.cpp
@@ -115,7 +115,7 @@ TQString InternetRadioStation::longName() const
{
TQString longN = name();
if (!longN.isEmpty()) {
- longN = i18n("%1, %2").tqarg(longN).tqarg(description());
+ longN = i18n("%1, %2").arg(longN).arg(description());
} else {
longN = description();
}
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index 2842522..b5bc509 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -104,7 +104,7 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name)
} else {
KMessageBox::error(NULL,
i18n("Library %1: Plugin Entry Point is missing\n")
- .tqarg(lib_name),
+ .arg(lib_name),
i18n("Plugin Library Load Error"));
library->unload();
info_func = NULL;
@@ -114,8 +114,8 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name)
} else {
KMessageBox::error(NULL,
i18n("Library %1: \n%2")
- .tqarg(lib_name)
- .tqarg(KLibLoader::self()->lastErrorMessage()),
+ .arg(lib_name)
+ .arg(KLibLoader::self()->lastErrorMessage()),
i18n("Plugin Library Load Error"));
}
}
@@ -269,7 +269,7 @@ KLibrary *KRadioApp::LoadLibrary (const TQString &library)
kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " "
<< i18n("Error: Loading Library %1 failed: %2")
- .tqarg(library).tqarg(KLibLoader::self()->lastErrorMessage())
+ .arg(library).arg(KLibLoader::self()->lastErrorMessage())
<< endl;
}
@@ -319,13 +319,13 @@ PluginBase *KRadioApp::CreatePlugin (PluginManager *manager, const TQString &cla
if (!retval) {
kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " "
- << i18n("Error: Creation of instance \"%1\" of class %2 falied.").tqarg(object_name).tqarg(class_name)
+ << i18n("Error: Creation of instance \"%1\" of class %2 falied.").arg(object_name).arg(class_name)
<< endl;
}
} else {
kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " "
- << i18n("Error: Cannot create instance \"%1\" of unknown class %2.").tqarg(object_name).tqarg(class_name)
+ << i18n("Error: Cannot create instance \"%1\" of unknown class %2.").arg(object_name).arg(class_name)
<< endl;
}
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index 892df34..8eef203 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -120,7 +120,7 @@ void PluginManager::updateWidgetPluginMenuItem(WidgetPluginBase *b, TQMenuData *
return;
const TQString &name = b->description();
- TQString text = (shown ? i18n("Hide %1") : i18n("Show %1")).tqarg(name);
+ TQString text = (shown ? i18n("Hide %1") : i18n("Show %1")).arg(name);
menu->changeItem(map[b],
TQIconSet(SmallIconSet(!shown ? "kradio_show" : "kradio_hide")),
@@ -456,7 +456,7 @@ void PluginManager::restoreState (KConfig *c)
TQString object_name = c->readEntry("plugin_name_" + TQString::number(i));
if (m_showProgressBar)
- progress->TQWidget::setCaption(i18n("Creating Plugin %1").tqarg(class_name));
+ progress->TQWidget::setCaption(i18n("Creating Plugin %1").arg(class_name));
if (class_name.length() && object_name.length())
m_Application->CreatePlugin(this, class_name, object_name);
if (m_showProgressBar)
@@ -473,7 +473,7 @@ void PluginManager::restoreState (KConfig *c)
for (TQMapConstIterator<TQString, PluginClassInfo> it=classes.begin(); it != end; ++it, ++idx) {
const PluginClassInfo &cls = *it;
if (m_showProgressBar)
- progress->TQWidget::setCaption(i18n("Creating Plugin %1").tqarg(cls.class_name));
+ progress->TQWidget::setCaption(i18n("Creating Plugin %1").arg(cls.class_name));
m_Application->CreatePlugin(this, cls.class_name, m_Name + "-" + cls.class_name);
if (m_showProgressBar)
progress->progressBar()->setProgress(idx);
@@ -487,7 +487,7 @@ void PluginManager::restoreState (KConfig *c)
for (PluginIterator i(m_plugins); i.current(); ++i, ++idx) {
BlockProfiler profile_plugin("PluginManager::restoreState - " + i.current()->pluginClassName());
if (m_showProgressBar)
- progress->TQWidget::setCaption(i18n("Initializing Plugin %1").tqarg(i.current()->pluginClassName()));
+ progress->TQWidget::setCaption(i18n("Initializing Plugin %1").arg(i.current()->pluginClassName()));
i.current()->restoreState(c);
if (m_showProgressBar)
progress->progressBar()->setProgress(idx+1);
diff --git a/kradio3/src/soundstreamid.cpp b/kradio3/src/soundstreamid.cpp
index f1905e9..1c9cfed 100644
--- a/kradio3/src/soundstreamid.cpp
+++ b/kradio3/src/soundstreamid.cpp
@@ -62,7 +62,7 @@ SoundStreamID SoundStreamID::createNewID(const SoundStreamID &oldID)
}
-void SoundStreamID::tqinvalidate()
+void SoundStreamID::invalidate()
{
m_ID = 0;
m_PhysicalID = 0;
diff --git a/kradio3/src/standardscandialog.cpp b/kradio3/src/standardscandialog.cpp
index 52e29ba..b738618 100644
--- a/kradio3/src/standardscandialog.cpp
+++ b/kradio3/src/standardscandialog.cpp
@@ -157,7 +157,7 @@ bool StandardScanDialog::noticeProgress (float f)
int ms = (int)rint((1 - f) * (float) secs / f * 1000.0);
if (ms > 0 && ms < 86400000) // max one day
- labelTime->setText(i18n("<p align=\"right\">%1</p>").tqarg(TQTime(0,0).addMSecs(ms).toString()));
+ labelTime->setText(i18n("<p align=\"right\">%1</p>").arg(TQTime(0,0).addMSecs(ms).toString()));
else
labelTime->setText(i18n("unknown"));
diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp
index b5965f7..8c6bf80 100644
--- a/kradio3/src/stationlist.cpp
+++ b/kradio3/src/stationlist.cpp
@@ -340,13 +340,13 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool
if (!KIO::NetAccess::download(url, tmpfile, NULL)) {
if (enableMessageBox) {
logger.logError("StationList::readXML: " +
- i18n("error downloading preset file %1").tqarg(url.url()));
+ i18n("error downloading preset file %1").arg(url.url()));
TQMessageBox::warning(NULL, "KRadio",
i18n("Download of the station preset file at %1 failed.")
- .tqarg(url.url()));
+ .arg(url.url()));
} else {
logger.logWarning("StationList::readXML: " +
- i18n("error downloading preset file %1").tqarg(url.url()));
+ i18n("error downloading preset file %1").arg(url.url()));
}
return false;
}
@@ -358,11 +358,11 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool
if (! presetFile.open(IO_ReadOnly)) {
logger.logError("StationList::readXML: " +
- i18n("error opening preset file %1").tqarg(tmpfile));
+ i18n("error opening preset file %1").arg(tmpfile));
if (enableMessageBox) {
TQMessageBox::warning(NULL, "KRadio",
i18n("Opening of the station preset file at %1 failed.")
- .tqarg(tmpfile));
+ .arg(tmpfile));
}
return false;
}
@@ -458,11 +458,11 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool
outs << output;
if (outf->status() != IO_Ok) {
logger.logError("StationList::writeXML: " +
- i18n("error writing to tempfile %1").tqarg(tmpFile.name()));
+ i18n("error writing to tempfile %1").arg(tmpFile.name()));
if (enableMessageBox) {
TQMessageBox::warning(NULL, "KRadio",
i18n("Writing station preset file %1 failed.")
- .tqarg(tmpFile.name()));
+ .arg(tmpFile.name()));
}
return false;
}
@@ -472,19 +472,19 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool
if (count() <= 1) {
logger.logWarning("StationList::writeXML: " +
- i18n("uploading preset file %1: ").tqarg(url.url()));
+ i18n("uploading preset file %1: ").arg(url.url()));
logger.logWarning("StationList::writeXML: " +
- i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").tqarg(count()));
+ i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").arg(count()));
} else {
if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) {
logger.logError("StationList::writeXML: " +
- i18n("error uploading preset file %1").tqarg(url.url()));
+ i18n("error uploading preset file %1").arg(url.url()));
if (enableMessageBox) {
TQMessageBox::warning(NULL, "KRadio",
i18n("Upload of station preset file to %1 failed.")
- .tqarg(url.url()));
+ .arg(url.url()));
}
return false;
}
diff --git a/kradio3/src/stationlistxmlhandler.cpp b/kradio3/src/stationlistxmlhandler.cpp
index 0e303da..1bd09ed 100644
--- a/kradio3/src/stationlistxmlhandler.cpp
+++ b/kradio3/src/stationlistxmlhandler.cpp
@@ -62,7 +62,7 @@ bool StationListXmlHandler::startDocument ()
#define START_ELEMENT_ERROR m_logger.logError("StationListXmlHandler::startElement: " + \
i18n("misplaced element %1") \
- .tqarg(qname));\
+ .arg(qname));\
return false;
bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString &/*localname*/,
@@ -113,7 +113,7 @@ bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString
} else { // unknown
m_logger.logWarning("StationListXmlHandler::startElement: " +
- i18n("unknown or unexpected element %1").tqarg(qname));
+ i18n("unknown or unexpected element %1").arg(qname));
}
m_status.push_back(qname);
@@ -143,10 +143,10 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString &
if (m_status.size()) {
m_logger.logError("StationListXmlHandler::endElement: " +
i18n("expected element %1, but found %2")
- .tqarg(m_status.back()).tqarg(qname));
+ .arg(m_status.back()).arg(qname));
} else {
m_logger.logError("StationListXmlHandler::endElement: " +
- i18n("unexpected element %1").tqarg(qname));
+ i18n("unexpected element %1").arg(qname));
}
}
return true;
@@ -155,7 +155,7 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString &
#define CHARACTERS_ERROR m_logger.logError("StationListXmlHandler::characters: " + \
i18n("invalid data for element %1") \
- .tqarg(stat)); \
+ .arg(stat)); \
return false;
bool StationListXmlHandler::characters (const TQString &ch)
@@ -169,7 +169,7 @@ bool StationListXmlHandler::characters (const TQString &ch)
if (stat == StationListFormat) {
if (str != STATION_LIST_FORMAT) {
- m_logger.logError(i18n("found a station list with unknown format %1").tqarg(str));
+ m_logger.logError(i18n("found a station list with unknown format %1").arg(str));
return false;
}
@@ -210,13 +210,13 @@ bool StationListXmlHandler::characters (const TQString &ch)
if (!m_newStation->setProperty(stat, str)) {
m_logger.logWarning("StationListXmlHandler::characters: " +
i18n("unknown property %1 for class %2")
- .tqarg(stat)
- .tqarg(m_newStation->getClassName()));
+ .arg(stat)
+ .arg(m_newStation->getClassName()));
}
} else if (str.length()) {
m_logger.logError("StationListXmlHandler::characters: " +
- i18n("characters ignored for element %1").tqarg(stat));
+ i18n("characters ignored for element %1").arg(stat));
}
return true;
}
diff --git a/kradio3/src/widgetplugins.cpp b/kradio3/src/widgetplugins.cpp
index d01ef88..c7e866d 100644
--- a/kradio3/src/widgetplugins.cpp
+++ b/kradio3/src/widgetplugins.cpp
@@ -100,7 +100,7 @@ void WidgetPluginBase::pShowOnOrgDesktop()
{
KWin::setMainWindow(getWidget(), 0);
- logDebug(TQString("%1::pShowOnOrgDesktop: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid));
+ logDebug(TQString("%1::pShowOnOrgDesktop: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid));
if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) {
TQWidget *w = getWidget();
if (!w) return;
@@ -131,7 +131,7 @@ void WidgetPluginBase::pShow()
{
KWin::setMainWindow(getWidget(), 0);
- logDebug(TQString("%1::pShow: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid));
+ logDebug(TQString("%1::pShow: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid));
if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) {
TQWidget *w = getWidget();
if (!w) return;
@@ -150,9 +150,9 @@ void WidgetPluginBase::pShow()
void WidgetPluginBase::pHide()
{
- logDebug(TQString("%1::pHide1: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid));
+ logDebug(TQString("%1::pHide1: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid));
getKWinState();
- logDebug(TQString("%1::pHide2: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid));
+ logDebug(TQString("%1::pHide2: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid));
}