summaryrefslogtreecommitdiffstats
path: root/kradio3/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-15 15:32:31 -0600
committerTimothy Pearson <[email protected]>2011-12-15 15:32:31 -0600
commit5fb78f4b68672906005b059e7e5066c702bc5c90 (patch)
tree715819ae8220ea037525fe5d7f15f7879c137b88 /kradio3/plugins
parentb66ecc4a25ee7b26513ffe3c91ffbed7fe313a0d (diff)
downloadtderadio-5fb78f4b68672906005b059e7e5066c702bc5c90.tar.gz
tderadio-5fb78f4b68672906005b059e7e5066c702bc5c90.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kradio3/plugins')
-rw-r--r--kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui26
-rw-r--r--kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui6
-rw-r--r--kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp16
-rw-r--r--kradio3/plugins/alsa-sound/alsa-sound.cpp100
-rw-r--r--kradio3/plugins/gui-docking-menu/docking-configuration.cpp18
-rw-r--r--kradio3/plugins/gui-docking-menu/docking.cpp22
-rw-r--r--kradio3/plugins/gui-error-log/errorlog.cpp18
-rw-r--r--kradio3/plugins/gui-quickbar/buttonflowlayout.cpp28
-rw-r--r--kradio3/plugins/gui-quickbar/buttonflowlayout.h12
-rw-r--r--kradio3/plugins/gui-quickbar/quickbar.cpp12
-rw-r--r--kradio3/plugins/gui-standard-display/displaycfg.cpp28
-rw-r--r--kradio3/plugins/gui-standard-display/radioview.cpp14
-rw-r--r--kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp24
-rw-r--r--kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp2
-rw-r--r--kradio3/plugins/gui-standard-display/radioview_volume.cpp4
-rw-r--r--kradio3/plugins/lirc/lircsupport.cpp2
-rw-r--r--kradio3/plugins/oss-sound/oss-sound.cpp62
-rw-r--r--kradio3/plugins/radio/radio-configuration-ui.ui50
-rw-r--r--kradio3/plugins/radio/radio-configuration.cpp2
-rw-r--r--kradio3/plugins/recording/encoder_mp3.cpp14
-rw-r--r--kradio3/plugins/recording/encoder_ogg.cpp4
-rw-r--r--kradio3/plugins/recording/encoder_pcm.cpp4
-rw-r--r--kradio3/plugins/recording/recording-configuration-ui.ui36
-rw-r--r--kradio3/plugins/recording/recording-datamonitor.cpp20
-rw-r--r--kradio3/plugins/recording/recording-monitor.cpp18
-rw-r--r--kradio3/plugins/recording/recording-monitor.h2
-rw-r--r--kradio3/plugins/recording/recording.cpp6
-rw-r--r--kradio3/plugins/streaming/streaming-configuration-ui.ui52
-rw-r--r--kradio3/plugins/streaming/streaming-job.cpp2
-rw-r--r--kradio3/plugins/streaming/streaming.cpp10
-rw-r--r--kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui28
-rw-r--r--kradio3/plugins/timecontrol/timecontrol-configuration.cpp2
-rw-r--r--kradio3/plugins/timecontrol/timecontrol.cpp6
-rw-r--r--kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui14
-rw-r--r--kradio3/plugins/timeshifter/timeshifter.cpp8
-rw-r--r--kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui56
-rw-r--r--kradio3/plugins/v4lradio/v4lradio.cpp38
37 files changed, 383 insertions, 383 deletions
diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
index ebdd9a1..54467cc 100644
--- a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
+++ b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>1</width>
<height>40</height>
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>1</width>
<height>40</height>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -113,7 +113,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>11</width>
<height>20</height>
@@ -157,7 +157,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>11</width>
<height>20</height>
@@ -168,7 +168,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -184,7 +184,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -193,7 +193,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -255,7 +255,7 @@
<property name="text">
<string>MixerName</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
index c15e91d..df64968 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
+++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
@@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -59,7 +59,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<grid>
<property name="name">
@@ -259,7 +259,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
index 88c4d57..56908d1 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
@@ -17,7 +17,7 @@
#include <tqcheckbox.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqscrollview.h>
#include <kurlrequester.h>
@@ -57,7 +57,7 @@ AlsaSoundConfiguration::AlsaSoundConfiguration (TQWidget *parent, AlsaSoundDevic
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->setFrameShape(TQFrame::NoFrame);
@@ -135,13 +135,13 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname)
delete m_groupMixerSubFrame;
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);
int rows = 1;
int cols = (all_list.count()+rows-1)/rows;
m_groupMixerLayout = new TQGridLayout( m_groupMixerSubFrame, rows, cols, 0, 0 );
- m_groupMixerLayout->tqsetAlignment( TQt::AlignBottom );
+ m_groupMixerLayout->setAlignment( TQt::AlignBottom );
int idx = 0;
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;
if ((err = snd_ctl_pcm_info(handle, pcminfo)) < 0) {
if (err != -ENOENT) {
- //logError(TQString("control digital audio info (%1): %2").tqarg(card).tqarg(snd_strerror(err)));
+ //logError(TQString("control digital audio info (%1): %2").arg(card).arg(snd_strerror(err)));
}
continue;
}
const char *dev_name = snd_pcm_info_get_name(pcminfo);
- TQString devname = i18n("context-card-plus-device-number", "%1 device %2").tqarg(dev_name).tqarg(dev);
+ TQString devname = i18n("context-card-plus-device-number", "%1 device %2").arg(dev_name).arg(dev);
if (combobox)
combobox->insertItem(devname);
if (devname2dev)
@@ -315,14 +315,14 @@ void AlsaSoundConfiguration::slotCancel()
slotCaptureCardSelected(m_comboCaptureCard->currentText());
m_comboCaptureDevice->setCurrentItem(m_captureDevice2idx[dev]);
- //IErrorLogClient::staticLogDebug(TQString("capture: card = %1(%2), dev = %3").tqarg(card).tqarg(m_captureCard2idx[card]).tqarg(dev));
+ //IErrorLogClient::staticLogDebug(TQString("capture: card = %1(%2), dev = %3").arg(card).arg(m_captureCard2idx[card]).arg(dev));
editHWBufferSize ->setValue (m_SoundDevice ? m_SoundDevice->getHWBufferSize()/1024 : 4);
editBufferSize ->setValue (m_SoundDevice ? m_SoundDevice->getBufferSize()/1024 : 4);
chkDisablePlayback->setChecked(m_SoundDevice ? !m_SoundDevice->isPlaybackEnabled() : false);
chkDisableCapture ->setChecked(m_SoundDevice ? !m_SoundDevice->isCaptureEnabled() : false);
- //IErrorLogClient::staticLogDebug(TQString("capture: card = %1").tqarg(m_comboCaptureCard->currentText()));
+ //IErrorLogClient::staticLogDebug(TQString("capture: card = %1").arg(m_comboCaptureCard->currentText()));
if (m_SoundDevice)
diff --git a/kradio3/plugins/alsa-sound/alsa-sound.cpp b/kradio3/plugins/alsa-sound/alsa-sound.cpp
index 84d93d5..06ebc80 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-sound.cpp
@@ -150,7 +150,7 @@ void AlsaSoundDevice::saveState (KConfig *c) const
int i = 0;
for (TQMapConstIterator<TQString, AlsaConfigMixerSetting> it = m_CaptureMixerSettings.begin(); it != m_CaptureMixerSettings.end(); ++it, ++i) {
- TQString prefix = TQString("mixer-setting-%1-").tqarg(i);
+ TQString prefix = TQString("mixer-setting-%1-").arg(i);
(*it).saveState(c, prefix);
}
@@ -179,7 +179,7 @@ void AlsaSoundDevice::restoreState (KConfig *c)
int n = c->readNumEntry("mixer-settings", 0);
for (int i = 0; i < n; ++i) {
- TQString prefix = TQString("mixer-setting-%1-").tqarg(i);
+ TQString prefix = TQString("mixer-setting-%1-").arg(i);
AlsaConfigMixerSetting s(c, prefix);
m_CaptureMixerSettings.insert(s.getIDString(), s);
}
@@ -418,9 +418,9 @@ bool AlsaSoundDevice::stopCapture(SoundStreamID id)
slotPollCapture();
// if (m_captureThread->error()) {
-// logError(i18n("ALSA Plugin, device plughw:%1,%2: %3").tqarg(m_CaptureCard)
-// .tqarg(m_CaptureDevice)
-// .tqarg(i18n("unknown error")));
+// logError(i18n("ALSA Plugin, device plughw:%1,%2: %3").arg(m_CaptureCard)
+// .arg(m_CaptureDevice)
+// .arg(i18n("unknown error")));
// }
//
// delete m_captureThread;
@@ -526,7 +526,7 @@ bool AlsaSoundDevice::noticeSoundStreamData(SoundStreamID id,
/* if (n < size) {
m_PlaybackSkipCount += size - n;
} else if (m_PlaybackSkipCount > 0) {
- logWarning(i18n("plughw:%1,%2: Playback buffer overflow. Skipped %3 bytes").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice).tqarg(TQString::number(m_PlaybackSkipCount)));
+ logWarning(i18n("plughw:%1,%2: Playback buffer overflow. Skipped %3 bytes").arg(m_PlaybackCard).arg(m_PlaybackDevice).arg(TQString::number(m_PlaybackSkipCount)));
m_PlaybackSkipCount = 0;
}
return m_PlaybackSkipCount == 0;*/
@@ -550,12 +550,12 @@ void AlsaSoundDevice::slotPollPlayback()
if (framesWritten > 0) {
m_PlaybackBuffer.removeData(bytesWritten);
} else if (framesWritten == 0) {
- logError(i18n("ALSA Plugin: cannot write data for device plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice));
+ logError(i18n("ALSA Plugin: cannot write data for device plughw:%1,%2").arg(m_PlaybackCard).arg(m_PlaybackDevice));
} else if (framesWritten == -EAGAIN) {
// do nothing
} else {
snd_pcm_prepare(m_hPlayback);
- logWarning(i18n("ALSA Plugin: buffer underrun for device plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice));
+ logWarning(i18n("ALSA Plugin: buffer underrun for device plughw:%1,%2").arg(m_PlaybackCard).arg(m_PlaybackDevice));
}
}
@@ -577,7 +577,7 @@ void AlsaSoundDevice::slotPollCapture()
if (m_CaptureStreamID.isValid() && m_hCapture) {
// while (m_captureThread && m_captureThread->getAvailableReadBuffers()) {
-// TQString dev = TQString("alsa://plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice);
+// TQString dev = TQString("alsa://plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice);
// size_t size = 0;
// char *buffer = m_captureThread->getReadBuffer(size);
// time_t cur_time = time(NULL);
@@ -608,22 +608,22 @@ void AlsaSoundDevice::slotPollCapture()
m_CaptureBuffer.removeFreeSpace(bytesRead);
} else if (framesRead == 0) {
snd_pcm_prepare(m_hCapture);
- logError(i18n("ALSA Plugin: cannot read data from device plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice));
+ logError(i18n("ALSA Plugin: cannot read data from device plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice));
} else if (framesRead == -EAGAIN) {
// do nothing
} else {
snd_pcm_prepare(m_hCapture);
- logWarning(i18n("ALSA Plugin: buffer overrun for device plughw:%1,%2 (buffersize=%3, buffer=%4)").tqarg(m_CaptureCard).tqarg(m_CaptureDevice).tqarg(bufferSize).tqarg((long long unsigned)buffer));
+ logWarning(i18n("ALSA Plugin: buffer overrun for device plughw:%1,%2 (buffersize=%3, buffer=%4)").arg(m_CaptureCard).arg(m_CaptureDevice).arg(bufferSize).arg((long long unsigned)buffer));
}
- TQString dev = TQString("alsa://plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice);
+ TQString dev = TQString("alsa://plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice);
while (m_CaptureBuffer.getFillSize() > m_CaptureBuffer.getSize() / 3) {
size_t size = 0;
buffer = m_CaptureBuffer.getData(size);
time_t cur_time = time(NULL);
size_t consumed_size = SIZE_T_DONT_CARE;
- notifySoundStreamData(m_CaptureStreamID, m_CaptureFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").tqarg(dev)));
+ notifySoundStreamData(m_CaptureStreamID, m_CaptureFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").arg(dev)));
if (consumed_size == SIZE_T_DONT_CARE)
consumed_size = size;
@@ -664,7 +664,7 @@ bool AlsaSoundDevice::openPlaybackDevice(const SoundFormat &format, bool reopen)
m_PlaybackFormat = format;
- TQString dev = TQString("plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice);
+ TQString dev = TQString("plughw:%1,%2").arg(m_PlaybackCard).arg(m_PlaybackDevice);
bool error = !openAlsaDevice(m_hPlayback, m_PlaybackFormat, dev.ascii(), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK, m_PlaybackLatency);
if (!error) {
@@ -704,7 +704,7 @@ bool AlsaSoundDevice::openCaptureDevice(const SoundFormat &format, bool reopen)
m_CaptureFormat = format;
- TQString dev = TQString("plughw:%1,%2").tqarg(m_CaptureCard).tqarg(m_CaptureDevice);
+ TQString dev = TQString("plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice);
// bool error = !openAlsaDevice(m_hCapture, m_CaptureFormat, dev.ascii(), SND_PCM_STREAM_CAPTURE, /*flags = block*/0, m_CaptureLatency);
bool error = !openAlsaDevice(m_hCapture, m_CaptureFormat, dev.ascii(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK, m_CaptureLatency);
@@ -733,19 +733,19 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
/* OPEN */
if (!error && snd_pcm_open(&alsa_handle, pcm_name, stream, flags) < 0) {
- logError(i18n("ALSA Plugin: Error opening PCM device %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Error opening PCM device %1").arg(pcm_name));
error = true;
}
if (!error && snd_pcm_hw_params_any(alsa_handle, hwparams) < 0) {
- logError(i18n("ALSA Plugin: Can not configure PCM device %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Can not configure PCM device %1").arg(pcm_name));
error = true;
}
/* interleaved access type */
if (!error && snd_pcm_hw_params_set_access(alsa_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) {
- logError(i18n("ALSA Plugin: Error setting access for %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Error setting access for %1").arg(pcm_name));
error = true;
}
@@ -755,30 +755,30 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
!format.m_IsSigned,
format.m_Endianess == BIG_ENDIAN);
if (!error && snd_pcm_hw_params_set_format(alsa_handle, hwparams, sample_format) < 0) {
- logError(i18n("ALSA Plugin: Error setting sample format for %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Error setting sample format for %1").arg(pcm_name));
error = true;
}
/* channels */
if (!error && snd_pcm_hw_params_set_channels(alsa_handle, hwparams, format.m_Channels) < 0) {
- logError(i18n("ALSA Plugin: Error setting channels for %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Error setting channels for %1").arg(pcm_name));
error = true;
}
/* sample rate */
int rate = format.m_SampleRate;
if (!error && snd_pcm_hw_params_set_rate_near(alsa_handle, hwparams, &format.m_SampleRate, &dir) < 0) {
- logError(i18n("ALSA Plugin: Error setting rate for %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Error setting rate for %1").arg(pcm_name));
error = true;
}
if (!error && format.m_SampleRate != format.m_SampleRate) {
- logWarning(i18n("ALSA Plugin: The rate %1 Hz is not supported by your hardware %2. Using %3 Hz instead").tqarg(rate).tqarg(pcm_name).tqarg(format.m_SampleRate));
+ logWarning(i18n("ALSA Plugin: The rate %1 Hz is not supported by your hardware %2. Using %3 Hz instead").arg(rate).arg(pcm_name).arg(format.m_SampleRate));
}
snd_pcm_uframes_t period_size = m_HWBufferSize / format.frameSize();
if (!error && snd_pcm_hw_params_set_period_size_near(alsa_handle, hwparams, &period_size, &dir) < 0) {
- logError(i18n("ALSA Plugin: Error setting period size for %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Error setting period size for %1").arg(pcm_name));
error = true;
}
@@ -788,7 +788,7 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
//
// /* fragments */
// if (!error && snd_pcm_hw_params_set_periods(alsa_handle, hwparams, periods, 0) < 0) {
-// logError(i18n("ALSA Plugin: Error setting periods for %1").tqarg(pcm_name));
+// logError(i18n("ALSA Plugin: Error setting periods for %1").arg(pcm_name));
// error = true;
// }
@@ -798,17 +798,17 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
// if (!error && snd_pcm_hw_params_set_buffer_size_near(alsa_handle, hwparams, &exact_buffersize_frames) < 0) {
// exact_buffersize_frames = 4096;
// if (!error && snd_pcm_hw_params_set_buffer_size_near(alsa_handle, hwparams, &exact_buffersize_frames) < 0) {
-// logError(i18n("ALSA Plugin: Error setting buffersize for %1").tqarg(pcm_name));
+// logError(i18n("ALSA Plugin: Error setting buffersize for %1").arg(pcm_name));
// error = true;
// }
// }
// size_t exact_buffersize = exact_buffersize_frames * format.frameSize();
// if (!error && m_HWBufferSize != exact_buffersize) {
-// logWarning(i18n("ALSA Plugin: Hardware %1 does not support buffer size of %2. Using buffer size of %3 instead.").tqarg(pcm_name).tqarg(m_HWBufferSize).tqarg(exact_buffersize));
+// logWarning(i18n("ALSA Plugin: Hardware %1 does not support buffer size of %2. Using buffer size of %3 instead.").arg(pcm_name).arg(m_HWBufferSize).arg(exact_buffersize));
// size_t tmp = (((m_HWBufferSize - 1) / exact_buffersize) + 1) * exact_buffersize;
// setHWBufferSize(tmp);
-// logInfo(i18n("ALSA Plugin: adjusted buffer size for %1 to %2 bytes").tqarg(pcm_name).tqarg(TQString::number(tmp)));
+// logInfo(i18n("ALSA Plugin: adjusted buffer size for %1 to %2 bytes").arg(pcm_name).arg(TQString::number(tmp)));
// }
/* set all params */
@@ -819,7 +819,7 @@ bool AlsaSoundDevice::openAlsaDevice(snd_pcm_t *&alsa_handle, SoundFormat &forma
}
if (!error && snd_pcm_hw_params_get_period_size(hwparams, &period_size, &dir) < 0) {
- logError(i18n("ALSA Plugin: Error getting period size for %1").tqarg(pcm_name));
+ logError(i18n("ALSA Plugin: Error getting period size for %1").arg(pcm_name));
error = true;
}
@@ -924,18 +924,18 @@ bool AlsaSoundDevice::openMixerDevice(snd_mixer_t *&mixer_handle, int card, bool
bool attached = false;
if (!error) {
if (snd_mixer_attach (mixer_handle, cardid.ascii()) < 0) {
- staticLogError(i18n("ALSA Plugin: ERROR: snd_mixer_attach for card %1").tqarg(card));
+ staticLogError(i18n("ALSA Plugin: ERROR: snd_mixer_attach for card %1").arg(card));
error = true;
} else {
attached = true;
}
}
if (!error && snd_mixer_selem_register(mixer_handle, NULL, NULL) < 0) {
- staticLogError(i18n("ALSA Plugin: Error: snd_mixer_selem_register for card %1").tqarg(card));
+ staticLogError(i18n("ALSA Plugin: Error: snd_mixer_selem_register for card %1").arg(card));
error = true;
}
if (!error && snd_mixer_load (mixer_handle) < 0) {
- staticLogError(i18n("ALSA Plugin: Error: snd_mixer_load for card %1").tqarg(card));
+ staticLogError(i18n("ALSA Plugin: Error: snd_mixer_load for card %1").arg(card));
error = true;
}
if (mixer_handle) {
@@ -1003,7 +1003,7 @@ void AlsaSoundDevice::getPlaybackMixerChannels(
TQString name = snd_mixer_selem_id_get_name(sid);
int idx = snd_mixer_selem_id_get_index(sid);
if (idx)
- name = i18n("context-mixername-number", "%1 %2").tqarg(name).tqarg(idx);
+ name = i18n("context-mixername-number", "%1 %2").arg(name).arg(idx);
if (snd_mixer_selem_has_playback_volume(elem)) {
ch2id[name] = sid;
retval.append(name);
@@ -1050,7 +1050,7 @@ void AlsaSoundDevice::getCaptureMixerChannels(
TQString name = snd_mixer_selem_id_get_name(sid);
int idx = snd_mixer_selem_id_get_index(sid);
if (idx)
- name = i18n("context-mixerelement-name-number", "%1 %2").tqarg(name).tqarg(idx);
+ name = i18n("context-mixerelement-name-number", "%1 %2").arg(name).arg(idx);
bool add2all = false;
if (snd_mixer_selem_has_capture_switch(elem)) {
@@ -1204,8 +1204,8 @@ float AlsaSoundDevice::readPlaybackMixerVolume(const TQString &channel, bool &mu
}
logError("AlsaSound::readPlaybackMixerVolume: " +
i18n("error while reading volume from hwplug:%1,%2")
- .tqarg(m_PlaybackCard)
- .tqarg(m_PlaybackDevice));
+ .arg(m_PlaybackCard)
+ .arg(m_PlaybackDevice));
return 0;
}
@@ -1234,8 +1234,8 @@ float AlsaSoundDevice::readCaptureMixerVolume(const TQString &channel) const
}
logError("AlsaSound::readCaptureMixerVolume: " +
i18n("error while reading volume from hwplug:%1,%2")
- .tqarg(m_CaptureCard)
- .tqarg(m_CaptureDevice));
+ .arg(m_CaptureCard)
+ .arg(m_CaptureDevice));
return 0;
}
@@ -1267,9 +1267,9 @@ bool AlsaSoundDevice::writePlaybackMixerVolume (const TQString &channel, float &
}
logError("AlsaSound::writePlaybackMixerVolume: " +
i18n("error while writing volume %1 to hwplug:%2,%3")
- .tqarg(vol)
- .tqarg(m_PlaybackCard)
- .tqarg(m_PlaybackDevice));
+ .arg(vol)
+ .arg(m_PlaybackCard)
+ .arg(m_PlaybackDevice));
return false;
}
@@ -1302,9 +1302,9 @@ bool AlsaSoundDevice::writeCaptureMixerVolume (const TQString &channel, float &v
}
logError("AlsaSound::writeCaptureMixerVolume: " +
i18n("error while writing volume %1 to hwplug:%2,%3")
- .tqarg(vol)
- .tqarg(m_CaptureCard)
- .tqarg(m_CaptureDevice));
+ .arg(vol)
+ .arg(m_CaptureCard)
+ .arg(m_CaptureDevice));
return false;
}
@@ -1325,9 +1325,9 @@ bool AlsaSoundDevice::writeCaptureMixerSwitch (const TQString &channel, bool cap
}
logError("AlsaSound::writeCaptureMixerSwitch: " +
i18n("error while setting capture switch %1 for hwplug:%2,%3")
- .tqarg(channel)
- .tqarg(m_CaptureCard)
- .tqarg(m_CaptureDevice));
+ .arg(channel)
+ .arg(m_CaptureCard)
+ .arg(m_CaptureDevice));
return false;
}
@@ -1445,7 +1445,7 @@ void AlsaSoundDevice::setCaptureDevice(int card, int dev)
TQString AlsaSoundDevice::getSoundStreamClientDescription() const
{
- return i18n("ALSA Sound Device %1").tqarg(PluginBase::name());
+ return i18n("ALSA Sound Device %1").arg(PluginBase::name());
}
@@ -1520,9 +1520,9 @@ void AlsaSoundDevice::setCaptureMixerSettings(const TQMap<TQString, AlsaConfigMi
// if (m_captureThread) {
// AlsaCaptureEvent *e = static_cast<AlsaCaptureEvent*>(_e);
// TQString msg = i18n("ALSA Plugin, device plughw:%1,%2: %3")
-// .tqarg(m_CaptureCard)
-// .tqarg(m_CaptureDevice)
-// .tqarg(e->message());
+// .arg(m_CaptureCard)
+// .arg(m_CaptureDevice)
+// .arg(e->message());
// switch (_e->type()) {
// case CaptureError :
// logError(msg);
diff --git a/kradio3/plugins/gui-docking-menu/docking-configuration.cpp b/kradio3/plugins/gui-docking-menu/docking-configuration.cpp
index 489df58..4aaa4a9 100644
--- a/kradio3/plugins/gui-docking-menu/docking-configuration.cpp
+++ b/kradio3/plugins/gui-docking-menu/docking-configuration.cpp
@@ -19,7 +19,7 @@
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
#include <klocale.h>
@@ -31,26 +31,26 @@ DockingConfiguration::DockingConfiguration (RadioDocking *docking, TQWidget *par
m_docking(docking),
m_disableGUIUpdates(false)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout();
- TQHBoxLayout *tqlayout2 = new TQHBoxLayout();
+ TQHBoxLayout *layout = new TQHBoxLayout();
+ TQHBoxLayout *layout2 = new TQHBoxLayout();
m_labelClickMode = new TQLabel(this);
- tqlayout->addWidget(m_labelClickMode);
+ layout->addWidget(m_labelClickMode);
m_comboClickMode = new TQComboBox(this);
- tqlayout->addWidget(m_comboClickMode);
+ layout->addWidget(m_comboClickMode);
TQSpacerItem *spacer = new TQSpacerItem( 20, 2, TQSizePolicy::Expanding, TQSizePolicy::Minimum);
- tqlayout->addItem(spacer);
+ layout->addItem(spacer);
TQFrame *line = new TQFrame(this);
line->setFrameShape ( TQFrame::HLine );
line->setFrameShadow( TQFrame::Sunken );
- tqlayout2->addWidget(line);
+ layout2->addWidget(line);
StationSelectorUILayout->expand(2,0);
- StationSelectorUILayout->addMultiCellLayout(tqlayout2, 2, 2, 0, 2);
- StationSelectorUILayout->addMultiCellLayout(tqlayout, 3, 3, 0, 2);
+ StationSelectorUILayout->addMultiCellLayout(layout2, 2, 2, 0, 2);
+ StationSelectorUILayout->addMultiCellLayout(layout, 3, 3, 0, 2);
connect(m_comboClickMode, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSetDirty()));
diff --git a/kradio3/plugins/gui-docking-menu/docking.cpp b/kradio3/plugins/gui-docking-menu/docking.cpp
index 4b1f696..24511f1 100644
--- a/kradio3/plugins/gui-docking-menu/docking.cpp
+++ b/kradio3/plugins/gui-docking-menu/docking.cpp
@@ -137,8 +137,8 @@ void RadioDocking::restoreState (KConfig *config)
int n = config->readNumEntry("show_hide_cache_entries", 0);
for (int i = 1; i <= n; ++i) {
- TQString s = config->readEntry(TQString("show_hide_cache_id_%1").tqarg(i), TQString());
- bool b = config->readBoolEntry(TQString("show_hide_cache_value_%1").tqarg(i), false);
+ TQString s = config->readEntry(TQString("show_hide_cache_id_%1").arg(i), TQString());
+ bool b = config->readBoolEntry(TQString("show_hide_cache_value_%1").arg(i), false);
if (!s.isNull()) {
m_widgetsShownCache.insert(s,b);
}
@@ -161,8 +161,8 @@ void RadioDocking::saveState (KConfig *config) const
config->writeEntry("show_hide_cache_entries", m_widgetsShownCache.count());
i = 1;
for (TQMapConstIterator<TQString, bool> it = m_widgetsShownCache.begin(); it != m_widgetsShownCache.end(); ++it, ++i) {
- config->writeEntry(TQString("show_hide_cache_id_%1").tqarg(i), it.key());
- config->writeEntry(TQString("show_hide_cache_value_%1").tqarg(i), *it);
+ config->writeEntry(TQString("show_hide_cache_id_%1").arg(i), it.key());
+ config->writeEntry(TQString("show_hide_cache_value_%1").arg(i), *it);
}
}
@@ -351,7 +351,7 @@ bool RadioDocking::noticeNextAlarmChanged(const Alarm *a)
if (a) d = a->nextAlarm();
if (d.isValid())
- m_menu->changeTitle (m_alarmID, i18n("next alarm: %1").tqarg(d.toString()));
+ m_menu->changeTitle (m_alarmID, i18n("next alarm: %1").arg(d.toString()));
else
m_menu->changeTitle (m_alarmID, i18n("<no alarm pending>"));
return true;
@@ -361,7 +361,7 @@ bool RadioDocking::noticeNextAlarmChanged(const Alarm *a)
bool RadioDocking::noticeCountdownStarted(const TQDateTime &end)
{
if (end.isValid())
- m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Stop Sleep Countdown (running until %1)").tqarg(end.toString()));
+ m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Stop Sleep Countdown (running until %1)").arg(end.toString()));
else
m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Start Sleep Countdown"));
return true;
@@ -404,7 +404,7 @@ bool RadioDocking::noticeStationChanged (const RadioStation &rs, int /*idx*/)
s = rs.longName();
TQToolTip::add(this, s);
- m_menu->changeTitle (m_titleID, i18n("KRadio: %1").tqarg(s));
+ m_menu->changeTitle (m_titleID, i18n("KRadio: %1").arg(s));
// FIXME: title does not change in opened popupmenu
TQValueList<int>::iterator iit = m_stationMenuIDs.begin();
@@ -472,7 +472,7 @@ void RadioDocking::ShowHideWidgetPlugins()
if (p) {
bool visible = p->isAnywhereVisible();
TQString name = p->name();
- logDebug(TQString("visibility of %1: %2").tqarg(name).tqarg(visible));
+ logDebug(TQString("visibility of %1: %2").arg(name).arg(visible));
m_widgetsShownCache.insert(name, visible);
p->getWidget()->hide();
}
@@ -540,7 +540,7 @@ bool RadioDocking::startRecordingWithFormat(
querySoundStreamDescription(id, descr);
int menu_id = m_NextRecordingMenuID++;
m_recordingMenu->insertItem(SmallIcon("kradio_record"),
- i18n("Stop Recording of %1").tqarg(descr),
+ i18n("Stop Recording of %1").arg(descr),
menu_id);
m_MenuID2StreamID.insert(menu_id, id);
m_StreamID2MenuID.insert(id, menu_id);
@@ -613,7 +613,7 @@ void RadioDocking::buildRecordingMenu()
if (r) {
int menu_id = m_NextRecordingMenuID++;
m->insertItem(SmallIcon("kradio_record"),
- i18n("Stop Recording of %1").tqarg(descr),
+ i18n("Stop Recording of %1").arg(descr),
menu_id);
m_MenuID2StreamID.insert(menu_id, id);
m_StreamID2MenuID.insert(id, menu_id);
@@ -633,7 +633,7 @@ bool RadioDocking::noticeSoundStreamChanged(SoundStreamID id)
querySoundStreamDescription(id, descr);
m_recordingMenu->changeItem(m_StreamID2MenuID[id],
SmallIcon("kradio_record"),
- i18n("Stop Recording of %1").tqarg(descr));
+ i18n("Stop Recording of %1").arg(descr));
return true;
}
return false;
diff --git a/kradio3/plugins/gui-error-log/errorlog.cpp b/kradio3/plugins/gui-error-log/errorlog.cpp
index b675d14..97cc22b 100644
--- a/kradio3/plugins/gui-error-log/errorlog.cpp
+++ b/kradio3/plugins/gui-error-log/errorlog.cpp
@@ -19,11 +19,11 @@
#include <tqframe.h>
#include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <kfiledialog.h>
#include <kurl.h>
#include <ktempfile.h>
@@ -162,7 +162,7 @@ void ErrorLog::showOnOrgDesktop()
void ErrorLog::hide()
{
- logDebug(TQString("%1, ErrorLog::hide: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid));
+ logDebug(TQString("%1, ErrorLog::hide: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid));
WidgetPluginBase::pHide();
KDialogBase::hide();
}
@@ -183,7 +183,7 @@ void ErrorLog::hideEvent(TQHideEvent *e)
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) {
showPage(PAGE_ID_ERROR);
show();
@@ -193,19 +193,19 @@ bool ErrorLog::logError (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;
}
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;
}
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;
}
@@ -244,7 +244,7 @@ void ErrorLog::slotUser1()
if (outf->status() != IO_Ok) {
logError("ErrorLogger: " +
- i18n("error writing to tempfile %1").tqarg(tmpFile.name()));
+ i18n("error writing to tempfile %1").arg(tmpFile.name()));
return;
}
@@ -253,7 +253,7 @@ void ErrorLog::slotUser1()
if (!KIO::NetAccess::upload(tmpFile.name(), url, this)) {
logError("ErrorLogger: " +
- i18n("error uploading preset file %1").tqarg(url.url()));
+ i18n("error uploading preset file %1").arg(url.url()));
}
}
setIconListAllVisible(true);
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
index 4cd8dd0..38cdbac 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
@@ -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.
**
@@ -104,9 +104,9 @@ bool ButtonFlowLayout::hasHeightForWidth() const
return TRUE;
}
-TQSize ButtonFlowLayout::tqsizeHint() const
+TQSize ButtonFlowLayout::sizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
TQSizePolicy::ExpandData ButtonFlowLayout::expanding() const
@@ -133,7 +133,7 @@ void ButtonFlowLayout::setGeometry( const TQRect &r )
int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
{
-/* kdDebug() << "buttonflowtqlayout::doLayout ("
+/* kdDebug() << "buttonflowlayout::doLayout ("
<< r.x() << "," << r.y() << ","
<< r.width() << "," << r.height() << ", " << testonly << ")\n";
*/
@@ -154,8 +154,8 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
it.toFirst();
while ( (o=it.current()) != 0 ) {
++it;
- buttonWidth = TQMAX( buttonWidth, o->tqsizeHint().width() );
- buttonHeight = TQMAX( buttonHeight, o->tqsizeHint().height() );
+ buttonWidth = TQMAX( buttonWidth, o->sizeHint().width() );
+ buttonHeight = TQMAX( buttonHeight, o->sizeHint().height() );
}
// 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);
for (TQPtrListIterator<TQLayoutItem> it(list); it.current(); ++it) {
TQLayoutItem *o = it.current();
- s = s.expandedTo( o->tqsizeHint()); //tqminimumSize() );
+ s = s.expandedTo( o->sizeHint()); //minimumSize() );
}
s.setHeight(heightForWidth(r.width()));
@@ -249,7 +249,7 @@ int ButtonFlowLayout::count() const {
\reimp
*/
TQLayoutItem* ButtonFlowLayout::itemAt(int index) const {
- return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).tqat(index)) : 0;
+ return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).at(index)) : 0;
}
/*!
@@ -258,8 +258,8 @@ TQLayoutItem* ButtonFlowLayout::itemAt(int index) const {
TQLayoutItem* ButtonFlowLayout::takeAt(int index) {
if (index < 0 || index >= list.count())
return 0;
- TQLayoutItem *item = list.tqat(index);
- list.remove(list.tqat(index));
+ TQLayoutItem *item = list.at(index);
+ list.remove(list.at(index));
delete item;
invalidate();
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
index fe33efc..3346c6d 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
@@ -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
**
@@ -23,7 +23,7 @@
#include "../../src/include/utils.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqptrlist.h>
class ButtonFlowLayout : public TQLayout
@@ -41,9 +41,9 @@ public:
void addItem( TQLayoutItem *item);
bool hasHeightForWidth() const;
int heightForWidth( int ) const;
- TQSize tqsizeHint() const;
- TQSize tqminimumSize() const;
- TQSize tqminimumSize(const TQSize &r) const; // tqminimumSize is dependent from width
+ TQSize sizeHint() const;
+ TQSize minimumSize() const;
+ TQSize minimumSize(const TQSize &r) const; // minimumSize is dependent from width
TQLayoutIterator iterator();
TQSizePolicy::ExpandData expanding() const;
diff --git a/kradio3/plugins/gui-quickbar/quickbar.cpp b/kradio3/plugins/gui-quickbar/quickbar.cpp
index ca1d4d8..eee163e 100644
--- a/kradio3/plugins/gui-quickbar/quickbar.cpp
+++ b/kradio3/plugins/gui-quickbar/quickbar.cpp
@@ -303,7 +303,7 @@ void QuickBar::rebuildGUI()
else
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());
if (isVisible()) b->show();
@@ -316,9 +316,9 @@ void QuickBar::rebuildGUI()
// activate correct button
activateCurrentButton();
- // calculate tqgeometry
+ // calculate geometry
if (m_layout) {
- TQRect r = tqgeometry();
+ TQRect r = geometry();
int h = m_layout->heightForWidth( r.width());
if (h > r.height())
@@ -367,7 +367,7 @@ void QuickBar::setGeometry (int x, int y, int w, int h)
{
if (m_layout) {
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);
}
@@ -381,10 +381,10 @@ void QuickBar::setGeometry (const TQRect &r)
void QuickBar::resizeEvent (TQResizeEvent *e)
{
- // tqminimumSize might change because of the flow tqlayout
+ // minimumSize might change because of the flow layout
if (m_layout) {
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);
diff --git a/kradio3/plugins/gui-standard-display/displaycfg.cpp b/kradio3/plugins/gui-standard-display/displaycfg.cpp
index 0e92da7..8d4e1ca 100644
--- a/kradio3/plugins/gui-standard-display/displaycfg.cpp
+++ b/kradio3/plugins/gui-standard-display/displaycfg.cpp
@@ -20,7 +20,7 @@
#include <kcolordialog.h>
#include <kfontdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <tqlabel.h>
#include <tqbuttongroup.h>
@@ -32,9 +32,9 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
{
TQGroupBox *bg = new TQGroupBox(i18n("Display Colors"), this);
bg->setColumnLayout(0, Qt::Vertical );
- bg->tqlayout()->setSpacing( 8 );
- bg->tqlayout()->setMargin( 12 );
- TQGridLayout *gl = new TQGridLayout (bg->tqlayout());
+ bg->layout()->setSpacing( 8 );
+ bg->layout()->setMargin( 12 );
+ TQGridLayout *gl = new TQGridLayout (bg->layout());
m_btnActive = new KColorButton(queryDisplayActiveColor(), bg);
m_btnInactive = new KColorButton(queryDisplayInactiveColor(), bg);
@@ -48,16 +48,16 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
TQLabel *l2 = new TQLabel(i18n("Inactive Text"), bg);
TQLabel *l3 = new TQLabel(i18n("Background Color"), bg);
- l1->tqsetAlignment(TQLabel::AlignCenter);
- l2->tqsetAlignment(TQLabel::AlignCenter);
- l3->tqsetAlignment(TQLabel::AlignCenter);
+ l1->setAlignment(TQLabel::AlignCenter);
+ l2->setAlignment(TQLabel::AlignCenter);
+ l3->setAlignment(TQLabel::AlignCenter);
- l1->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
- l2->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
- l3->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
- m_btnActive ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- m_btnInactive->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- m_btnBkgnd ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ l1->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ l2->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ l3->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_btnActive ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_btnInactive->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_btnBkgnd ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_btnActive ->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->setFont(queryDisplayFont());
- m_fontChooser->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_fontChooser->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQVBoxLayout *l = new TQVBoxLayout(this, 10);
l->addWidget(bg);
diff --git a/kradio3/plugins/gui-standard-display/radioview.cpp b/kradio3/plugins/gui-standard-display/radioview.cpp
index c5f12f2..efe5bf1 100644
--- a/kradio3/plugins/gui-standard-display/radioview.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbutton.h>
#include <tqslider.h>
#include <tqfile.h>
@@ -162,10 +162,10 @@ RadioView::RadioView(const TQString &name)
btnSnooze->setIconSet(SmallIconSet("kradio_zzz"));
btnPlugins->setIconSet(SmallIconSet("kradio_plugins"));
- widgetStacks[clsRadioSound] ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
- widgetStacks[clsRadioDisplay]->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
- widgetStacks[clsRadioSeek] ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
- comboStations ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+ widgetStacks[clsRadioSound] ->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
+ widgetStacks[clsRadioDisplay]->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
+ widgetStacks[clsRadioSeek] ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+ comboStations ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
comboStations->setMinimumHeight(28);
@@ -439,7 +439,7 @@ bool RadioView::startRecordingWithFormat(
querySoundStreamDescription(id, descr);
int menu_id = m_NextRecordingMenuID++;
m_RecordingMenu->insertItem(SmallIcon("kradio_record"),
- i18n("Stop Recording of %1").tqarg(descr),
+ i18n("Stop Recording of %1").arg(descr),
menu_id);
m_MenuID2StreamID.insert(menu_id, id);
m_StreamID2MenuID.insert(id, menu_id);
@@ -477,7 +477,7 @@ bool RadioView::noticeSoundStreamChanged(SoundStreamID id)
querySoundStreamDescription(id, descr);
m_RecordingMenu->changeItem(m_StreamID2MenuID[id],
SmallIcon("kradio_record"),
- i18n("Stop Recording of %1").tqarg(descr));
+ i18n("Stop Recording of %1").arg(descr));
return true;
}
return false;
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index 17afde3..f449122 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -185,11 +185,11 @@ bool RadioViewFrequencyRadio::setDisplayColors(const TQColor &activeText,
if (parentWidget() && parentWidget()->backgroundPixmap() ){
KPixmapIO io;
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));
setBackgroundOrigin(WindowOrigin);
} else {
- setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button));
+ setBackgroundColor(colorGroup().color(TQColorGroup::Button));
}
if (change)
@@ -222,7 +222,7 @@ bool RadioViewFrequencyRadio::noticePowerChanged (bool on, const IRadioDevice */
queryIsStereo(ssid, s);
noticeStereoChanged(ssid, s);
- tqrepaint();
+ repaint();
return true;
}
@@ -246,7 +246,7 @@ bool RadioViewFrequencyRadio::noticeSignalQualityChanged(SoundStreamID id, float
if (queryCurrentSoundStreamID() != id)
return false;
m_quality = q;
- tqrepaint ();
+ repaint ();
return true;
}
@@ -256,7 +256,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s)
if (queryCurrentSoundStreamID() != id)
return false;
m_stereo = s;
- tqrepaint ();
+ repaint ();
return true;
}
@@ -269,7 +269,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s)
bool RadioViewFrequencyRadio::noticeFrequencyChanged(float f, const RadioStation *)
{
m_frequency = f;
- tqrepaint ();
+ repaint ();
return true;
}
@@ -320,10 +320,10 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
xx_sg = r.x() + margin,
xy_sg = r.y() + margin;
- TQPen activePen (tqcolorGroup().color(TQColorGroup::Text), penw);
- TQPen inactivePen (tqcolorGroup().color(TQColorGroup::Mid), penw);
- TQBrush activeBrush = tqcolorGroup().brush(TQColorGroup::Text);
- TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid);
+ TQPen activePen (colorGroup().color(TQColorGroup::Text), penw);
+ TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), penw);
+ TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text);
+ TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
// draw stereo symbol
paint->setPen( (m_stereo && m_power) ? activePen : inactivePen);
@@ -403,9 +403,9 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
TQString s;
if (m_frequency < 10) {
- s = i18n("%1 kHz").tqarg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
+ s = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
} else {
- s = i18n("%1 MHz").tqarg(KGlobal::locale()->formatNumber(m_frequency, 2));
+ s = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(m_frequency, 2));
}
float pxs = xh_f;
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
index e334e45..318c049 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include <math.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqslider.h>
#include <tqtoolbutton.h>
#include <tqaccel.h>
diff --git a/kradio3/plugins/gui-standard-display/radioview_volume.cpp b/kradio3/plugins/gui-standard-display/radioview_volume.cpp
index abde874..8e4f024 100644
--- a/kradio3/plugins/gui-standard-display/radioview_volume.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_volume.cpp
@@ -17,7 +17,7 @@
#include <math.h>
#include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqaccel.h>
#include <tqtooltip.h>
@@ -37,7 +37,7 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
{
float v = 0;
SoundStreamID ssid = queryCurrentSoundStreamID();
- sendLogDebug (TQString ("RadioViewVolume: ssid=%1").tqarg(ssid.getID()));
+ sendLogDebug (TQString ("RadioViewVolume: ssid=%1").arg(ssid.getID()));
queryPlaybackVolume(ssid, v);
m_slider = new TQSlider(SLIDER_MINVAL,
SLIDER_MAXVAL,
diff --git a/kradio3/plugins/lirc/lircsupport.cpp b/kradio3/plugins/lirc/lircsupport.cpp
index 68bcb6a..5b81d8c 100644
--- a/kradio3/plugins/lirc/lircsupport.cpp
+++ b/kradio3/plugins/lirc/lircsupport.cpp
@@ -64,7 +64,7 @@ LircSupport::LircSupport(const TQString &name)
TQFile lircrc(slircrc);
if (!lircrc.exists()) {
- logWarning(i18n("%1 does not exist. File was created with KRadio's default .lircrc proposal").tqarg(LIRCRC));
+ logWarning(i18n("%1 does not exist. File was created with KRadio's default .lircrc proposal").arg(LIRCRC));
TQFile default_lircrc(locate("data", "kradio/default-dot-lircrc"));
lircrc.open(IO_WriteOnly);
default_lircrc.open(IO_ReadOnly);
diff --git a/kradio3/plugins/oss-sound/oss-sound.cpp b/kradio3/plugins/oss-sound/oss-sound.cpp
index 2ac0f6e..c1a9160 100644
--- a/kradio3/plugins/oss-sound/oss-sound.cpp
+++ b/kradio3/plugins/oss-sound/oss-sound.cpp
@@ -478,7 +478,7 @@ bool OSSSoundDevice::noticeSoundStreamData(SoundStreamID id,
// if (n < size) {
// m_PlaybackSkipCount += size - n;
// } else if (m_PlaybackSkipCount > 0) {
-// logWarning(i18n("%1: Playback buffer overflow. Skipped %1 bytes").tqarg(m_DSPDeviceName).tqarg(TQString::number(m_PlaybackSkipCount)));
+// logWarning(i18n("%1: Playback buffer overflow. Skipped %1 bytes").arg(m_DSPDeviceName).arg(TQString::number(m_PlaybackSkipCount)));
// m_PlaybackSkipCount = 0;
// }
@@ -504,7 +504,7 @@ void OSSSoundDevice::slotPoll()
bytesRead = 0;
} else if (bytesRead == 0) {
err = -1;
- logError(i18n("OSS device %1: No data to record").tqarg(m_DSPDeviceName));
+ logError(i18n("OSS device %1: No data to record").arg(m_DSPDeviceName));
} else {
err = errno;
}
@@ -514,7 +514,7 @@ void OSSSoundDevice::slotPoll()
buffer = m_CaptureBuffer.getData(size);
time_t cur_time = time(NULL);
size_t consumed_size = SIZE_T_DONT_CARE;
- notifySoundStreamData(m_CaptureStreamID, m_DSPFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").tqarg(m_DSPDeviceName)));
+ notifySoundStreamData(m_CaptureStreamID, m_DSPFormat, buffer, size, consumed_size, SoundMetaData(m_CapturePos, cur_time - m_CaptureStartTime, cur_time, i18n("internal stream, not stored (%1)").arg(m_DSPDeviceName)));
if (consumed_size == SIZE_T_DONT_CARE)
consumed_size = size;
m_CaptureBuffer.removeData(consumed_size);
@@ -546,7 +546,7 @@ void OSSSoundDevice::slotPoll()
}
if (err) {
- logError(i18n("Error %1 while handling OSS device %2").tqarg(TQString().setNum(err)).tqarg(m_DSPDeviceName));
+ logError(i18n("Error %1 while handling OSS device %2").arg(TQString().setNum(err)).arg(m_DSPDeviceName));
}
if (m_PlaybackStreamID.isValid())
@@ -590,13 +590,13 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
m_DSP_fd = open(m_DSPDeviceName.ascii(), O_NONBLOCK | O_RDONLY);
bool err = m_DSP_fd < 0;
if (err) {
- logError(i18n("Cannot open DSP device %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot open DSP device %1").arg(m_DSPDeviceName));
return false;
}
int caps = 0;
err |= (ioctl (m_DSP_fd, SNDCTL_DSP_GETCAPS, &caps) != 0);
if (err)
- logError(i18n("Cannot read DSP capabilities for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot read DSP capabilities for %1").arg(m_DSPDeviceName));
m_DuplexMode = (caps & DSP_CAP_DUPLEX) ? DUPLEX_FULL : DUPLEX_HALF;
close (m_DSP_fd);
@@ -616,24 +616,24 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
err = m_DSP_fd < 0;
if (err) {
- logError(i18n("Cannot open DSP device %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot open DSP device %1").arg(m_DSPDeviceName));
return false;
}
int oss_format = getOSSFormat(m_DSPFormat);
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SETFMT, &oss_format) != 0);
if (err)
- logError(i18n("Cannot set DSP sample format for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot set DSP sample format for %1").arg(m_DSPDeviceName));
int channels = m_DSPFormat.m_Channels;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_CHANNELS, &channels) != 0);
if (err)
- logError(i18n("Cannot set number of channels for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot set number of channels for %1").arg(m_DSPDeviceName));
int rate = m_DSPFormat.m_SampleRate;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SPEED, &rate) != 0);
if (err)
- logError(i18n("Cannot set sampling rate for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot set sampling rate for %1").arg(m_DSPDeviceName));
if (rate != (int)m_DSPFormat.m_SampleRate) {
logWarning(i18n("Asking for %1 Hz but %2 uses %3 Hz").
arg(TQString::number(m_DSPFormat.m_SampleRate)).
@@ -645,12 +645,12 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
int stereo = m_DSPFormat.m_Channels == 2;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_STEREO, &stereo) != 0);
if (err)
- logError(i18n("Cannot set stereo mode for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot set stereo mode for %1").arg(m_DSPDeviceName));
unsigned sampleSize = m_DSPFormat.m_SampleBits;
err |= (ioctl(m_DSP_fd, SNDCTL_DSP_SAMPLESIZE, &sampleSize) != 0);
if (err || sampleSize != m_DSPFormat.m_SampleBits)
- logError(i18n("Cannot set sample size for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot set sample size for %1").arg(m_DSPDeviceName));
// setup buffer, ask for 40ms latency
int tmp = (400 * m_DSPFormat.frameSize() * m_DSPFormat.m_SampleRate) / 1000;
@@ -659,17 +659,17 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
mask |= 0x7FFF0000;
err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &mask);
if (err)
- logError(i18n("Cannot set buffers for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot set buffers for %1").arg(m_DSPDeviceName));
int bufferBlockSize = 0;
err |= ioctl (m_DSP_fd, SNDCTL_DSP_GETBLKSIZE, &bufferBlockSize);
if (err) {
- logError(i18n("Cannot read buffer size for %1").tqarg(m_DSPDeviceName));
+ logError(i18n("Cannot read buffer size for %1").arg(m_DSPDeviceName));
} else {
- logInfo(i18n("%1 uses buffer blocks of %2 bytes").tqarg(m_DSPDeviceName).tqarg(TQString::number(bufferBlockSize)));
+ logInfo(i18n("%1 uses buffer blocks of %2 bytes").arg(m_DSPDeviceName).arg(TQString::number(bufferBlockSize)));
size_t tmp = (((m_BufferSize - 1) / bufferBlockSize) + 1) * bufferBlockSize;
setBufferSize(tmp);
- logInfo(i18n("adjusted own buffer size to %1 bytes").tqarg(TQString::number(tmp)));
+ logInfo(i18n("adjusted own buffer size to %1 bytes").arg(TQString::number(tmp)));
}
int trigger = ~PCM_ENABLE_INPUT & ~PCM_ENABLE_OUTPUT;
@@ -721,7 +721,7 @@ bool OSSSoundDevice::openMixerDevice(bool reopen)
m_Mixer_fd = open(m_MixerDeviceName.ascii(), O_RDONLY);
if (m_Mixer_fd < 0) {
- logError(i18n("Cannot open mixer device %1").tqarg(m_MixerDeviceName));
+ logError(i18n("Cannot open mixer device %1").arg(m_MixerDeviceName));
} else {
m_PollingTimer.start(40);
}
@@ -754,7 +754,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS
fd = open(m_MixerDeviceName.ascii(), O_RDONLY);
if (fd < 0) {
- logError(i18n("OSSSoundDevice::getMixerChannels: Cannot open mixer device %1").tqarg(m_MixerDeviceName));
+ logError(i18n("OSSSoundDevice::getMixerChannels: Cannot open mixer device %1").arg(m_MixerDeviceName));
}
if (fd >= 0) {
@@ -768,7 +768,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS
}
}
} else {
- logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device mask on device %1").tqarg(m_MixerDeviceName));
+ logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device mask on device %1").arg(m_MixerDeviceName));
}
}
if (fd != m_Mixer_fd)
@@ -874,8 +874,8 @@ float OSSSoundDevice::readMixerVolume(int channel) const
if (err) {
logError("OSSSound::readMixerVolume: " +
i18n("error %1 while reading volume from %2")
- .tqarg(TQString().setNum(err))
- .tqarg(m_MixerDeviceName));
+ .arg(TQString().setNum(err))
+ .arg(m_MixerDeviceName));
tmpvol.l = tmpvol.r = 0;
}
return float(tmpvol.l) / 100.0;
@@ -897,9 +897,9 @@ float OSSSoundDevice::writeMixerVolume (int channel, float vol)
if (err != 0) {
logError("OSSSoundDevice::writeMixerVolume: " +
i18n("error %1 while setting volume to %2 on device %3")
- .tqarg(TQString().setNum(err))
- .tqarg(TQString().setNum(vol))
- .tqarg(m_MixerDeviceName));
+ .arg(TQString().setNum(err))
+ .arg(TQString().setNum(vol))
+ .arg(m_MixerDeviceName));
return -1;
}
}
@@ -913,21 +913,21 @@ void OSSSoundDevice::selectCaptureChannel (int channel)
int err = ioctl(m_Mixer_fd, SOUND_MIXER_WRITE_RECSRC, &x);
if (err)
logError(i18n("Selecting recording source on device %1 failed with error code %2")
- .tqarg(m_MixerDeviceName)
- .tqarg(TQString::number(err)));
+ .arg(m_MixerDeviceName)
+ .arg(TQString::number(err)));
_lrvol tmpvol;
err = ioctl(m_Mixer_fd, MIXER_READ(SOUND_MIXER_IGAIN), &tmpvol);
if (err)
logError(i18n("Reading igain volume on device %1 failed with error code %2")
- .tqarg(m_MixerDeviceName)
- .tqarg(TQString::number(err)));
+ .arg(m_MixerDeviceName)
+ .arg(TQString::number(err)));
if (tmpvol.r == 0 && tmpvol.l == 0) {
tmpvol.r = tmpvol.l = 1;
err = ioctl(m_Mixer_fd, MIXER_WRITE(SOUND_MIXER_IGAIN), &tmpvol);
if (err)
logError(i18n("Setting igain volume on device %1 failed with error code %2")
- .tqarg(m_MixerDeviceName)
- .tqarg(TQString::number(err)));
+ .arg(m_MixerDeviceName)
+ .arg(TQString::number(err)));
}
}
@@ -983,7 +983,7 @@ void OSSSoundDevice::setDSPDeviceName(const TQString &s)
TQString OSSSoundDevice::getSoundStreamClientDescription() const
{
- return i18n("OSS Sound Device %1").tqarg(PluginBase::name());
+ return i18n("OSS Sound Device %1").arg(PluginBase::name());
}
diff --git a/kradio3/plugins/radio/radio-configuration-ui.ui b/kradio3/plugins/radio/radio-configuration-ui.ui
index 28e936e..2ea4d33 100644
--- a/kradio3/plugins/radio/radio-configuration-ui.ui
+++ b/kradio3/plugins/radio/radio-configuration-ui.ui
@@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout32</cstring>
+ <cstring>layout32</cstring>
</property>
<property name="margin" stdset="0">
<number>6</number>
@@ -55,7 +55,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<vbox>
<property name="name">
@@ -63,7 +63,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -84,7 +84,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -157,7 +157,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<hbox>
<property name="name">
@@ -228,7 +228,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<vbox>
<property name="name">
@@ -249,7 +249,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -280,7 +280,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout32</cstring>
+ <cstring>layout32</cstring>
</property>
<vbox>
<property name="name">
@@ -311,7 +311,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -327,7 +327,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -358,7 +358,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -377,7 +377,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -395,7 +395,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>10</width>
<height>5</height>
@@ -434,7 +434,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -443,7 +443,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -481,7 +481,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -494,7 +494,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout25</cstring>
+ <cstring>layout25</cstring>
</property>
<hbox>
<property name="name">
@@ -541,7 +541,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -550,7 +550,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<grid>
<property name="name">
@@ -579,7 +579,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -683,7 +683,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -697,7 +697,7 @@
<property name="text">
<string>&lt;p align="center"&gt;Click on the link below to contribute this station preset file to the kradio project.&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -705,7 +705,7 @@
<property name="name">
<cstring>mailLabel</cstring>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kradio3/plugins/radio/radio-configuration.cpp b/kradio3/plugins/radio/radio-configuration.cpp
index 4cbf764..b4136b6 100644
--- a/kradio3/plugins/radio/radio-configuration.cpp
+++ b/kradio3/plugins/radio/radio-configuration.cpp
@@ -484,7 +484,7 @@ void RadioConfiguration::slotStorePresets()
void RadioConfiguration::slotLastChangeNow()
{
slotSetDirty();
- editLastChange->setDateTime(TQDateTime::tqcurrentDateTime());
+ editLastChange->setDateTime(TQDateTime::currentDateTime());
}
diff --git a/kradio3/plugins/recording/encoder_mp3.cpp b/kradio3/plugins/recording/encoder_mp3.cpp
index 8d76fe2..2b2eb74 100644
--- a/kradio3/plugins/recording/encoder_mp3.cpp
+++ b/kradio3/plugins/recording/encoder_mp3.cpp
@@ -76,7 +76,7 @@ void RecordingEncodingMP3::encode(const char *_buffer, size_t buffer_size, char
m_MP3BufferSize);
lameSerialization.unlock();
if (n < 0) {
- m_errorString += i18n("Error %1 while encoding mp3. ").tqarg(TQString().setNum(n));
+ m_errorString += i18n("Error %1 while encoding mp3. ").arg(TQString().setNum(n));
m_error = true;
} else if (n > 0) {
m_encodedSize += n;
@@ -86,7 +86,7 @@ void RecordingEncodingMP3::encode(const char *_buffer, size_t buffer_size, char
int r = fwrite(m_MP3Buffer, 1, n, m_MP3Output);
if (r <= 0) {
- m_errorString += i18n("Error %1 writing output. ").tqarg(TQString().setNum(r));
+ m_errorString += i18n("Error %1 writing output. ").arg(TQString().setNum(r));
m_error = true;
}
}
@@ -120,13 +120,13 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
if (lame_init_params(m_LAMEFlags) < 0) {
m_error = true;
- m_errorString += i18n("Cannot initialize libmp3lame parameters. ").tqarg(output);
+ m_errorString += i18n("Cannot initialize libmp3lame parameters. ").arg(output);
}
if (!m_error) {
id3tag_init(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");
size_t l = title.length() + comment.length() + 10;
m_ID3Tags = new char[l];
@@ -140,7 +140,7 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
m_MP3Output = fopen(output.ascii(), "wb+");
if (!m_MP3Output) {
- m_errorString += i18n("Cannot open output file %1. ").tqarg(output);
+ m_errorString += i18n("Cannot open output file %1. ").arg(output);
m_error = true;
}
@@ -186,12 +186,12 @@ void RecordingEncodingMP3::closeOutput()
m_MP3BufferSize);
if (n < 0) {
m_error = true;
- m_errorString += i18n("Error %1 while encoding mp3. ").tqarg(TQString().setNum(n));
+ m_errorString += i18n("Error %1 while encoding mp3. ").arg(TQString().setNum(n));
} else if (n > 0) {
int r = fwrite(m_MP3Buffer, 1, n, m_MP3Output);
if (r <= 0) {
m_error = true;
- m_errorString += i18n("Error %1 writing output. ").tqarg(TQString().setNum(r));
+ m_errorString += i18n("Error %1 writing output. ").arg(TQString().setNum(r));
} else {
lame_mp3_tags_fid(m_LAMEFlags, m_MP3Output);
}
diff --git a/kradio3/plugins/recording/encoder_ogg.cpp b/kradio3/plugins/recording/encoder_ogg.cpp
index b51eedd..ec43546 100644
--- a/kradio3/plugins/recording/encoder_ogg.cpp
+++ b/kradio3/plugins/recording/encoder_ogg.cpp
@@ -133,7 +133,7 @@ bool RecordingEncodingOgg::openOutput(const TQString &output)
#ifdef HAVE_OGG
m_OggOutput = fopen(output.ascii(), "wb+");
if (!m_OggOutput) {
- m_errorString += i18n("Cannot open Ogg/Vorbis output file %1. ").tqarg(output);
+ m_errorString += i18n("Cannot open Ogg/Vorbis output file %1. ").arg(output);
m_error = true;
}
@@ -176,7 +176,7 @@ bool RecordingEncodingOgg::openOutput(const TQString &output)
vorbis_comment_init (&vc);
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, "date", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate));
+ vorbis_comment_add_tag_new(&vc, "date", TQDateTime::currentDateTime().toString(Qt::ISODate));
vorbis_analysis_headerout(&m_VorbisDSP, &vc,
&header_main, &header_comments, &header_codebooks);
diff --git a/kradio3/plugins/recording/encoder_pcm.cpp b/kradio3/plugins/recording/encoder_pcm.cpp
index 85da6ee..1143bc3 100644
--- a/kradio3/plugins/recording/encoder_pcm.cpp
+++ b/kradio3/plugins/recording/encoder_pcm.cpp
@@ -50,7 +50,7 @@ void RecordingEncodingPCM::encode(const char *buffer, size_t buffer_size, char *
if (err != (int)buffer_size) {
m_error = true;
- m_errorString += i18n("Error %1 writing output. ").tqarg(TQString().setNum(err));
+ m_errorString += i18n("Error %1 writing output. ").arg(TQString().setNum(err));
}
}
@@ -63,7 +63,7 @@ bool RecordingEncodingPCM::openOutput(const TQString &output)
if (!m_output) {
m_error = true;
- m_errorString += i18n("Cannot open output file %1. ").tqarg(output);
+ m_errorString += i18n("Cannot open output file %1. ").arg(output);
}
return !m_error;
}
diff --git a/kradio3/plugins/recording/recording-configuration-ui.ui b/kradio3/plugins/recording/recording-configuration-ui.ui
index e5ba41c..2a90973 100644
--- a/kradio3/plugins/recording/recording-configuration-ui.ui
+++ b/kradio3/plugins/recording/recording-configuration-ui.ui
@@ -42,7 +42,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@@ -50,7 +50,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout3_2</cstring>
+ <cstring>layout3_2</cstring>
</property>
<hbox>
<property name="name">
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="2">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -222,7 +222,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -247,7 +247,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout69</cstring>
+ <cstring>layout69</cstring>
</property>
<grid>
<property name="name">
@@ -263,7 +263,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>225</width>
<height>20</height>
@@ -321,7 +321,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>225</width>
<height>20</height>
@@ -454,7 +454,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>225</width>
<height>20</height>
@@ -473,7 +473,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -498,7 +498,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -563,7 +563,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -588,7 +588,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout68</cstring>
+ <cstring>layout68</cstring>
</property>
<vbox>
<property name="name">
@@ -596,7 +596,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -623,7 +623,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>380</width>
<height>20</height>
@@ -634,7 +634,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -688,7 +688,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kradio3/plugins/recording/recording-datamonitor.cpp b/kradio3/plugins/recording/recording-datamonitor.cpp
index 8f22b1a..f2bbe8e 100644
--- a/kradio3/plugins/recording/recording-datamonitor.cpp
+++ b/kradio3/plugins/recording/recording-datamonitor.cpp
@@ -50,7 +50,7 @@ RecordingDataMonitor::RecordingDataMonitor(TQWidget *parent, const char *name)
setColors(TQColor(20, 244, 20),
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;
TQRect r = contentsRect();
- TQPen activePen (tqcolorGroup().color(TQColorGroup::Text), 1);
- TQPen inactivePen (tqcolorGroup().color(TQColorGroup::Mid), 1);
- TQBrush activeBrush = tqcolorGroup().brush(TQColorGroup::Text);
- TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid);
+ TQPen activePen (colorGroup().color(TQColorGroup::Text), 1);
+ TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), 1);
+ TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text);
+ TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
TQBrush yellowBrush(TQColor(255,255,0));
TQBrush orangeBrush(TQColor(255,192,0));
TQBrush redBrush (TQColor(255,0, 0));
@@ -171,12 +171,12 @@ void RecordingDataMonitor::internalDrawContents(TQPainter &painter, bool repaint
f.setPixelSize(CHANNEL_H_MIN);
painter.setFont(f);
- int maxW = TQFontMetrics(f).width(i18n("%1 dB").tqarg((int)min_dB));
+ int maxW = TQFontMetrics(f).width(i18n("%1 dB").arg((int)min_dB));
int delta_dB = 5;
while (abs((long)min_dB) / delta_dB * maxW * 2 > r.width()) delta_dB *= 2;
for (int dB = 0; dB >= min_dB; dB -= delta_dB) {
- TQString txt = i18n("%1 dB").tqarg(dB);
+ TQString txt = i18n("%1 dB").arg(dB);
int w = TQFontMetrics(f).width(txt);
int x = x0 + (int)(nBlocks * BLOCK_W_MIN * (min_dB - dB) / min_dB) - w;
if (x < x0) continue;
@@ -223,11 +223,11 @@ bool RecordingDataMonitor::setColors(const TQColor &activeText,
if (parentWidget() && parentWidget()->backgroundPixmap() ){
KPixmapIO io;
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));
setBackgroundOrigin(WindowOrigin);
} else {
- setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button));
+ setBackgroundColor(colorGroup().color(TQColorGroup::Button));
}
return true;
@@ -267,7 +267,7 @@ bool RecordingDataMonitor::noticeSoundStreamData(SoundStreamID /*id*/,
TQPainter paint(this);
if (m_maxValue != old_max) {
- tqrepaint(true);
+ repaint(true);
} else {
internalDrawContents(paint, false);
}
diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp
index 063a095..f2c773e 100644
--- a/kradio3/plugins/recording/recording-monitor.cpp
+++ b/kradio3/plugins/recording/recording-monitor.cpp
@@ -21,7 +21,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <kcombobox.h>
@@ -43,7 +43,7 @@ RecordingMonitor::RecordingMonitor(const TQString &name)
l0->addWidget( new TQLabel(i18n("SoundStream"), this), 0, 0);
l0->addWidget(m_comboSoundStreamSelector = new KComboBox( this), 0, 1);
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(m_labelFileName = new TQLabel(i18n("<undefined>"), this), 2, 1);
l0->addWidget( new TQLabel(i18n("File Size"), this), 3, 0);
@@ -336,13 +336,13 @@ bool RecordingMonitor::noticeSoundStreamData(SoundStreamID id,
double MB = kB / 1024;
double GB = MB / 1024;
TQString str_size;
- str_size = i18n("%1 Byte").tqarg(KGlobal::locale()->formatNumber((int)B, 0));
- if (kB > 1) str_size = i18n("%1 kB").tqarg(KGlobal::locale()->formatNumber(kB, 3));
- if (MB > 1) str_size = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber(MB, 3));
- if (GB > 1) str_size = i18n("%1 GB").tqarg(KGlobal::locale()->formatNumber(GB, 3));
+ str_size = i18n("%1 Byte").arg(KGlobal::locale()->formatNumber((int)B, 0));
+ if (kB > 1) str_size = i18n("%1 kB").arg(KGlobal::locale()->formatNumber(kB, 3));
+ if (MB > 1) str_size = i18n("%1 MB").arg(KGlobal::locale()->formatNumber(MB, 3));
+ if (GB > 1) str_size = i18n("%1 GB").arg(KGlobal::locale()->formatNumber(GB, 3));
m_labelSize->setText(str_size);
- m_labelRate->setText(i18n("%1 Hz").tqarg(sf.m_SampleRate));
+ m_labelRate->setText(i18n("%1 Hz").arg(sf.m_SampleRate));
return true;
}
return false;
@@ -369,7 +369,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
m_labelTime ->setEnabled(true);
m_labelRate ->setEnabled(true);
m_labelFileName ->setEnabled(true);
- m_labeltqStatus ->setEnabled(true);
+ m_labelStatus ->setEnabled(true);
} else {
m_dataMonitor ->setEnabled(false);
m_labelSize ->setEnabled(false);
@@ -377,7 +377,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
m_labelTime ->setEnabled(false);
m_labelRate ->setEnabled(false);
m_labelFileName ->setEnabled(false);
- m_labeltqStatus ->setEnabled(false);
+ m_labelStatus ->setEnabled(false);
}
m_currentStream = id;
m_recording = false;
diff --git a/kradio3/plugins/recording/recording-monitor.h b/kradio3/plugins/recording/recording-monitor.h
index a979c02..5f9247a 100644
--- a/kradio3/plugins/recording/recording-monitor.h
+++ b/kradio3/plugins/recording/recording-monitor.h
@@ -105,7 +105,7 @@ protected:
TQLabel *m_labelTime;
TQLabel *m_labelRate;
TQLabel *m_labelFileName;
- TQLabel *m_labeltqStatus;
+ TQLabel *m_labelStatus;
TQPushButton *m_btnStartStop;
KComboBox *m_comboSoundStreamSelector;
diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index ca11bfe..46dc502 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -479,7 +479,7 @@ bool Recording::noticeSoundStreamData(SoundStreamID id,
size_t bufferSize = remSize;
char *buf = thread->lockInputBuffer(bufferSize);
if (!buf) {
- logWarning(i18n("Encoder input buffer overflow (buffer configuration problem?). Skipped %1 input bytes").tqarg(TQString::number(remSize)));
+ logWarning(i18n("Encoder input buffer overflow (buffer configuration problem?). Skipped %1 input bytes").arg(TQString::number(remSize)));
break;
}
if (bufferSize > remSize) {
@@ -529,7 +529,7 @@ bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
TQString station = rs ? rs->name() + "-" : "";
station.replace(TQRegExp("[/*?]"), "_");
- TQDate date = TQDate::tqcurrentDate();
+ TQDate date = TQDate::currentDate();
TQTime time = TQTime::currentTime();
TQString sdate;
@@ -644,7 +644,7 @@ bool Recording::event(TQEvent *_e)
notifySoundStreamData(m_RawStreams2EncodedStreams[id], thread->config().m_SoundFormat,
step->data(), step->size(), consumed_size, step->metaData());
if (consumed_size != SIZE_T_DONT_CARE && consumed_size < step->size()) {
- logError(i18n("Recording::notifySoundStreamData(encoded data): Receivers skipped %1 Bytes").tqarg(step->size() - consumed_size));
+ logError(i18n("Recording::notifySoundStreamData(encoded data): Receivers skipped %1 Bytes").arg(step->size() - consumed_size));
}
}
}
diff --git a/kradio3/plugins/streaming/streaming-configuration-ui.ui b/kradio3/plugins/streaming/streaming-configuration-ui.ui
index 884e03c..e6b93af 100644
--- a/kradio3/plugins/streaming/streaming-configuration-ui.ui
+++ b/kradio3/plugins/streaming/streaming-configuration-ui.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout48</cstring>
+ <cstring>layout48</cstring>
</property>
<grid>
<property name="name">
@@ -124,7 +124,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="3">
<property name="name">
- <cstring>tqlayout38_2</cstring>
+ <cstring>layout38_2</cstring>
</property>
<vbox>
<property name="name">
@@ -142,13 +142,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -173,13 +173,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -202,7 +202,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>10</width>
<height>10</height>
@@ -221,13 +221,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -252,13 +252,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -275,7 +275,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout38</cstring>
+ <cstring>layout38</cstring>
</property>
<vbox>
<property name="name">
@@ -293,13 +293,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -324,13 +324,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -353,7 +353,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>10</width>
<height>10</height>
@@ -372,13 +372,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -403,13 +403,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -658,7 +658,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -675,7 +675,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -692,7 +692,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -709,7 +709,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -726,7 +726,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
diff --git a/kradio3/plugins/streaming/streaming-job.cpp b/kradio3/plugins/streaming/streaming-job.cpp
index 4374de9..3266618 100644
--- a/kradio3/plugins/streaming/streaming-job.cpp
+++ b/kradio3/plugins/streaming/streaming-job.cpp
@@ -201,7 +201,7 @@ void StreamingJob::slotReadData (KIO::Job */*job*/, const TQByteArray &data)
size_t free = m_Buffer.getFreeSize();
if (free < data.size()) {
m_SkipCount += data.size() - free;
- emit logStreamWarning(m_URL, i18n("skipped %1 bytes").tqarg(data.size() - free));
+ emit logStreamWarning(m_URL, i18n("skipped %1 bytes").arg(data.size() - free));
}
else {
free = data.size();
diff --git a/kradio3/plugins/streaming/streaming.cpp b/kradio3/plugins/streaming/streaming.cpp
index 7634fa2..be464e2 100644
--- a/kradio3/plugins/streaming/streaming.cpp
+++ b/kradio3/plugins/streaming/streaming.cpp
@@ -390,7 +390,7 @@ bool StreamingDevice::noticeReadyForPlaybackData(SoundStreamID id, size_t free_s
const char *buffer = NULL;
size_t size = SIZE_T_DONT_CARE;
size_t consumed_size = SIZE_T_DONT_CARE;
- SoundMetaData meta_data(0,0,0, i18n("internal stream, not stored (%1)").tqarg(m_AllCaptureStreams[id]));
+ SoundMetaData meta_data(0,0,0, i18n("internal stream, not stored (%1)").arg(m_AllCaptureStreams[id]));
x.lockData(buffer, size, meta_data); // get pointer to data and meta-data content
if (size > free_size)
size = free_size;
@@ -400,7 +400,7 @@ bool StreamingDevice::noticeReadyForPlaybackData(SoundStreamID id, size_t free_s
x.removeData(consumed_size);
free_size -= consumed_size;
if (consumed_size < size) {
- logWarning(i18n("StreamingDevice %1::notifySoundStreamData: Playback Clients skipped %2 bytes").tqarg(name()).tqarg(size-consumed_size));
+ logWarning(i18n("StreamingDevice %1::notifySoundStreamData: Playback Clients skipped %2 bytes").arg(name()).arg(size-consumed_size));
break;
}
}
@@ -423,18 +423,18 @@ const TQStringList &StreamingDevice::getCaptureChannels() const
TQString StreamingDevice::getSoundStreamClientDescription() const
{
- return i18n("Streaming Device %1").tqarg(PluginBase::name());
+ return i18n("Streaming Device %1").arg(PluginBase::name());
}
void StreamingDevice::logStreamError(const KURL &url, const TQString &s)
{
- logError(i18n("Streaming Device %1, %2: %3").tqarg(name()).tqarg(url.url()).tqarg(s));
+ logError(i18n("Streaming Device %1, %2: %3").arg(name()).arg(url.url()).arg(s));
}
void StreamingDevice::logStreamWarning(const KURL &url, const TQString &s)
{
- logWarning(i18n("Streaming Device %1, %2: %3").tqarg(name()).tqarg(url.url()).tqarg(s));
+ logWarning(i18n("Streaming Device %1, %2: %3").arg(name()).arg(url.url()).arg(s));
}
diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
index 15ecc20..e592ea1 100644
--- a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
+++ b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -87,7 +87,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -95,7 +95,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -150,7 +150,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<vbox>
<property name="name">
@@ -158,7 +158,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<hbox>
<property name="name">
@@ -166,7 +166,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout27</cstring>
+ <cstring>layout27</cstring>
</property>
<vbox>
<property name="name">
@@ -189,7 +189,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<vbox>
<property name="name">
@@ -212,7 +212,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<vbox>
<property name="name">
@@ -249,7 +249,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<grid>
<property name="name">
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>100</height>
@@ -348,7 +348,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -358,7 +358,7 @@
<property name="name">
<cstring>pixmapAlarmStation</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
@@ -378,7 +378,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
index 31ec3db..c72aa5e 100644
--- a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
@@ -371,7 +371,7 @@ void TimeControlConfiguration::slotAlarmSelectChanged(int idx)
void TimeControlConfiguration::slotNewAlarm()
{
- TQDateTime dt(TQDateTime::tqcurrentDateTime());
+ TQDateTime dt(TQDateTime::currentDateTime());
Alarm a(dt, false, false);
alarms.push_back(a);
listAlarms->insertItem(a.alarmTime().toString());
diff --git a/kradio3/plugins/timecontrol/timecontrol.cpp b/kradio3/plugins/timecontrol/timecontrol.cpp
index 276e602..e5f99cf 100644
--- a/kradio3/plugins/timecontrol/timecontrol.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol.cpp
@@ -102,7 +102,7 @@ bool TimeControl::setCountdownSeconds(int n)
bool TimeControl::startCountdown()
{
- m_countdownEnd = TQDateTime::tqcurrentDateTime().addSecs(m_countdownSeconds);
+ m_countdownEnd = TQDateTime::currentDateTime().addSecs(m_countdownSeconds);
m_countdownTimer.start(m_countdownSeconds * 1000, true);
notifyCountdownStarted(getCountdownEnd());
@@ -134,7 +134,7 @@ TQDateTime TimeControl::getNextAlarmTime() const
const Alarm *TimeControl::getNextAlarm () const
{
- TQDateTime now = TQDateTime::tqcurrentDateTime(),
+ TQDateTime now = TQDateTime::currentDateTime(),
next;
const Alarm *retval = NULL;
@@ -180,7 +180,7 @@ void TimeControl::slotQTimerAlarmTimeout()
notifyAlarm(*m_waitingFor);
}
- TQDateTime now = TQDateTime::tqcurrentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
Alarm const *n = getNextAlarm();
TQDateTime na = getNextAlarmTime();
diff --git a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
index 2020bbc..135bac6 100644
--- a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
+++ b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>104</width>
<height>21</height>
@@ -133,7 +133,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>26</width>
<height>26</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
@@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
@@ -202,7 +202,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>61</height>
diff --git a/kradio3/plugins/timeshifter/timeshifter.cpp b/kradio3/plugins/timeshifter/timeshifter.cpp
index 52d3448..fb8d653 100644
--- a/kradio3/plugins/timeshifter/timeshifter.cpp
+++ b/kradio3/plugins/timeshifter/timeshifter.cpp
@@ -154,8 +154,8 @@ bool TimeShifter::stopPlayback(SoundStreamID id)
SoundStreamID tmp_newID = m_NewStreamID;
SoundStreamID tmp_orgID = m_OrgStreamID;
- m_OrgStreamID.tqinvalidate();
- m_NewStreamID.tqinvalidate();
+ m_OrgStreamID.invalidate();
+ m_NewStreamID.invalidate();
sendStopCapture(tmp_newID);
closeSoundStream(tmp_newID);
@@ -182,7 +182,7 @@ bool TimeShifter::pausePlayback(SoundStreamID id)
sendMute(newid);
sendPlaybackVolume(newid, 0);
- m_NewStreamID.tqinvalidate();
+ m_NewStreamID.invalidate();
sendStopPlayback(newid);
m_NewStreamID = newid;
@@ -352,7 +352,7 @@ bool TimeShifter::noticeReadyForPlaybackData(SoundStreamID id, size_t free_size)
free_size -= consumed_size;
m_PlaybackDataLeftInBuffer -= consumed_size;
if (consumed_size < s) {
- logError(i18n("TimeShifter::notifySoundStreamData: clients skipped %1 bytes. Data Lost").tqarg(s - consumed_size));
+ logError(i18n("TimeShifter::notifySoundStreamData: clients skipped %1 bytes. Data Lost").arg(s - consumed_size));
free_size = 0; // break condition for outer loop
break;
}
diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
index 06550c7..130d440 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>152</width>
<height>21</height>
@@ -292,7 +292,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>5</width>
<height>5</height>
@@ -374,7 +374,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<hbox>
<property name="name">
@@ -549,7 +549,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -574,7 +574,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<vbox>
<property name="name">
@@ -593,13 +593,13 @@
<property name="text">
<string>volume</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34</cstring>
+ <cstring>layout34</cstring>
</property>
<hbox>
<property name="name">
@@ -615,7 +615,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -643,7 +643,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -664,7 +664,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout35_2</cstring>
+ <cstring>layout35_2</cstring>
</property>
<vbox>
<property name="name">
@@ -683,13 +683,13 @@
<property name="text">
<string>treble</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34_2</cstring>
+ <cstring>layout34_2</cstring>
</property>
<hbox>
<property name="name">
@@ -705,7 +705,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -733,7 +733,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -754,7 +754,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
- <cstring>tqlayout35_2_2</cstring>
+ <cstring>layout35_2_2</cstring>
</property>
<vbox>
<property name="name">
@@ -773,13 +773,13 @@
<property name="text">
<string>bass</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34_2_3</cstring>
+ <cstring>layout34_2_3</cstring>
</property>
<hbox>
<property name="name">
@@ -795,7 +795,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -823,7 +823,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -844,7 +844,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="3">
<property name="name">
- <cstring>tqlayout51</cstring>
+ <cstring>layout51</cstring>
</property>
<vbox>
<property name="name">
@@ -860,7 +860,7 @@
<property name="text">
<string>balance</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -874,7 +874,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>33</height>
@@ -911,7 +911,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>33</height>
diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp
index dbfec2a..f39334f 100644
--- a/kradio3/plugins/v4lradio/v4lradio.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio.cpp
@@ -31,7 +31,7 @@
#include <string.h> // memcpy needed
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqvaluelist.h>
@@ -656,7 +656,7 @@ bool V4LRadio::setFrequency(float freq)
if (freq > maxf || freq < minf) {
logError("V4LRadio::setFrequency: " +
- i18n("invalid frequency %1").tqarg(TQString().setNum(freq)));
+ i18n("invalid frequency %1").arg(TQString().setNum(freq)));
if (!oldMute && !m_ActivePlayback)
unmute(m_SoundStreamID);
return false;
@@ -678,14 +678,14 @@ bool V4LRadio::setFrequency(float freq)
else {
logError("V4LRadio::setFrequency: " +
i18n("don't known how to handle V4L-version %1")
- .tqarg(m_caps.version));
+ .arg(m_caps.version));
}
if (r) {
logError("V4LRadio::setFrequency: " +
i18n("error setting frequency to %1 (%2)")
- .tqarg(TQString().setNum(freq))
- .tqarg(TQString().setNum(r)));
+ .arg(TQString().setNum(freq))
+ .arg(TQString().setNum(r)));
// unmute the old radio with the old radio station
if (!oldMute && !m_ActivePlayback)
unmute(m_SoundStreamID);
@@ -1001,7 +1001,7 @@ void V4LRadio::restoreState (KConfig *config)
else {
if (found_devname.isNull())
found_devname = *it;
- logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").tqarg(*it));
+ logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").arg(*it));
}
}
}
@@ -1123,7 +1123,7 @@ void V4LRadio::radio_init()
radio_done();
logError("V4LRadio::radio_init: " +
- i18n("Cannot open mixer device %1").tqarg(m_mixerDev));
+ i18n("Cannot open mixer device %1").arg(m_mixerDev));
return;
}
*/
@@ -1132,7 +1132,7 @@ void V4LRadio::radio_init()
radio_done();
logError("V4LRadio::radio_init: " +
- i18n("Cannot open radio device %1").tqarg(m_radioDev));
+ i18n("Cannot open radio device %1").arg(m_radioDev));
return;
}
@@ -1183,7 +1183,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
if (fd < 0) {
logError("V4LRadio::readV4LCaps: " +
- i18n("cannot open %1").tqarg(device));
+ i18n("cannot open %1").arg(device));
return c;
}
@@ -1207,7 +1207,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
video_audio audiocaps;
if (0 == ioctl(fd, VIDIOCGAUDIO, &audiocaps)) {
logDebug("V4LRadio::readV4LCaps: " +
- i18n("audio caps = %1").tqarg(TQString().setNum(audiocaps.flags)));
+ i18n("audio caps = %1").arg(TQString().setNum(audiocaps.flags)));
if ((audiocaps.flags & VIDEO_AUDIO_MUTABLE) != 0)
c.hasMute = true;
if ((audiocaps.flags & VIDEO_AUDIO_VOLUME) != 0)
@@ -1230,7 +1230,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
if (r == 0) {
c.version = 2;
- logDebug(i18n("V4L2 - Version: %1").tqarg(TQString().sprintf("%08X", caps2.version)));
+ logDebug(i18n("V4L2 - Version: %1").arg(TQString().sprintf("%08X", caps2.version)));
size_t l = sizeof(caps.name);
l = l < CAPS_NAME_LEN ? l : CAPS_NAME_LEN;
@@ -1289,7 +1289,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
}
#endif
if (c.version > 0) {
- logInfo(i18n("V4L %1 detected").tqarg(c.version));
+ logInfo(i18n("V4L %1 detected").arg(c.version));
} else {
logError(i18n("V4L not detected"));
}
@@ -1356,13 +1356,13 @@ bool V4LRadio::readTunerInfo() const
else {
logError("V4LRadio::readTunerInfo: " +
i18n("don't known how to handle V4L-version %1")
- .tqarg(TQString().setNum(m_caps.version)));
+ .arg(TQString().setNum(m_caps.version)));
}
if (r != 0) {
m_signalQuality = 0;
logError("V4LRadio::readTunerInfo: " +
- i18n("cannot get tuner info (error %1)").tqarg(TQString().setNum(r)));
+ i18n("cannot get tuner info (error %1)").arg(TQString().setNum(r)));
}
} else {
m_signalQuality = 0;
@@ -1406,7 +1406,7 @@ bool V4LRadio::readTunerInfo() const
} \
x = x ? x : r; \
if (r) \
- logError(i18n("error setting %1: %2").tqarg(#what).tqarg(TQString().setNum(r))); \
+ logError(i18n("error setting %1: %2").arg(#what).arg(TQString().setNum(r))); \
}
#define V4L2_G_CTRL(what) \
@@ -1414,7 +1414,7 @@ bool V4LRadio::readTunerInfo() const
r = ioctl (m_radio_fd, VIDIOC_G_CTRL, &ctl); \
x = x ? x : r; \
if (r) \
- logError(i18n("error reading %1: %2").tqarg(#what).tqarg(TQString().setNum(r))); \
+ logError(i18n("error reading %1: %2").arg(#what).arg(TQString().setNum(r))); \
}
@@ -1505,14 +1505,14 @@ bool V4LRadio::updateAudioInfo(bool write) const
else {
logError("V4LRadio::updateAudioInfo: " +
i18n("don't known how to handle V4L-version %1")
- .tqarg(TQString().setNum(m_caps.version)));
+ .arg(TQString().setNum(m_caps.version)));
}
if (r) {
logError("V4LRadio::updateAudioInfo: " +
i18n("error updating radio audio info (%1): %2")
- .tqarg(write ? i18n("write") : i18n("read"))
- .tqarg(TQString().setNum(r)));
+ .arg(write ? i18n("write") : i18n("read"))
+ .arg(TQString().setNum(r)));
return false;
}
}