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

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 8d4453deaa
commit d9f7baa97d
39 changed files with 241 additions and 241 deletions
Show Stats Download Patch File Download Diff File

2
kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
Unescape View File

@ -255,7 +255,7 @@
<property name="text">
<string>MixerName</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

8
kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
Unescape View File

@ -250,12 +250,12 @@ int AlsaSoundConfiguration::listSoundDevices(KComboBox *combobox, TQMap<TQString
int err = 0;
if ((err = snd_ctl_pcm_info(handle, pcminfo)) < 0) {
if (err != -ENOENT) {
//logError(TQString("control digital audio info (%1): %2").tqarg(card).tqarg(snd_strerror(err)));
//logError(TQString("control digital audio info (%1): %2").arg(card).arg(snd_strerror(err)));
}
continue;
}
const char *dev_name = snd_pcm_info_get_name(pcminfo);
TQString devname = i18n("context-card-plus-device-number", "%1 device %2").tqarg(dev_name).tqarg(dev);
TQString devname = i18n("context-card-plus-device-number", "%1 device %2").arg(dev_name).arg(dev);
if (combobox)
combobox->insertItem(devname);
if (devname2dev)
@ -315,14 +315,14 @@ void AlsaSoundConfiguration::slotCancel()
slotCaptureCardSelected(m_comboCaptureCard->currentText());
m_comboCaptureDevice->setCurrentItem(m_captureDevice2idx[dev]);
//IErrorLogClient::staticLogDebug(TQString("capture: card = %1(%2), dev = %3").tqarg(card).tqarg(m_captureCard2idx[card]).tqarg(dev));
//IErrorLogClient::staticLogDebug(TQString("capture: card = %1(%2), dev = %3").arg(card).arg(m_captureCard2idx[card]).arg(dev));
editHWBufferSize ->setValue (m_SoundDevice ? m_SoundDevice->getHWBufferSize()/1024 : 4);
editBufferSize ->setValue (m_SoundDevice ? m_SoundDevice->getBufferSize()/1024 : 4);
chkDisablePlayback->setChecked(m_SoundDevice ? !m_SoundDevice->isPlaybackEnabled() : false);
chkDisableCapture ->setChecked(m_SoundDevice ? !m_SoundDevice->isCaptureEnabled() : false);
//IErrorLogClient::staticLogDebug(TQString("capture: card = %1").tqarg(m_comboCaptureCard->currentText()));
//IErrorLogClient::staticLogDebug(TQString("capture: card = %1").arg(m_comboCaptureCard->currentText()));
if (m_SoundDevice)

100
kradio3/plugins/alsa-sound/alsa-sound.cpp
Unescape View File

@ -150,7 +150,7 @@ void AlsaSoundDevice::saveState (KConfig *c) const
int i = 0;
for (TQMapConstIterator<TQString, AlsaConfigMixerSetting> it = m_CaptureMixerSettings.begin(); it != m_CaptureMixerSettings.end(); ++it, ++i) {
TQString prefix = TQString("mixer-setting-%1-").tqarg(i);
TQString prefix = TQString("mixer-setting-%1-").arg(i);
(*it).saveState(c, prefix);
}
@ -179,7 +179,7 @@ void AlsaSoundDevice::restoreState (KConfig *c)
int n = c->readNumEntry("mixer-settings", 0);
for (int i = 0; i < n; ++i) {
TQString prefix = TQString("mixer-setting-%1-").tqarg(i);
TQString prefix = TQString("mixer-setting-%1-").arg(i);
AlsaConfigMixerSetting s(c, prefix);
m_CaptureMixerSettings.insert(s.getIDString(), s);
}
@ -418,9 +418,9 @@ bool AlsaSoundDevice::stopCapture(SoundStreamID id)
slotPollCapture();
// if (m_captureThread->error()) {
// logError(i18n("ALSA Plugin, device plughw:%1,%2: %3").tqarg(m_CaptureCard)
// .tqarg(m_CaptureDevice)
// .tqarg(i18n("unknown error")));
// logError(i18n("ALSA Plugin, device plughw:%1,%2: %3").arg(m_CaptureCard)
// .arg(m_CaptureDevice)
// .arg(i18n("unknown error")));
// }
//
// delete m_captureThread;
@ -526,7 +526,7 @@ bool AlsaSoundDevice::noticeSoundStreamData(SoundStreamID id,
/* if (n < size) {
m_PlaybackSkipCount += size - n;
} else if (m_PlaybackSkipCount > 0) {
logWarning(i18n("plughw:%1,%2: Playback buffer overflow. Skipped %3 bytes").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice).tqarg(TQString::number(m_PlaybackSkipCount)));
logWarning(i18n("plughw:%1,%2: Playback buffer overflow. Skipped %3 bytes").arg(m_PlaybackCard).arg(m_PlaybackDevice).arg(TQString::number(m_PlaybackSkipCount)));
m_PlaybackSkipCount = 0;
}
return m_PlaybackSkipCount == 0;*/
@ -550,12 +550,12 @@ void AlsaSoundDevice::slotPollPlayback()
if (framesWritten > 0) {
m_PlaybackBuffer.removeData(bytesWritten);
} else if (framesWritten == 0) {
logError(i18n("ALSA Plugin: cannot write data for device plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice));
logError(i18n("ALSA Plugin: cannot write data for device plughw:%1,%2").arg(m_PlaybackCard).arg(m_PlaybackDevice));
} else if (framesWritten == -EAGAIN) {
// do nothing
} else {
snd_pcm_prepare(m_hPlayback);
logWarning(i18n("ALSA Plugin: buffer underrun for device plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice));
logWarning(i18n("ALSA Plugin: buffer underrun for device plughw:%1,%2").arg(m_PlaybackCard).arg(m_PlaybackDevice));
}
}
@ -577,7 +577,7 @@ void AlsaSoundDevice::slotPollCapture()
if (m_CaptureStreamID.isValid() && m_hCapture) {
// while (m_captureThread && m_captureThread->getAvailableReadBuffers()) {
// TQString dev = TQString("alsa://plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice);
// TQString dev = TQString("alsa://plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice);
// size_t size = 0;
// char *buffer = m_captureThread->getReadBuffer(size);
// time_t cur_time = time(NULL);
@ -608,22 +608,22 @@ void AlsaSoundDevice::slotPollCapture()
m_CaptureBuffer.removeFreeSpace(bytesRead);
} else if (framesRead == 0) {
snd_pcm_prepare(m_hCapture);
logError(i18n("ALSA Plugin: cannot read data from device plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice));
logError(i18n("ALSA Plugin: cannot read data from device plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice));
} else if (framesRead == -EAGAIN) {
// do nothing
} else {
snd_pcm_prepare(m_hCapture);
logWarning(i18n("ALSA Plugin: buffer overrun for device plughw:%1,%2 (buffersize=%3, buffer=%4)").tqarg(m_CaptureCard).tqarg(m_CaptureDevice).tqarg(bufferSize).tqarg((long long unsigned)buffer));
logWarning(i18n("ALSA Plugin: buffer overrun for device plughw:%1,%2 (buffersize=%3, buffer=%4)").arg(m_CaptureCard).arg(m_CaptureDevice).arg(bufferSize).arg((long long unsigned)buffer));
}
TQString dev = TQString("alsa://plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice);
TQString dev = TQString("alsa://plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice);
while (m_CaptureBuffer.getFillSize() > m_CaptureBuffer.getSize() / 3) {
size_t size = 0;
buffer = m_CaptureBuffer.getData(size);
time_t cur_time = time(NULL);
size_t consumed_size = SIZE_T_DONT_CARE;
notifySoundStreamData(m_CaptureStreamID, m_CaptureFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").tqarg(dev)));
notifySoundStreamData(m_CaptureStreamID, m_CaptureFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").arg(dev)));
if (consumed_size == SIZE_T_DONT_CARE)
consumed_size = size;
@ -664,7 +664,7 @@ bool AlsaSoundDevice::openPlaybackDevice(const SoundFormat &format, bool reopen)
m_PlaybackFormat = format;
TQString dev = TQString("plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice);
TQString dev = TQString("plughw:%1,%2").arg(m_PlaybackCard).arg(m_PlaybackDevice);
bool error = !openAlsaDevice(m_hPlayback, m_PlaybackFormat, dev.ascii(), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK, m_PlaybackLatency);
if (!error) {
@ -704,7 +704,7 @@ bool AlsaSoundDevice::openCaptureDevice(const SoundFormat &format, bool reopen)
m_CaptureFormat = format;
TQString dev = TQString("plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice);
TQString dev = TQString("plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice);
// bool error = !openAlsaDevice(m_hCapture, m_CaptureFormat, dev.ascii(), SND_PCM_STREAM_CAPTURE, /*flags = block*/0, m_CaptureLatency);
bool error = !openAlsaDevice(m_hCapture, m_CaptureFormat, dev.ascii(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK, m_CaptureLatency);
@ -733,19 +733,19 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
/* OPEN */
if (!error && snd_pcm_open(&alsa_handle, pcm_name, stream, flags) < 0) {
logError(i18n("ALSA Plugin: Error opening PCM device %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Error opening PCM device %1").arg(pcm_name));
error = true;
}
if (!error && snd_pcm_hw_params_any(alsa_handle, hwparams) < 0) {
logError(i18n("ALSA Plugin: Can not configure PCM device %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Can not configure PCM device %1").arg(pcm_name));
error = true;
}
/* interleaved access type */
if (!error && snd_pcm_hw_params_set_access(alsa_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) {
logError(i18n("ALSA Plugin: Error setting access for %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Error setting access for %1").arg(pcm_name));
error = true;
}
@ -755,30 +755,30 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
!format.m_IsSigned,
format.m_Endianess == BIG_ENDIAN);
if (!error && snd_pcm_hw_params_set_format(alsa_handle, hwparams, sample_format) < 0) {
logError(i18n("ALSA Plugin: Error setting sample format for %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Error setting sample format for %1").arg(pcm_name));
error = true;
}
/* channels */
if (!error && snd_pcm_hw_params_set_channels(alsa_handle, hwparams, format.m_Channels) < 0) {
logError(i18n("ALSA Plugin: Error setting channels for %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Error setting channels for %1").arg(pcm_name));
error = true;
}
/* sample rate */
int rate = format.m_SampleRate;
if (!error && snd_pcm_hw_params_set_rate_near(alsa_handle, hwparams, &format.m_SampleRate, &dir) < 0) {
logError(i18n("ALSA Plugin: Error setting rate for %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Error setting rate for %1").arg(pcm_name));
error = true;
}
if (!error && format.m_SampleRate != format.m_SampleRate) {
logWarning(i18n("ALSA Plugin: The rate %1 Hz is not supported by your hardware %2. Using %3 Hz instead").tqarg(rate).tqarg(pcm_name).tqarg(format.m_SampleRate));
logWarning(i18n("ALSA Plugin: The rate %1 Hz is not supported by your hardware %2. Using %3 Hz instead").arg(rate).arg(pcm_name).arg(format.m_SampleRate));
}
snd_pcm_uframes_t period_size = m_HWBufferSize / format.frameSize();
if (!error && snd_pcm_hw_params_set_period_size_near(alsa_handle, hwparams, &period_size, &dir) < 0) {
logError(i18n("ALSA Plugin: Error setting period size for %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Error setting period size for %1").arg(pcm_name));
error = true;
}
@ -788,7 +788,7 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
//
// /* fragments */
// if (!error && snd_pcm_hw_params_set_periods(alsa_handle, hwparams, periods, 0) < 0) {
// logError(i18n("ALSA Plugin: Error setting periods for %1").tqarg(pcm_name));
// logError(i18n("ALSA Plugin: Error setting periods for %1").arg(pcm_name));
// error = true;
// }
@ -798,17 +798,17 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
// if (!error && snd_pcm_hw_params_set_buffer_size_near(alsa_handle, hwparams, &exact_buffersize_frames) < 0) {
// exact_buffersize_frames = 4096;
// if (!error && snd_pcm_hw_params_set_buffer_size_near(alsa_handle, hwparams, &exact_buffersize_frames) < 0) {
// logError(i18n("ALSA Plugin: Error setting buffersize for %1").tqarg(pcm_name));
// logError(i18n("ALSA Plugin: Error setting buffersize for %1").arg(pcm_name));
// error = true;
// }
// }
// size_t exact_buffersize = exact_buffersize_frames * format.frameSize();
// if (!error && m_HWBufferSize != exact_buffersize) {
// logWarning(i18n("ALSA Plugin: Hardware %1 does not support buffer size of %2. Using buffer size of %3 instead.").tqarg(pcm_name).tqarg(m_HWBufferSize).tqarg(exact_buffersize));
// logWarning(i18n("ALSA Plugin: Hardware %1 does not support buffer size of %2. Using buffer size of %3 instead.").arg(pcm_name).arg(m_HWBufferSize).arg(exact_buffersize));
// size_t tmp = (((m_HWBufferSize - 1) / exact_buffersize) + 1) * exact_buffersize;
// setHWBufferSize(tmp);
// logInfo(i18n("ALSA Plugin: adjusted buffer size for %1 to %2 bytes").tqarg(pcm_name).tqarg(TQString::number(tmp)));
// logInfo(i18n("ALSA Plugin: adjusted buffer size for %1 to %2 bytes").arg(pcm_name).arg(TQString::number(tmp)));
// }
/* set all params */
@ -819,7 +819,7 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
}
if (!error && snd_pcm_hw_params_get_period_size(hwparams, &period_size, &dir) < 0) {
logError(i18n("ALSA Plugin: Error getting period size for %1").tqarg(pcm_name));
logError(i18n("ALSA Plugin: Error getting period size for %1").arg(pcm_name));
error = true;
}
@ -924,18 +924,18 @@ bool AlsaSoundDevice::openMixerDevice(snd_mixer_t *&mixer_handle, int card, bool
bool attached = false;
if (!error) {
if (snd_mixer_attach (mixer_handle, cardid.ascii()) < 0) {
staticLogError(i18n("ALSA Plugin: ERROR: snd_mixer_attach for card %1").tqarg(card));
staticLogError(i18n("ALSA Plugin: ERROR: snd_mixer_attach for card %1").arg(card));
error = true;
} else {
attached = true;
}
}
if (!error && snd_mixer_selem_register(mixer_handle, NULL, NULL) < 0) {
staticLogError(i18n("ALSA Plugin: Error: snd_mixer_selem_register for card %1").tqarg(card));
staticLogError(i18n("ALSA Plugin: Error: snd_mixer_selem_register for card %1").arg(card));
error = true;
}
if (!error && snd_mixer_load (mixer_handle) < 0) {
staticLogError(i18n("ALSA Plugin: Error: snd_mixer_load for card %1").tqarg(card));
staticLogError(i18n("ALSA Plugin: Error: snd_mixer_load for card %1").arg(card));
error = true;
}
if (mixer_handle) {
@ -1003,7 +1003,7 @@ void AlsaSoundDevice::getPlaybackMixerChannels(
TQString name = snd_mixer_selem_id_get_name(sid);
int idx = snd_mixer_selem_id_get_index(sid);
if (idx)
name = i18n("context-mixername-number", "%1 %2").tqarg(name).tqarg(idx);
name = i18n("context-mixername-number", "%1 %2").arg(name).arg(idx);
if (snd_mixer_selem_has_playback_volume(elem)) {
ch2id[name] = sid;
retval.append(name);
@ -1050,7 +1050,7 @@ void AlsaSoundDevice::getCaptureMixerChannels(
TQString name = snd_mixer_selem_id_get_name(sid);
int idx = snd_mixer_selem_id_get_index(sid);
if (idx)
name = i18n("context-mixerelement-name-number", "%1 %2").tqarg(name).tqarg(idx);
name = i18n("context-mixerelement-name-number", "%1 %2").arg(name).arg(idx);
bool add2all = false;
if (snd_mixer_selem_has_capture_switch(elem)) {
@ -1204,8 +1204,8 @@ float AlsaSoundDevice::readPlaybackMixerVolume(const TQString &channel, bool &mu
}
logError("AlsaSound::readPlaybackMixerVolume: " +
i18n("error while reading volume from hwplug:%1,%2")
.tqarg(m_PlaybackCard)
.tqarg(m_PlaybackDevice));
.arg(m_PlaybackCard)
.arg(m_PlaybackDevice));
return 0;
}
@ -1234,8 +1234,8 @@ float AlsaSoundDevice::readCaptureMixerVolume(const TQString &channel) const
}
logError("AlsaSound::readCaptureMixerVolume: " +
i18n("error while reading volume from hwplug:%1,%2")
.tqarg(m_CaptureCard)
.tqarg(m_CaptureDevice));
.arg(m_CaptureCard)
.arg(m_CaptureDevice));
return 0;
}
@ -1267,9 +1267,9 @@ bool AlsaSoundDevice::writePlaybackMixerVolume (const TQString &channel, float &
}
logError("AlsaSound::writePlaybackMixerVolume: " +
i18n("error while writing volume %1 to hwplug:%2,%3")
.tqarg(vol)
.tqarg(m_PlaybackCard)
.tqarg(m_PlaybackDevice));
.arg(vol)
.arg(m_PlaybackCard)
.arg(m_PlaybackDevice));
return false;
}
@ -1302,9 +1302,9 @@ bool AlsaSoundDevice::writeCaptureMixerVolume (const TQString &channel, float &v
}
logError("AlsaSound::writeCaptureMixerVolume: " +
i18n("error while writing volume %1 to hwplug:%2,%3")
.tqarg(vol)
.tqarg(m_CaptureCard)
.tqarg(m_CaptureDevice));
.arg(vol)
.arg(m_CaptureCard)
.arg(m_CaptureDevice));
return false;
}
@ -1325,9 +1325,9 @@ bool AlsaSoundDevice::writeCaptureMixerSwitch (const TQString &channel, bool cap
}
logError("AlsaSound::writeCaptureMixerSwitch: " +
i18n("error while setting capture switch %1 for hwplug:%2,%3")
.tqarg(channel)
.tqarg(m_CaptureCard)
.tqarg(m_CaptureDevice));
.arg(channel)
.arg(m_CaptureCard)
.arg(m_CaptureDevice));
return false;
}
@ -1445,7 +1445,7 @@ void AlsaSoundDevice::setCaptureDevice(int card, int dev)
TQString AlsaSoundDevice::getSoundStreamClientDescription() const
{
return i18n("ALSA Sound Device %1").tqarg(PluginBase::name());
return i18n("ALSA Sound Device %1").arg(PluginBase::name());
}
@ -1520,9 +1520,9 @@ void AlsaSoundDevice::setCaptureMixerSettings(const TQMap<TQString, AlsaConfigMi
// if (m_captureThread) {
// AlsaCaptureEvent *e = static_cast<AlsaCaptureEvent*>(_e);
// TQString msg = i18n("ALSA Plugin, device plughw:%1,%2: %3")
// .tqarg(m_CaptureCard)
// .tqarg(m_CaptureDevice)
// .tqarg(e->message());
// .arg(m_CaptureCard)
// .arg(m_CaptureDevice)
// .arg(e->message());
// switch (_e->type()) {
// case CaptureError :
// logError(msg);

22
kradio3/plugins/gui-docking-menu/docking.cpp
Unescape View File

@ -137,8 +137,8 @@ void RadioDocking::restoreState (KConfig *config)
int n = config->readNumEntry("show_hide_cache_entries", 0);
for (int i = 1; i <= n; ++i) {
TQString s = config->readEntry(TQString("show_hide_cache_id_%1").tqarg(i), TQString());
bool b = config->readBoolEntry(TQString("show_hide_cache_value_%1").tqarg(i), false);
TQString s = config->readEntry(TQString("show_hide_cache_id_%1").arg(i), TQString());
bool b = config->readBoolEntry(TQString("show_hide_cache_value_%1").arg(i), false);
if (!s.isNull()) {
m_widgetsShownCache.insert(s,b);
}
@ -161,8 +161,8 @@ void RadioDocking::saveState (KConfig *config) const
config->writeEntry("show_hide_cache_entries", m_widgetsShownCache.count());
i = 1;
for (TQMapConstIterator<TQString, bool> it = m_widgetsShownCache.begin(); it != m_widgetsShownCache.end(); ++it, ++i) {
config->writeEntry(TQString("show_hide_cache_id_%1").tqarg(i), it.key());
config->writeEntry(TQString("show_hide_cache_value_%1").tqarg(i), *it);
config->writeEntry(TQString("show_hide_cache_id_%1").arg(i), it.key());
config->writeEntry(TQString("show_hide_cache_value_%1").arg(i), *it);
}
}
@ -351,7 +351,7 @@ bool RadioDocking::noticeNextAlarmChanged(const Alarm *a)
if (a) d = a->nextAlarm();
if (d.isValid())
m_menu->changeTitle (m_alarmID, i18n("next alarm: %1").tqarg(d.toString()));
m_menu->changeTitle (m_alarmID, i18n("next alarm: %1").arg(d.toString()));
else
m_menu->changeTitle (m_alarmID, i18n("<no alarm pending>"));
return true;
@ -361,7 +361,7 @@ bool RadioDocking::noticeNextAlarmChanged(const Alarm *a)
bool RadioDocking::noticeCountdownStarted(const TQDateTime &end)
{
if (end.isValid())
m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Stop Sleep Countdown (running until %1)").tqarg(end.toString()));
m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Stop Sleep Countdown (running until %1)").arg(end.toString()));
else
m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Start Sleep Countdown"));
return true;
@ -404,7 +404,7 @@ bool RadioDocking::noticeStationChanged (const RadioStation &rs, int /*idx*/)
s = rs.longName();
TQToolTip::add(this, s);
m_menu->changeTitle (m_titleID, i18n("KRadio: %1").tqarg(s));
m_menu->changeTitle (m_titleID, i18n("KRadio: %1").arg(s));
// FIXME: title does not change in opened popupmenu
TQValueList<int>::iterator iit = m_stationMenuIDs.begin();
@ -472,7 +472,7 @@ void RadioDocking::ShowHideWidgetPlugins()
if (p) {
bool visible = p->isAnywhereVisible();
TQString name = p->name();
logDebug(TQString("visibility of %1: %2").tqarg(name).tqarg(visible));
logDebug(TQString("visibility of %1: %2").arg(name).arg(visible));
m_widgetsShownCache.insert(name, visible);
p->getWidget()->hide();
}
@ -540,7 +540,7 @@ bool RadioDocking::startRecordingWithFormat(
querySoundStreamDescription(id, descr);
int menu_id = m_NextRecordingMenuID++;
m_recordingMenu->insertItem(SmallIcon("kradio_record"),
i18n("Stop Recording of %1").tqarg(descr),
i18n("Stop Recording of %1").arg(descr),
menu_id);
m_MenuID2StreamID.insert(menu_id, id);
m_StreamID2MenuID.insert(id, menu_id);
@ -613,7 +613,7 @@ void RadioDocking::buildRecordingMenu()
if (r) {
int menu_id = m_NextRecordingMenuID++;
m->insertItem(SmallIcon("kradio_record"),
i18n("Stop Recording of %1").tqarg(descr),
i18n("Stop Recording of %1").arg(descr),
menu_id);
m_MenuID2StreamID.insert(menu_id, id);
m_StreamID2MenuID.insert(id, menu_id);
@ -633,7 +633,7 @@ bool RadioDocking::noticeSoundStreamChanged(SoundStreamID id)
querySoundStreamDescription(id, descr);
m_recordingMenu->changeItem(m_StreamID2MenuID[id],
SmallIcon("kradio_record"),
i18n("Stop Recording of %1").tqarg(descr));
i18n("Stop Recording of %1").arg(descr));
return true;
}
return false;

6
kradio3/plugins/gui-error-log/errorlog.cpp
Unescape View File

@ -162,7 +162,7 @@ void ErrorLog::showOnOrgDesktop()
void ErrorLog::hide()
{
logDebug(TQString("%1, ErrorLog::hide: 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, ErrorLog::hide: 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));
WidgetPluginBase::pHide();
KDialogBase::hide();
}
@ -244,7 +244,7 @@ void ErrorLog::slotUser1()
if (outf->status() != IO_Ok) {
logError("ErrorLogger: " +
i18n("error writing to tempfile %1").tqarg(tmpFile.name()));
i18n("error writing to tempfile %1").arg(tmpFile.name()));
return;
}
@ -253,7 +253,7 @@ void ErrorLog::slotUser1()
if (!KIO::NetAccess::upload(tmpFile.name(), url, this)) {
logError("ErrorLogger: " +
i18n("error uploading preset file %1").tqarg(url.url()));
i18n("error uploading preset file %1").arg(url.url()));
}
}
setIconListAllVisible(true);

8
kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
Unescape View File

@ -219,7 +219,7 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
TQSize ButtonFlowLayout::minimumSize() const
{
return minimumSize(tqgeometry().size());
return minimumSize(geometry().size());
}
@ -249,7 +249,7 @@ int ButtonFlowLayout::count() const {
\reimp
*/
TQLayoutItem* ButtonFlowLayout::itemAt(int index) const {
return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).tqat(index)) : 0;
return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).at(index)) : 0;
}
/*!
@ -258,8 +258,8 @@ TQLayoutItem* ButtonFlowLayout::itemAt(int index) const {
TQLayoutItem* ButtonFlowLayout::takeAt(int index) {
if (index < 0 || index >= list.count())
return 0;
TQLayoutItem *item = list.tqat(index);
list.remove(list.tqat(index));
TQLayoutItem *item = list.at(index);
list.remove(list.at(index));
delete item;
invalidate();

4
kradio3/plugins/gui-quickbar/quickbar.cpp
Unescape View File

@ -316,9 +316,9 @@ void QuickBar::rebuildGUI()
// activate correct button
activateCurrentButton();
// calculate tqgeometry
// calculate geometry
if (m_layout) {
TQRect r = tqgeometry();
TQRect r = geometry();
int h = m_layout->heightForWidth( r.width());
if (h > r.height())

4
kradio3/plugins/gui-standard-display/radioview.cpp
Unescape View File

@ -439,7 +439,7 @@ bool RadioView::startRecordingWithFormat(
querySoundStreamDescription(id, descr);
int menu_id = m_NextRecordingMenuID++;
m_RecordingMenu->insertItem(SmallIcon("kradio_record"),
i18n("Stop Recording of %1").tqarg(descr),
i18n("Stop Recording of %1").arg(descr),
menu_id);
m_MenuID2StreamID.insert(menu_id, id);
m_StreamID2MenuID.insert(id, menu_id);
@ -477,7 +477,7 @@ bool RadioView::noticeSoundStreamChanged(SoundStreamID id)
querySoundStreamDescription(id, descr);
m_RecordingMenu->changeItem(m_StreamID2MenuID[id],
SmallIcon("kradio_record"),
i18n("Stop Recording of %1").tqarg(descr));
i18n("Stop Recording of %1").arg(descr));
return true;
}
return false;

12
kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
Unescape View File

@ -222,7 +222,7 @@ bool RadioViewFrequencyRadio::noticePowerChanged (bool on, const IRadioDevice */
queryIsStereo(ssid, s);
noticeStereoChanged(ssid, s);
tqrepaint();
repaint();
return true;
}
@ -246,7 +246,7 @@ bool RadioViewFrequencyRadio::noticeSignalQualityChanged(SoundStreamID id, float
if (queryCurrentSoundStreamID() != id)
return false;
m_quality = q;
tqrepaint ();
repaint ();
return true;
}
@ -256,7 +256,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s)
if (queryCurrentSoundStreamID() != id)
return false;
m_stereo = s;
tqrepaint ();
repaint ();
return true;
}
@ -269,7 +269,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s)
bool RadioViewFrequencyRadio::noticeFrequencyChanged(float f, const RadioStation *)
{
m_frequency = f;
tqrepaint ();
repaint ();
return true;
}
@ -403,9 +403,9 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
TQString s;
if (m_frequency < 10) {
s = i18n("%1 kHz").tqarg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
s = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
} else {
s = i18n("%1 MHz").tqarg(KGlobal::locale()->formatNumber(m_frequency, 2));
s = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(m_frequency, 2));
}
float pxs = xh_f;

2
kradio3/plugins/gui-standard-display/radioview_volume.cpp
Unescape View File

@ -37,7 +37,7 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
{
float v = 0;
SoundStreamID ssid = queryCurrentSoundStreamID();
sendLogDebug (TQString ("RadioViewVolume: ssid=%1").tqarg(ssid.getID()));
sendLogDebug (TQString ("RadioViewVolume: ssid=%1").arg(ssid.getID()));
queryPlaybackVolume(ssid, v);
m_slider = new TQSlider(SLIDER_MINVAL,
SLIDER_MAXVAL,

2
kradio3/plugins/lirc/lircsupport.cpp
Unescape View File

@ -64,7 +64,7 @@ LircSupport::LircSupport(const TQString &name)
TQFile lircrc(slircrc);
if (!lircrc.exists()) {
logWarning(i18n("%1 does not exist. File was created with KRadio's default .lircrc proposal").tqarg(LIRCRC));
logWarning(i18n("%1 does not exist. File was created with KRadio's default .lircrc proposal").arg(LIRCRC));
TQFile default_lircrc(locate("data", "kradio/default-dot-lircrc"));
lircrc.open(IO_WriteOnly);
default_lircrc.open(IO_ReadOnly);

62
kradio3/plugins/oss-sound/oss-sound.cpp
Unescape View File

@ -478,7 +478,7 @@ bool OSSSoundDevice::noticeSoundStreamData(SoundStreamID id,
// if (n < size) {
// m_PlaybackSkipCount += size - n;
// } else if (m_PlaybackSkipCount > 0) {
// logWarning(i18n("%1: Playback buffer overflow. Skipped %1 bytes").tqarg(m_DSPDeviceName).tqarg(TQString::number(m_PlaybackSkipCount)));
// logWarning(i18n("%1: Playback buffer overflow. Skipped %1 bytes").arg(m_DSPDeviceName).arg(TQString::number(m_PlaybackSkipCount)));
// m_PlaybackSkipCount = 0;
// }
@ -504,7 +504,7 @@ void OSSSoundDevice::slotPoll()
bytesRead = 0;
} else if (bytesRead == 0) {
err = -1;
logError(i18n("OSS device %1: No data to record").tqarg(m_DSPDeviceName));
logError(i18n("OSS device %1: No data to record").arg(m_DSPDeviceName));
} else {
err = errno;
}
@ -514,7 +514,7 @@ void OSSSoundDevice::slotPoll()
buffer = m_CaptureBuffer.getData(size);
time_t cur_time = time(NULL);
size_t consumed_size = SIZE_T_DONT_CARE;
notifySoundStreamData(m_CaptureStreamID, m_DSPFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").tqarg(m_DSPDeviceName)));
notifySoundStreamData(m_CaptureStreamID, m_DSPFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").arg(m_DSPDeviceName)));
if (consumed_size == SIZE_T_DONT_CARE)
consumed_size = size;
m_CaptureBuffer.removeData(consumed_size);
@ -546,7 +546,7 @@ void OSSSoundDevice::slotPoll()
}
if (err) {
logError(i18n("Error %1 while handling OSS device %2").tqarg(TQString().setNum(err)).tqarg(m_DSPDeviceName));
logError(i18n("Error %1 while handling OSS device %2").arg(TQString().setNum(err)).arg(m_DSPDeviceName));
}
if (m_PlaybackStreamID.isValid())
@ -590,13 +590,13 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
m_DSP_fd = open(m_DSPDeviceName.ascii(), O_NONBLOCK | O_RDONLY);
bool err = m_DSP_fd < 0;
if (err) {
logError(i18n("Cannot open DSP device %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot open DSP device %1").arg(m_DSPDeviceName));
return false;
}
int caps = 0;
err |= (ioctl (m_DSP_fd, SNDCTL_DSP_GETCAPS, &caps) != 0);
if (err)
logError(i18n("Cannot read DSP capabilities for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot read DSP capabilities for %1").arg(m_DSPDeviceName));
m_DuplexMode = (caps & DSP_CAP_DUPLEX) ? DUPLEX_FULL : DUPLEX_HALF;
close (m_DSP_fd);
@ -616,24 +616,24 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
err = m_DSP_fd < 0;
if (err) {
logError(i18n("Cannot open DSP device %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot open DSP device %1").arg(m_DSPDeviceName));
return false;
}
int oss_format = getOSSFormat(m_DSPFormat);
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SETFMT, &oss_format) != 0);
if (err)
logError(i18n("Cannot set DSP sample format for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot set DSP sample format for %1").arg(m_DSPDeviceName));
int channels = m_DSPFormat.m_Channels;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_CHANNELS, &channels) != 0);
if (err)
logError(i18n("Cannot set number of channels for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot set number of channels for %1").arg(m_DSPDeviceName));
int rate = m_DSPFormat.m_SampleRate;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SPEED, &rate) != 0);
if (err)
logError(i18n("Cannot set sampling rate for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot set sampling rate for %1").arg(m_DSPDeviceName));
if (rate != (int)m_DSPFormat.m_SampleRate) {
logWarning(i18n("Asking for %1 Hz but %2 uses %3 Hz").
arg(TQString::number(m_DSPFormat.m_SampleRate)).
@ -645,12 +645,12 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
int stereo = m_DSPFormat.m_Channels == 2;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_STEREO, &stereo) != 0);
if (err)
logError(i18n("Cannot set stereo mode for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot set stereo mode for %1").arg(m_DSPDeviceName));
unsigned sampleSize = m_DSPFormat.m_SampleBits;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SAMPLESIZE, &sampleSize) != 0);
if (err || sampleSize != m_DSPFormat.m_SampleBits)
logError(i18n("Cannot set sample size for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot set sample size for %1").arg(m_DSPDeviceName));
// setup buffer, ask for 40ms latency
int tmp = (400 * m_DSPFormat.frameSize() * m_DSPFormat.m_SampleRate) / 1000;
@ -659,17 +659,17 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
mask |= 0x7FFF0000;
err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &mask);
if (err)
logError(i18n("Cannot set buffers for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot set buffers for %1").arg(m_DSPDeviceName));
int bufferBlockSize = 0;
err |= ioctl (m_DSP_fd, SNDCTL_DSP_GETBLKSIZE, &bufferBlockSize);
if (err) {
logError(i18n("Cannot read buffer size for %1").tqarg(m_DSPDeviceName));
logError(i18n("Cannot read buffer size for %1").arg(m_DSPDeviceName));
} else {
logInfo(i18n("%1 uses buffer blocks of %2 bytes").tqarg(m_DSPDeviceName).tqarg(TQString::number(bufferBlockSize)));
logInfo(i18n("%1 uses buffer blocks of %2 bytes").arg(m_DSPDeviceName).arg(TQString::number(bufferBlockSize)));
size_t tmp = (((m_BufferSize - 1) / bufferBlockSize) + 1) * bufferBlockSize;
setBufferSize(tmp);
logInfo(i18n("adjusted own buffer size to %1 bytes").tqarg(TQString::number(tmp)));
logInfo(i18n("adjusted own buffer size to %1 bytes").arg(TQString::number(tmp)));
}
int trigger = ~PCM_ENABLE_INPUT & ~PCM_ENABLE_OUTPUT;
@ -721,7 +721,7 @@ bool OSSSoundDevice::openMixerDevice(bool reopen)
m_Mixer_fd = open(m_MixerDeviceName.ascii(), O_RDONLY);
if (m_Mixer_fd < 0) {
logError(i18n("Cannot open mixer device %1").tqarg(m_MixerDeviceName));
logError(i18n("Cannot open mixer device %1").arg(m_MixerDeviceName));
} else {
m_PollingTimer.start(40);
}
@ -754,7 +754,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS
fd = open(m_MixerDeviceName.ascii(), O_RDONLY);
if (fd < 0) {
logError(i18n("OSSSoundDevice::getMixerChannels: Cannot open mixer device %1").tqarg(m_MixerDeviceName));
logError(i18n("OSSSoundDevice::getMixerChannels: Cannot open mixer device %1").arg(m_MixerDeviceName));
}
if (fd >= 0) {
@ -768,7 +768,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS
}
}
} else {
logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device mask on device %1").tqarg(m_MixerDeviceName));
logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device mask on device %1").arg(m_MixerDeviceName));
}
}
if (fd != m_Mixer_fd)
@ -874,8 +874,8 @@ float OSSSoundDevice::readMixerVolume(int channel) const
if (err) {
logError("OSSSound::readMixerVolume: " +
i18n("error %1 while reading volume from %2")
.tqarg(TQString().setNum(err))
.tqarg(m_MixerDeviceName));
.arg(TQString().setNum(err))
.arg(m_MixerDeviceName));
tmpvol.l = tmpvol.r = 0;
}
return float(tmpvol.l) / 100.0;
@ -897,9 +897,9 @@ float OSSSoundDevice::writeMixerVolume (int channel, float vol)
if (err != 0) {
logError("OSSSoundDevice::writeMixerVolume: " +
i18n("error %1 while setting volume to %2 on device %3")
.tqarg(TQString().setNum(err))
.tqarg(TQString().setNum(vol))
.tqarg(m_MixerDeviceName));
.arg(TQString().setNum(err))
.arg(TQString().setNum(vol))
.arg(m_MixerDeviceName));
return -1;
}
}
@ -913,21 +913,21 @@ void OSSSoundDevice::selectCaptureChannel (int channel)
int err = ioctl(m_Mixer_fd, SOUND_MIXER_WRITE_RECSRC, &x);
if (err)
logError(i18n("Selecting recording source on device %1 failed with error code %2")
.tqarg(m_MixerDeviceName)
.tqarg(TQString::number(err)));
.arg(m_MixerDeviceName)
.arg(TQString::number(err)));
_lrvol tmpvol;
err = ioctl(m_Mixer_fd, MIXER_READ(SOUND_MIXER_IGAIN), &tmpvol);
if (err)
logError(i18n("Reading igain volume on device %1 failed with error code %2")
.tqarg(m_MixerDeviceName)
.tqarg(TQString::number(err)));
.arg(m_MixerDeviceName)
.arg(TQString::number(err)));
if (tmpvol.r == 0 && tmpvol.l == 0) {
tmpvol.r = tmpvol.l = 1;
err = ioctl(m_Mixer_fd, MIXER_WRITE(SOUND_MIXER_IGAIN), &tmpvol);
if (err)
logError(i18n("Setting igain volume on device %1 failed with error code %2")
.tqarg(m_MixerDeviceName)
.tqarg(TQString::number(err)));
.arg(m_MixerDeviceName)
.arg(TQString::number(err)));
}
}
@ -983,7 +983,7 @@ void OSSSoundDevice::setDSPDeviceName(const TQString &s)
TQString OSSSoundDevice::getSoundStreamClientDescription() const
{
return i18n("OSS Sound Device %1").tqarg(PluginBase::name());
return i18n("OSS Sound Device %1").arg(PluginBase::name());
}

4
kradio3/plugins/radio/radio-configuration-ui.ui
Unescape View File

@ -697,7 +697,7 @@
<property name="text">
<string>&lt;p align="center"&gt;Click on the link below to contribute this station preset file to the kradio project.&lt;/p&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@ -705,7 +705,7 @@
<property name="name">
<cstring>mailLabel</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

12
kradio3/plugins/recording/encoder_mp3.cpp
Unescape View File

@ -76,7 +76,7 @@ void RecordingEncodingMP3::encode(const char *_buffer, size_t buffer_size, char
m_MP3BufferSize);
lameSerialization.unlock();
if (n < 0) {
m_errorString += i18n("Error %1 while encoding mp3. ").tqarg(TQString().setNum(n));
m_errorString += i18n("Error %1 while encoding mp3. ").arg(TQString().setNum(n));
m_error = true;
} else if (n > 0) {
m_encodedSize += n;
@ -86,7 +86,7 @@ void RecordingEncodingMP3::encode(const char *_buffer, size_t buffer_size, char
int r = fwrite(m_MP3Buffer, 1, n, m_MP3Output);
if (r <= 0) {
m_errorString += i18n("Error %1 writing output. ").tqarg(TQString().setNum(r));
m_errorString += i18n("Error %1 writing output. ").arg(TQString().setNum(r));
m_error = true;
}
}
@ -120,7 +120,7 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
if (lame_init_params(m_LAMEFlags) < 0) {
m_error = true;
m_errorString += i18n("Cannot initialize libmp3lame parameters. ").tqarg(output);
m_errorString += i18n("Cannot initialize libmp3lame parameters. ").arg(output);
}
if (!m_error) {
@ -140,7 +140,7 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
m_MP3Output = fopen(output.ascii(), "wb+");
if (!m_MP3Output) {
m_errorString += i18n("Cannot open output file %1. ").tqarg(output);
m_errorString += i18n("Cannot open output file %1. ").arg(output);
m_error = true;
}
@ -186,12 +186,12 @@ void RecordingEncodingMP3::closeOutput()
m_MP3BufferSize);
if (n < 0) {
m_error = true;
m_errorString += i18n("Error %1 while encoding mp3. ").tqarg(TQString().setNum(n));
m_errorString += i18n("Error %1 while encoding mp3. ").arg(TQString().setNum(n));
} else if (n > 0) {
int r = fwrite(m_MP3Buffer, 1, n, m_MP3Output);
if (r <= 0) {
m_error = true;
m_errorString += i18n("Error %1 writing output. ").tqarg(TQString().setNum(r));
m_errorString += i18n("Error %1 writing output. ").arg(TQString().setNum(r));
} else {
lame_mp3_tags_fid(m_LAMEFlags, m_MP3Output);
}

2
kradio3/plugins/recording/encoder_ogg.cpp
Unescape View File

@ -133,7 +133,7 @@ bool RecordingEncodingOgg::openOutput(const TQString &output)
#ifdef HAVE_OGG
m_OggOutput = fopen(output.ascii(), "wb+");
if (!m_OggOutput) {
m_errorString += i18n("Cannot open Ogg/Vorbis output file %1. ").tqarg(output);
m_errorString += i18n("Cannot open Ogg/Vorbis output file %1. ").arg(output);
m_error = true;
}

4
kradio3/plugins/recording/encoder_pcm.cpp
Unescape View File

@ -50,7 +50,7 @@ void RecordingEncodingPCM::encode(const char *buffer, size_t buffer_size, char *
if (err != (int)buffer_size) {
m_error = true;
m_errorString += i18n("Error %1 writing output. ").tqarg(TQString().setNum(err));
m_errorString += i18n("Error %1 writing output. ").arg(TQString().setNum(err));
}
}
@ -63,7 +63,7 @@ bool RecordingEncodingPCM::openOutput(const TQString &output)
if (!m_output) {
m_error = true;
m_errorString += i18n("Cannot open output file %1. ").tqarg(output);
m_errorString += i18n("Cannot open output file %1. ").arg(output);
}
return !m_error;
}

6
kradio3/plugins/recording/recording-datamonitor.cpp
Unescape View File

@ -171,12 +171,12 @@ void RecordingDataMonitor::internalDrawContents(TQPainter &painter, bool repaint
f.setPixelSize(CHANNEL_H_MIN);
painter.setFont(f);
int maxW = TQFontMetrics(f).width(i18n("%1 dB").tqarg((int)min_dB));
int maxW = TQFontMetrics(f).width(i18n("%1 dB").arg((int)min_dB));
int delta_dB = 5;
while (abs((long)min_dB) / delta_dB * maxW * 2 > r.width()) delta_dB *= 2;
for (int dB = 0; dB >= min_dB; dB -= delta_dB) {
TQString txt = i18n("%1 dB").tqarg(dB);
TQString txt = i18n("%1 dB").arg(dB);
int w = TQFontMetrics(f).width(txt);
int x = x0 + (int)(nBlocks * BLOCK_W_MIN * (min_dB - dB) / min_dB) - w;
if (x < x0) continue;
@ -267,7 +267,7 @@ bool RecordingDataMonitor::noticeSoundStreamData(SoundStreamID /*id*/,
TQPainter paint(this);
if (m_maxValue != old_max) {
tqrepaint(true);
repaint(true);
} else {
internalDrawContents(paint, false);
}

10
kradio3/plugins/recording/recording-monitor.cpp
Unescape View File

@ -336,13 +336,13 @@ bool RecordingMonitor::noticeSoundStreamData(SoundStreamID id,
double MB = kB / 1024;
double GB = MB / 1024;
TQString str_size;
str_size = i18n("%1 Byte").tqarg(KGlobal::locale()->formatNumber((int)B, 0));
if (kB > 1) str_size = i18n("%1 kB").tqarg(KGlobal::locale()->formatNumber(kB, 3));
if (MB > 1) str_size = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber(MB, 3));
if (GB > 1) str_size = i18n("%1 GB").tqarg(KGlobal::locale()->formatNumber(GB, 3));
str_size = i18n("%1 Byte").arg(KGlobal::locale()->formatNumber((int)B, 0));
if (kB > 1) str_size = i18n("%1 kB").arg(KGlobal::locale()->formatNumber(kB, 3));
if (MB > 1) str_size = i18n("%1 MB").arg(KGlobal::locale()->formatNumber(MB, 3));
if (GB > 1) str_size = i18n("%1 GB").arg(KGlobal::locale()->formatNumber(GB, 3));
m_labelSize->setText(str_size);
m_labelRate->setText(i18n("%1 Hz").tqarg(sf.m_SampleRate));
m_labelRate->setText(i18n("%1 Hz").arg(sf.m_SampleRate));
return true;
}
return false;

4
kradio3/plugins/recording/recording.cpp
Unescape View File

@ -479,7 +479,7 @@ bool Recording::noticeSoundStreamData(SoundStreamID id,
size_t bufferSize = remSize;
char *buf = thread->lockInputBuffer(bufferSize);
if (!buf) {
logWarning(i18n("Encoder input buffer overflow (buffer configuration problem?). Skipped %1 input bytes").tqarg(TQString::number(remSize)));
logWarning(i18n("Encoder input buffer overflow (buffer configuration problem?). Skipped %1 input bytes").arg(TQString::number(remSize)));
break;
}
if (bufferSize > remSize) {
@ -644,7 +644,7 @@ bool Recording::event(TQEvent *_e)
notifySoundStreamData(m_RawStreams2EncodedStreams[id], thread->config().m_SoundFormat,
step->data(), step->size(), consumed_size, step->metaData());
if (consumed_size != SIZE_T_DONT_CARE && consumed_size < step->size()) {
logError(i18n("Recording::notifySoundStreamData(encoded data): Receivers skipped %1 Bytes").tqarg(step->size() - consumed_size));
logError(i18n("Recording::notifySoundStreamData(encoded data): Receivers skipped %1 Bytes").arg(step->size() - consumed_size));
}
}
}

2
kradio3/plugins/streaming/streaming-job.cpp
Unescape View File

@ -201,7 +201,7 @@ void StreamingJob::slotReadData (KIO::Job */*job*/, const TQByteArray &data)
size_t free = m_Buffer.getFreeSize();
if (free < data.size()) {
m_SkipCount += data.size() - free;
emit logStreamWarning(m_URL, i18n("skipped %1 bytes").tqarg(data.size() - free));
emit logStreamWarning(m_URL, i18n("skipped %1 bytes").arg(data.size() - free));
}
else {
free = data.size();

10
kradio3/plugins/streaming/streaming.cpp
Unescape View File

@ -390,7 +390,7 @@ bool StreamingDevice::noticeReadyForPlaybackData(SoundStreamID id, size_t free_s
const char *buffer = NULL;
size_t size = SIZE_T_DONT_CARE;
size_t consumed_size = SIZE_T_DONT_CARE;
SoundMetaData meta_data(0,0,0, i18n("internal stream, not stored (%1)").tqarg(m_AllCaptureStreams[id]));
SoundMetaData meta_data(0,0,0, i18n("internal stream, not stored (%1)").arg(m_AllCaptureStreams[id]));
x.lockData(buffer, size, meta_data); // get pointer to data and meta-data content
if (size > free_size)
size = free_size;
@ -400,7 +400,7 @@ bool StreamingDevice::noticeReadyForPlaybackData(SoundStreamID id, size_t free_s
x.removeData(consumed_size);
free_size -= consumed_size;
if (consumed_size < size) {
logWarning(i18n("StreamingDevice %1::notifySoundStreamData: Playback Clients skipped %2 bytes").tqarg(name()).tqarg(size-consumed_size));
logWarning(i18n("StreamingDevice %1::notifySoundStreamData: Playback Clients skipped %2 bytes").arg(name()).arg(size-consumed_size));
break;
}
}
@ -423,18 +423,18 @@ const TQStringList &StreamingDevice::getCaptureChannels() const
TQString StreamingDevice::getSoundStreamClientDescription() const
{
return i18n("Streaming Device %1").tqarg(PluginBase::name());
return i18n("Streaming Device %1").arg(PluginBase::name());
}
void StreamingDevice::logStreamError(const KURL &url, const TQString &s)
{
logError(i18n("Streaming Device %1, %2: %3").tqarg(name()).tqarg(url.url()).tqarg(s));
logError(i18n("Streaming Device %1, %2: %3").arg(name()).arg(url.url()).arg(s));
}
void StreamingDevice::logStreamWarning(const KURL &url, const TQString &s)
{
logWarning(i18n("Streaming Device %1, %2: %3").tqarg(name()).tqarg(url.url()).tqarg(s));
logWarning(i18n("Streaming Device %1, %2: %3").arg(name()).arg(url.url()).arg(s));
}

8
kradio3/plugins/timeshifter/timeshifter.cpp
Unescape View File

@ -154,8 +154,8 @@ bool TimeShifter::stopPlayback(SoundStreamID id)
SoundStreamID tmp_newID = m_NewStreamID;
SoundStreamID tmp_orgID = m_OrgStreamID;
m_OrgStreamID.tqinvalidate();
m_NewStreamID.tqinvalidate();
m_OrgStreamID.invalidate();
m_NewStreamID.invalidate();
sendStopCapture(tmp_newID);
closeSoundStream(tmp_newID);
@ -182,7 +182,7 @@ bool TimeShifter::pausePlayback(SoundStreamID id)
sendMute(newid);
sendPlaybackVolume(newid, 0);
m_NewStreamID.tqinvalidate();
m_NewStreamID.invalidate();
sendStopPlayback(newid);
m_NewStreamID = newid;
@ -352,7 +352,7 @@ bool TimeShifter::noticeReadyForPlaybackData(SoundStreamID id, size_t free_size)
free_size -= consumed_size;
m_PlaybackDataLeftInBuffer -= consumed_size;
if (consumed_size < s) {
logError(i18n("TimeShifter::notifySoundStreamData: clients skipped %1 bytes. Data Lost").tqarg(s - consumed_size));
logError(i18n("TimeShifter::notifySoundStreamData: clients skipped %1 bytes. Data Lost").arg(s - consumed_size));
free_size = 0; // break condition for outer loop
break;
}

8
kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
Unescape View File

@ -593,7 +593,7 @@
<property name="text">
<string>volume</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@ -683,7 +683,7 @@
<property name="text">
<string>treble</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@ -773,7 +773,7 @@
<property name="text">
<string>bass</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@ -860,7 +860,7 @@
<property name="text">
<string>balance</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

36
kradio3/plugins/v4lradio/v4lradio.cpp
Unescape View File

@ -656,7 +656,7 @@ bool V4LRadio::setFrequency(float freq)
if (freq > maxf || freq < minf) {
logError("V4LRadio::setFrequency: " +
i18n("invalid frequency %1").tqarg(TQString().setNum(freq)));
i18n("invalid frequency %1").arg(TQString().setNum(freq)));
if (!oldMute && !m_ActivePlayback)
unmute(m_SoundStreamID);
return false;
@ -678,14 +678,14 @@ bool V4LRadio::setFrequency(float freq)
else {
logError("V4LRadio::setFrequency: " +
i18n("don't known how to handle V4L-version %1")
.tqarg(m_caps.version));
.arg(m_caps.version));
}
if (r) {
logError("V4LRadio::setFrequency: " +
i18n("error setting frequency to %1 (%2)")
.tqarg(TQString().setNum(freq))
.tqarg(TQString().setNum(r)));
.arg(TQString().setNum(freq))
.arg(TQString().setNum(r)));
// unmute the old radio with the old radio station
if (!oldMute && !m_ActivePlayback)
unmute(m_SoundStreamID);
@ -1001,7 +1001,7 @@ void V4LRadio::restoreState (KConfig *config)
else {
if (found_devname.isNull())
found_devname = *it;
logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").tqarg(*it));
logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").arg(*it));
}
}
}
@ -1123,7 +1123,7 @@ void V4LRadio::radio_init()
radio_done();
logError("V4LRadio::radio_init: " +
i18n("Cannot open mixer device %1").tqarg(m_mixerDev));
i18n("Cannot open mixer device %1").arg(m_mixerDev));
return;
}
*/
@ -1132,7 +1132,7 @@ void V4LRadio::radio_init()
radio_done();
logError("V4LRadio::radio_init: " +
i18n("Cannot open radio device %1").tqarg(m_radioDev));
i18n("Cannot open radio device %1").arg(m_radioDev));
return;
}
@ -1183,7 +1183,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
if (fd < 0) {
logError("V4LRadio::readV4LCaps: " +
i18n("cannot open %1").tqarg(device));
i18n("cannot open %1").arg(device));
return c;
}
@ -1207,7 +1207,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
video_audio audiocaps;
if (0 == ioctl(fd, VIDIOCGAUDIO, &audiocaps)) {
logDebug("V4LRadio::readV4LCaps: " +
i18n("audio caps = %1").tqarg(TQString().setNum(audiocaps.flags)));
i18n("audio caps = %1").arg(TQString().setNum(audiocaps.flags)));
if ((audiocaps.flags & VIDEO_AUDIO_MUTABLE) != 0)
c.hasMute = true;
if ((audiocaps.flags & VIDEO_AUDIO_VOLUME) != 0)
@ -1230,7 +1230,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
if (r == 0) {
c.version = 2;
logDebug(i18n("V4L2 - Version: %1").tqarg(TQString().sprintf("%08X", caps2.version)));
logDebug(i18n("V4L2 - Version: %1").arg(TQString().sprintf("%08X", caps2.version)));
size_t l = sizeof(caps.name);
l = l < CAPS_NAME_LEN ? l : CAPS_NAME_LEN;
@ -1289,7 +1289,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
}
#endif
if (c.version > 0) {
logInfo(i18n("V4L %1 detected").tqarg(c.version));
logInfo(i18n("V4L %1 detected").arg(c.version));
} else {
logError(i18n("V4L not detected"));
}
@ -1356,13 +1356,13 @@ bool V4LRadio::readTunerInfo() const
else {
logError("V4LRadio::readTunerInfo: " +
i18n("don't known how to handle V4L-version %1")
.tqarg(TQString().setNum(m_caps.version)));
.arg(TQString().setNum(m_caps.version)));
}
if (r != 0) {
m_signalQuality = 0;
logError("V4LRadio::readTunerInfo: " +
i18n("cannot get tuner info (error %1)").tqarg(TQString().setNum(r)));
i18n("cannot get tuner info (error %1)").arg(TQString().setNum(r)));
}
} else {
m_signalQuality = 0;
@ -1406,7 +1406,7 @@ bool V4LRadio::readTunerInfo() const
} \
x = x ? x : r; \
if (r) \
logError(i18n("error setting %1: %2").tqarg(#what).tqarg(TQString().setNum(r))); \
logError(i18n("error setting %1: %2").arg(#what).arg(TQString().setNum(r))); \
}
#define V4L2_G_CTRL(what) \
@ -1414,7 +1414,7 @@ bool V4LRadio::readTunerInfo() const
r = ioctl (m_radio_fd, VIDIOC_G_CTRL, &ctl); \
x = x ? x : r; \
if (r) \
logError(i18n("error reading %1: %2").tqarg(#what).tqarg(TQString().setNum(r))); \
logError(i18n("error reading %1: %2").arg(#what).arg(TQString().setNum(r))); \
}
@ -1505,14 +1505,14 @@ bool V4LRadio::updateAudioInfo(bool write) const
else {
logError("V4LRadio::updateAudioInfo: " +
i18n("don't known how to handle V4L-version %1")
.tqarg(TQString().setNum(m_caps.version)));
.arg(TQString().setNum(m_caps.version)));
}
if (r) {
logError("V4LRadio::updateAudioInfo: " +
i18n("error updating radio audio info (%1): %2")
.tqarg(write ? i18n("write") : i18n("read"))
.tqarg(TQString().setNum(r)));
.arg(write ? i18n("write") : i18n("read"))
.arg(TQString().setNum(r)));
return false;
}
}

4
kradio3/src/aboutwidget.cpp
Unescape View File

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

32
kradio3/src/errorlog-interfaces.cpp
Unescape View File

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

14
kradio3/src/fileringbuffer.cpp
Unescape View File

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

6
kradio3/src/frequencyradiostation.cpp
Unescape View File

@ -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;
}

8
kradio3/src/include/interfaces.h
Unescape View File

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

4
kradio3/src/include/soundstreamclient_interfaces.h
Unescape View File

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

2
kradio3/src/include/soundstreamid.h
Unescape View File

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

2
kradio3/src/internetradiostation.cpp
Unescape View File

@ -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();
}

12
kradio3/src/kradioapp.cpp
Unescape View File

@ -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;
}

8
kradio3/src/pluginmanager.cpp
Unescape View File

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

2
kradio3/src/soundstreamid.cpp
Unescape View File

@ -62,7 +62,7 @@ SoundStreamID SoundStreamID::createNewID(const SoundStreamID &oldID)
}
void SoundStreamID::tqinvalidate()
void SoundStreamID::invalidate()
{
m_ID = 0;
m_PhysicalID = 0;

2
kradio3/src/standardscandialog.cpp
Unescape View File

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

22
kradio3/src/stationlist.cpp
Unescape View File

@ -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;
}

18
kradio3/src/stationlistxmlhandler.cpp
Unescape View File

@ -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;
}

8
kradio3/src/widgetplugins.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save