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

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent b66ecc4a25
commit 5fb78f4b68
61 changed files with 507 additions and 507 deletions
Show Stats Download Patch File Download Diff File

2
kradio3/convert-presets/convert-presets.cpp
Unescape View File

@ -4,7 +4,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqtextstream.h> #include <textstream.h>
#include <tqfile.h> #include <tqfile.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>

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

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -37,7 +37,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -54,7 +54,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>1</width> <width>1</width>
<height>40</height> <height>40</height>
@ -85,7 +85,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>1</width> <width>1</width>
<height>40</height> <height>40</height>
@ -102,7 +102,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -113,7 +113,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -129,7 +129,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>11</width> <width>11</width>
<height>20</height> <height>20</height>
@ -157,7 +157,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>11</width> <width>11</width>
<height>20</height> <height>20</height>
@ -168,7 +168,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -184,7 +184,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -193,7 +193,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -236,7 +236,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -255,7 +255,7 @@
<property name="text"> <property name="text">
<string>MixerName</string> <string>MixerName</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>

6
kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
Unescape View File

@ -50,7 +50,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -59,7 +59,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout58</cstring> <cstring>layout58</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -259,7 +259,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

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

@ -17,7 +17,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqlayout.h> #include <layout.h>
#include <tqscrollview.h> #include <tqscrollview.h>
#include <kurlrequester.h> #include <kurlrequester.h>
@ -57,7 +57,7 @@ AlsaSoundConfiguration::AlsaSoundConfiguration (TQWidget *parent, AlsaSoundDevic
m_groupMixer->setColumnLayout(0, Qt::Horizontal ); m_groupMixer->setColumnLayout(0, Qt::Horizontal );
TQHBoxLayout *tmp_layout = new TQHBoxLayout( m_groupMixer->tqlayout() ); TQHBoxLayout *tmp_layout = new TQHBoxLayout( m_groupMixer->layout() );
m_groupMixerScrollView = new TQScrollView (m_groupMixer); m_groupMixerScrollView = new TQScrollView (m_groupMixer);
m_groupMixerScrollView->setFrameShape(TQFrame::NoFrame); m_groupMixerScrollView->setFrameShape(TQFrame::NoFrame);
@ -135,13 +135,13 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname)
delete m_groupMixerSubFrame; delete m_groupMixerSubFrame;
m_groupMixerSubFrame = new TQFrame(m_groupMixerScrollView->viewport()); m_groupMixerSubFrame = new TQFrame(m_groupMixerScrollView->viewport());
m_groupMixerSubFrame->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); m_groupMixerSubFrame->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
m_groupMixerScrollView->addChild(m_groupMixerSubFrame); m_groupMixerScrollView->addChild(m_groupMixerSubFrame);
int rows = 1; int rows = 1;
int cols = (all_list.count()+rows-1)/rows; int cols = (all_list.count()+rows-1)/rows;
m_groupMixerLayout = new TQGridLayout( m_groupMixerSubFrame, rows, cols, 0, 0 ); m_groupMixerLayout = new TQGridLayout( m_groupMixerSubFrame, rows, cols, 0, 0 );
m_groupMixerLayout->tqsetAlignment( TQt::AlignBottom ); m_groupMixerLayout->setAlignment( TQt::AlignBottom );
int idx = 0; int idx = 0;
for (TQValueListConstIterator<TQString> it = all_list.begin(); it != all_list.end(); ++it, ++idx) { for (TQValueListConstIterator<TQString> it = all_list.begin(); it != all_list.end(); ++it, ++idx) {
@ -250,12 +250,12 @@ int AlsaSoundConfiguration::listSoundDevices(KComboBox *combobox, TQMap<TQString
int err = 0; int err = 0;
if ((err = snd_ctl_pcm_info(handle, pcminfo)) < 0) { if ((err = snd_ctl_pcm_info(handle, pcminfo)) < 0) {
if (err != -ENOENT) { 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; continue;
} }
const char *dev_name = snd_pcm_info_get_name(pcminfo); 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) if (combobox)
combobox->insertItem(devname); combobox->insertItem(devname);
if (devname2dev) if (devname2dev)
@ -315,14 +315,14 @@ void AlsaSoundConfiguration::slotCancel()
slotCaptureCardSelected(m_comboCaptureCard->currentText()); slotCaptureCardSelected(m_comboCaptureCard->currentText());
m_comboCaptureDevice->setCurrentItem(m_captureDevice2idx[dev]); 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); editHWBufferSize ->setValue (m_SoundDevice ? m_SoundDevice->getHWBufferSize()/1024 : 4);
editBufferSize ->setValue (m_SoundDevice ? m_SoundDevice->getBufferSize()/1024 : 4); editBufferSize ->setValue (m_SoundDevice ? m_SoundDevice->getBufferSize()/1024 : 4);
chkDisablePlayback->setChecked(m_SoundDevice ? !m_SoundDevice->isPlaybackEnabled() : false); chkDisablePlayback->setChecked(m_SoundDevice ? !m_SoundDevice->isPlaybackEnabled() : false);
chkDisableCapture ->setChecked(m_SoundDevice ? !m_SoundDevice->isCaptureEnabled() : 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) 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; int i = 0;
for (TQMapConstIterator<TQString, AlsaConfigMixerSetting> it = m_CaptureMixerSettings.begin(); it != m_CaptureMixerSettings.end(); ++it, ++i) { 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); (*it).saveState(c, prefix);
} }
@ -179,7 +179,7 @@ void AlsaSoundDevice::restoreState (KConfig *c)
int n = c->readNumEntry("mixer-settings", 0); int n = c->readNumEntry("mixer-settings", 0);
for (int i = 0; i < n; ++i) { 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); AlsaConfigMixerSetting s(c, prefix);
m_CaptureMixerSettings.insert(s.getIDString(), s); m_CaptureMixerSettings.insert(s.getIDString(), s);
} }
@ -418,9 +418,9 @@ bool AlsaSoundDevice::stopCapture(SoundStreamID id)
slotPollCapture(); slotPollCapture();
// if (m_captureThread->error()) { // if (m_captureThread->error()) {
// logError(i18n("ALSA Plugin, device plughw:%1,%2: %3").tqarg(m_CaptureCard) // logError(i18n("ALSA Plugin, device plughw:%1,%2: %3").arg(m_CaptureCard)
// .tqarg(m_CaptureDevice) // .arg(m_CaptureDevice)
// .tqarg(i18n("unknown error"))); // .arg(i18n("unknown error")));
// } // }
// //
// delete m_captureThread; // delete m_captureThread;
@ -526,7 +526,7 @@ bool AlsaSoundDevice::noticeSoundStreamData(SoundStreamID id,
/* if (n < size) { /* if (n < size) {
m_PlaybackSkipCount += size - n; m_PlaybackSkipCount += size - n;
} else if (m_PlaybackSkipCount > 0) { } 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; m_PlaybackSkipCount = 0;
} }
return m_PlaybackSkipCount == 0;*/ return m_PlaybackSkipCount == 0;*/
@ -550,12 +550,12 @@ void AlsaSoundDevice::slotPollPlayback()
if (framesWritten > 0) { if (framesWritten > 0) {
m_PlaybackBuffer.removeData(bytesWritten); m_PlaybackBuffer.removeData(bytesWritten);
} else if (framesWritten == 0) { } 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) { } else if (framesWritten == -EAGAIN) {
// do nothing // do nothing
} else { } else {
snd_pcm_prepare(m_hPlayback); 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) { if (m_CaptureStreamID.isValid() && m_hCapture) {
// while (m_captureThread && m_captureThread->getAvailableReadBuffers()) { // 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; // size_t size = 0;
// char *buffer = m_captureThread->getReadBuffer(size); // char *buffer = m_captureThread->getReadBuffer(size);
// time_t cur_time = time(NULL); // time_t cur_time = time(NULL);
@ -608,22 +608,22 @@ void AlsaSoundDevice::slotPollCapture()
m_CaptureBuffer.removeFreeSpace(bytesRead); m_CaptureBuffer.removeFreeSpace(bytesRead);
} else if (framesRead == 0) { } else if (framesRead == 0) {
snd_pcm_prepare(m_hCapture); 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) { } else if (framesRead == -EAGAIN) {
// do nothing // do nothing
} else { } else {
snd_pcm_prepare(m_hCapture); 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) { while (m_CaptureBuffer.getFillSize() > m_CaptureBuffer.getSize() / 3) {
size_t size = 0; size_t size = 0;
buffer = m_CaptureBuffer.getData(size); buffer = m_CaptureBuffer.getData(size);
time_t cur_time = time(NULL); time_t cur_time = time(NULL);
size_t consumed_size = SIZE_T_DONT_CARE; 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) if (consumed_size == SIZE_T_DONT_CARE)
consumed_size = size; consumed_size = size;
@ -664,7 +664,7 @@ bool AlsaSoundDevice::openPlaybackDevice(const SoundFormat &format, bool reopen)
m_PlaybackFormat = format; 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); bool error = !openAlsaDevice(m_hPlayback, m_PlaybackFormat, dev.ascii(), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK, m_PlaybackLatency);
if (!error) { if (!error) {
@ -704,7 +704,7 @@ bool AlsaSoundDevice::openCaptureDevice(const SoundFormat &format, bool reopen)
m_CaptureFormat = format; 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, /*flags = block*/0, m_CaptureLatency);
bool error = !openAlsaDevice(m_hCapture, m_CaptureFormat, dev.ascii(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK, 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 */ /* OPEN */
if (!error && snd_pcm_open(&alsa_handle, pcm_name, stream, flags) < 0) { 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; error = true;
} }
if (!error && snd_pcm_hw_params_any(alsa_handle, hwparams) < 0) { 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; error = true;
} }
/* interleaved access type */ /* interleaved access type */
if (!error && snd_pcm_hw_params_set_access(alsa_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) { 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; error = true;
} }
@ -755,30 +755,30 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
!format.m_IsSigned, !format.m_IsSigned,
format.m_Endianess == BIG_ENDIAN); format.m_Endianess == BIG_ENDIAN);
if (!error && snd_pcm_hw_params_set_format(alsa_handle, hwparams, sample_format) < 0) { 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; error = true;
} }
/* channels */ /* channels */
if (!error && snd_pcm_hw_params_set_channels(alsa_handle, hwparams, format.m_Channels) < 0) { 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; error = true;
} }
/* sample rate */ /* sample rate */
int rate = format.m_SampleRate; int rate = format.m_SampleRate;
if (!error && snd_pcm_hw_params_set_rate_near(alsa_handle, hwparams, &format.m_SampleRate, &dir) < 0) { 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; error = true;
} }
if (!error && format.m_SampleRate != format.m_SampleRate) { 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(); 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) { 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; error = true;
} }
@ -788,7 +788,7 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
// //
// /* fragments */ // /* fragments */
// if (!error && snd_pcm_hw_params_set_periods(alsa_handle, hwparams, periods, 0) < 0) { // 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; // 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) { // if (!error && snd_pcm_hw_params_set_buffer_size_near(alsa_handle, hwparams, &exact_buffersize_frames) < 0) {
// exact_buffersize_frames = 4096; // exact_buffersize_frames = 4096;
// if (!error && snd_pcm_hw_params_set_buffer_size_near(alsa_handle, hwparams, &exact_buffersize_frames) < 0) { // 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; // error = true;
// } // }
// } // }
// size_t exact_buffersize = exact_buffersize_frames * format.frameSize(); // size_t exact_buffersize = exact_buffersize_frames * format.frameSize();
// if (!error && m_HWBufferSize != exact_buffersize) { // 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; // size_t tmp = (((m_HWBufferSize - 1) / exact_buffersize) + 1) * exact_buffersize;
// setHWBufferSize(tmp); // 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 */ /* 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) { 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; error = true;
} }
@ -924,18 +924,18 @@ bool AlsaSoundDevice::openMixerDevice(snd_mixer_t *&mixer_handle, int card, bool
bool attached = false; bool attached = false;
if (!error) { if (!error) {
if (snd_mixer_attach (mixer_handle, cardid.ascii()) < 0) { 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; error = true;
} else { } else {
attached = true; attached = true;
} }
} }
if (!error && snd_mixer_selem_register(mixer_handle, NULL, NULL) < 0) { 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; error = true;
} }
if (!error && snd_mixer_load (mixer_handle) < 0) { 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; error = true;
} }
if (mixer_handle) { if (mixer_handle) {
@ -1003,7 +1003,7 @@ void AlsaSoundDevice::getPlaybackMixerChannels(
TQString name = snd_mixer_selem_id_get_name(sid); TQString name = snd_mixer_selem_id_get_name(sid);
int idx = snd_mixer_selem_id_get_index(sid); int idx = snd_mixer_selem_id_get_index(sid);
if (idx) 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)) { if (snd_mixer_selem_has_playback_volume(elem)) {
ch2id[name] = sid; ch2id[name] = sid;
retval.append(name); retval.append(name);
@ -1050,7 +1050,7 @@ void AlsaSoundDevice::getCaptureMixerChannels(
TQString name = snd_mixer_selem_id_get_name(sid); TQString name = snd_mixer_selem_id_get_name(sid);
int idx = snd_mixer_selem_id_get_index(sid); int idx = snd_mixer_selem_id_get_index(sid);
if (idx) 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; bool add2all = false;
if (snd_mixer_selem_has_capture_switch(elem)) { if (snd_mixer_selem_has_capture_switch(elem)) {
@ -1204,8 +1204,8 @@ float AlsaSoundDevice::readPlaybackMixerVolume(const TQString &channel, bool &mu
} }
logError("AlsaSound::readPlaybackMixerVolume: " + logError("AlsaSound::readPlaybackMixerVolume: " +
i18n("error while reading volume from hwplug:%1,%2") i18n("error while reading volume from hwplug:%1,%2")
.tqarg(m_PlaybackCard) .arg(m_PlaybackCard)
.tqarg(m_PlaybackDevice)); .arg(m_PlaybackDevice));
return 0; return 0;
} }
@ -1234,8 +1234,8 @@ float AlsaSoundDevice::readCaptureMixerVolume(const TQString &channel) const
} }
logError("AlsaSound::readCaptureMixerVolume: " + logError("AlsaSound::readCaptureMixerVolume: " +
i18n("error while reading volume from hwplug:%1,%2") i18n("error while reading volume from hwplug:%1,%2")
.tqarg(m_CaptureCard) .arg(m_CaptureCard)
.tqarg(m_CaptureDevice)); .arg(m_CaptureDevice));
return 0; return 0;
} }
@ -1267,9 +1267,9 @@ bool AlsaSoundDevice::writePlaybackMixerVolume (const TQString &channel, float &
} }
logError("AlsaSound::writePlaybackMixerVolume: " + logError("AlsaSound::writePlaybackMixerVolume: " +
i18n("error while writing volume %1 to hwplug:%2,%3") i18n("error while writing volume %1 to hwplug:%2,%3")
.tqarg(vol) .arg(vol)
.tqarg(m_PlaybackCard) .arg(m_PlaybackCard)
.tqarg(m_PlaybackDevice)); .arg(m_PlaybackDevice));
return false; return false;
} }
@ -1302,9 +1302,9 @@ bool AlsaSoundDevice::writeCaptureMixerVolume (const TQString &channel, float &v
} }
logError("AlsaSound::writeCaptureMixerVolume: " + logError("AlsaSound::writeCaptureMixerVolume: " +
i18n("error while writing volume %1 to hwplug:%2,%3") i18n("error while writing volume %1 to hwplug:%2,%3")
.tqarg(vol) .arg(vol)
.tqarg(m_CaptureCard) .arg(m_CaptureCard)
.tqarg(m_CaptureDevice)); .arg(m_CaptureDevice));
return false; return false;
} }
@ -1325,9 +1325,9 @@ bool AlsaSoundDevice::writeCaptureMixerSwitch (const TQString &channel, bool cap
} }
logError("AlsaSound::writeCaptureMixerSwitch: " + logError("AlsaSound::writeCaptureMixerSwitch: " +
i18n("error while setting capture switch %1 for hwplug:%2,%3") i18n("error while setting capture switch %1 for hwplug:%2,%3")
.tqarg(channel) .arg(channel)
.tqarg(m_CaptureCard) .arg(m_CaptureCard)
.tqarg(m_CaptureDevice)); .arg(m_CaptureDevice));
return false; return false;
} }
@ -1445,7 +1445,7 @@ void AlsaSoundDevice::setCaptureDevice(int card, int dev)
TQString AlsaSoundDevice::getSoundStreamClientDescription() const 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) { // if (m_captureThread) {
// AlsaCaptureEvent *e = static_cast<AlsaCaptureEvent*>(_e); // AlsaCaptureEvent *e = static_cast<AlsaCaptureEvent*>(_e);
// TQString msg = i18n("ALSA Plugin, device plughw:%1,%2: %3") // TQString msg = i18n("ALSA Plugin, device plughw:%1,%2: %3")
// .tqarg(m_CaptureCard) // .arg(m_CaptureCard)
// .tqarg(m_CaptureDevice) // .arg(m_CaptureDevice)
// .tqarg(e->message()); // .arg(e->message());
// switch (_e->type()) { // switch (_e->type()) {
// case CaptureError : // case CaptureError :
// logError(msg); // logError(msg);

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

@ -19,7 +19,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <layout.h>
#include <tqframe.h> #include <tqframe.h>
#include <klocale.h> #include <klocale.h>
@ -31,26 +31,26 @@ DockingConfiguration::DockingConfiguration (RadioDocking *docking, TQWidget *par
m_docking(docking), m_docking(docking),
m_disableGUIUpdates(false) m_disableGUIUpdates(false)
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(); TQHBoxLayout *layout = new TQHBoxLayout();
TQHBoxLayout *tqlayout2 = new TQHBoxLayout(); TQHBoxLayout *layout2 = new TQHBoxLayout();
m_labelClickMode = new TQLabel(this); m_labelClickMode = new TQLabel(this);
tqlayout->addWidget(m_labelClickMode); layout->addWidget(m_labelClickMode);
m_comboClickMode = new TQComboBox(this); m_comboClickMode = new TQComboBox(this);
tqlayout->addWidget(m_comboClickMode); layout->addWidget(m_comboClickMode);
TQSpacerItem *spacer = new TQSpacerItem( 20, 2, TQSizePolicy::Expanding, TQSizePolicy::Minimum); TQSpacerItem *spacer = new TQSpacerItem( 20, 2, TQSizePolicy::Expanding, TQSizePolicy::Minimum);
tqlayout->addItem(spacer); layout->addItem(spacer);
TQFrame *line = new TQFrame(this); TQFrame *line = new TQFrame(this);
line->setFrameShape ( TQFrame::HLine ); line->setFrameShape ( TQFrame::HLine );
line->setFrameShadow( TQFrame::Sunken ); line->setFrameShadow( TQFrame::Sunken );
tqlayout2->addWidget(line); layout2->addWidget(line);
StationSelectorUILayout->expand(2,0); StationSelectorUILayout->expand(2,0);
StationSelectorUILayout->addMultiCellLayout(tqlayout2, 2, 2, 0, 2); StationSelectorUILayout->addMultiCellLayout(layout2, 2, 2, 0, 2);
StationSelectorUILayout->addMultiCellLayout(tqlayout, 3, 3, 0, 2); StationSelectorUILayout->addMultiCellLayout(layout, 3, 3, 0, 2);
connect(m_comboClickMode, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSetDirty())); connect(m_comboClickMode, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSetDirty()));

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

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

@ -19,11 +19,11 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqlayout.h> #include <layout.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqtextedit.h> #include <textedit.h>
#include <kfiledialog.h> #include <kfiledialog.h>
#include <kurl.h> #include <kurl.h>
#include <ktempfile.h> #include <ktempfile.h>
@ -162,7 +162,7 @@ void ErrorLog::showOnOrgDesktop()
void ErrorLog::hide() 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(); WidgetPluginBase::pHide();
KDialogBase::hide(); KDialogBase::hide();
} }
@ -183,7 +183,7 @@ void ErrorLog::hideEvent(TQHideEvent *e)
bool ErrorLog::logError (const TQString &s) bool ErrorLog::logError (const TQString &s)
{ {
m_teErrors->append("<i>" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n"); m_teErrors->append("<i>" + TQDateTime::currentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n");
if (init_done) { if (init_done) {
showPage(PAGE_ID_ERROR); showPage(PAGE_ID_ERROR);
show(); show();
@ -193,19 +193,19 @@ bool ErrorLog::logError (const TQString &s)
bool ErrorLog::logWarning(const TQString &s) bool ErrorLog::logWarning(const TQString &s)
{ {
m_teWarnings->append("<i>" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n"); m_teWarnings->append("<i>" + TQDateTime::currentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n");
return true; return true;
} }
bool ErrorLog::logInfo (const TQString &s) bool ErrorLog::logInfo (const TQString &s)
{ {
m_teInfos->append("<i>" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n"); m_teInfos->append("<i>" + TQDateTime::currentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n");
return true; return true;
} }
bool ErrorLog::logDebug (const TQString &s) bool ErrorLog::logDebug (const TQString &s)
{ {
m_teDebug->append("<i>" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n"); m_teDebug->append("<i>" + TQDateTime::currentDateTime().toString(Qt::ISODate) + "</i> " + s + "\n");
return true; return true;
} }
@ -244,7 +244,7 @@ void ErrorLog::slotUser1()
if (outf->status() != IO_Ok) { if (outf->status() != IO_Ok) {
logError("ErrorLogger: " + logError("ErrorLogger: " +
i18n("error writing to tempfile %1").tqarg(tmpFile.name())); i18n("error writing to tempfile %1").arg(tmpFile.name()));
return; return;
} }
@ -253,7 +253,7 @@ void ErrorLog::slotUser1()
if (!KIO::NetAccess::upload(tmpFile.name(), url, this)) { if (!KIO::NetAccess::upload(tmpFile.name(), url, this)) {
logError("ErrorLogger: " + logError("ErrorLogger: " +
i18n("error uploading preset file %1").tqarg(url.url())); i18n("error uploading preset file %1").arg(url.url()));
} }
} }
setIconListAllVisible(true); setIconListAllVisible(true);

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

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** $Id: buttonflowtqlayout.cpp 272 2005-05-18 08:12:51Z emw $ ** $Id: buttonflowlayout.cpp 272 2005-05-18 08:12:51Z emw $
** **
** Implementing your own tqlayout: flow example ** Implementing your own layout: flow example
** **
** Copyright (C) 1996 by Trolltech AS. All rights reserved. ** Copyright (C) 1996 by Trolltech AS. All rights reserved.
** **
@ -104,9 +104,9 @@ bool ButtonFlowLayout::hasHeightForWidth() const
return TRUE; return TRUE;
} }
TQSize ButtonFlowLayout::tqsizeHint() const TQSize ButtonFlowLayout::sizeHint() const
{ {
return tqminimumSize(); return minimumSize();
} }
TQSizePolicy::ExpandData ButtonFlowLayout::expanding() const TQSizePolicy::ExpandData ButtonFlowLayout::expanding() const
@ -133,7 +133,7 @@ void ButtonFlowLayout::setGeometry( const TQRect &r )
int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly ) int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
{ {
/* kdDebug() << "buttonflowtqlayout::doLayout (" /* kdDebug() << "buttonflowlayout::doLayout ("
<< r.x() << "," << r.y() << "," << r.x() << "," << r.y() << ","
<< r.width() << "," << r.height() << ", " << testonly << ")\n"; << r.width() << "," << r.height() << ", " << testonly << ")\n";
*/ */
@ -154,8 +154,8 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
it.toFirst(); it.toFirst();
while ( (o=it.current()) != 0 ) { while ( (o=it.current()) != 0 ) {
++it; ++it;
buttonWidth = TQMAX( buttonWidth, o->tqsizeHint().width() ); buttonWidth = TQMAX( buttonWidth, o->sizeHint().width() );
buttonHeight = TQMAX( buttonHeight, o->tqsizeHint().height() ); buttonHeight = TQMAX( buttonHeight, o->sizeHint().height() );
} }
// calculate the optimal width // calculate the optimal width
@ -217,19 +217,19 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
} }
TQSize ButtonFlowLayout::tqminimumSize() const TQSize ButtonFlowLayout::minimumSize() const
{ {
return tqminimumSize(tqgeometry().size()); return minimumSize(geometry().size());
} }
TQSize ButtonFlowLayout::tqminimumSize(const TQSize &r) const TQSize ButtonFlowLayout::minimumSize(const TQSize &r) const
{ {
TQSize s(0, 0); TQSize s(0, 0);
for (TQPtrListIterator<TQLayoutItem> it(list); it.current(); ++it) { for (TQPtrListIterator<TQLayoutItem> it(list); it.current(); ++it) {
TQLayoutItem *o = it.current(); TQLayoutItem *o = it.current();
s = s.expandedTo( o->tqsizeHint()); //tqminimumSize() ); s = s.expandedTo( o->sizeHint()); //minimumSize() );
} }
s.setHeight(heightForWidth(r.width())); s.setHeight(heightForWidth(r.width()));
@ -249,7 +249,7 @@ int ButtonFlowLayout::count() const {
\reimp \reimp
*/ */
TQLayoutItem* ButtonFlowLayout::itemAt(int index) const { 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) { TQLayoutItem* ButtonFlowLayout::takeAt(int index) {
if (index < 0 || index >= list.count()) if (index < 0 || index >= list.count())
return 0; return 0;
TQLayoutItem *item = list.tqat(index); TQLayoutItem *item = list.at(index);
list.remove(list.tqat(index)); list.remove(list.at(index));
delete item; delete item;
invalidate(); invalidate();

12
kradio3/plugins/gui-quickbar/buttonflowlayout.h
Unescape View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** $Id: buttonflowtqlayout.h 471 2006-11-11 17:04:51Z emw $ ** $Id: buttonflowlayout.h 471 2006-11-11 17:04:51Z emw $
** **
** Definition of simple flow tqlayout for custom tqlayout example ** Definition of simple flow layout for custom layout example
** **
** Created : 979899 ** Created : 979899
** **
@ -23,7 +23,7 @@
#include "../../src/include/utils.h" #include "../../src/include/utils.h"
#include <tqlayout.h> #include <layout.h>
#include <tqptrlist.h> #include <tqptrlist.h>
class ButtonFlowLayout : public TQLayout class ButtonFlowLayout : public TQLayout
@ -41,9 +41,9 @@ public:
void addItem( TQLayoutItem *item); void addItem( TQLayoutItem *item);
bool hasHeightForWidth() const; bool hasHeightForWidth() const;
int heightForWidth( int ) const; int heightForWidth( int ) const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSize() const; TQSize minimumSize() const;
TQSize tqminimumSize(const TQSize &r) const; // tqminimumSize is dependent from width TQSize minimumSize(const TQSize &r) const; // minimumSize is dependent from width
TQLayoutIterator iterator(); TQLayoutIterator iterator();
TQSizePolicy::ExpandData expanding() const; TQSizePolicy::ExpandData expanding() const;

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

@ -303,7 +303,7 @@ void QuickBar::rebuildGUI()
else else
b->setText(m_showShortName ? rs.shortName() : rs.name()); b->setText(m_showShortName ? rs.shortName() : rs.name());
b->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); b->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
TQToolTip::add(b, rs.longName()); TQToolTip::add(b, rs.longName());
if (isVisible()) b->show(); if (isVisible()) b->show();
@ -316,9 +316,9 @@ void QuickBar::rebuildGUI()
// activate correct button // activate correct button
activateCurrentButton(); activateCurrentButton();
// calculate tqgeometry // calculate geometry
if (m_layout) { if (m_layout) {
TQRect r = tqgeometry(); TQRect r = geometry();
int h = m_layout->heightForWidth( r.width()); int h = m_layout->heightForWidth( r.width());
if (h > r.height()) if (h > r.height())
@ -367,7 +367,7 @@ void QuickBar::setGeometry (int x, int y, int w, int h)
{ {
if (m_layout) { if (m_layout) {
TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2); TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2);
setMinimumSize(m_layout->tqminimumSize(TQSize(w, h) - marginSize) + marginSize); setMinimumSize(m_layout->minimumSize(TQSize(w, h) - marginSize) + marginSize);
} }
TQWidget::setGeometry (x, y, w, h); TQWidget::setGeometry (x, y, w, h);
} }
@ -381,10 +381,10 @@ void QuickBar::setGeometry (const TQRect &r)
void QuickBar::resizeEvent (TQResizeEvent *e) void QuickBar::resizeEvent (TQResizeEvent *e)
{ {
// tqminimumSize might change because of the flow tqlayout // minimumSize might change because of the flow layout
if (m_layout) { if (m_layout) {
TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2); TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2);
setMinimumSize(m_layout->tqminimumSize(e->size() - marginSize) + marginSize); setMinimumSize(m_layout->minimumSize(e->size() - marginSize) + marginSize);
} }
TQWidget::resizeEvent (e); TQWidget::resizeEvent (e);

28
kradio3/plugins/gui-standard-display/displaycfg.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <kcolordialog.h> #include <kcolordialog.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <tqlayout.h> #include <layout.h>
#include <klocale.h> #include <klocale.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
@ -32,9 +32,9 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
{ {
TQGroupBox *bg = new TQGroupBox(i18n("Display Colors"), this); TQGroupBox *bg = new TQGroupBox(i18n("Display Colors"), this);
bg->setColumnLayout(0, Qt::Vertical ); bg->setColumnLayout(0, Qt::Vertical );
bg->tqlayout()->setSpacing( 8 ); bg->layout()->setSpacing( 8 );
bg->tqlayout()->setMargin( 12 ); bg->layout()->setMargin( 12 );
TQGridLayout *gl = new TQGridLayout (bg->tqlayout()); TQGridLayout *gl = new TQGridLayout (bg->layout());
m_btnActive = new KColorButton(queryDisplayActiveColor(), bg); m_btnActive = new KColorButton(queryDisplayActiveColor(), bg);
m_btnInactive = new KColorButton(queryDisplayInactiveColor(), bg); m_btnInactive = new KColorButton(queryDisplayInactiveColor(), bg);
@ -48,16 +48,16 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
TQLabel *l2 = new TQLabel(i18n("Inactive Text"), bg); TQLabel *l2 = new TQLabel(i18n("Inactive Text"), bg);
TQLabel *l3 = new TQLabel(i18n("Background Color"), bg); TQLabel *l3 = new TQLabel(i18n("Background Color"), bg);
l1->tqsetAlignment(TQLabel::AlignCenter); l1->setAlignment(TQLabel::AlignCenter);
l2->tqsetAlignment(TQLabel::AlignCenter); l2->setAlignment(TQLabel::AlignCenter);
l3->tqsetAlignment(TQLabel::AlignCenter); l3->setAlignment(TQLabel::AlignCenter);
l1->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); l1->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
l2->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); l2->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
l3->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); l3->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_btnActive ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_btnActive ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_btnInactive->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_btnInactive->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_btnBkgnd ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_btnBkgnd ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_btnActive ->setMinimumSize(TQSize(40, 40)); m_btnActive ->setMinimumSize(TQSize(40, 40));
m_btnInactive->setMinimumSize(TQSize(40, 40)); m_btnInactive->setMinimumSize(TQSize(40, 40));
@ -72,7 +72,7 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
m_fontChooser = new KFontChooser(this, NULL, false, TQStringList(), true, 4); m_fontChooser = new KFontChooser(this, NULL, false, TQStringList(), true, 4);
m_fontChooser->setFont(queryDisplayFont()); m_fontChooser->setFont(queryDisplayFont());
m_fontChooser->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_fontChooser->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQVBoxLayout *l = new TQVBoxLayout(this, 10); TQVBoxLayout *l = new TQVBoxLayout(this, 10);
l->addWidget(bg); l->addWidget(bg);

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

@ -16,7 +16,7 @@
***************************************************************************/ ***************************************************************************/
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <tqslider.h> #include <tqslider.h>
#include <tqfile.h> #include <tqfile.h>
@ -162,10 +162,10 @@ RadioView::RadioView(const TQString &name)
btnSnooze->setIconSet(SmallIconSet("kradio_zzz")); btnSnooze->setIconSet(SmallIconSet("kradio_zzz"));
btnPlugins->setIconSet(SmallIconSet("kradio_plugins")); btnPlugins->setIconSet(SmallIconSet("kradio_plugins"));
widgetStacks[clsRadioSound] ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred)); widgetStacks[clsRadioSound] ->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
widgetStacks[clsRadioDisplay]->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred)); widgetStacks[clsRadioDisplay]->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
widgetStacks[clsRadioSeek] ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); widgetStacks[clsRadioSeek] ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
comboStations ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); comboStations ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
comboStations->setMinimumHeight(28); comboStations->setMinimumHeight(28);
@ -439,7 +439,7 @@ bool RadioView::startRecordingWithFormat(
querySoundStreamDescription(id, descr); querySoundStreamDescription(id, descr);
int menu_id = m_NextRecordingMenuID++; int menu_id = m_NextRecordingMenuID++;
m_RecordingMenu->insertItem(SmallIcon("kradio_record"), m_RecordingMenu->insertItem(SmallIcon("kradio_record"),
i18n("Stop Recording of %1").tqarg(descr), i18n("Stop Recording of %1").arg(descr),
menu_id); menu_id);
m_MenuID2StreamID.insert(menu_id, id); m_MenuID2StreamID.insert(menu_id, id);
m_StreamID2MenuID.insert(id, menu_id); m_StreamID2MenuID.insert(id, menu_id);
@ -477,7 +477,7 @@ bool RadioView::noticeSoundStreamChanged(SoundStreamID id)
querySoundStreamDescription(id, descr); querySoundStreamDescription(id, descr);
m_RecordingMenu->changeItem(m_StreamID2MenuID[id], m_RecordingMenu->changeItem(m_StreamID2MenuID[id],
SmallIcon("kradio_record"), SmallIcon("kradio_record"),
i18n("Stop Recording of %1").tqarg(descr)); i18n("Stop Recording of %1").arg(descr));
return true; return true;
} }
return false; return false;

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

@ -185,11 +185,11 @@ bool RadioViewFrequencyRadio::setDisplayColors(const TQColor &activeText,
if (parentWidget() && parentWidget()->backgroundPixmap() ){ if (parentWidget() && parentWidget()->backgroundPixmap() ){
KPixmapIO io; KPixmapIO io;
TQImage i = io.convertToImage(*parentWidget()->backgroundPixmap()); TQImage i = io.convertToImage(*parentWidget()->backgroundPixmap());
KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark)); KImageEffect::fade(i, 0.5, colorGroup().color(TQColorGroup::Dark));
setPaletteBackgroundPixmap(io.convertToPixmap(i)); setPaletteBackgroundPixmap(io.convertToPixmap(i));
setBackgroundOrigin(WindowOrigin); setBackgroundOrigin(WindowOrigin);
} else { } else {
setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button)); setBackgroundColor(colorGroup().color(TQColorGroup::Button));
} }
if (change) if (change)
@ -222,7 +222,7 @@ bool RadioViewFrequencyRadio::noticePowerChanged (bool on, const IRadioDevice */
queryIsStereo(ssid, s); queryIsStereo(ssid, s);
noticeStereoChanged(ssid, s); noticeStereoChanged(ssid, s);
tqrepaint(); repaint();
return true; return true;
} }
@ -246,7 +246,7 @@ bool RadioViewFrequencyRadio::noticeSignalQualityChanged(SoundStreamID id, float
if (queryCurrentSoundStreamID() != id) if (queryCurrentSoundStreamID() != id)
return false; return false;
m_quality = q; m_quality = q;
tqrepaint (); repaint ();
return true; return true;
} }
@ -256,7 +256,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s)
if (queryCurrentSoundStreamID() != id) if (queryCurrentSoundStreamID() != id)
return false; return false;
m_stereo = s; m_stereo = s;
tqrepaint (); repaint ();
return true; return true;
} }
@ -269,7 +269,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s)
bool RadioViewFrequencyRadio::noticeFrequencyChanged(float f, const RadioStation *) bool RadioViewFrequencyRadio::noticeFrequencyChanged(float f, const RadioStation *)
{ {
m_frequency = f; m_frequency = f;
tqrepaint (); repaint ();
return true; return true;
} }
@ -320,10 +320,10 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
xx_sg = r.x() + margin, xx_sg = r.x() + margin,
xy_sg = r.y() + margin; xy_sg = r.y() + margin;
TQPen activePen (tqcolorGroup().color(TQColorGroup::Text), penw); TQPen activePen (colorGroup().color(TQColorGroup::Text), penw);
TQPen inactivePen (tqcolorGroup().color(TQColorGroup::Mid), penw); TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), penw);
TQBrush activeBrush = tqcolorGroup().brush(TQColorGroup::Text); TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text);
TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid); TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
// draw stereo symbol // draw stereo symbol
paint->setPen( (m_stereo && m_power) ? activePen : inactivePen); paint->setPen( (m_stereo && m_power) ? activePen : inactivePen);
@ -403,9 +403,9 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
TQString s; TQString s;
if (m_frequency < 10) { 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 { } 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; float pxs = xh_f;

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

@ -16,7 +16,7 @@
***************************************************************************/ ***************************************************************************/
#include <math.h> #include <math.h>
#include <tqlayout.h> #include <layout.h>
#include <tqslider.h> #include <tqslider.h>
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <tqaccel.h> #include <tqaccel.h>

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

@ -17,7 +17,7 @@
#include <math.h> #include <math.h>
#include <tqslider.h> #include <tqslider.h>
#include <tqlayout.h> #include <layout.h>
#include <tqaccel.h> #include <tqaccel.h>
#include <tqtooltip.h> #include <tqtooltip.h>
@ -37,7 +37,7 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
{ {
float v = 0; float v = 0;
SoundStreamID ssid = queryCurrentSoundStreamID(); SoundStreamID ssid = queryCurrentSoundStreamID();
sendLogDebug (TQString ("RadioViewVolume: ssid=%1").tqarg(ssid.getID())); sendLogDebug (TQString ("RadioViewVolume: ssid=%1").arg(ssid.getID()));
queryPlaybackVolume(ssid, v); queryPlaybackVolume(ssid, v);
m_slider = new TQSlider(SLIDER_MINVAL, m_slider = new TQSlider(SLIDER_MINVAL,
SLIDER_MAXVAL, SLIDER_MAXVAL,

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

@ -64,7 +64,7 @@ LircSupport::LircSupport(const TQString &name)
TQFile lircrc(slircrc); TQFile lircrc(slircrc);
if (!lircrc.exists()) { 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")); TQFile default_lircrc(locate("data", "kradio/default-dot-lircrc"));
lircrc.open(IO_WriteOnly); lircrc.open(IO_WriteOnly);
default_lircrc.open(IO_ReadOnly); 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) { // if (n < size) {
// m_PlaybackSkipCount += size - n; // m_PlaybackSkipCount += size - n;
// } else if (m_PlaybackSkipCount > 0) { // } 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; // m_PlaybackSkipCount = 0;
// } // }
@ -504,7 +504,7 @@ void OSSSoundDevice::slotPoll()
bytesRead = 0; bytesRead = 0;
} else if (bytesRead == 0) { } else if (bytesRead == 0) {
err = -1; 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 { } else {
err = errno; err = errno;
} }
@ -514,7 +514,7 @@ void OSSSoundDevice::slotPoll()
buffer = m_CaptureBuffer.getData(size); buffer = m_CaptureBuffer.getData(size);
time_t cur_time = time(NULL); time_t cur_time = time(NULL);
size_t consumed_size = SIZE_T_DONT_CARE; 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) if (consumed_size == SIZE_T_DONT_CARE)
consumed_size = size; consumed_size = size;
m_CaptureBuffer.removeData(consumed_size); m_CaptureBuffer.removeData(consumed_size);
@ -546,7 +546,7 @@ void OSSSoundDevice::slotPoll()
} }
if (err) { 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()) 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); m_DSP_fd = open(m_DSPDeviceName.ascii(), O_NONBLOCK | O_RDONLY);
bool err = m_DSP_fd < 0; bool err = m_DSP_fd < 0;
if (err) { if (err) {
logError(i18n("Cannot open DSP device %1").tqarg(m_DSPDeviceName)); logError(i18n("Cannot open DSP device %1").arg(m_DSPDeviceName));
return false; return false;
} }
int caps = 0; int caps = 0;
err |= (ioctl (m_DSP_fd, SNDCTL_DSP_GETCAPS, &caps) != 0); err |= (ioctl (m_DSP_fd, SNDCTL_DSP_GETCAPS, &caps) != 0);
if (err) 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; m_DuplexMode = (caps & DSP_CAP_DUPLEX) ? DUPLEX_FULL : DUPLEX_HALF;
close (m_DSP_fd); close (m_DSP_fd);
@ -616,24 +616,24 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
err = m_DSP_fd < 0; err = m_DSP_fd < 0;
if (err) { if (err) {
logError(i18n("Cannot open DSP device %1").tqarg(m_DSPDeviceName)); logError(i18n("Cannot open DSP device %1").arg(m_DSPDeviceName));
return false; return false;
} }
int oss_format = getOSSFormat(m_DSPFormat); int oss_format = getOSSFormat(m_DSPFormat);
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SETFMT, &oss_format) != 0); err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SETFMT, &oss_format) != 0);
if (err) 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; int channels = m_DSPFormat.m_Channels;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_CHANNELS, &channels) != 0); err |= (ioctl(m_DSP_fd, SNDCTL_DSP_CHANNELS, &channels) != 0);
if (err) 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; int rate = m_DSPFormat.m_SampleRate;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SPEED, &rate) != 0); err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SPEED, &rate) != 0);
if (err) 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) { if (rate != (int)m_DSPFormat.m_SampleRate) {
logWarning(i18n("Asking for %1 Hz but %2 uses %3 Hz"). logWarning(i18n("Asking for %1 Hz but %2 uses %3 Hz").
arg(TQString::number(m_DSPFormat.m_SampleRate)). 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; int stereo = m_DSPFormat.m_Channels == 2;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_STEREO, &stereo) != 0); err |= (ioctl(m_DSP_fd, SNDCTL_DSP_STEREO, &stereo) != 0);
if (err) 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; unsigned sampleSize = m_DSPFormat.m_SampleBits;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SAMPLESIZE, &sampleSize) != 0); err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SAMPLESIZE, &sampleSize) != 0);
if (err || sampleSize != m_DSPFormat.m_SampleBits) 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 // setup buffer, ask for 40ms latency
int tmp = (400 * m_DSPFormat.frameSize() * m_DSPFormat.m_SampleRate) / 1000; 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; mask |= 0x7FFF0000;
err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &mask); err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &mask);
if (err) 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; int bufferBlockSize = 0;
err |= ioctl (m_DSP_fd, SNDCTL_DSP_GETBLKSIZE, &bufferBlockSize); err |= ioctl (m_DSP_fd, SNDCTL_DSP_GETBLKSIZE, &bufferBlockSize);
if (err) { 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 { } 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; size_t tmp = (((m_BufferSize - 1) / bufferBlockSize) + 1) * bufferBlockSize;
setBufferSize(tmp); 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; 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); m_Mixer_fd = open(m_MixerDeviceName.ascii(), O_RDONLY);
if (m_Mixer_fd < 0) { 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 { } else {
m_PollingTimer.start(40); m_PollingTimer.start(40);
} }
@ -754,7 +754,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS
fd = open(m_MixerDeviceName.ascii(), O_RDONLY); fd = open(m_MixerDeviceName.ascii(), O_RDONLY);
if (fd < 0) { 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) { if (fd >= 0) {
@ -768,7 +768,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS
} }
} }
} else { } 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) if (fd != m_Mixer_fd)
@ -874,8 +874,8 @@ float OSSSoundDevice::readMixerVolume(int channel) const
if (err) { if (err) {
logError("OSSSound::readMixerVolume: " + logError("OSSSound::readMixerVolume: " +
i18n("error %1 while reading volume from %2") i18n("error %1 while reading volume from %2")
.tqarg(TQString().setNum(err)) .arg(TQString().setNum(err))
.tqarg(m_MixerDeviceName)); .arg(m_MixerDeviceName));
tmpvol.l = tmpvol.r = 0; tmpvol.l = tmpvol.r = 0;
} }
return float(tmpvol.l) / 100.0; return float(tmpvol.l) / 100.0;
@ -897,9 +897,9 @@ float OSSSoundDevice::writeMixerVolume (int channel, float vol)
if (err != 0) { if (err != 0) {
logError("OSSSoundDevice::writeMixerVolume: " + logError("OSSSoundDevice::writeMixerVolume: " +
i18n("error %1 while setting volume to %2 on device %3") i18n("error %1 while setting volume to %2 on device %3")
.tqarg(TQString().setNum(err)) .arg(TQString().setNum(err))
.tqarg(TQString().setNum(vol)) .arg(TQString().setNum(vol))
.tqarg(m_MixerDeviceName)); .arg(m_MixerDeviceName));
return -1; return -1;
} }
} }
@ -913,21 +913,21 @@ void OSSSoundDevice::selectCaptureChannel (int channel)
int err = ioctl(m_Mixer_fd, SOUND_MIXER_WRITE_RECSRC, &x); int err = ioctl(m_Mixer_fd, SOUND_MIXER_WRITE_RECSRC, &x);
if (err) if (err)
logError(i18n("Selecting recording source on device %1 failed with error code %2") logError(i18n("Selecting recording source on device %1 failed with error code %2")
.tqarg(m_MixerDeviceName) .arg(m_MixerDeviceName)
.tqarg(TQString::number(err))); .arg(TQString::number(err)));
_lrvol tmpvol; _lrvol tmpvol;
err = ioctl(m_Mixer_fd, MIXER_READ(SOUND_MIXER_IGAIN), &tmpvol); err = ioctl(m_Mixer_fd, MIXER_READ(SOUND_MIXER_IGAIN), &tmpvol);
if (err) if (err)
logError(i18n("Reading igain volume on device %1 failed with error code %2") logError(i18n("Reading igain volume on device %1 failed with error code %2")
.tqarg(m_MixerDeviceName) .arg(m_MixerDeviceName)
.tqarg(TQString::number(err))); .arg(TQString::number(err)));
if (tmpvol.r == 0 && tmpvol.l == 0) { if (tmpvol.r == 0 && tmpvol.l == 0) {
tmpvol.r = tmpvol.l = 1; tmpvol.r = tmpvol.l = 1;
err = ioctl(m_Mixer_fd, MIXER_WRITE(SOUND_MIXER_IGAIN), &tmpvol); err = ioctl(m_Mixer_fd, MIXER_WRITE(SOUND_MIXER_IGAIN), &tmpvol);
if (err) if (err)
logError(i18n("Setting igain volume on device %1 failed with error code %2") logError(i18n("Setting igain volume on device %1 failed with error code %2")
.tqarg(m_MixerDeviceName) .arg(m_MixerDeviceName)
.tqarg(TQString::number(err))); .arg(TQString::number(err)));
} }
} }
@ -983,7 +983,7 @@ void OSSSoundDevice::setDSPDeviceName(const TQString &s)
TQString OSSSoundDevice::getSoundStreamClientDescription() const TQString OSSSoundDevice::getSoundStreamClientDescription() const
{ {
return i18n("OSS Sound Device %1").tqarg(PluginBase::name()); return i18n("OSS Sound Device %1").arg(PluginBase::name());
} }

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

@ -36,7 +36,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout32</cstring> <cstring>layout32</cstring>
</property> </property>
<property name="margin" stdset="0"> <property name="margin" stdset="0">
<number>6</number> <number>6</number>
@ -55,7 +55,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout22</cstring> <cstring>layout22</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -63,7 +63,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -84,7 +84,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -122,7 +122,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>10</height> <height>10</height>
@ -157,7 +157,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout21</cstring> <cstring>layout21</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -228,7 +228,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout18</cstring> <cstring>layout18</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -249,7 +249,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -280,7 +280,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout32</cstring> <cstring>layout32</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -311,7 +311,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -327,7 +327,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -358,7 +358,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -377,7 +377,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout19</cstring> <cstring>layout19</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -395,7 +395,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -415,7 +415,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>5</height> <height>5</height>
@ -434,7 +434,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>10</height> <height>10</height>
@ -443,7 +443,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout20</cstring> <cstring>layout20</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -481,7 +481,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -494,7 +494,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout25</cstring> <cstring>layout25</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -541,7 +541,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -550,7 +550,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout21</cstring> <cstring>layout21</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -579,7 +579,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout19</cstring> <cstring>layout19</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -683,7 +683,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -697,7 +697,7 @@
<property name="text"> <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> <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>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
</widget> </widget>
@ -705,7 +705,7 @@
<property name="name"> <property name="name">
<cstring>mailLabel</cstring> <cstring>mailLabel</cstring>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>

2
kradio3/plugins/radio/radio-configuration.cpp
Unescape View File

@ -484,7 +484,7 @@ void RadioConfiguration::slotStorePresets()
void RadioConfiguration::slotLastChangeNow() void RadioConfiguration::slotLastChangeNow()
{ {
slotSetDirty(); slotSetDirty();
editLastChange->setDateTime(TQDateTime::tqcurrentDateTime()); editLastChange->setDateTime(TQDateTime::currentDateTime());
} }

14
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); m_MP3BufferSize);
lameSerialization.unlock(); lameSerialization.unlock();
if (n < 0) { 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; m_error = true;
} else if (n > 0) { } else if (n > 0) {
m_encodedSize += n; 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); int r = fwrite(m_MP3Buffer, 1, n, m_MP3Output);
if (r <= 0) { 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; m_error = true;
} }
} }
@ -120,13 +120,13 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
if (lame_init_params(m_LAMEFlags) < 0) { if (lame_init_params(m_LAMEFlags) < 0) {
m_error = true; m_error = true;
m_errorString += i18n("Cannot initialize libmp3lame parameters. ").tqarg(output); m_errorString += i18n("Cannot initialize libmp3lame parameters. ").arg(output);
} }
if (!m_error) { if (!m_error) {
id3tag_init(m_LAMEFlags); id3tag_init(m_LAMEFlags);
id3tag_add_v2(m_LAMEFlags); id3tag_add_v2(m_LAMEFlags);
TQString title = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)).ascii()); TQString title = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::currentDateTime().toString(Qt::ISODate)).ascii());
TQString comment = i18n("Recorded by KRadio"); TQString comment = i18n("Recorded by KRadio");
size_t l = title.length() + comment.length() + 10; size_t l = title.length() + comment.length() + 10;
m_ID3Tags = new char[l]; m_ID3Tags = new char[l];
@ -140,7 +140,7 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
m_MP3Output = fopen(output.ascii(), "wb+"); m_MP3Output = fopen(output.ascii(), "wb+");
if (!m_MP3Output) { 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; m_error = true;
} }
@ -186,12 +186,12 @@ void RecordingEncodingMP3::closeOutput()
m_MP3BufferSize); m_MP3BufferSize);
if (n < 0) { if (n < 0) {
m_error = true; 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) { } else if (n > 0) {
int r = fwrite(m_MP3Buffer, 1, n, m_MP3Output); int r = fwrite(m_MP3Buffer, 1, n, m_MP3Output);
if (r <= 0) { if (r <= 0) {
m_error = true; 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 { } else {
lame_mp3_tags_fid(m_LAMEFlags, m_MP3Output); lame_mp3_tags_fid(m_LAMEFlags, m_MP3Output);
} }

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

@ -133,7 +133,7 @@ bool RecordingEncodingOgg::openOutput(const TQString &output)
#ifdef HAVE_OGG #ifdef HAVE_OGG
m_OggOutput = fopen(output.ascii(), "wb+"); m_OggOutput = fopen(output.ascii(), "wb+");
if (!m_OggOutput) { 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; m_error = true;
} }
@ -176,7 +176,7 @@ bool RecordingEncodingOgg::openOutput(const TQString &output)
vorbis_comment_init (&vc); vorbis_comment_init (&vc);
vorbis_comment_add_tag_new(&vc, "creator", "KRadio" VERSION); vorbis_comment_add_tag_new(&vc, "creator", "KRadio" VERSION);
vorbis_comment_add_tag_new(&vc, "title", m_RadioStation->longName().utf8()); vorbis_comment_add_tag_new(&vc, "title", m_RadioStation->longName().utf8());
vorbis_comment_add_tag_new(&vc, "date", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); vorbis_comment_add_tag_new(&vc, "date", TQDateTime::currentDateTime().toString(Qt::ISODate));
vorbis_analysis_headerout(&m_VorbisDSP, &vc, vorbis_analysis_headerout(&m_VorbisDSP, &vc,
&header_main, &header_comments, &header_codebooks); &header_main, &header_comments, &header_codebooks);

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) { if (err != (int)buffer_size) {
m_error = true; 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) { if (!m_output) {
m_error = true; 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; return !m_error;
} }

36
kradio3/plugins/recording/recording-configuration-ui.ui
Unescape View File

@ -42,7 +42,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -50,7 +50,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout3_2</cstring> <cstring>layout3_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -66,7 +66,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>141</width> <width>141</width>
<height>20</height> <height>20</height>
@ -91,7 +91,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="2"> <widget class="TQLayoutWidget" row="1" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -107,7 +107,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>141</width> <width>141</width>
<height>20</height> <height>20</height>
@ -222,7 +222,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -247,7 +247,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout69</cstring> <cstring>layout69</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -263,7 +263,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>225</width> <width>225</width>
<height>20</height> <height>20</height>
@ -321,7 +321,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>225</width> <width>225</width>
<height>20</height> <height>20</height>
@ -454,7 +454,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>225</width> <width>225</width>
<height>20</height> <height>20</height>
@ -473,7 +473,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -498,7 +498,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -563,7 +563,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -588,7 +588,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout68</cstring> <cstring>layout68</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -596,7 +596,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -623,7 +623,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>380</width> <width>380</width>
<height>20</height> <height>20</height>
@ -634,7 +634,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -688,7 +688,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

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

@ -50,7 +50,7 @@ RecordingDataMonitor::RecordingDataMonitor(TQWidget *parent, const char *name)
setColors(TQColor(20, 244, 20), setColors(TQColor(20, 244, 20),
TQColor(10, 117, 10)); TQColor(10, 117, 10));
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
} }
@ -107,10 +107,10 @@ void RecordingDataMonitor::internalDrawContents(TQPainter &painter, bool repaint
if (m_channels <= 0) return; if (m_channels <= 0) return;
TQRect r = contentsRect(); TQRect r = contentsRect();
TQPen activePen (tqcolorGroup().color(TQColorGroup::Text), 1); TQPen activePen (colorGroup().color(TQColorGroup::Text), 1);
TQPen inactivePen (tqcolorGroup().color(TQColorGroup::Mid), 1); TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), 1);
TQBrush activeBrush = tqcolorGroup().brush(TQColorGroup::Text); TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text);
TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid); TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
TQBrush yellowBrush(TQColor(255,255,0)); TQBrush yellowBrush(TQColor(255,255,0));
TQBrush orangeBrush(TQColor(255,192,0)); TQBrush orangeBrush(TQColor(255,192,0));
TQBrush redBrush (TQColor(255,0, 0)); TQBrush redBrush (TQColor(255,0, 0));
@ -171,12 +171,12 @@ void RecordingDataMonitor::internalDrawContents(TQPainter &painter, bool repaint
f.setPixelSize(CHANNEL_H_MIN); f.setPixelSize(CHANNEL_H_MIN);
painter.setFont(f); 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; int delta_dB = 5;
while (abs((long)min_dB) / delta_dB * maxW * 2 > r.width()) delta_dB *= 2; while (abs((long)min_dB) / delta_dB * maxW * 2 > r.width()) delta_dB *= 2;
for (int dB = 0; dB >= min_dB; dB -= delta_dB) { 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 w = TQFontMetrics(f).width(txt);
int x = x0 + (int)(nBlocks * BLOCK_W_MIN * (min_dB - dB) / min_dB) - w; int x = x0 + (int)(nBlocks * BLOCK_W_MIN * (min_dB - dB) / min_dB) - w;
if (x < x0) continue; if (x < x0) continue;
@ -223,11 +223,11 @@ bool RecordingDataMonitor::setColors(const TQColor &activeText,
if (parentWidget() && parentWidget()->backgroundPixmap() ){ if (parentWidget() && parentWidget()->backgroundPixmap() ){
KPixmapIO io; KPixmapIO io;
TQImage i = io.convertToImage(*parentWidget()->backgroundPixmap()); TQImage i = io.convertToImage(*parentWidget()->backgroundPixmap());
KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark)); KImageEffect::fade(i, 0.5, colorGroup().color(TQColorGroup::Dark));
setPaletteBackgroundPixmap(io.convertToPixmap(i)); setPaletteBackgroundPixmap(io.convertToPixmap(i));
setBackgroundOrigin(WindowOrigin); setBackgroundOrigin(WindowOrigin);
} else { } else {
setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button)); setBackgroundColor(colorGroup().color(TQColorGroup::Button));
} }
return true; return true;
@ -267,7 +267,7 @@ bool RecordingDataMonitor::noticeSoundStreamData(SoundStreamID /*id*/,
TQPainter paint(this); TQPainter paint(this);
if (m_maxValue != old_max) { if (m_maxValue != old_max) {
tqrepaint(true); repaint(true);
} else { } else {
internalDrawContents(paint, false); internalDrawContents(paint, false);
} }

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

@ -21,7 +21,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqlayout.h> #include <layout.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kcombobox.h> #include <kcombobox.h>
@ -43,7 +43,7 @@ RecordingMonitor::RecordingMonitor(const TQString &name)
l0->addWidget( new TQLabel(i18n("SoundStream"), this), 0, 0); l0->addWidget( new TQLabel(i18n("SoundStream"), this), 0, 0);
l0->addWidget(m_comboSoundStreamSelector = new KComboBox( this), 0, 1); l0->addWidget(m_comboSoundStreamSelector = new KComboBox( this), 0, 1);
l0->addWidget( new TQLabel(i18n("Status"), this), 1, 0); l0->addWidget( new TQLabel(i18n("Status"), this), 1, 0);
l0->addWidget(m_labeltqStatus = new TQLabel(i18n("<undefined>"), this), 1, 1); l0->addWidget(m_labelStatus = new TQLabel(i18n("<undefined>"), this), 1, 1);
l0->addWidget( new TQLabel(i18n("Recording File"), this), 2, 0); l0->addWidget( new TQLabel(i18n("Recording File"), this), 2, 0);
l0->addWidget(m_labelFileName = new TQLabel(i18n("<undefined>"), this), 2, 1); l0->addWidget(m_labelFileName = new TQLabel(i18n("<undefined>"), this), 2, 1);
l0->addWidget( new TQLabel(i18n("File Size"), this), 3, 0); l0->addWidget( new TQLabel(i18n("File Size"), this), 3, 0);
@ -336,13 +336,13 @@ bool RecordingMonitor::noticeSoundStreamData(SoundStreamID id,
double MB = kB / 1024; double MB = kB / 1024;
double GB = MB / 1024; double GB = MB / 1024;
TQString str_size; TQString str_size;
str_size = i18n("%1 Byte").tqarg(KGlobal::locale()->formatNumber((int)B, 0)); str_size = i18n("%1 Byte").arg(KGlobal::locale()->formatNumber((int)B, 0));
if (kB > 1) str_size = i18n("%1 kB").tqarg(KGlobal::locale()->formatNumber(kB, 3)); if (kB > 1) str_size = i18n("%1 kB").arg(KGlobal::locale()->formatNumber(kB, 3));
if (MB > 1) str_size = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber(MB, 3)); if (MB > 1) str_size = i18n("%1 MB").arg(KGlobal::locale()->formatNumber(MB, 3));
if (GB > 1) str_size = i18n("%1 GB").tqarg(KGlobal::locale()->formatNumber(GB, 3)); if (GB > 1) str_size = i18n("%1 GB").arg(KGlobal::locale()->formatNumber(GB, 3));
m_labelSize->setText(str_size); 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 true;
} }
return false; return false;
@ -369,7 +369,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
m_labelTime ->setEnabled(true); m_labelTime ->setEnabled(true);
m_labelRate ->setEnabled(true); m_labelRate ->setEnabled(true);
m_labelFileName ->setEnabled(true); m_labelFileName ->setEnabled(true);
m_labeltqStatus ->setEnabled(true); m_labelStatus ->setEnabled(true);
} else { } else {
m_dataMonitor ->setEnabled(false); m_dataMonitor ->setEnabled(false);
m_labelSize ->setEnabled(false); m_labelSize ->setEnabled(false);
@ -377,7 +377,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
m_labelTime ->setEnabled(false); m_labelTime ->setEnabled(false);
m_labelRate ->setEnabled(false); m_labelRate ->setEnabled(false);
m_labelFileName ->setEnabled(false); m_labelFileName ->setEnabled(false);
m_labeltqStatus ->setEnabled(false); m_labelStatus ->setEnabled(false);
} }
m_currentStream = id; m_currentStream = id;
m_recording = false; m_recording = false;

2
kradio3/plugins/recording/recording-monitor.h
Unescape View File

@ -105,7 +105,7 @@ protected:
TQLabel *m_labelTime; TQLabel *m_labelTime;
TQLabel *m_labelRate; TQLabel *m_labelRate;
TQLabel *m_labelFileName; TQLabel *m_labelFileName;
TQLabel *m_labeltqStatus; TQLabel *m_labelStatus;
TQPushButton *m_btnStartStop; TQPushButton *m_btnStartStop;
KComboBox *m_comboSoundStreamSelector; KComboBox *m_comboSoundStreamSelector;

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

@ -479,7 +479,7 @@ bool Recording::noticeSoundStreamData(SoundStreamID id,
size_t bufferSize = remSize; size_t bufferSize = remSize;
char *buf = thread->lockInputBuffer(bufferSize); char *buf = thread->lockInputBuffer(bufferSize);
if (!buf) { 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; break;
} }
if (bufferSize > remSize) { if (bufferSize > remSize) {
@ -529,7 +529,7 @@ bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
TQString station = rs ? rs->name() + "-" : ""; TQString station = rs ? rs->name() + "-" : "";
station.replace(TQRegExp("[/*?]"), "_"); station.replace(TQRegExp("[/*?]"), "_");
TQDate date = TQDate::tqcurrentDate(); TQDate date = TQDate::currentDate();
TQTime time = TQTime::currentTime(); TQTime time = TQTime::currentTime();
TQString sdate; TQString sdate;
@ -644,7 +644,7 @@ bool Recording::event(TQEvent *_e)
notifySoundStreamData(m_RawStreams2EncodedStreams[id], thread->config().m_SoundFormat, notifySoundStreamData(m_RawStreams2EncodedStreams[id], thread->config().m_SoundFormat,
step->data(), step->size(), consumed_size, step->metaData()); step->data(), step->size(), consumed_size, step->metaData());
if (consumed_size != SIZE_T_DONT_CARE && consumed_size < step->size()) { 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));
} }
} }
} }

52
kradio3/plugins/streaming/streaming-configuration-ui.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout48</cstring> <cstring>layout48</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -124,7 +124,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="3"> <widget class="TQLayoutWidget" row="1" column="3">
<property name="name"> <property name="name">
<cstring>tqlayout38_2</cstring> <cstring>layout38_2</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -142,13 +142,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -173,13 +173,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -202,7 +202,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>10</height> <height>10</height>
@ -221,13 +221,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -252,13 +252,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -275,7 +275,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout38</cstring> <cstring>layout38</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -293,13 +293,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -324,13 +324,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -353,7 +353,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>10</height> <height>10</height>
@ -372,13 +372,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -403,13 +403,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -658,7 +658,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>
@ -675,7 +675,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>
@ -692,7 +692,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>
@ -709,7 +709,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>
@ -726,7 +726,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>

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(); size_t free = m_Buffer.getFreeSize();
if (free < data.size()) { if (free < data.size()) {
m_SkipCount += data.size() - free; 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 { else {
free = data.size(); 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; const char *buffer = NULL;
size_t size = SIZE_T_DONT_CARE; size_t size = SIZE_T_DONT_CARE;
size_t consumed_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 x.lockData(buffer, size, meta_data); // get pointer to data and meta-data content
if (size > free_size) if (size > free_size)
size = free_size; size = free_size;
@ -400,7 +400,7 @@ bool StreamingDevice::noticeReadyForPlaybackData(SoundStreamID id, size_t free_s
x.removeData(consumed_size); x.removeData(consumed_size);
free_size -= consumed_size; free_size -= consumed_size;
if (consumed_size < 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; break;
} }
} }
@ -423,18 +423,18 @@ const TQStringList &StreamingDevice::getCaptureChannels() const
TQString StreamingDevice::getSoundStreamClientDescription() 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) 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) 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));
} }

28
kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
Unescape View File

@ -18,7 +18,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -62,7 +62,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -87,7 +87,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -95,7 +95,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -150,7 +150,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout17</cstring> <cstring>layout17</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -158,7 +158,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout28</cstring> <cstring>layout28</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -166,7 +166,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout27</cstring> <cstring>layout27</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -189,7 +189,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout28</cstring> <cstring>layout28</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -212,7 +212,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout29</cstring> <cstring>layout29</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -249,7 +249,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -273,7 +273,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>100</height> <height>100</height>
@ -348,7 +348,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout20</cstring> <cstring>layout20</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -358,7 +358,7 @@
<property name="name"> <property name="name">
<cstring>pixmapAlarmStation</cstring> <cstring>pixmapAlarmStation</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -378,7 +378,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>150</width> <width>150</width>
<height>20</height> <height>20</height>

2
kradio3/plugins/timecontrol/timecontrol-configuration.cpp
Unescape View File

@ -371,7 +371,7 @@ void TimeControlConfiguration::slotAlarmSelectChanged(int idx)
void TimeControlConfiguration::slotNewAlarm() void TimeControlConfiguration::slotNewAlarm()
{ {
TQDateTime dt(TQDateTime::tqcurrentDateTime()); TQDateTime dt(TQDateTime::currentDateTime());
Alarm a(dt, false, false); Alarm a(dt, false, false);
alarms.push_back(a); alarms.push_back(a);
listAlarms->insertItem(a.alarmTime().toString()); listAlarms->insertItem(a.alarmTime().toString());

6
kradio3/plugins/timecontrol/timecontrol.cpp
Unescape View File

@ -102,7 +102,7 @@ bool TimeControl::setCountdownSeconds(int n)
bool TimeControl::startCountdown() bool TimeControl::startCountdown()
{ {
m_countdownEnd = TQDateTime::tqcurrentDateTime().addSecs(m_countdownSeconds); m_countdownEnd = TQDateTime::currentDateTime().addSecs(m_countdownSeconds);
m_countdownTimer.start(m_countdownSeconds * 1000, true); m_countdownTimer.start(m_countdownSeconds * 1000, true);
notifyCountdownStarted(getCountdownEnd()); notifyCountdownStarted(getCountdownEnd());
@ -134,7 +134,7 @@ TQDateTime TimeControl::getNextAlarmTime() const
const Alarm *TimeControl::getNextAlarm () const const Alarm *TimeControl::getNextAlarm () const
{ {
TQDateTime now = TQDateTime::tqcurrentDateTime(), TQDateTime now = TQDateTime::currentDateTime(),
next; next;
const Alarm *retval = NULL; const Alarm *retval = NULL;
@ -180,7 +180,7 @@ void TimeControl::slotQTimerAlarmTimeout()
notifyAlarm(*m_waitingFor); notifyAlarm(*m_waitingFor);
} }
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
Alarm const *n = getNextAlarm(); Alarm const *n = getNextAlarm();
TQDateTime na = getNextAlarmTime(); TQDateTime na = getNextAlarmTime();

14
kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
Unescape View File

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -40,7 +40,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>21</height> <height>21</height>
@ -57,7 +57,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>104</width> <width>104</width>
<height>21</height> <height>21</height>
@ -133,7 +133,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>26</width> <width>26</width>
<height>26</height> <height>26</height>
@ -166,7 +166,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>21</height> <height>21</height>
@ -183,7 +183,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>21</height> <height>21</height>
@ -202,7 +202,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>61</height> <height>61</height>

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_newID = m_NewStreamID;
SoundStreamID tmp_orgID = m_OrgStreamID; SoundStreamID tmp_orgID = m_OrgStreamID;
m_OrgStreamID.tqinvalidate(); m_OrgStreamID.invalidate();
m_NewStreamID.tqinvalidate(); m_NewStreamID.invalidate();
sendStopCapture(tmp_newID); sendStopCapture(tmp_newID);
closeSoundStream(tmp_newID); closeSoundStream(tmp_newID);
@ -182,7 +182,7 @@ bool TimeShifter::pausePlayback(SoundStreamID id)
sendMute(newid); sendMute(newid);
sendPlaybackVolume(newid, 0); sendPlaybackVolume(newid, 0);
m_NewStreamID.tqinvalidate(); m_NewStreamID.invalidate();
sendStopPlayback(newid); sendStopPlayback(newid);
m_NewStreamID = newid; m_NewStreamID = newid;
@ -352,7 +352,7 @@ bool TimeShifter::noticeReadyForPlaybackData(SoundStreamID id, size_t free_size)
free_size -= consumed_size; free_size -= consumed_size;
m_PlaybackDataLeftInBuffer -= consumed_size; m_PlaybackDataLeftInBuffer -= consumed_size;
if (consumed_size < s) { 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 free_size = 0; // break condition for outer loop
break; break;
} }

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

@ -53,7 +53,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>21</height> <height>21</height>
@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>21</height> <height>21</height>
@ -103,7 +103,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>21</height> <height>21</height>
@ -120,7 +120,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>21</height> <height>21</height>
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>21</height> <height>21</height>
@ -154,7 +154,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>152</width> <width>152</width>
<height>21</height> <height>21</height>
@ -292,7 +292,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>5</width> <width>5</width>
<height>5</height> <height>5</height>
@ -374,7 +374,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout37</cstring> <cstring>layout37</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -549,7 +549,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -574,7 +574,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout35</cstring> <cstring>layout35</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -593,13 +593,13 @@
<property name="text"> <property name="text">
<string>volume</string> <string>volume</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout34</cstring> <cstring>layout34</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -615,7 +615,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -643,7 +643,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -664,7 +664,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout35_2</cstring> <cstring>layout35_2</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -683,13 +683,13 @@
<property name="text"> <property name="text">
<string>treble</string> <string>treble</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout34_2</cstring> <cstring>layout34_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -705,7 +705,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -733,7 +733,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -754,7 +754,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout35_2_2</cstring> <cstring>layout35_2_2</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -773,13 +773,13 @@
<property name="text"> <property name="text">
<string>bass</string> <string>bass</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout34_2_3</cstring> <cstring>layout34_2_3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -795,7 +795,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -823,7 +823,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -844,7 +844,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="3"> <widget class="TQLayoutWidget" row="0" column="3">
<property name="name"> <property name="name">
<cstring>tqlayout51</cstring> <cstring>layout51</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -860,7 +860,7 @@
<property name="text"> <property name="text">
<string>balance</string> <string>balance</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
@ -874,7 +874,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>33</height> <height>33</height>
@ -911,7 +911,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>33</height> <height>33</height>

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

@ -31,7 +31,7 @@
#include <string.h> // memcpy needed #include <string.h> // memcpy needed
#include <tqlayout.h> #include <layout.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
@ -656,7 +656,7 @@ bool V4LRadio::setFrequency(float freq)
if (freq > maxf || freq < minf) { if (freq > maxf || freq < minf) {
logError("V4LRadio::setFrequency: " + logError("V4LRadio::setFrequency: " +
i18n("invalid frequency %1").tqarg(TQString().setNum(freq))); i18n("invalid frequency %1").arg(TQString().setNum(freq)));
if (!oldMute && !m_ActivePlayback) if (!oldMute && !m_ActivePlayback)
unmute(m_SoundStreamID); unmute(m_SoundStreamID);
return false; return false;
@ -678,14 +678,14 @@ bool V4LRadio::setFrequency(float freq)
else { else {
logError("V4LRadio::setFrequency: " + logError("V4LRadio::setFrequency: " +
i18n("don't known how to handle V4L-version %1") i18n("don't known how to handle V4L-version %1")
.tqarg(m_caps.version)); .arg(m_caps.version));
} }
if (r) { if (r) {
logError("V4LRadio::setFrequency: " + logError("V4LRadio::setFrequency: " +
i18n("error setting frequency to %1 (%2)") i18n("error setting frequency to %1 (%2)")
.tqarg(TQString().setNum(freq)) .arg(TQString().setNum(freq))
.tqarg(TQString().setNum(r))); .arg(TQString().setNum(r)));
// unmute the old radio with the old radio station // unmute the old radio with the old radio station
if (!oldMute && !m_ActivePlayback) if (!oldMute && !m_ActivePlayback)
unmute(m_SoundStreamID); unmute(m_SoundStreamID);
@ -1001,7 +1001,7 @@ void V4LRadio::restoreState (KConfig *config)
else { else {
if (found_devname.isNull()) if (found_devname.isNull())
found_devname = *it; 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(); radio_done();
logError("V4LRadio::radio_init: " + logError("V4LRadio::radio_init: " +
i18n("Cannot open mixer device %1").tqarg(m_mixerDev)); i18n("Cannot open mixer device %1").arg(m_mixerDev));
return; return;
} }
*/ */
@ -1132,7 +1132,7 @@ void V4LRadio::radio_init()
radio_done(); radio_done();
logError("V4LRadio::radio_init: " + logError("V4LRadio::radio_init: " +
i18n("Cannot open radio device %1").tqarg(m_radioDev)); i18n("Cannot open radio device %1").arg(m_radioDev));
return; return;
} }
@ -1183,7 +1183,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
if (fd < 0) { if (fd < 0) {
logError("V4LRadio::readV4LCaps: " + logError("V4LRadio::readV4LCaps: " +
i18n("cannot open %1").tqarg(device)); i18n("cannot open %1").arg(device));
return c; return c;
} }
@ -1207,7 +1207,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
video_audio audiocaps; video_audio audiocaps;
if (0 == ioctl(fd, VIDIOCGAUDIO, &audiocaps)) { if (0 == ioctl(fd, VIDIOCGAUDIO, &audiocaps)) {
logDebug("V4LRadio::readV4LCaps: " + 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) if ((audiocaps.flags & VIDEO_AUDIO_MUTABLE) != 0)
c.hasMute = true; c.hasMute = true;
if ((audiocaps.flags & VIDEO_AUDIO_VOLUME) != 0) if ((audiocaps.flags & VIDEO_AUDIO_VOLUME) != 0)
@ -1230,7 +1230,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
if (r == 0) { if (r == 0) {
c.version = 2; 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); size_t l = sizeof(caps.name);
l = l < CAPS_NAME_LEN ? l : CAPS_NAME_LEN; l = l < CAPS_NAME_LEN ? l : CAPS_NAME_LEN;
@ -1289,7 +1289,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
} }
#endif #endif
if (c.version > 0) { if (c.version > 0) {
logInfo(i18n("V4L %1 detected").tqarg(c.version)); logInfo(i18n("V4L %1 detected").arg(c.version));
} else { } else {
logError(i18n("V4L not detected")); logError(i18n("V4L not detected"));
} }
@ -1356,13 +1356,13 @@ bool V4LRadio::readTunerInfo() const
else { else {
logError("V4LRadio::readTunerInfo: " + logError("V4LRadio::readTunerInfo: " +
i18n("don't known how to handle V4L-version %1") 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) { if (r != 0) {
m_signalQuality = 0; m_signalQuality = 0;
logError("V4LRadio::readTunerInfo: " + 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 { } else {
m_signalQuality = 0; m_signalQuality = 0;
@ -1406,7 +1406,7 @@ bool V4LRadio::readTunerInfo() const
} \ } \
x = x ? x : r; \ x = x ? x : r; \
if (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) \ #define V4L2_G_CTRL(what) \
@ -1414,7 +1414,7 @@ bool V4LRadio::readTunerInfo() const
r = ioctl (m_radio_fd, VIDIOC_G_CTRL, &ctl); \ r = ioctl (m_radio_fd, VIDIOC_G_CTRL, &ctl); \
x = x ? x : r; \ x = x ? x : r; \
if (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 { else {
logError("V4LRadio::updateAudioInfo: " + logError("V4LRadio::updateAudioInfo: " +
i18n("don't known how to handle V4L-version %1") i18n("don't known how to handle V4L-version %1")
.tqarg(TQString().setNum(m_caps.version))); .arg(TQString().setNum(m_caps.version)));
} }
if (r) { if (r) {
logError("V4LRadio::updateAudioInfo: " + logError("V4LRadio::updateAudioInfo: " +
i18n("error updating radio audio info (%1): %2") i18n("error updating radio audio info (%1): %2")
.tqarg(write ? i18n("write") : i18n("read")) .arg(write ? i18n("write") : i18n("read"))
.tqarg(TQString().setNum(r))); .arg(TQString().setNum(r)));
return false; return false;
} }
} }

44
kradio3/src/aboutwidget.cpp
Unescape View File

@ -25,13 +25,13 @@
#include <tqframe.h> #include <tqframe.h>
#include <kaboutdialog.h> #include <kaboutdialog.h>
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtabbar.h> #include <tqtabbar.h>
#include <tqimage.h> #include <tqimage.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <ktextbrowser.h> #include <ktextbrowser.h>
#include <tqtextedit.h> #include <textedit.h>
#include <kdebug.h> #include <kdebug.h>
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
@ -45,8 +45,8 @@ class KRadioAboutTabWidget : public TQTabWidget
{ {
public: public:
KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
TQSize tqsizeHint() const { TQSize sizeHint() const {
return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
} }
}; };
@ -75,7 +75,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType
if( layoutType & AbtTitle ) if( layoutType & AbtTitle )
{ {
mTitleLabel = new TQLabel( this, "title" ); mTitleLabel = new TQLabel( this, "title" );
mTitleLabel->tqsetAlignment(AlignCenter); mTitleLabel->setAlignment(AlignCenter);
mTopLayout->addWidget( mTitleLabel ); mTopLayout->addWidget( mTitleLabel );
mTopLayout->addSpacing( KDialog::spacingHint() ); mTopLayout->addSpacing( KDialog::spacingHint() );
} }
@ -190,9 +190,9 @@ void KRadioAboutWidget::show( void )
TQWidget::show(); TQWidget::show();
} }
TQSize KRadioAboutWidget::tqsizeHint( void ) const TQSize KRadioAboutWidget::sizeHint( void ) const
{ {
return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
} }
void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ ) void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
@ -211,7 +211,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
f.setBold( true ); f.setBold( true );
mVersionLabel->setFont(f); mVersionLabel->setFont(f);
mAuthorLabel->setFont(f); mAuthorLabel->setFont(f);
mVersionLabel->parentWidget()->tqlayout()->activate(); mVersionLabel->parentWidget()->layout()->activate();
} }
update(); update();
@ -279,7 +279,7 @@ KAboutContainer *KRadioAboutWidget::addContainerPage( const TQString &title,
{ {
if( mPageTab == 0 ) if( mPageTab == 0 )
{ {
kdDebug(291) << "addPage: " << i18n("Invalid tqlayout") << endl; kdDebug(291) << "addPage: " << i18n("Invalid layout") << endl;
return 0; return 0;
} }
@ -309,7 +309,7 @@ KAboutContainer *KRadioAboutWidget::addScrolledContainerPage(
{ {
if( mPageTab == 0 ) if( mPageTab == 0 )
{ {
kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; kdDebug(291) << "addPage: " << "Invalid layout" << endl;
return 0; return 0;
} }
@ -338,7 +338,7 @@ TQFrame *KRadioAboutWidget::addEmptyPage( const TQString &title )
{ {
if( mPageTab == 0 ) if( mPageTab == 0 )
{ {
kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; kdDebug(291) << "addPage: " << "Invalid layout" << endl;
return 0; return 0;
} }
@ -376,7 +376,7 @@ void KRadioAboutWidget::setTitle( const TQString &title )
{ {
if( mTitleLabel == 0 ) if( mTitleLabel == 0 )
{ {
kdDebug(291) << "setTitle: " << "Invalid tqlayout" << endl; kdDebug(291) << "setTitle: " << "Invalid layout" << endl;
return; return;
} }
mTitleLabel->setText(title); mTitleLabel->setText(title);
@ -387,7 +387,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName )
{ {
if( mImageLabel == 0 ) if( mImageLabel == 0 )
{ {
kdDebug(291) << "setImage: " << "Invalid tqlayout" << endl; kdDebug(291) << "setImage: " << "Invalid layout" << endl;
return; return;
} }
if( fileName.isNull() ) if( fileName.isNull() )
@ -402,7 +402,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName )
pix = logo; pix = logo;
mImageLabel->setPixmap( pix ); mImageLabel->setPixmap( pix );
} }
mImageFrame->tqlayout()->activate(); mImageFrame->layout()->activate();
} }
@ -441,18 +441,18 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
{ {
if( mIconLabel == 0 ) if( mIconLabel == 0 )
{ {
kdDebug(291) << "setProduct: " << "Invalid tqlayout" << endl; kdDebug(291) << "setProduct: " << "Invalid layout" << endl;
return; return;
} }
if ( kapp ) if ( kapp )
mIconLabel->setPixmap( kapp->icon() ); 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::tqfromLatin1(KRADIO_VERSION)). arg(TQString::fromLatin1(KRADIO_VERSION)).
arg(TQString::tqfromLatin1(TDE_VERSION_STRING)); 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::tqfromLatin1(""); arg(author) : TQString::fromLatin1("");
mVersionLabel->setText( msg1 ); mVersionLabel->setText( msg1 );
mAuthorLabel->setText( msg2 ); mAuthorLabel->setText( msg2 );
@ -461,7 +461,7 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
mAuthorLabel->hide(); mAuthorLabel->hide();
} }
mIconLabel->parentWidget()->tqlayout()->activate(); mIconLabel->parentWidget()->layout()->activate();
} }
@ -563,7 +563,7 @@ void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData)
TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(), TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(),
translatorPage); translatorPage);
label->adjustSize(); label->adjustSize();
label->setMinimumSize(label->tqsizeHint()); label->setMinimumSize(label->sizeHint());
translatorPage->addWidget(label); translatorPage->addWidget(label);
} }

2
kradio3/src/alarm.cpp
Unescape View File

@ -64,7 +64,7 @@ Alarm::~Alarm()
TQDateTime Alarm::nextAlarm(bool ignoreEnable) const TQDateTime Alarm::nextAlarm(bool ignoreEnable) const
{ {
TQDateTime now = TQDateTime::tqcurrentDateTime(), TQDateTime now = TQDateTime::currentDateTime(),
alarm = m_time; alarm = m_time;
if (m_daily) { if (m_daily) {
alarm.setDate (now.date()); alarm.setDate (now.date());

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

@ -41,8 +41,8 @@ IErrorLog::~IErrorLog()
int IErrorLogClient::sendLogError(const TQString &s) const int IErrorLogClient::sendLogError(const TQString &s) const
{ {
kdDebug() << TQString(i18n("%1 Error: %2\n")) kdDebug() << TQString(i18n("%1 Error: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
IF_SEND_MESSAGE(logError(s)); IF_SEND_MESSAGE(logError(s));
} }
@ -50,8 +50,8 @@ int IErrorLogClient::sendLogError(const TQString &s) const
int IErrorLogClient::sendLogWarning(const TQString &s) const int IErrorLogClient::sendLogWarning(const TQString &s) const
{ {
kdDebug() << TQString(i18n("%1 Warning: %2\n")) kdDebug() << TQString(i18n("%1 Warning: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
IF_SEND_MESSAGE(logWarning(s)); IF_SEND_MESSAGE(logWarning(s));
} }
@ -59,8 +59,8 @@ int IErrorLogClient::sendLogWarning(const TQString &s) const
int IErrorLogClient::sendLogInfo(const TQString &s) const int IErrorLogClient::sendLogInfo(const TQString &s) const
{ {
kdDebug() << TQString(i18n("%1 Information: %2\n")) kdDebug() << TQString(i18n("%1 Information: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
IF_SEND_MESSAGE(logInfo(s)); IF_SEND_MESSAGE(logInfo(s));
} }
@ -68,16 +68,16 @@ int IErrorLogClient::sendLogInfo(const TQString &s) const
int IErrorLogClient::sendLogDebug(const TQString &s) const int IErrorLogClient::sendLogDebug(const TQString &s) const
{ {
kdDebug() << TQString(i18n("%1 Debug: %2\n")) kdDebug() << TQString(i18n("%1 Debug: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
IF_SEND_MESSAGE(logDebug(s)); IF_SEND_MESSAGE(logDebug(s));
} }
void IErrorLogClient::staticLogError (const TQString &s) void IErrorLogClient::staticLogError (const TQString &s)
{ {
kdDebug() << TQString(i18n("%1 Error: %2\n")) kdDebug() << TQString(i18n("%1 Error: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
if (staticLogger) if (staticLogger)
staticLogger->logError(s); staticLogger->logError(s);
} }
@ -85,8 +85,8 @@ void IErrorLogClient::staticLogError (const TQString &s)
void IErrorLogClient::staticLogWarning(const TQString &s) void IErrorLogClient::staticLogWarning(const TQString &s)
{ {
kdDebug() << TQString(i18n("%1 Warning: %2\n")) kdDebug() << TQString(i18n("%1 Warning: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
if (staticLogger) if (staticLogger)
staticLogger->logWarning(s); staticLogger->logWarning(s);
} }
@ -94,8 +94,8 @@ void IErrorLogClient::staticLogWarning(const TQString &s)
void IErrorLogClient::staticLogInfo (const TQString &s) void IErrorLogClient::staticLogInfo (const TQString &s)
{ {
kdDebug() << TQString(i18n("%1 Information: %2\n")) kdDebug() << TQString(i18n("%1 Information: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
if (staticLogger) if (staticLogger)
staticLogger->logInfo(s); staticLogger->logInfo(s);
} }
@ -103,8 +103,8 @@ void IErrorLogClient::staticLogInfo (const TQString &s)
void IErrorLogClient::staticLogDebug (const TQString &s) void IErrorLogClient::staticLogDebug (const TQString &s)
{ {
kdDebug() << TQString(i18n("%1 Debug: %2\n")) kdDebug() << TQString(i18n("%1 Debug: %2\n"))
.tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) .arg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s); .arg(s);
if (staticLogger) if (staticLogger)
staticLogger->logDebug(s); 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_FillSize = 0;
m_Start = 0; m_Start = 0;
m_error = m_File == NULL; 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_FileName = m_BaseFileName + "_" + TQString::number(++m_FileIdx);
m_File = fopen(m_FileName.ascii(), "w+"); m_File = fopen(m_FileName.ascii(), "w+");
m_error = m_File == NULL; 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) { if (new_max_size >= m_RealSize) {
@ -90,13 +90,13 @@ bool FileRingBuffer::resize(const TQString &filename, TQ_UINT64 new_max_size)
newFill += tmp_size; newFill += tmp_size;
} else { } else {
m_error = true; 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 { } else {
m_error = true; 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) { 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); fseek(m_File, m_Start + m_FillSize, SEEK_SET);
if (rest > 0 && fwrite(src, rest, 1, m_File) <= 0) { if (rest > 0 && fwrite(src, rest, 1, m_File) <= 0) {
m_error = true; 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 { } else {
m_FillSize += rest; m_FillSize += rest;
if (m_Start + m_FillSize > m_RealSize) 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); fseek(m_File, m_Start + m_FillSize - m_RealSize, SEEK_SET);
if (fwrite(src, rest, 1, m_File) <= 0) { if (fwrite(src, rest, 1, m_File) <= 0) {
m_error = true; 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 { } else {
m_FillSize += rest; m_FillSize += rest;
written += rest; written += rest;
@ -165,7 +165,7 @@ size_t FileRingBuffer::takeData(char *dst, size_t size)
fseek(m_File, m_Start, SEEK_SET); fseek(m_File, m_Start, SEEK_SET);
if (fread(dst+read, n, 1, m_File) <= 0) { if (fread(dst+read, n, 1, m_File) <= 0) {
m_error = true; 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 { } else {
m_FillSize -= n; m_FillSize -= n;
m_Start += n; m_Start += n;

6
kradio3/src/frequencyradiostation.cpp
Unescape View File

@ -117,7 +117,7 @@ TQString FrequencyRadioStation::longName() const
{ {
TQString longN = name(); TQString longN = name();
if (!longN.isEmpty()) { if (!longN.isEmpty()) {
longN = i18n("%1, %2").tqarg(longN).tqarg(description()); longN = i18n("%1, %2").arg(longN).arg(description());
} else { } else {
longN = description(); longN = description();
} }
@ -131,9 +131,9 @@ TQString FrequencyRadioStation::description() const
float cf = frequency(); float cf = frequency();
TQString f; TQString f;
if (cf >= 10) if (cf >= 10)
f = i18n("%1 MHz").tqarg(KGlobal::locale()->formatNumber(cf, 2)); f = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(cf, 2));
else 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; return f;
} }

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

@ -94,7 +94,7 @@ class KRadioAboutWidget : public TQWidget
public: public:
KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0); KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0);
virtual void show( void ); virtual void show( void );
virtual TQSize tqsizeHint( void ) const; virtual TQSize sizeHint( void ) const;
void setAboutData(const KAboutData &abtData); void setAboutData(const KAboutData &abtData);

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

@ -145,7 +145,7 @@
- sending Messages - sending Messages
Declare a virtual constant method with return value "int" and the desired 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: the message:
virtual bool SendingMessages(int any_or_non_param) const; 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 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 - querying queries
@ -195,7 +195,7 @@
IF_ANSWER( AnsweringQueries(int another_param) ) IF_ANSWER( AnsweringQueries(int another_param) )
The method has to be implemented by a derived class. The current item of the 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 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 int ComplementaryInterface::SendingMessages(int any_or_non_param) const
{ {
IF_SEND_MESSAGE( ReceivingMessages(any_or_non_param) ) IF_SEND_MESSAGE( ReceivingMessages(any_or_non_param) )
// macro includes "return #tqreceivers" // macro includes "return #receivers"
} }
int ComplementaryInterface::QueryingQueries(int another_param) const 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 &) ) 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 ( sendReleasePlayback, (SoundStreamID id) )
IF_SENDER_FINE ( sendReleaseCapture, (SoundStreamID id) ) IF_SENDER_FINE ( sendReleaseCapture, (SoundStreamID id) )
@ -315,7 +315,7 @@ SENDERS:
CALL_SNDSTR_SERVER ( queryIsMuted, (SoundStreamID id, bool &v), (id, v) ) 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 ( sendReleasePlayback, (SoundStreamID id), (id) )
CALL_SNDSTR_SERVER ( sendReleaseCapture, (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 HasSamePhysicalID(const SoundStreamID &x) const { return m_PhysicalID == x.m_PhysicalID; }
bool isValid() const { return m_ID != 0; } // m_PhysicalID is not checked! bool isValid() const { return m_ID != 0; } // m_PhysicalID is not checked!
void tqinvalidate(); void invalidate();
static const SoundStreamID InvalidID; static const SoundStreamID InvalidID;

2
kradio3/src/internetradiostation.cpp
Unescape View File

@ -115,7 +115,7 @@ TQString InternetRadioStation::longName() const
{ {
TQString longN = name(); TQString longN = name();
if (!longN.isEmpty()) { if (!longN.isEmpty()) {
longN = i18n("%1, %2").tqarg(longN).tqarg(description()); longN = i18n("%1, %2").arg(longN).arg(description());
} else { } else {
longN = description(); longN = description();
} }

18
kradio3/src/kradioapp.cpp
Unescape View File

@ -104,7 +104,7 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name)
} else { } else {
KMessageBox::error(NULL, KMessageBox::error(NULL,
i18n("Library %1: Plugin Entry Point is missing\n") i18n("Library %1: Plugin Entry Point is missing\n")
.tqarg(lib_name), .arg(lib_name),
i18n("Plugin Library Load Error")); i18n("Plugin Library Load Error"));
library->unload(); library->unload();
info_func = NULL; info_func = NULL;
@ -114,8 +114,8 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name)
} else { } else {
KMessageBox::error(NULL, KMessageBox::error(NULL,
i18n("Library %1: \n%2") i18n("Library %1: \n%2")
.tqarg(lib_name) .arg(lib_name)
.tqarg(KLibLoader::self()->lastErrorMessage()), .arg(KLibLoader::self()->lastErrorMessage()),
i18n("Plugin Library Load Error")); i18n("Plugin Library Load Error"));
} }
} }
@ -266,10 +266,10 @@ KLibrary *KRadioApp::LoadLibrary (const TQString &library)
m_PluginInfos.insert(it.key(), PluginClassInfo (it.key(), *it, libinfo.init_func)); m_PluginInfos.insert(it.key(), PluginClassInfo (it.key(), *it, libinfo.init_func));
} }
} else { } else {
kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " " << " "
<< i18n("Error: Loading Library %1 failed: %2") << i18n("Error: Loading Library %1 failed: %2")
.tqarg(library).tqarg(KLibLoader::self()->lastErrorMessage()) .arg(library).arg(KLibLoader::self()->lastErrorMessage())
<< endl; << endl;
} }
@ -317,15 +317,15 @@ PluginBase *KRadioApp::CreatePlugin (PluginManager *manager, const TQString &cla
if (m_PluginInfos.contains(class_name)) { if (m_PluginInfos.contains(class_name)) {
retval = m_PluginInfos[class_name].CreateInstance(object_name); retval = m_PluginInfos[class_name].CreateInstance(object_name);
if (!retval) { if (!retval) {
kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) 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; << endl;
} }
} else { } else {
kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) 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; << endl;
} }

14
kradio3/src/pluginmanager-configuration-ui.ui
Unescape View File

@ -126,7 +126,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>87</height> <height>87</height>
@ -137,7 +137,7 @@
<property name="name"> <property name="name">
<cstring>btnRemovePluginInstance</cstring> <cstring>btnRemovePluginInstance</cstring>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
@ -196,7 +196,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>55</height> <height>55</height>
@ -207,7 +207,7 @@
<property name="name"> <property name="name">
<cstring>btnNewPluginInstance</cstring> <cstring>btnNewPluginInstance</cstring>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
@ -301,7 +301,7 @@
<property name="name"> <property name="name">
<cstring>btnRemoveLibrary</cstring> <cstring>btnRemoveLibrary</cstring>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
@ -321,7 +321,7 @@
<property name="name"> <property name="name">
<cstring>btnAddLibrary</cstring> <cstring>btnAddLibrary</cstring>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
@ -363,7 +363,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>61</height> <height>61</height>

18
kradio3/src/pluginmanager.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kprogress.h> #include <kprogress.h>
#include <tqlayout.h> #include <layout.h>
#include <tqframe.h> #include <tqframe.h>
#include <tqmenudata.h> #include <tqmenudata.h>
@ -120,7 +120,7 @@ void PluginManager::updateWidgetPluginMenuItem(WidgetPluginBase *b, TQMenuData *
return; return;
const TQString &name = b->description(); 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], menu->changeItem(map[b],
TQIconSet(SmallIconSet(!shown ? "kradio_show" : "kradio_hide")), TQIconSet(SmallIconSet(!shown ? "kradio_show" : "kradio_hide")),
@ -153,7 +153,7 @@ void PluginManager::insertPlugin(PluginBase *p)
if (p) { if (p) {
BlockProfiler profiler_cfg("PluginManager::insertPlugin - about/config"); BlockProfiler profiler_cfg("PluginManager::insertPlugin - about/config");
/*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " Debug: Adding Plugin: " << p->name() << "\n";*/ << " Debug: Adding Plugin: " << p->name() << "\n";*/
if (!m_configDialog) if (!m_configDialog)
@ -173,7 +173,7 @@ void PluginManager::insertPlugin(PluginBase *p)
// connect plugins with each other // connect plugins with each other
for (PluginIterator it(m_plugins); it.current(); ++it) { for (PluginIterator it(m_plugins); it.current(); ++it) {
if (it.current() != p) { if (it.current() != p) {
/*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " Debug: connecting with " << it.current()->name() << "\n";*/ << " Debug: connecting with " << it.current()->name() << "\n";*/
p->connectI(it.current()); p->connectI(it.current());
} }
@ -295,7 +295,7 @@ TQFrame *PluginManager::addConfigurationPage (const ConfigPageInfo &info)
KGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium ) KGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium )
); );
// fill config frame with tqlayout ... // fill config frame with layout ...
TQGridLayout *l = new TQGridLayout(f); TQGridLayout *l = new TQGridLayout(f);
l->setSpacing( 0 ); l->setSpacing( 0 );
l->setMargin( 0 ); l->setMargin( 0 );
@ -378,7 +378,7 @@ void PluginManager::addAboutPage (PluginBase *forWhom,
m_aboutPageFrames.insert(forWhom, f); m_aboutPageFrames.insert(forWhom, f);
m_aboutPages.insert(forWhom, info.page); m_aboutPages.insert(forWhom, info.page);
// fill config frame with tqlayout ... // fill config frame with layout ...
TQGridLayout *l = new TQGridLayout(f); TQGridLayout *l = new TQGridLayout(f);
l->setSpacing( 0 ); l->setSpacing( 0 );
l->setMargin( 0 ); l->setMargin( 0 );
@ -456,7 +456,7 @@ void PluginManager::restoreState (KConfig *c)
TQString object_name = c->readEntry("plugin_name_" + TQString::number(i)); TQString object_name = c->readEntry("plugin_name_" + TQString::number(i));
if (m_showProgressBar) 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()) if (class_name.length() && object_name.length())
m_Application->CreatePlugin(this, class_name, object_name); m_Application->CreatePlugin(this, class_name, object_name);
if (m_showProgressBar) if (m_showProgressBar)
@ -473,7 +473,7 @@ void PluginManager::restoreState (KConfig *c)
for (TQMapConstIterator<TQString, PluginClassInfo> it=classes.begin(); it != end; ++it, ++idx) { for (TQMapConstIterator<TQString, PluginClassInfo> it=classes.begin(); it != end; ++it, ++idx) {
const PluginClassInfo &cls = *it; const PluginClassInfo &cls = *it;
if (m_showProgressBar) 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); m_Application->CreatePlugin(this, cls.class_name, m_Name + "-" + cls.class_name);
if (m_showProgressBar) if (m_showProgressBar)
progress->progressBar()->setProgress(idx); progress->progressBar()->setProgress(idx);
@ -487,7 +487,7 @@ void PluginManager::restoreState (KConfig *c)
for (PluginIterator i(m_plugins); i.current(); ++i, ++idx) { for (PluginIterator i(m_plugins); i.current(); ++i, ++idx) {
BlockProfiler profile_plugin("PluginManager::restoreState - " + i.current()->pluginClassName()); BlockProfiler profile_plugin("PluginManager::restoreState - " + i.current()->pluginClassName());
if (m_showProgressBar) 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); i.current()->restoreState(c);
if (m_showProgressBar) if (m_showProgressBar)
progress->progressBar()->setProgress(idx+1); progress->progressBar()->setProgress(idx+1);

2
kradio3/src/radiostation-config.cpp
Unescape View File

@ -17,7 +17,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqlayout.h> #include <layout.h>
#include <klocale.h> #include <klocale.h>
#include <math.h> #include <math.h>

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_ID = 0;
m_PhysicalID = 0; m_PhysicalID = 0;

8
kradio3/src/standardscandialog-ui.ui
Unescape View File

@ -38,7 +38,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -54,7 +54,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>20</height> <height>20</height>
@ -79,7 +79,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>20</height> <height>20</height>
@ -90,7 +90,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

6
kradio3/src/standardscandialog.cpp
Unescape View File

@ -67,7 +67,7 @@ void StandardScanDialog::start()
if (!m_running) { if (!m_running) {
m_running = true; m_running = true;
m_stations.all().clear(); m_stations.all().clear();
m_startTime = TQDateTime::tqcurrentDateTime(); m_startTime = TQDateTime::currentDateTime();
m_oldPowerOn = queryIsPowerOn(); m_oldPowerOn = queryIsPowerOn();
m_oldStation = queryCurrentStation().copy(); m_oldStation = queryCurrentStation().copy();
sendToBeginning(); sendToBeginning();
@ -153,11 +153,11 @@ bool StandardScanDialog::noticeProgress (float f)
progressBar->setProgress((int)rint(f * 100)); progressBar->setProgress((int)rint(f * 100));
if (m_running) { if (m_running) {
int secs = m_startTime.secsTo(TQDateTime::tqcurrentDateTime()); int secs = m_startTime.secsTo(TQDateTime::currentDateTime());
int ms = (int)rint((1 - f) * (float) secs / f * 1000.0); int ms = (int)rint((1 - f) * (float) secs / f * 1000.0);
if (ms > 0 && ms < 86400000) // max one day 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 else
labelTime->setText(i18n("unknown")); labelTime->setText(i18n("unknown"));

2
kradio3/src/station-drag-object.cpp
Unescape View File

@ -76,7 +76,7 @@ bool StationDragObject::decode (const TQMimeSource *e, TQStringList &stationIDs)
{ {
stationIDs.clear(); stationIDs.clear();
if (canDecode(e)) { if (canDecode(e)) {
const TQByteArray &tmp = e->tqencodedData(e->format(0)); const TQByteArray &tmp = e->encodedData(e->format(0));
TQString str = ""; TQString str = "";
for (unsigned int pos = 0; pos < tmp.size(); ++pos) { for (unsigned int pos = 0; pos < tmp.size(); ++pos) {
if (tmp[pos]) { if (tmp[pos]) {

24
kradio3/src/stationlist.cpp
Unescape View File

@ -235,7 +235,7 @@ void StationList::merge(const StationList & other)
if (! m_metaData.comment.isEmpty()) if (! m_metaData.comment.isEmpty())
m_metaData.comment += "\n"; m_metaData.comment += "\n";
m_metaData.lastChange = TQDateTime::tqcurrentDateTime(); m_metaData.lastChange = TQDateTime::currentDateTime();
if (!metaData.maintainer.isEmpty()) if (!metaData.maintainer.isEmpty())
m_metaData.maintainer += (count() ? TQString(" / ") : TQString()) + metaData.maintainer; m_metaData.maintainer += (count() ? TQString(" / ") : TQString()) + metaData.maintainer;
@ -340,13 +340,13 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool
if (!KIO::NetAccess::download(url, tmpfile, NULL)) { if (!KIO::NetAccess::download(url, tmpfile, NULL)) {
if (enableMessageBox) { if (enableMessageBox) {
logger.logError("StationList::readXML: " + 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", TQMessageBox::warning(NULL, "KRadio",
i18n("Download of the station preset file at %1 failed.") i18n("Download of the station preset file at %1 failed.")
.tqarg(url.url())); .arg(url.url()));
} else { } else {
logger.logWarning("StationList::readXML: " + logger.logWarning("StationList::readXML: " +
i18n("error downloading preset file %1").tqarg(url.url())); i18n("error downloading preset file %1").arg(url.url()));
} }
return false; return false;
} }
@ -358,11 +358,11 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool
if (! presetFile.open(IO_ReadOnly)) { if (! presetFile.open(IO_ReadOnly)) {
logger.logError("StationList::readXML: " + logger.logError("StationList::readXML: " +
i18n("error opening preset file %1").tqarg(tmpfile)); i18n("error opening preset file %1").arg(tmpfile));
if (enableMessageBox) { if (enableMessageBox) {
TQMessageBox::warning(NULL, "KRadio", TQMessageBox::warning(NULL, "KRadio",
i18n("Opening of the station preset file at %1 failed.") i18n("Opening of the station preset file at %1 failed.")
.tqarg(tmpfile)); .arg(tmpfile));
} }
return false; return false;
} }
@ -458,11 +458,11 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool
outs << output; outs << output;
if (outf->status() != IO_Ok) { if (outf->status() != IO_Ok) {
logger.logError("StationList::writeXML: " + logger.logError("StationList::writeXML: " +
i18n("error writing to tempfile %1").tqarg(tmpFile.name())); i18n("error writing to tempfile %1").arg(tmpFile.name()));
if (enableMessageBox) { if (enableMessageBox) {
TQMessageBox::warning(NULL, "KRadio", TQMessageBox::warning(NULL, "KRadio",
i18n("Writing station preset file %1 failed.") i18n("Writing station preset file %1 failed.")
.tqarg(tmpFile.name())); .arg(tmpFile.name()));
} }
return false; return false;
} }
@ -472,19 +472,19 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool
if (count() <= 1) { if (count() <= 1) {
logger.logWarning("StationList::writeXML: " + logger.logWarning("StationList::writeXML: " +
i18n("uploading preset file %1: ").tqarg(url.url())); i18n("uploading preset file %1: ").arg(url.url()));
logger.logWarning("StationList::writeXML: " + 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 { } else {
if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) { if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) {
logger.logError("StationList::writeXML: " + logger.logError("StationList::writeXML: " +
i18n("error uploading preset file %1").tqarg(url.url())); i18n("error uploading preset file %1").arg(url.url()));
if (enableMessageBox) { if (enableMessageBox) {
TQMessageBox::warning(NULL, "KRadio", TQMessageBox::warning(NULL, "KRadio",
i18n("Upload of station preset file to %1 failed.") i18n("Upload of station preset file to %1 failed.")
.tqarg(url.url())); .arg(url.url()));
} }
return false; 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: " + \ #define START_ELEMENT_ERROR m_logger.logError("StationListXmlHandler::startElement: " + \
i18n("misplaced element %1") \ i18n("misplaced element %1") \
.tqarg(qname));\ .arg(qname));\
return false; return false;
bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString &/*localname*/, bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString &/*localname*/,
@ -113,7 +113,7 @@ bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString
} else { // unknown } else { // unknown
m_logger.logWarning("StationListXmlHandler::startElement: " + 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); m_status.push_back(qname);
@ -143,10 +143,10 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString &
if (m_status.size()) { if (m_status.size()) {
m_logger.logError("StationListXmlHandler::endElement: " + m_logger.logError("StationListXmlHandler::endElement: " +
i18n("expected element %1, but found %2") i18n("expected element %1, but found %2")
.tqarg(m_status.back()).tqarg(qname)); .arg(m_status.back()).arg(qname));
} else { } else {
m_logger.logError("StationListXmlHandler::endElement: " + m_logger.logError("StationListXmlHandler::endElement: " +
i18n("unexpected element %1").tqarg(qname)); i18n("unexpected element %1").arg(qname));
} }
} }
return true; return true;
@ -155,7 +155,7 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString &
#define CHARACTERS_ERROR m_logger.logError("StationListXmlHandler::characters: " + \ #define CHARACTERS_ERROR m_logger.logError("StationListXmlHandler::characters: " + \
i18n("invalid data for element %1") \ i18n("invalid data for element %1") \
.tqarg(stat)); \ .arg(stat)); \
return false; return false;
bool StationListXmlHandler::characters (const TQString &ch) bool StationListXmlHandler::characters (const TQString &ch)
@ -169,7 +169,7 @@ bool StationListXmlHandler::characters (const TQString &ch)
if (stat == StationListFormat) { if (stat == StationListFormat) {
if (str != STATION_LIST_FORMAT) { 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; return false;
} }
@ -210,13 +210,13 @@ bool StationListXmlHandler::characters (const TQString &ch)
if (!m_newStation->setProperty(stat, str)) { if (!m_newStation->setProperty(stat, str)) {
m_logger.logWarning("StationListXmlHandler::characters: " + m_logger.logWarning("StationListXmlHandler::characters: " +
i18n("unknown property %1 for class %2") i18n("unknown property %1 for class %2")
.tqarg(stat) .arg(stat)
.tqarg(m_newStation->getClassName())); .arg(m_newStation->getClassName()));
} }
} else if (str.length()) { } else if (str.length()) {
m_logger.logError("StationListXmlHandler::characters: " + m_logger.logError("StationListXmlHandler::characters: " +
i18n("characters ignored for element %1").tqarg(stat)); i18n("characters ignored for element %1").arg(stat));
} }
return true; return true;
} }

6
kradio3/src/stationselector-ui.ui
Unescape View File

@ -48,7 +48,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -102,7 +102,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -129,7 +129,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>

4
kradio3/src/timecontrol_interfaces.cpp
Unescape View File

@ -83,7 +83,7 @@ void ITimeControlClient::noticeConnectedI(cmplInterface *, bool /*pointer_valid*
noticeAlarmsChanged(queryAlarms()); noticeAlarmsChanged(queryAlarms());
noticeNextAlarmChanged(queryNextAlarm()); noticeNextAlarmChanged(queryNextAlarm());
TQDateTime end = queryCountdownEnd(); TQDateTime end = queryCountdownEnd();
if (end > TQDateTime::tqcurrentDateTime()) if (end > TQDateTime::currentDateTime())
noticeCountdownStarted(end); noticeCountdownStarted(end);
else else
noticeCountdownStopped(); noticeCountdownStopped();
@ -95,7 +95,7 @@ void ITimeControlClient::noticeDisconnectedI(cmplInterface *, bool /*pointer_val
noticeAlarmsChanged(queryAlarms()); noticeAlarmsChanged(queryAlarms());
noticeNextAlarmChanged(queryNextAlarm()); noticeNextAlarmChanged(queryNextAlarm());
TQDateTime end = queryCountdownEnd(); TQDateTime end = queryCountdownEnd();
if (end > TQDateTime::tqcurrentDateTime()) if (end > TQDateTime::currentDateTime())
noticeCountdownStarted(end); noticeCountdownStarted(end);
else else
noticeCountdownStopped(); noticeCountdownStopped();

8
kradio3/src/widgetplugins.cpp
Unescape View File

@ -100,7 +100,7 @@ void WidgetPluginBase::pShowOnOrgDesktop()
{ {
KWin::setMainWindow(getWidget(), 0); 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) ) { if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) {
TQWidget *w = getWidget(); TQWidget *w = getWidget();
if (!w) return; if (!w) return;
@ -131,7 +131,7 @@ void WidgetPluginBase::pShow()
{ {
KWin::setMainWindow(getWidget(), 0); 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) ) { if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) {
TQWidget *w = getWidget(); TQWidget *w = getWidget();
if (!w) return; if (!w) return;
@ -150,9 +150,9 @@ void WidgetPluginBase::pShow()
void WidgetPluginBase::pHide() 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(); 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