From 6df9eac4b9928768bf0c3dc988bac1c0c1fbb685 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:04 -0600 Subject: [PATCH] Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 5fb78f4b68672906005b059e7e5066c702bc5c90. --- kradio3/convert-presets/convert-presets.cpp | 2 +- .../alsa-sound/alsa-mixer-element-ui.ui | 26 ++--- .../alsa-sound/alsa-sound-configuration-ui.ui | 6 +- .../alsa-sound/alsa-sound-configuration.cpp | 16 +-- kradio3/plugins/alsa-sound/alsa-sound.cpp | 100 +++++++++--------- .../docking-configuration.cpp | 18 ++-- kradio3/plugins/gui-docking-menu/docking.cpp | 22 ++-- kradio3/plugins/gui-error-log/errorlog.cpp | 18 ++-- .../plugins/gui-quickbar/buttonflowlayout.cpp | 28 ++--- .../plugins/gui-quickbar/buttonflowlayout.h | 12 +-- kradio3/plugins/gui-quickbar/quickbar.cpp | 12 +-- .../gui-standard-display/displaycfg.cpp | 28 ++--- .../gui-standard-display/radioview.cpp | 14 +-- .../radioview_frequencyradio.cpp | 24 ++--- .../radioview_frequencyseeker.cpp | 2 +- .../gui-standard-display/radioview_volume.cpp | 4 +- kradio3/plugins/lirc/lircsupport.cpp | 2 +- kradio3/plugins/oss-sound/oss-sound.cpp | 62 +++++------ .../plugins/radio/radio-configuration-ui.ui | 50 ++++----- kradio3/plugins/radio/radio-configuration.cpp | 2 +- kradio3/plugins/recording/encoder_mp3.cpp | 14 +-- kradio3/plugins/recording/encoder_ogg.cpp | 4 +- kradio3/plugins/recording/encoder_pcm.cpp | 4 +- .../recording/recording-configuration-ui.ui | 36 +++---- .../recording/recording-datamonitor.cpp | 20 ++-- .../plugins/recording/recording-monitor.cpp | 18 ++-- kradio3/plugins/recording/recording-monitor.h | 2 +- kradio3/plugins/recording/recording.cpp | 6 +- .../streaming/streaming-configuration-ui.ui | 52 ++++----- kradio3/plugins/streaming/streaming-job.cpp | 2 +- kradio3/plugins/streaming/streaming.cpp | 10 +- .../timecontrol-configuration-ui.ui | 28 ++--- .../timecontrol/timecontrol-configuration.cpp | 2 +- kradio3/plugins/timecontrol/timecontrol.cpp | 6 +- .../timeshifter-configuration-ui.ui | 14 +-- kradio3/plugins/timeshifter/timeshifter.cpp | 8 +- .../v4lradio/v4lradio-configuration-ui.ui | 56 +++++----- kradio3/plugins/v4lradio/v4lradio.cpp | 38 +++---- kradio3/src/aboutwidget.cpp | 44 ++++---- kradio3/src/alarm.cpp | 2 +- kradio3/src/errorlog-interfaces.cpp | 32 +++--- kradio3/src/fileringbuffer.cpp | 14 +-- kradio3/src/frequencyradiostation.cpp | 6 +- kradio3/src/include/aboutwidget.h | 2 +- kradio3/src/include/interfaces.h | 8 +- .../include/soundstreamclient_interfaces.h | 4 +- kradio3/src/include/soundstreamid.h | 2 +- kradio3/src/internetradiostation.cpp | 2 +- kradio3/src/kradioapp.cpp | 18 ++-- kradio3/src/pluginmanager-configuration-ui.ui | 14 +-- kradio3/src/pluginmanager.cpp | 18 ++-- kradio3/src/radiostation-config.cpp | 2 +- kradio3/src/soundstreamid.cpp | 2 +- kradio3/src/standardscandialog-ui.ui | 8 +- kradio3/src/standardscandialog.cpp | 6 +- kradio3/src/station-drag-object.cpp | 2 +- kradio3/src/stationlist.cpp | 24 ++--- kradio3/src/stationlistxmlhandler.cpp | 18 ++-- kradio3/src/stationselector-ui.ui | 6 +- kradio3/src/timecontrol_interfaces.cpp | 4 +- kradio3/src/widgetplugins.cpp | 8 +- 61 files changed, 507 insertions(+), 507 deletions(-) diff --git a/kradio3/convert-presets/convert-presets.cpp b/kradio3/convert-presets/convert-presets.cpp index 379f52f..8ee0d4f 100644 --- a/kradio3/convert-presets/convert-presets.cpp +++ b/kradio3/convert-presets/convert-presets.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui index 54467cc..ebdd9a1 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 @@ - layout16 + tqlayout16 @@ -37,7 +37,7 @@ Expanding - + 16 20 @@ -54,7 +54,7 @@ Expanding - + 1 40 @@ -85,7 +85,7 @@ Expanding - + 1 40 @@ -102,7 +102,7 @@ Expanding - + 20 20 @@ -113,7 +113,7 @@ - layout7 + tqlayout7 @@ -129,7 +129,7 @@ Expanding - + 11 20 @@ -157,7 +157,7 @@ Expanding - + 11 20 @@ -168,7 +168,7 @@ - layout5 + tqlayout5 @@ -184,7 +184,7 @@ Expanding - + 16 20 @@ -193,7 +193,7 @@ - layout4 + tqlayout4 @@ -236,7 +236,7 @@ Expanding - + 16 20 @@ -255,7 +255,7 @@ MixerName - + AlignCenter diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui index df64968..c15e91d 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 @@ Expanding - + 20 5 @@ -59,7 +59,7 @@ - layout58 + tqlayout58 @@ -259,7 +259,7 @@ Expanding - + 20 40 diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp index 56908d1..88c4d57 100644 --- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp +++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -57,7 +57,7 @@ AlsaSoundConfiguration::AlsaSoundConfiguration (TQWidget *parent, AlsaSoundDevic m_groupMixer->setColumnLayout(0, Qt::Horizontal ); - TQHBoxLayout *tmp_layout = new TQHBoxLayout( m_groupMixer->layout() ); + TQHBoxLayout *tmp_layout = new TQHBoxLayout( m_groupMixer->tqlayout() ); 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->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); + m_groupMixerSubFrame->tqsetSizePolicy(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->setAlignment( TQt::AlignBottom ); + m_groupMixerLayout->tqsetAlignment( TQt::AlignBottom ); int idx = 0; for (TQValueListConstIterator it = all_list.begin(); it != all_list.end(); ++it, ++idx) { @@ -250,12 +250,12 @@ int AlsaSoundConfiguration::listSoundDevices(KComboBox *combobox, TQMapinsertItem(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").arg(card).arg(m_captureCard2idx[card]).arg(dev)); + //IErrorLogClient::staticLogDebug(TQString("capture: card = %1(%2), dev = %3").tqarg(card).tqarg(m_captureCard2idx[card]).tqarg(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").arg(m_comboCaptureCard->currentText())); + //IErrorLogClient::staticLogDebug(TQString("capture: card = %1").tqarg(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 06ebc80..84d93d5 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 it = m_CaptureMixerSettings.begin(); it != m_CaptureMixerSettings.end(); ++it, ++i) { - TQString prefix = TQString("mixer-setting-%1-").arg(i); + TQString prefix = TQString("mixer-setting-%1-").tqarg(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-").arg(i); + TQString prefix = TQString("mixer-setting-%1-").tqarg(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").arg(m_CaptureCard) -// .arg(m_CaptureDevice) -// .arg(i18n("unknown error"))); +// logError(i18n("ALSA Plugin, device plughw:%1,%2: %3").tqarg(m_CaptureCard) +// .tqarg(m_CaptureDevice) +// .tqarg(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").arg(m_PlaybackCard).arg(m_PlaybackDevice).arg(TQString::number(m_PlaybackSkipCount))); + logWarning(i18n("plughw:%1,%2: Playback buffer overflow. Skipped %3 bytes").tqarg(m_PlaybackCard).tqarg(m_PlaybackDevice).tqarg(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").arg(m_PlaybackCard).arg(m_PlaybackDevice)); + logError(i18n("ALSA Plugin: cannot write data for device plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(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").arg(m_PlaybackCard).arg(m_PlaybackDevice)); + logWarning(i18n("ALSA Plugin: buffer underrun for device plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(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").arg(m_CaptureCard).arg(m_CaptureDevice); +// TQString dev = TQString("alsa://plughw:%1,%2").tqarg(m_CaptureCard).tqarg(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").arg(m_CaptureCard).arg(m_CaptureDevice)); + logError(i18n("ALSA Plugin: cannot read data from device plughw:%1,%2").tqarg(m_CaptureCard).tqarg(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)").arg(m_CaptureCard).arg(m_CaptureDevice).arg(bufferSize).arg((long long unsigned)buffer)); + 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)); } - TQString dev = TQString("alsa://plughw:%1,%2").arg(m_CaptureCard).arg(m_CaptureDevice); + TQString dev = TQString("alsa://plughw:%1,%2").tqarg(m_CaptureCard).tqarg(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)").arg(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)").tqarg(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").arg(m_PlaybackCard).arg(m_PlaybackDevice); + TQString dev = TQString("plughw:%1,%2").tqarg(m_PlaybackCard).tqarg(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").arg(m_CaptureCard).arg(m_CaptureDevice); + TQString dev = TQString("plughw:%1,%2").tqarg(m_CaptureCard).tqarg(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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Error opening PCM device %1").tqarg(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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Can not configure PCM device %1").tqarg(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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Error setting access for %1").tqarg(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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Error setting sample format for %1").tqarg(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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Error setting channels for %1").tqarg(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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Error setting rate for %1").tqarg(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").arg(rate).arg(pcm_name).arg(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)); } 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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Error setting period size for %1").tqarg(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").arg(pcm_name)); +// logError(i18n("ALSA Plugin: Error setting periods for %1").tqarg(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").arg(pcm_name)); +// logError(i18n("ALSA Plugin: Error setting buffersize for %1").tqarg(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.").arg(pcm_name).arg(m_HWBufferSize).arg(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)); // 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").arg(pcm_name).arg(TQString::number(tmp))); +// logInfo(i18n("ALSA Plugin: adjusted buffer size for %1 to %2 bytes").tqarg(pcm_name).tqarg(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").arg(pcm_name)); + logError(i18n("ALSA Plugin: Error getting period size for %1").tqarg(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").arg(card)); + staticLogError(i18n("ALSA Plugin: ERROR: snd_mixer_attach for card %1").tqarg(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").arg(card)); + staticLogError(i18n("ALSA Plugin: Error: snd_mixer_selem_register for card %1").tqarg(card)); error = true; } if (!error && snd_mixer_load (mixer_handle) < 0) { - staticLogError(i18n("ALSA Plugin: Error: snd_mixer_load for card %1").arg(card)); + staticLogError(i18n("ALSA Plugin: Error: snd_mixer_load for card %1").tqarg(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").arg(name).arg(idx); + name = i18n("context-mixername-number", "%1 %2").tqarg(name).tqarg(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").arg(name).arg(idx); + name = i18n("context-mixerelement-name-number", "%1 %2").tqarg(name).tqarg(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") - .arg(m_PlaybackCard) - .arg(m_PlaybackDevice)); + .tqarg(m_PlaybackCard) + .tqarg(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") - .arg(m_CaptureCard) - .arg(m_CaptureDevice)); + .tqarg(m_CaptureCard) + .tqarg(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") - .arg(vol) - .arg(m_PlaybackCard) - .arg(m_PlaybackDevice)); + .tqarg(vol) + .tqarg(m_PlaybackCard) + .tqarg(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") - .arg(vol) - .arg(m_CaptureCard) - .arg(m_CaptureDevice)); + .tqarg(vol) + .tqarg(m_CaptureCard) + .tqarg(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") - .arg(channel) - .arg(m_CaptureCard) - .arg(m_CaptureDevice)); + .tqarg(channel) + .tqarg(m_CaptureCard) + .tqarg(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").arg(PluginBase::name()); + return i18n("ALSA Sound Device %1").tqarg(PluginBase::name()); } @@ -1520,9 +1520,9 @@ void AlsaSoundDevice::setCaptureMixerSettings(const TQMap(_e); // TQString msg = i18n("ALSA Plugin, device plughw:%1,%2: %3") -// .arg(m_CaptureCard) -// .arg(m_CaptureDevice) -// .arg(e->message()); +// .tqarg(m_CaptureCard) +// .tqarg(m_CaptureDevice) +// .tqarg(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 4aaa4a9..489df58 100644 --- a/kradio3/plugins/gui-docking-menu/docking-configuration.cpp +++ b/kradio3/plugins/gui-docking-menu/docking-configuration.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -31,26 +31,26 @@ DockingConfiguration::DockingConfiguration (RadioDocking *docking, TQWidget *par m_docking(docking), m_disableGUIUpdates(false) { - TQHBoxLayout *layout = new TQHBoxLayout(); - TQHBoxLayout *layout2 = new TQHBoxLayout(); + TQHBoxLayout *tqlayout = new TQHBoxLayout(); + TQHBoxLayout *tqlayout2 = new TQHBoxLayout(); m_labelClickMode = new TQLabel(this); - layout->addWidget(m_labelClickMode); + tqlayout->addWidget(m_labelClickMode); m_comboClickMode = new TQComboBox(this); - layout->addWidget(m_comboClickMode); + tqlayout->addWidget(m_comboClickMode); TQSpacerItem *spacer = new TQSpacerItem( 20, 2, TQSizePolicy::Expanding, TQSizePolicy::Minimum); - layout->addItem(spacer); + tqlayout->addItem(spacer); TQFrame *line = new TQFrame(this); line->setFrameShape ( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); - layout2->addWidget(line); + tqlayout2->addWidget(line); StationSelectorUILayout->expand(2,0); - StationSelectorUILayout->addMultiCellLayout(layout2, 2, 2, 0, 2); - StationSelectorUILayout->addMultiCellLayout(layout, 3, 3, 0, 2); + StationSelectorUILayout->addMultiCellLayout(tqlayout2, 2, 2, 0, 2); + StationSelectorUILayout->addMultiCellLayout(tqlayout, 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 24511f1..4b1f696 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").arg(i), TQString()); - bool b = config->readBoolEntry(TQString("show_hide_cache_value_%1").arg(i), false); + 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); 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 it = m_widgetsShownCache.begin(); it != m_widgetsShownCache.end(); ++it, ++i) { - config->writeEntry(TQString("show_hide_cache_id_%1").arg(i), it.key()); - config->writeEntry(TQString("show_hide_cache_value_%1").arg(i), *it); + config->writeEntry(TQString("show_hide_cache_id_%1").tqarg(i), it.key()); + config->writeEntry(TQString("show_hide_cache_value_%1").tqarg(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").arg(d.toString())); + m_menu->changeTitle (m_alarmID, i18n("next alarm: %1").tqarg(d.toString())); else m_menu->changeTitle (m_alarmID, i18n("")); 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)").arg(end.toString())); + m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Stop Sleep Countdown (running until %1)").tqarg(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").arg(s)); + m_menu->changeTitle (m_titleID, i18n("KRadio: %1").tqarg(s)); // FIXME: title does not change in opened popupmenu TQValueList::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").arg(name).arg(visible)); + logDebug(TQString("visibility of %1: %2").tqarg(name).tqarg(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").arg(descr), + i18n("Stop Recording of %1").tqarg(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").arg(descr), + i18n("Stop Recording of %1").tqarg(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").arg(descr)); + i18n("Stop Recording of %1").tqarg(descr)); return true; } return false; diff --git a/kradio3/plugins/gui-error-log/errorlog.cpp b/kradio3/plugins/gui-error-log/errorlog.cpp index 97cc22b..b675d14 100644 --- a/kradio3/plugins/gui-error-log/errorlog.cpp +++ b/kradio3/plugins/gui-error-log/errorlog.cpp @@ -19,11 +19,11 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -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").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + 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)); WidgetPluginBase::pHide(); KDialogBase::hide(); } @@ -183,7 +183,7 @@ void ErrorLog::hideEvent(TQHideEvent *e) bool ErrorLog::logError (const TQString &s) { - m_teErrors->append("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n"); + m_teErrors->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + 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("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n"); + m_teWarnings->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + s + "\n"); return true; } bool ErrorLog::logInfo (const TQString &s) { - m_teInfos->append("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n"); + m_teInfos->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + s + "\n"); return true; } bool ErrorLog::logDebug (const TQString &s) { - m_teDebug->append("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n"); + m_teDebug->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + s + "\n"); return true; } @@ -244,7 +244,7 @@ void ErrorLog::slotUser1() if (outf->status() != IO_Ok) { logError("ErrorLogger: " + - i18n("error writing to tempfile %1").arg(tmpFile.name())); + i18n("error writing to tempfile %1").tqarg(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").arg(url.url())); + i18n("error uploading preset file %1").tqarg(url.url())); } } setIconListAllVisible(true); diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp index 38cdbac..4cd8dd0 100644 --- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp +++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id: buttonflowlayout.cpp 272 2005-05-18 08:12:51Z emw $ +** $Id: buttonflowtqlayout.cpp 272 2005-05-18 08:12:51Z emw $ ** -** Implementing your own layout: flow example +** Implementing your own tqlayout: flow example ** ** Copyright (C) 1996 by Trolltech AS. All rights reserved. ** @@ -104,9 +104,9 @@ bool ButtonFlowLayout::hasHeightForWidth() const return TRUE; } -TQSize ButtonFlowLayout::sizeHint() const +TQSize ButtonFlowLayout::tqsizeHint() const { - return minimumSize(); + return tqminimumSize(); } TQSizePolicy::ExpandData ButtonFlowLayout::expanding() const @@ -133,7 +133,7 @@ void ButtonFlowLayout::setGeometry( const TQRect &r ) int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly ) { -/* kdDebug() << "buttonflowlayout::doLayout (" +/* kdDebug() << "buttonflowtqlayout::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->sizeHint().width() ); - buttonHeight = TQMAX( buttonHeight, o->sizeHint().height() ); + buttonWidth = TQMAX( buttonWidth, o->tqsizeHint().width() ); + buttonHeight = TQMAX( buttonHeight, o->tqsizeHint().height() ); } // calculate the optimal width @@ -217,19 +217,19 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly ) } -TQSize ButtonFlowLayout::minimumSize() const +TQSize ButtonFlowLayout::tqminimumSize() const { - return minimumSize(geometry().size()); + return tqminimumSize(tqgeometry().size()); } -TQSize ButtonFlowLayout::minimumSize(const TQSize &r) const +TQSize ButtonFlowLayout::tqminimumSize(const TQSize &r) const { TQSize s(0, 0); for (TQPtrListIterator it(list); it.current(); ++it) { TQLayoutItem *o = it.current(); - s = s.expandedTo( o->sizeHint()); //minimumSize() ); + s = s.expandedTo( o->tqsizeHint()); //tqminimumSize() ); } 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&>(list).at(index)) : 0; + return index >= 0 && index < list.count() ? (const_cast&>(list).tqat(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.at(index); - list.remove(list.at(index)); + TQLayoutItem *item = list.tqat(index); + list.remove(list.tqat(index)); delete item; invalidate(); diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h index 3346c6d..fe33efc 100644 --- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h +++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id: buttonflowlayout.h 471 2006-11-11 17:04:51Z emw $ +** $Id: buttonflowtqlayout.h 471 2006-11-11 17:04:51Z emw $ ** -** Definition of simple flow layout for custom layout example +** Definition of simple flow tqlayout for custom tqlayout example ** ** Created : 979899 ** @@ -23,7 +23,7 @@ #include "../../src/include/utils.h" -#include +#include #include class ButtonFlowLayout : public TQLayout @@ -41,9 +41,9 @@ public: void addItem( TQLayoutItem *item); bool hasHeightForWidth() const; int heightForWidth( int ) const; - TQSize sizeHint() const; - TQSize minimumSize() const; - TQSize minimumSize(const TQSize &r) const; // minimumSize is dependent from width + TQSize tqsizeHint() const; + TQSize tqminimumSize() const; + TQSize tqminimumSize(const TQSize &r) const; // tqminimumSize 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 eee163e..ca1d4d8 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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); + b->tqsetSizePolicy(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 geometry + // calculate tqgeometry if (m_layout) { - TQRect r = geometry(); + TQRect r = tqgeometry(); 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->minimumSize(TQSize(w, h) - marginSize) + marginSize); + setMinimumSize(m_layout->tqminimumSize(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) { - // minimumSize might change because of the flow layout + // tqminimumSize might change because of the flow tqlayout if (m_layout) { TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2); - setMinimumSize(m_layout->minimumSize(e->size() - marginSize) + marginSize); + setMinimumSize(m_layout->tqminimumSize(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 8d4e1ca..0e92da7 100644 --- a/kradio3/plugins/gui-standard-display/displaycfg.cpp +++ b/kradio3/plugins/gui-standard-display/displaycfg.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -32,9 +32,9 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent) { TQGroupBox *bg = new TQGroupBox(i18n("Display Colors"), this); bg->setColumnLayout(0, Qt::Vertical ); - bg->layout()->setSpacing( 8 ); - bg->layout()->setMargin( 12 ); - TQGridLayout *gl = new TQGridLayout (bg->layout()); + bg->tqlayout()->setSpacing( 8 ); + bg->tqlayout()->setMargin( 12 ); + TQGridLayout *gl = new TQGridLayout (bg->tqlayout()); 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->setAlignment(TQLabel::AlignCenter); - l2->setAlignment(TQLabel::AlignCenter); - l3->setAlignment(TQLabel::AlignCenter); + l1->tqsetAlignment(TQLabel::AlignCenter); + l2->tqsetAlignment(TQLabel::AlignCenter); + l3->tqsetAlignment(TQLabel::AlignCenter); - 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)); + 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)); 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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_fontChooser->tqsetSizePolicy(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 efe5bf1..c5f12f2 100644 --- a/kradio3/plugins/gui-standard-display/radioview.cpp +++ b/kradio3/plugins/gui-standard-display/radioview.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -162,10 +162,10 @@ RadioView::RadioView(const TQString &name) btnSnooze->setIconSet(SmallIconSet("kradio_zzz")); btnPlugins->setIconSet(SmallIconSet("kradio_plugins")); - 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)); + 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)); 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").arg(descr), + i18n("Stop Recording of %1").tqarg(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").arg(descr)); + i18n("Stop Recording of %1").tqarg(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 f449122..17afde3 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, colorGroup().color(TQColorGroup::Dark)); + KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark)); setPaletteBackgroundPixmap(io.convertToPixmap(i)); setBackgroundOrigin(WindowOrigin); } else { - setBackgroundColor(colorGroup().color(TQColorGroup::Button)); + setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button)); } if (change) @@ -222,7 +222,7 @@ bool RadioViewFrequencyRadio::noticePowerChanged (bool on, const IRadioDevice */ queryIsStereo(ssid, s); noticeStereoChanged(ssid, s); - repaint(); + tqrepaint(); return true; } @@ -246,7 +246,7 @@ bool RadioViewFrequencyRadio::noticeSignalQualityChanged(SoundStreamID id, float if (queryCurrentSoundStreamID() != id) return false; m_quality = q; - repaint (); + tqrepaint (); return true; } @@ -256,7 +256,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s) if (queryCurrentSoundStreamID() != id) return false; m_stereo = s; - repaint (); + tqrepaint (); return true; } @@ -269,7 +269,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool s) bool RadioViewFrequencyRadio::noticeFrequencyChanged(float f, const RadioStation *) { m_frequency = f; - repaint (); + tqrepaint (); return true; } @@ -320,10 +320,10 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint) xx_sg = r.x() + margin, xy_sg = r.y() + margin; - 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); + 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); // 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").arg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0)); + s = i18n("%1 kHz").tqarg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0)); } else { - s = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(m_frequency, 2)); + s = i18n("%1 MHz").tqarg(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 318c049..e334e45 100644 --- a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp +++ b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include diff --git a/kradio3/plugins/gui-standard-display/radioview_volume.cpp b/kradio3/plugins/gui-standard-display/radioview_volume.cpp index 8e4f024..abde874 100644 --- a/kradio3/plugins/gui-standard-display/radioview_volume.cpp +++ b/kradio3/plugins/gui-standard-display/radioview_volume.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -37,7 +37,7 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name) { float v = 0; SoundStreamID ssid = queryCurrentSoundStreamID(); - sendLogDebug (TQString ("RadioViewVolume: ssid=%1").arg(ssid.getID())); + sendLogDebug (TQString ("RadioViewVolume: ssid=%1").tqarg(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 5b81d8c..68bcb6a 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").arg(LIRCRC)); + logWarning(i18n("%1 does not exist. File was created with KRadio's default .lircrc proposal").tqarg(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 c1a9160..2ac0f6e 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").arg(m_DSPDeviceName).arg(TQString::number(m_PlaybackSkipCount))); +// logWarning(i18n("%1: Playback buffer overflow. Skipped %1 bytes").tqarg(m_DSPDeviceName).tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("OSS device %1: No data to record").tqarg(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)").arg(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)").tqarg(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").arg(TQString().setNum(err)).arg(m_DSPDeviceName)); + logError(i18n("Error %1 while handling OSS device %2").tqarg(TQString().setNum(err)).tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot open DSP device %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot read DSP capabilities for %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot open DSP device %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot set DSP sample format for %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot set number of channels for %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot set sampling rate for %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot set stereo mode for %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot set sample size for %1").tqarg(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").arg(m_DSPDeviceName)); + logError(i18n("Cannot set buffers for %1").tqarg(m_DSPDeviceName)); int bufferBlockSize = 0; err |= ioctl (m_DSP_fd, SNDCTL_DSP_GETBLKSIZE, &bufferBlockSize); if (err) { - logError(i18n("Cannot read buffer size for %1").arg(m_DSPDeviceName)); + logError(i18n("Cannot read buffer size for %1").tqarg(m_DSPDeviceName)); } else { - logInfo(i18n("%1 uses buffer blocks of %2 bytes").arg(m_DSPDeviceName).arg(TQString::number(bufferBlockSize))); + logInfo(i18n("%1 uses buffer blocks of %2 bytes").tqarg(m_DSPDeviceName).tqarg(TQString::number(bufferBlockSize))); size_t tmp = (((m_BufferSize - 1) / bufferBlockSize) + 1) * bufferBlockSize; setBufferSize(tmp); - logInfo(i18n("adjusted own buffer size to %1 bytes").arg(TQString::number(tmp))); + logInfo(i18n("adjusted own buffer size to %1 bytes").tqarg(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").arg(m_MixerDeviceName)); + logError(i18n("Cannot open mixer device %1").tqarg(m_MixerDeviceName)); } else { m_PollingTimer.start(40); } @@ -754,7 +754,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap= 0) { @@ -768,7 +768,7 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap - layout32 + tqlayout32 6 @@ -55,7 +55,7 @@ - layout22 + tqlayout22 @@ -63,7 +63,7 @@ - layout9 + tqlayout9 @@ -84,7 +84,7 @@ - layout5 + tqlayout5 @@ -122,7 +122,7 @@ Expanding - + 20 10 @@ -157,7 +157,7 @@ - layout21 + tqlayout21 @@ -228,7 +228,7 @@ - layout18 + tqlayout18 @@ -249,7 +249,7 @@ - layout7 + tqlayout7 @@ -280,7 +280,7 @@ - layout32 + tqlayout32 @@ -311,7 +311,7 @@ - layout6 + tqlayout6 @@ -327,7 +327,7 @@ - layout5 + tqlayout5 @@ -358,7 +358,7 @@ 0 - + 0 0 @@ -377,7 +377,7 @@ - layout19 + tqlayout19 @@ -395,7 +395,7 @@ 0 - + 20 20 @@ -415,7 +415,7 @@ Expanding - + 10 5 @@ -434,7 +434,7 @@ Expanding - + 20 10 @@ -443,7 +443,7 @@ - layout20 + tqlayout20 @@ -481,7 +481,7 @@ Expanding - + 21 20 @@ -494,7 +494,7 @@ - layout25 + tqlayout25 @@ -541,7 +541,7 @@ Expanding - + 21 20 @@ -550,7 +550,7 @@ - layout21 + tqlayout21 @@ -579,7 +579,7 @@ - layout19 + tqlayout19 @@ -683,7 +683,7 @@ Expanding - + 20 20 @@ -697,7 +697,7 @@ <p align="center">Click on the link below to contribute this station preset file to the kradio project.</p> - + WordBreak|AlignCenter @@ -705,7 +705,7 @@ mailLabel - + AlignCenter diff --git a/kradio3/plugins/radio/radio-configuration.cpp b/kradio3/plugins/radio/radio-configuration.cpp index b4136b6..4cbf764 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::currentDateTime()); + editLastChange->setDateTime(TQDateTime::tqcurrentDateTime()); } diff --git a/kradio3/plugins/recording/encoder_mp3.cpp b/kradio3/plugins/recording/encoder_mp3.cpp index 2b2eb74..8d76fe2 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. ").arg(TQString().setNum(n)); + m_errorString += i18n("Error %1 while encoding mp3. ").tqarg(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. ").arg(TQString().setNum(r)); + m_errorString += i18n("Error %1 writing output. ").tqarg(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. ").arg(output); + m_errorString += i18n("Cannot initialize libmp3lame parameters. ").tqarg(output); } if (!m_error) { id3tag_init(m_LAMEFlags); id3tag_add_v2(m_LAMEFlags); - TQString title = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::currentDateTime().toString(Qt::ISODate)).ascii()); + TQString title = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::tqcurrentDateTime().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. ").arg(output); + m_errorString += i18n("Cannot open output file %1. ").tqarg(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. ").arg(TQString().setNum(n)); + m_errorString += i18n("Error %1 while encoding mp3. ").tqarg(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. ").arg(TQString().setNum(r)); + m_errorString += i18n("Error %1 writing output. ").tqarg(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 ec43546..b51eedd 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. ").arg(output); + m_errorString += i18n("Cannot open Ogg/Vorbis output file %1. ").tqarg(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::currentDateTime().toString(Qt::ISODate)); + vorbis_comment_add_tag_new(&vc, "date", TQDateTime::tqcurrentDateTime().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 1143bc3..85da6ee 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. ").arg(TQString().setNum(err)); + m_errorString += i18n("Error %1 writing output. ").tqarg(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. ").arg(output); + m_errorString += i18n("Cannot open output file %1. ").tqarg(output); } return !m_error; } diff --git a/kradio3/plugins/recording/recording-configuration-ui.ui b/kradio3/plugins/recording/recording-configuration-ui.ui index 2a90973..e5ba41c 100644 --- a/kradio3/plugins/recording/recording-configuration-ui.ui +++ b/kradio3/plugins/recording/recording-configuration-ui.ui @@ -42,7 +42,7 @@ - layout7 + tqlayout7 @@ -50,7 +50,7 @@ - layout3_2 + tqlayout3_2 @@ -66,7 +66,7 @@ Expanding - + 141 20 @@ -91,7 +91,7 @@ - layout3 + tqlayout3 @@ -107,7 +107,7 @@ Expanding - + 141 20 @@ -222,7 +222,7 @@ Expanding - + 20 5 @@ -247,7 +247,7 @@ - layout69 + tqlayout69 @@ -263,7 +263,7 @@ Minimum - + 225 20 @@ -321,7 +321,7 @@ Minimum - + 225 20 @@ -454,7 +454,7 @@ Minimum - + 225 20 @@ -473,7 +473,7 @@ Expanding - + 20 5 @@ -498,7 +498,7 @@ - layout5 + tqlayout5 @@ -563,7 +563,7 @@ Expanding - + 20 16 @@ -588,7 +588,7 @@ - layout68 + tqlayout68 @@ -596,7 +596,7 @@ - layout6 + tqlayout6 @@ -623,7 +623,7 @@ Expanding - + 380 20 @@ -634,7 +634,7 @@ - layout7 + tqlayout7 @@ -688,7 +688,7 @@ Expanding - + 20 16 diff --git a/kradio3/plugins/recording/recording-datamonitor.cpp b/kradio3/plugins/recording/recording-datamonitor.cpp index f2bbe8e..8f22b1a 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)); - setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + tqsetSizePolicy(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 (colorGroup().color(TQColorGroup::Text), 1); - TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), 1); - TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text); - TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid); + 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); 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").arg((int)min_dB)); + int maxW = TQFontMetrics(f).width(i18n("%1 dB").tqarg((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").arg(dB); + TQString txt = i18n("%1 dB").tqarg(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, colorGroup().color(TQColorGroup::Dark)); + KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark)); setPaletteBackgroundPixmap(io.convertToPixmap(i)); setBackgroundOrigin(WindowOrigin); } else { - setBackgroundColor(colorGroup().color(TQColorGroup::Button)); + setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button)); } return true; @@ -267,7 +267,7 @@ bool RecordingDataMonitor::noticeSoundStreamData(SoundStreamID /*id*/, TQPainter paint(this); if (m_maxValue != old_max) { - repaint(true); + tqrepaint(true); } else { internalDrawContents(paint, false); } diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp index f2c773e..063a095 100644 --- a/kradio3/plugins/recording/recording-monitor.cpp +++ b/kradio3/plugins/recording/recording-monitor.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -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_labelStatus = new TQLabel(i18n(""), this), 1, 1); + l0->addWidget(m_labeltqStatus = new TQLabel(i18n(""), this), 1, 1); l0->addWidget( new TQLabel(i18n("Recording File"), this), 2, 0); l0->addWidget(m_labelFileName = new TQLabel(i18n(""), 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").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)); + 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)); m_labelSize->setText(str_size); - m_labelRate->setText(i18n("%1 Hz").arg(sf.m_SampleRate)); + m_labelRate->setText(i18n("%1 Hz").tqarg(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_labelStatus ->setEnabled(true); + m_labeltqStatus ->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_labelStatus ->setEnabled(false); + m_labeltqStatus ->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 5f9247a..a979c02 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_labelStatus; + TQLabel *m_labeltqStatus; TQPushButton *m_btnStartStop; KComboBox *m_comboSoundStreamSelector; diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp index 46dc502..ca11bfe 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").arg(TQString::number(remSize))); + logWarning(i18n("Encoder input buffer overflow (buffer configuration problem?). Skipped %1 input bytes").tqarg(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::currentDate(); + TQDate date = TQDate::tqcurrentDate(); 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").arg(step->size() - consumed_size)); + logError(i18n("Recording::notifySoundStreamData(encoded data): Receivers skipped %1 Bytes").tqarg(step->size() - consumed_size)); } } } diff --git a/kradio3/plugins/streaming/streaming-configuration-ui.ui b/kradio3/plugins/streaming/streaming-configuration-ui.ui index e6b93af..884e03c 100644 --- a/kradio3/plugins/streaming/streaming-configuration-ui.ui +++ b/kradio3/plugins/streaming/streaming-configuration-ui.ui @@ -21,7 +21,7 @@ - layout48 + tqlayout48 @@ -124,7 +124,7 @@ - layout38_2 + tqlayout38_2 @@ -142,13 +142,13 @@ 0 - + 30 30 - + 30 30 @@ -173,13 +173,13 @@ 0 - + 30 30 - + 30 30 @@ -202,7 +202,7 @@ Expanding - + 10 10 @@ -221,13 +221,13 @@ 0 - + 30 30 - + 30 30 @@ -252,13 +252,13 @@ 0 - + 30 30 - + 30 30 @@ -275,7 +275,7 @@ - layout38 + tqlayout38 @@ -293,13 +293,13 @@ 0 - + 30 30 - + 30 30 @@ -324,13 +324,13 @@ 0 - + 30 30 - + 30 30 @@ -353,7 +353,7 @@ Expanding - + 10 10 @@ -372,13 +372,13 @@ 0 - + 30 30 - + 30 30 @@ -403,13 +403,13 @@ 0 - + 30 30 - + 30 30 @@ -658,7 +658,7 @@ Minimum - + 140 20 @@ -675,7 +675,7 @@ Minimum - + 140 20 @@ -692,7 +692,7 @@ Minimum - + 140 20 @@ -709,7 +709,7 @@ Minimum - + 140 20 @@ -726,7 +726,7 @@ Minimum - + 140 20 diff --git a/kradio3/plugins/streaming/streaming-job.cpp b/kradio3/plugins/streaming/streaming-job.cpp index 3266618..4374de9 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").arg(data.size() - free)); + emit logStreamWarning(m_URL, i18n("skipped %1 bytes").tqarg(data.size() - free)); } else { free = data.size(); diff --git a/kradio3/plugins/streaming/streaming.cpp b/kradio3/plugins/streaming/streaming.cpp index be464e2..7634fa2 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)").arg(m_AllCaptureStreams[id])); + SoundMetaData meta_data(0,0,0, i18n("internal stream, not stored (%1)").tqarg(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").arg(name()).arg(size-consumed_size)); + logWarning(i18n("StreamingDevice %1::notifySoundStreamData: Playback Clients skipped %2 bytes").tqarg(name()).tqarg(size-consumed_size)); break; } } @@ -423,18 +423,18 @@ const TQStringList &StreamingDevice::getCaptureChannels() const TQString StreamingDevice::getSoundStreamClientDescription() const { - return i18n("Streaming Device %1").arg(PluginBase::name()); + return i18n("Streaming Device %1").tqarg(PluginBase::name()); } void StreamingDevice::logStreamError(const KURL &url, const TQString &s) { - logError(i18n("Streaming Device %1, %2: %3").arg(name()).arg(url.url()).arg(s)); + logError(i18n("Streaming Device %1, %2: %3").tqarg(name()).tqarg(url.url()).tqarg(s)); } void StreamingDevice::logStreamWarning(const KURL &url, const TQString &s) { - logWarning(i18n("Streaming Device %1, %2: %3").arg(name()).arg(url.url()).arg(s)); + logWarning(i18n("Streaming Device %1, %2: %3").tqarg(name()).tqarg(url.url()).tqarg(s)); } diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui index e592ea1..15ecc20 100644 --- a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui +++ b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui @@ -18,7 +18,7 @@ - layout13 + tqlayout13 @@ -62,7 +62,7 @@ Expanding - + 40 20 @@ -87,7 +87,7 @@ - layout15 + tqlayout15 @@ -95,7 +95,7 @@ - layout14 + tqlayout14 @@ -150,7 +150,7 @@ - layout17 + tqlayout17 @@ -158,7 +158,7 @@ - layout28 + tqlayout28 @@ -166,7 +166,7 @@ - layout27 + tqlayout27 @@ -189,7 +189,7 @@ - layout28 + tqlayout28 @@ -212,7 +212,7 @@ - layout29 + tqlayout29 @@ -249,7 +249,7 @@ - layout16 + tqlayout16 @@ -273,7 +273,7 @@ Expanding - + 20 100 @@ -348,7 +348,7 @@ - layout20 + tqlayout20 @@ -358,7 +358,7 @@ pixmapAlarmStation - + 20 20 @@ -378,7 +378,7 @@ Expanding - + 150 20 diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp index c72aa5e..31ec3db 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::currentDateTime()); + TQDateTime dt(TQDateTime::tqcurrentDateTime()); 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 e5f99cf..276e602 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::currentDateTime().addSecs(m_countdownSeconds); + m_countdownEnd = TQDateTime::tqcurrentDateTime().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::currentDateTime(), + TQDateTime now = TQDateTime::tqcurrentDateTime(), next; const Alarm *retval = NULL; @@ -180,7 +180,7 @@ void TimeControl::slotQTimerAlarmTimeout() notifyAlarm(*m_waitingFor); } - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); 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 135bac6..2020bbc 100644 --- a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui +++ b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui @@ -24,7 +24,7 @@ - layout10 + tqlayout10 @@ -40,7 +40,7 @@ Preferred - + 30 21 @@ -57,7 +57,7 @@ Preferred - + 104 21 @@ -133,7 +133,7 @@ 0 - + 26 26 @@ -166,7 +166,7 @@ Preferred - + 30 21 @@ -183,7 +183,7 @@ Preferred - + 30 21 @@ -202,7 +202,7 @@ Expanding - + 20 61 diff --git a/kradio3/plugins/timeshifter/timeshifter.cpp b/kradio3/plugins/timeshifter/timeshifter.cpp index fb8d653..52d3448 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.invalidate(); - m_NewStreamID.invalidate(); + m_OrgStreamID.tqinvalidate(); + m_NewStreamID.tqinvalidate(); sendStopCapture(tmp_newID); closeSoundStream(tmp_newID); @@ -182,7 +182,7 @@ bool TimeShifter::pausePlayback(SoundStreamID id) sendMute(newid); sendPlaybackVolume(newid, 0); - m_NewStreamID.invalidate(); + m_NewStreamID.tqinvalidate(); 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").arg(s - consumed_size)); + logError(i18n("TimeShifter::notifySoundStreamData: clients skipped %1 bytes. Data Lost").tqarg(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 130d440..06550c7 100644 --- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui +++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui @@ -53,7 +53,7 @@ Preferred - + 40 21 @@ -86,7 +86,7 @@ Preferred - + 40 21 @@ -103,7 +103,7 @@ Preferred - + 40 21 @@ -120,7 +120,7 @@ Preferred - + 40 21 @@ -137,7 +137,7 @@ Preferred - + 40 21 @@ -154,7 +154,7 @@ Preferred - + 152 21 @@ -292,7 +292,7 @@ Expanding - + 5 5 @@ -374,7 +374,7 @@ - layout37 + tqlayout37 @@ -549,7 +549,7 @@ Expanding - + 20 5 @@ -574,7 +574,7 @@ - layout35 + tqlayout35 @@ -593,13 +593,13 @@ volume - + AlignCenter - layout34 + tqlayout34 @@ -615,7 +615,7 @@ Expanding - + 20 20 @@ -643,7 +643,7 @@ Expanding - + 16 20 @@ -664,7 +664,7 @@ - layout35_2 + tqlayout35_2 @@ -683,13 +683,13 @@ treble - + AlignCenter - layout34_2 + tqlayout34_2 @@ -705,7 +705,7 @@ Expanding - + 20 20 @@ -733,7 +733,7 @@ Expanding - + 16 20 @@ -754,7 +754,7 @@ - layout35_2_2 + tqlayout35_2_2 @@ -773,13 +773,13 @@ bass - + AlignCenter - layout34_2_3 + tqlayout34_2_3 @@ -795,7 +795,7 @@ Expanding - + 20 20 @@ -823,7 +823,7 @@ Expanding - + 16 20 @@ -844,7 +844,7 @@ - layout51 + tqlayout51 @@ -860,7 +860,7 @@ balance - + AlignCenter @@ -874,7 +874,7 @@ Expanding - + 20 33 @@ -911,7 +911,7 @@ Expanding - + 20 33 diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp index f39334f..dbfec2a 100644 --- a/kradio3/plugins/v4lradio/v4lradio.cpp +++ b/kradio3/plugins/v4lradio/v4lradio.cpp @@ -31,7 +31,7 @@ #include // memcpy needed -#include +#include #include #include #include @@ -656,7 +656,7 @@ bool V4LRadio::setFrequency(float freq) if (freq > maxf || freq < minf) { logError("V4LRadio::setFrequency: " + - i18n("invalid frequency %1").arg(TQString().setNum(freq))); + i18n("invalid frequency %1").tqarg(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") - .arg(m_caps.version)); + .tqarg(m_caps.version)); } if (r) { logError("V4LRadio::setFrequency: " + i18n("error setting frequency to %1 (%2)") - .arg(TQString().setNum(freq)) - .arg(TQString().setNum(r))); + .tqarg(TQString().setNum(freq)) + .tqarg(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.").arg(*it)); + logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").tqarg(*it)); } } } @@ -1123,7 +1123,7 @@ void V4LRadio::radio_init() radio_done(); logError("V4LRadio::radio_init: " + - i18n("Cannot open mixer device %1").arg(m_mixerDev)); + i18n("Cannot open mixer device %1").tqarg(m_mixerDev)); return; } */ @@ -1132,7 +1132,7 @@ void V4LRadio::radio_init() radio_done(); logError("V4LRadio::radio_init: " + - i18n("Cannot open radio device %1").arg(m_radioDev)); + i18n("Cannot open radio device %1").tqarg(m_radioDev)); return; } @@ -1183,7 +1183,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const if (fd < 0) { logError("V4LRadio::readV4LCaps: " + - i18n("cannot open %1").arg(device)); + i18n("cannot open %1").tqarg(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").arg(TQString().setNum(audiocaps.flags))); + i18n("audio caps = %1").tqarg(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").arg(TQString().sprintf("%08X", caps2.version))); + logDebug(i18n("V4L2 - Version: %1").tqarg(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").arg(c.version)); + logInfo(i18n("V4L %1 detected").tqarg(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") - .arg(TQString().setNum(m_caps.version))); + .tqarg(TQString().setNum(m_caps.version))); } if (r != 0) { m_signalQuality = 0; logError("V4LRadio::readTunerInfo: " + - i18n("cannot get tuner info (error %1)").arg(TQString().setNum(r))); + i18n("cannot get tuner info (error %1)").tqarg(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").arg(#what).arg(TQString().setNum(r))); \ + logError(i18n("error setting %1: %2").tqarg(#what).tqarg(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").arg(#what).arg(TQString().setNum(r))); \ + logError(i18n("error reading %1: %2").tqarg(#what).tqarg(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") - .arg(TQString().setNum(m_caps.version))); + .tqarg(TQString().setNum(m_caps.version))); } if (r) { logError("V4LRadio::updateAudioInfo: " + i18n("error updating radio audio info (%1): %2") - .arg(write ? i18n("write") : i18n("read")) - .arg(TQString().setNum(r))); + .tqarg(write ? i18n("write") : i18n("read")) + .tqarg(TQString().setNum(r))); return false; } } diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp index e873bbc..8d81179 100644 --- a/kradio3/src/aboutwidget.cpp +++ b/kradio3/src/aboutwidget.cpp @@ -25,13 +25,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -45,8 +45,8 @@ class KRadioAboutTabWidget : public TQTabWidget { public: KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} - TQSize sizeHint() const { - return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) ); + TQSize tqsizeHint() const { + return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); } }; @@ -75,7 +75,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType if( layoutType & AbtTitle ) { mTitleLabel = new TQLabel( this, "title" ); - mTitleLabel->setAlignment(AlignCenter); + mTitleLabel->tqsetAlignment(AlignCenter); mTopLayout->addWidget( mTitleLabel ); mTopLayout->addSpacing( KDialog::spacingHint() ); } @@ -190,9 +190,9 @@ void KRadioAboutWidget::show( void ) TQWidget::show(); } -TQSize KRadioAboutWidget::sizeHint( void ) const +TQSize KRadioAboutWidget::tqsizeHint( void ) const { - return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) ); + return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); } void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ ) @@ -211,7 +211,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->parentWidget()->layout()->activate(); + mVersionLabel->parentWidget()->tqlayout()->activate(); } update(); @@ -279,7 +279,7 @@ KAboutContainer *KRadioAboutWidget::addContainerPage( const TQString &title, { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << i18n("Invalid layout") << endl; + kdDebug(291) << "addPage: " << i18n("Invalid tqlayout") << endl; return 0; } @@ -309,7 +309,7 @@ KAboutContainer *KRadioAboutWidget::addScrolledContainerPage( { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << "Invalid layout" << endl; + kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; return 0; } @@ -338,7 +338,7 @@ TQFrame *KRadioAboutWidget::addEmptyPage( const TQString &title ) { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << "Invalid layout" << endl; + kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; return 0; } @@ -376,7 +376,7 @@ void KRadioAboutWidget::setTitle( const TQString &title ) { if( mTitleLabel == 0 ) { - kdDebug(291) << "setTitle: " << "Invalid layout" << endl; + kdDebug(291) << "setTitle: " << "Invalid tqlayout" << endl; return; } mTitleLabel->setText(title); @@ -387,7 +387,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName ) { if( mImageLabel == 0 ) { - kdDebug(291) << "setImage: " << "Invalid layout" << endl; + kdDebug(291) << "setImage: " << "Invalid tqlayout" << endl; return; } if( fileName.isNull() ) @@ -402,7 +402,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName ) pix = logo; mImageLabel->setPixmap( pix ); } - mImageFrame->layout()->activate(); + mImageFrame->tqlayout()->activate(); } @@ -441,18 +441,18 @@ void KRadioAboutWidget::setProduct( const TQString &appName, { if( mIconLabel == 0 ) { - kdDebug(291) << "setProduct: " << "Invalid layout" << endl; + kdDebug(291) << "setProduct: " << "Invalid tqlayout" << endl; return; } if ( kapp ) mIconLabel->setPixmap( kapp->icon() ); - TQString msg1 = i18n("%1 %2 (Using KDE %3)").arg(appName). - arg(TQString::fromLatin1(KRADIO_VERSION)). - arg(TQString::fromLatin1(TDE_VERSION_STRING)); - TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('©').arg(year). - arg(author) : TQString::fromLatin1(""); + TQString msg1 = i18n("%1 %2 (Using KDE %3)").tqarg(appName). + arg(TQString::tqfromLatin1(KRADIO_VERSION)). + arg(TQString::tqfromLatin1(TDE_VERSION_STRING)); + TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").tqarg('©').tqarg(year). + arg(author) : TQString::tqfromLatin1(""); mVersionLabel->setText( msg1 ); mAuthorLabel->setText( msg2 ); @@ -461,7 +461,7 @@ void KRadioAboutWidget::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->parentWidget()->layout()->activate(); + mIconLabel->parentWidget()->tqlayout()->activate(); } @@ -563,7 +563,7 @@ void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData) TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(), translatorPage); label->adjustSize(); - label->setMinimumSize(label->sizeHint()); + label->setMinimumSize(label->tqsizeHint()); translatorPage->addWidget(label); } diff --git a/kradio3/src/alarm.cpp b/kradio3/src/alarm.cpp index 475d48b..a7335d7 100644 --- a/kradio3/src/alarm.cpp +++ b/kradio3/src/alarm.cpp @@ -64,7 +64,7 @@ Alarm::~Alarm() TQDateTime Alarm::nextAlarm(bool ignoreEnable) const { - TQDateTime now = TQDateTime::currentDateTime(), + TQDateTime now = TQDateTime::tqcurrentDateTime(), alarm = m_time; if (m_daily) { alarm.setDate (now.date()); diff --git a/kradio3/src/errorlog-interfaces.cpp b/kradio3/src/errorlog-interfaces.cpp index ec18402..65e2e43 100644 --- a/kradio3/src/errorlog-interfaces.cpp +++ b/kradio3/src/errorlog-interfaces.cpp @@ -41,8 +41,8 @@ IErrorLog::~IErrorLog() int IErrorLogClient::sendLogError(const TQString &s) const { kdDebug() << TQString(i18n("%1 Error: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logError(s)); } @@ -50,8 +50,8 @@ int IErrorLogClient::sendLogError(const TQString &s) const int IErrorLogClient::sendLogWarning(const TQString &s) const { kdDebug() << TQString(i18n("%1 Warning: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logWarning(s)); } @@ -59,8 +59,8 @@ int IErrorLogClient::sendLogWarning(const TQString &s) const int IErrorLogClient::sendLogInfo(const TQString &s) const { kdDebug() << TQString(i18n("%1 Information: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logInfo(s)); } @@ -68,16 +68,16 @@ int IErrorLogClient::sendLogInfo(const TQString &s) const int IErrorLogClient::sendLogDebug(const TQString &s) const { kdDebug() << TQString(i18n("%1 Debug: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logDebug(s)); } void IErrorLogClient::staticLogError (const TQString &s) { kdDebug() << TQString(i18n("%1 Error: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logError(s); } @@ -85,8 +85,8 @@ void IErrorLogClient::staticLogError (const TQString &s) void IErrorLogClient::staticLogWarning(const TQString &s) { kdDebug() << TQString(i18n("%1 Warning: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logWarning(s); } @@ -94,8 +94,8 @@ void IErrorLogClient::staticLogWarning(const TQString &s) void IErrorLogClient::staticLogInfo (const TQString &s) { kdDebug() << TQString(i18n("%1 Information: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logInfo(s); } @@ -103,8 +103,8 @@ void IErrorLogClient::staticLogInfo (const TQString &s) void IErrorLogClient::staticLogDebug (const TQString &s) { kdDebug() << TQString(i18n("%1 Debug: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logDebug(s); } diff --git a/kradio3/src/fileringbuffer.cpp b/kradio3/src/fileringbuffer.cpp index a31e007..584b8c2 100644 --- a/kradio3/src/fileringbuffer.cpp +++ b/kradio3/src/fileringbuffer.cpp @@ -32,7 +32,7 @@ FileRingBuffer::FileRingBuffer(const TQString &filename, TQ_UINT64 max_size) m_FillSize = 0; m_Start = 0; m_error = m_File == NULL; - m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").arg(filename); + m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").tqarg(filename); } @@ -65,7 +65,7 @@ bool FileRingBuffer::resize(const TQString &filename, TQ_UINT64 new_max_size) m_FileName = m_BaseFileName + "_" + TQString::number(++m_FileIdx); m_File = fopen(m_FileName.ascii(), "w+"); m_error = m_File == NULL; - m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").arg(filename); + m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").tqarg(filename); } if (new_max_size >= m_RealSize) { @@ -90,13 +90,13 @@ bool FileRingBuffer::resize(const TQString &filename, TQ_UINT64 new_max_size) newFill += tmp_size; } else { m_error = true; - m_errorString += i18n("FileRingbuffer::resize: Writing to tmpfile %1 failed. ").arg(tmp_file_name); + m_errorString += i18n("FileRingbuffer::resize: Writing to tmpfile %1 failed. ").tqarg(tmp_file_name); } } } } else { m_error = true; - m_errorString += i18n("FileRingbuffer::resize: Opening tmpfile %1 failed. ").arg(tmp_file_name); + m_errorString += i18n("FileRingbuffer::resize: Opening tmpfile %1 failed. ").tqarg(tmp_file_name); } if (!m_error) { @@ -124,7 +124,7 @@ size_t FileRingBuffer::addData (const char *src, size_t size) fseek(m_File, m_Start + m_FillSize, SEEK_SET); if (rest > 0 && fwrite(src, rest, 1, m_File) <= 0) { m_error = true; - m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").arg(m_FileName); + m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").tqarg(m_FileName); } else { m_FillSize += rest; if (m_Start + m_FillSize > m_RealSize) @@ -142,7 +142,7 @@ size_t FileRingBuffer::addData (const char *src, size_t size) fseek(m_File, m_Start + m_FillSize - m_RealSize, SEEK_SET); if (fwrite(src, rest, 1, m_File) <= 0) { m_error = true; - m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").arg(m_FileName); + m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").tqarg(m_FileName); } else { m_FillSize += rest; written += rest; @@ -165,7 +165,7 @@ size_t FileRingBuffer::takeData(char *dst, size_t size) fseek(m_File, m_Start, SEEK_SET); if (fread(dst+read, n, 1, m_File) <= 0) { m_error = true; - m_errorString += i18n("FileRingBuffer::takeData: failed reading data to file %1.").arg(m_FileName); + m_errorString += i18n("FileRingBuffer::takeData: failed reading data to file %1.").tqarg(m_FileName); } else { m_FillSize -= n; m_Start += n; diff --git a/kradio3/src/frequencyradiostation.cpp b/kradio3/src/frequencyradiostation.cpp index 75257b2..d2c9eb3 100644 --- a/kradio3/src/frequencyradiostation.cpp +++ b/kradio3/src/frequencyradiostation.cpp @@ -117,7 +117,7 @@ TQString FrequencyRadioStation::longName() const { TQString longN = name(); if (!longN.isEmpty()) { - longN = i18n("%1, %2").arg(longN).arg(description()); + longN = i18n("%1, %2").tqarg(longN).tqarg(description()); } else { longN = description(); } @@ -131,9 +131,9 @@ TQString FrequencyRadioStation::description() const float cf = frequency(); TQString f; if (cf >= 10) - f = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(cf, 2)); + f = i18n("%1 MHz").tqarg(KGlobal::locale()->formatNumber(cf, 2)); else - f = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber(cf * 1000, 0)); + f = i18n("%1 kHz").tqarg(KGlobal::locale()->formatNumber(cf * 1000, 0)); return f; } diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h index 6d0639a..58d9389 100644 --- a/kradio3/src/include/aboutwidget.h +++ b/kradio3/src/include/aboutwidget.h @@ -94,7 +94,7 @@ class KRadioAboutWidget : public TQWidget public: KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0); virtual void show( void ); - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; void setAboutData(const KAboutData &abtData); diff --git a/kradio3/src/include/interfaces.h b/kradio3/src/include/interfaces.h index c698521..7e53a24 100644 --- a/kradio3/src/include/interfaces.h +++ b/kradio3/src/include/interfaces.h @@ -145,7 +145,7 @@ - sending Messages Declare a virtual constant method with return value "int" and the desired - parameters. The return value will indicate how many receivers have handled + parameters. The return value will indicate how many tqreceivers have handled the message: virtual bool SendingMessages(int any_or_non_param) const; @@ -168,7 +168,7 @@ The method has to be implemented by a derived class. The current item of the - receivers conntions list is set to the sender. + tqreceivers conntions list is set to the sender. - querying queries @@ -195,7 +195,7 @@ IF_ANSWER( AnsweringQueries(int another_param) ) The method has to be implemented by a derived class. The current item of the - receivers conntions list is set to the sender. + tqreceivers conntions list is set to the sender. At last a note on maxConnections. This member is set on initialization by @@ -216,7 +216,7 @@ int ComplementaryInterface::SendingMessages(int any_or_non_param) const { IF_SEND_MESSAGE( ReceivingMessages(any_or_non_param) ) - // macro includes "return #receivers" + // macro includes "return #tqreceivers" } int ComplementaryInterface::QueryingQueries(int another_param) const diff --git a/kradio3/src/include/soundstreamclient_interfaces.h b/kradio3/src/include/soundstreamclient_interfaces.h index 3f53ac5..310d42a 100644 --- a/kradio3/src/include/soundstreamclient_interfaces.h +++ b/kradio3/src/include/soundstreamclient_interfaces.h @@ -107,7 +107,7 @@ SENDERS: IF_SENDER_FINE ( queryIsMuted, (SoundStreamID /*id*/, bool &) ) - // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers + // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers IF_SENDER_FINE ( sendReleasePlayback, (SoundStreamID id) ) IF_SENDER_FINE ( sendReleaseCapture, (SoundStreamID id) ) @@ -315,7 +315,7 @@ SENDERS: CALL_SNDSTR_SERVER ( queryIsMuted, (SoundStreamID id, bool &v), (id, v) ) - // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers + // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers CALL_SNDSTR_SERVER ( sendReleasePlayback, (SoundStreamID id), (id) ) CALL_SNDSTR_SERVER ( sendReleaseCapture, (SoundStreamID id), (id) ) diff --git a/kradio3/src/include/soundstreamid.h b/kradio3/src/include/soundstreamid.h index e7aa4d5..4133103 100644 --- a/kradio3/src/include/soundstreamid.h +++ b/kradio3/src/include/soundstreamid.h @@ -44,7 +44,7 @@ public: bool HasSamePhysicalID(const SoundStreamID &x) const { return m_PhysicalID == x.m_PhysicalID; } bool isValid() const { return m_ID != 0; } // m_PhysicalID is not checked! - void invalidate(); + void tqinvalidate(); static const SoundStreamID InvalidID; diff --git a/kradio3/src/internetradiostation.cpp b/kradio3/src/internetradiostation.cpp index 04cd9f9..6bec8d2 100644 --- a/kradio3/src/internetradiostation.cpp +++ b/kradio3/src/internetradiostation.cpp @@ -115,7 +115,7 @@ TQString InternetRadioStation::longName() const { TQString longN = name(); if (!longN.isEmpty()) { - longN = i18n("%1, %2").arg(longN).arg(description()); + longN = i18n("%1, %2").tqarg(longN).tqarg(description()); } else { longN = description(); } diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp index b5bc509..36be553 100644 --- a/kradio3/src/kradioapp.cpp +++ b/kradio3/src/kradioapp.cpp @@ -104,7 +104,7 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name) } else { KMessageBox::error(NULL, i18n("Library %1: Plugin Entry Point is missing\n") - .arg(lib_name), + .tqarg(lib_name), i18n("Plugin Library Load Error")); library->unload(); info_func = NULL; @@ -114,8 +114,8 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name) } else { KMessageBox::error(NULL, i18n("Library %1: \n%2") - .arg(lib_name) - .arg(KLibLoader::self()->lastErrorMessage()), + .tqarg(lib_name) + .tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Plugin Library Load Error")); } } @@ -266,10 +266,10 @@ KLibrary *KRadioApp::LoadLibrary (const TQString &library) m_PluginInfos.insert(it.key(), PluginClassInfo (it.key(), *it, libinfo.init_func)); } } else { - kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " " << i18n("Error: Loading Library %1 failed: %2") - .arg(library).arg(KLibLoader::self()->lastErrorMessage()) + .tqarg(library).tqarg(KLibLoader::self()->lastErrorMessage()) << endl; } @@ -317,15 +317,15 @@ PluginBase *KRadioApp::CreatePlugin (PluginManager *manager, const TQString &cla if (m_PluginInfos.contains(class_name)) { retval = m_PluginInfos[class_name].CreateInstance(object_name); if (!retval) { - kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " " - << i18n("Error: Creation of instance \"%1\" of class %2 falied.").arg(object_name).arg(class_name) + << i18n("Error: Creation of instance \"%1\" of class %2 falied.").tqarg(object_name).tqarg(class_name) << endl; } } else { - kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " " - << i18n("Error: Cannot create instance \"%1\" of unknown class %2.").arg(object_name).arg(class_name) + << i18n("Error: Cannot create instance \"%1\" of unknown class %2.").tqarg(object_name).tqarg(class_name) << endl; } diff --git a/kradio3/src/pluginmanager-configuration-ui.ui b/kradio3/src/pluginmanager-configuration-ui.ui index 13adb7f..abaa991 100644 --- a/kradio3/src/pluginmanager-configuration-ui.ui +++ b/kradio3/src/pluginmanager-configuration-ui.ui @@ -126,7 +126,7 @@ Expanding - + 20 87 @@ -137,7 +137,7 @@ btnRemovePluginInstance - + 24 24 @@ -196,7 +196,7 @@ Expanding - + 20 55 @@ -207,7 +207,7 @@ btnNewPluginInstance - + 24 24 @@ -301,7 +301,7 @@ btnRemoveLibrary - + 24 24 @@ -321,7 +321,7 @@ btnAddLibrary - + 24 24 @@ -363,7 +363,7 @@ Expanding - + 20 61 diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp index 09f8a59..6164f20 100644 --- a/kradio3/src/pluginmanager.cpp +++ b/kradio3/src/pluginmanager.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -120,7 +120,7 @@ void PluginManager::updateWidgetPluginMenuItem(WidgetPluginBase *b, TQMenuData * return; const TQString &name = b->description(); - TQString text = (shown ? i18n("Hide %1") : i18n("Show %1")).arg(name); + TQString text = (shown ? i18n("Hide %1") : i18n("Show %1")).tqarg(name); menu->changeItem(map[b], TQIconSet(SmallIconSet(!shown ? "kradio_show" : "kradio_hide")), @@ -153,7 +153,7 @@ void PluginManager::insertPlugin(PluginBase *p) if (p) { BlockProfiler profiler_cfg("PluginManager::insertPlugin - about/config"); - /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + /*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " Debug: Adding Plugin: " << p->name() << "\n";*/ if (!m_configDialog) @@ -173,7 +173,7 @@ void PluginManager::insertPlugin(PluginBase *p) // connect plugins with each other for (PluginIterator it(m_plugins); it.current(); ++it) { if (it.current() != p) { - /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + /*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " Debug: connecting with " << it.current()->name() << "\n";*/ p->connectI(it.current()); } @@ -295,7 +295,7 @@ TQFrame *PluginManager::addConfigurationPage (const ConfigPageInfo &info) KGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium ) ); - // fill config frame with layout ... + // fill config frame with tqlayout ... TQGridLayout *l = new TQGridLayout(f); l->setSpacing( 0 ); l->setMargin( 0 ); @@ -378,7 +378,7 @@ void PluginManager::addAboutPage (PluginBase *forWhom, m_aboutPageFrames.insert(forWhom, f); m_aboutPages.insert(forWhom, info.page); - // fill config frame with layout ... + // fill config frame with tqlayout ... TQGridLayout *l = new TQGridLayout(f); l->setSpacing( 0 ); l->setMargin( 0 ); @@ -456,7 +456,7 @@ void PluginManager::restoreState (KConfig *c) TQString object_name = c->readEntry("plugin_name_" + TQString::number(i)); if (m_showProgressBar) - progress->TQWidget::setCaption(i18n("Creating Plugin %1").arg(class_name)); + progress->TQWidget::setCaption(i18n("Creating Plugin %1").tqarg(class_name)); if (class_name.length() && object_name.length()) m_Application->CreatePlugin(this, class_name, object_name); if (m_showProgressBar) @@ -473,7 +473,7 @@ void PluginManager::restoreState (KConfig *c) for (TQMapConstIterator it=classes.begin(); it != end; ++it, ++idx) { const PluginClassInfo &cls = *it; if (m_showProgressBar) - progress->TQWidget::setCaption(i18n("Creating Plugin %1").arg(cls.class_name)); + progress->TQWidget::setCaption(i18n("Creating Plugin %1").tqarg(cls.class_name)); m_Application->CreatePlugin(this, cls.class_name, m_Name + "-" + cls.class_name); if (m_showProgressBar) progress->progressBar()->setProgress(idx); @@ -487,7 +487,7 @@ void PluginManager::restoreState (KConfig *c) for (PluginIterator i(m_plugins); i.current(); ++i, ++idx) { BlockProfiler profile_plugin("PluginManager::restoreState - " + i.current()->pluginClassName()); if (m_showProgressBar) - progress->TQWidget::setCaption(i18n("Initializing Plugin %1").arg(i.current()->pluginClassName())); + progress->TQWidget::setCaption(i18n("Initializing Plugin %1").tqarg(i.current()->pluginClassName())); i.current()->restoreState(c); if (m_showProgressBar) progress->progressBar()->setProgress(idx+1); diff --git a/kradio3/src/radiostation-config.cpp b/kradio3/src/radiostation-config.cpp index f045c27..677d798 100644 --- a/kradio3/src/radiostation-config.cpp +++ b/kradio3/src/radiostation-config.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/kradio3/src/soundstreamid.cpp b/kradio3/src/soundstreamid.cpp index 1c9cfed..f1905e9 100644 --- a/kradio3/src/soundstreamid.cpp +++ b/kradio3/src/soundstreamid.cpp @@ -62,7 +62,7 @@ SoundStreamID SoundStreamID::createNewID(const SoundStreamID &oldID) } -void SoundStreamID::invalidate() +void SoundStreamID::tqinvalidate() { m_ID = 0; m_PhysicalID = 0; diff --git a/kradio3/src/standardscandialog-ui.ui b/kradio3/src/standardscandialog-ui.ui index 394ccfc..8d0e8d5 100644 --- a/kradio3/src/standardscandialog-ui.ui +++ b/kradio3/src/standardscandialog-ui.ui @@ -38,7 +38,7 @@ - layout2 + tqlayout2 @@ -54,7 +54,7 @@ Expanding - + 100 20 @@ -79,7 +79,7 @@ Expanding - + 70 20 @@ -90,7 +90,7 @@ - layout2 + tqlayout2 diff --git a/kradio3/src/standardscandialog.cpp b/kradio3/src/standardscandialog.cpp index b738618..b96f794 100644 --- a/kradio3/src/standardscandialog.cpp +++ b/kradio3/src/standardscandialog.cpp @@ -67,7 +67,7 @@ void StandardScanDialog::start() if (!m_running) { m_running = true; m_stations.all().clear(); - m_startTime = TQDateTime::currentDateTime(); + m_startTime = TQDateTime::tqcurrentDateTime(); m_oldPowerOn = queryIsPowerOn(); m_oldStation = queryCurrentStation().copy(); sendToBeginning(); @@ -153,11 +153,11 @@ bool StandardScanDialog::noticeProgress (float f) progressBar->setProgress((int)rint(f * 100)); if (m_running) { - int secs = m_startTime.secsTo(TQDateTime::currentDateTime()); + int secs = m_startTime.secsTo(TQDateTime::tqcurrentDateTime()); int ms = (int)rint((1 - f) * (float) secs / f * 1000.0); if (ms > 0 && ms < 86400000) // max one day - labelTime->setText(i18n("

%1

").arg(TQTime(0,0).addMSecs(ms).toString())); + labelTime->setText(i18n("

%1

").tqarg(TQTime(0,0).addMSecs(ms).toString())); else labelTime->setText(i18n("unknown")); diff --git a/kradio3/src/station-drag-object.cpp b/kradio3/src/station-drag-object.cpp index f8cc2c7..b3fecb7 100644 --- a/kradio3/src/station-drag-object.cpp +++ b/kradio3/src/station-drag-object.cpp @@ -76,7 +76,7 @@ bool StationDragObject::decode (const TQMimeSource *e, TQStringList &stationIDs) { stationIDs.clear(); if (canDecode(e)) { - const TQByteArray &tmp = e->encodedData(e->format(0)); + const TQByteArray &tmp = e->tqencodedData(e->format(0)); TQString str = ""; for (unsigned int pos = 0; pos < tmp.size(); ++pos) { if (tmp[pos]) { diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp index 8c6bf80..e7e7d64 100644 --- a/kradio3/src/stationlist.cpp +++ b/kradio3/src/stationlist.cpp @@ -235,7 +235,7 @@ void StationList::merge(const StationList & other) if (! m_metaData.comment.isEmpty()) m_metaData.comment += "\n"; - m_metaData.lastChange = TQDateTime::currentDateTime(); + m_metaData.lastChange = TQDateTime::tqcurrentDateTime(); if (!metaData.maintainer.isEmpty()) m_metaData.maintainer += (count() ? TQString(" / ") : TQString()) + metaData.maintainer; @@ -340,13 +340,13 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool if (!KIO::NetAccess::download(url, tmpfile, NULL)) { if (enableMessageBox) { logger.logError("StationList::readXML: " + - i18n("error downloading preset file %1").arg(url.url())); + i18n("error downloading preset file %1").tqarg(url.url())); TQMessageBox::warning(NULL, "KRadio", i18n("Download of the station preset file at %1 failed.") - .arg(url.url())); + .tqarg(url.url())); } else { logger.logWarning("StationList::readXML: " + - i18n("error downloading preset file %1").arg(url.url())); + i18n("error downloading preset file %1").tqarg(url.url())); } return false; } @@ -358,11 +358,11 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool if (! presetFile.open(IO_ReadOnly)) { logger.logError("StationList::readXML: " + - i18n("error opening preset file %1").arg(tmpfile)); + i18n("error opening preset file %1").tqarg(tmpfile)); if (enableMessageBox) { TQMessageBox::warning(NULL, "KRadio", i18n("Opening of the station preset file at %1 failed.") - .arg(tmpfile)); + .tqarg(tmpfile)); } return false; } @@ -458,11 +458,11 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool outs << output; if (outf->status() != IO_Ok) { logger.logError("StationList::writeXML: " + - i18n("error writing to tempfile %1").arg(tmpFile.name())); + i18n("error writing to tempfile %1").tqarg(tmpFile.name())); if (enableMessageBox) { TQMessageBox::warning(NULL, "KRadio", i18n("Writing station preset file %1 failed.") - .arg(tmpFile.name())); + .tqarg(tmpFile.name())); } return false; } @@ -472,19 +472,19 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool if (count() <= 1) { logger.logWarning("StationList::writeXML: " + - i18n("uploading preset file %1: ").arg(url.url())); + i18n("uploading preset file %1: ").tqarg(url.url())); logger.logWarning("StationList::writeXML: " + - i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").arg(count())); + i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").tqarg(count())); } else { if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) { logger.logError("StationList::writeXML: " + - i18n("error uploading preset file %1").arg(url.url())); + i18n("error uploading preset file %1").tqarg(url.url())); if (enableMessageBox) { TQMessageBox::warning(NULL, "KRadio", i18n("Upload of station preset file to %1 failed.") - .arg(url.url())); + .tqarg(url.url())); } return false; } diff --git a/kradio3/src/stationlistxmlhandler.cpp b/kradio3/src/stationlistxmlhandler.cpp index 1bd09ed..0e303da 100644 --- a/kradio3/src/stationlistxmlhandler.cpp +++ b/kradio3/src/stationlistxmlhandler.cpp @@ -62,7 +62,7 @@ bool StationListXmlHandler::startDocument () #define START_ELEMENT_ERROR m_logger.logError("StationListXmlHandler::startElement: " + \ i18n("misplaced element %1") \ - .arg(qname));\ + .tqarg(qname));\ return false; bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString &/*localname*/, @@ -113,7 +113,7 @@ bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString } else { // unknown m_logger.logWarning("StationListXmlHandler::startElement: " + - i18n("unknown or unexpected element %1").arg(qname)); + i18n("unknown or unexpected element %1").tqarg(qname)); } m_status.push_back(qname); @@ -143,10 +143,10 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString & if (m_status.size()) { m_logger.logError("StationListXmlHandler::endElement: " + i18n("expected element %1, but found %2") - .arg(m_status.back()).arg(qname)); + .tqarg(m_status.back()).tqarg(qname)); } else { m_logger.logError("StationListXmlHandler::endElement: " + - i18n("unexpected element %1").arg(qname)); + i18n("unexpected element %1").tqarg(qname)); } } return true; @@ -155,7 +155,7 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString & #define CHARACTERS_ERROR m_logger.logError("StationListXmlHandler::characters: " + \ i18n("invalid data for element %1") \ - .arg(stat)); \ + .tqarg(stat)); \ return false; bool StationListXmlHandler::characters (const TQString &ch) @@ -169,7 +169,7 @@ bool StationListXmlHandler::characters (const TQString &ch) if (stat == StationListFormat) { if (str != STATION_LIST_FORMAT) { - m_logger.logError(i18n("found a station list with unknown format %1").arg(str)); + m_logger.logError(i18n("found a station list with unknown format %1").tqarg(str)); return false; } @@ -210,13 +210,13 @@ bool StationListXmlHandler::characters (const TQString &ch) if (!m_newStation->setProperty(stat, str)) { m_logger.logWarning("StationListXmlHandler::characters: " + i18n("unknown property %1 for class %2") - .arg(stat) - .arg(m_newStation->getClassName())); + .tqarg(stat) + .tqarg(m_newStation->getClassName())); } } else if (str.length()) { m_logger.logError("StationListXmlHandler::characters: " + - i18n("characters ignored for element %1").arg(stat)); + i18n("characters ignored for element %1").tqarg(stat)); } return true; } diff --git a/kradio3/src/stationselector-ui.ui b/kradio3/src/stationselector-ui.ui index 2844baf..bc3f3dd 100644 --- a/kradio3/src/stationselector-ui.ui +++ b/kradio3/src/stationselector-ui.ui @@ -48,7 +48,7 @@ - layout1 + tqlayout1 @@ -102,7 +102,7 @@ Expanding - + 20 40 @@ -129,7 +129,7 @@ Minimum - + 10 20 diff --git a/kradio3/src/timecontrol_interfaces.cpp b/kradio3/src/timecontrol_interfaces.cpp index c4f42b5..248fa47 100644 --- a/kradio3/src/timecontrol_interfaces.cpp +++ b/kradio3/src/timecontrol_interfaces.cpp @@ -83,7 +83,7 @@ void ITimeControlClient::noticeConnectedI(cmplInterface *, bool /*pointer_valid* noticeAlarmsChanged(queryAlarms()); noticeNextAlarmChanged(queryNextAlarm()); TQDateTime end = queryCountdownEnd(); - if (end > TQDateTime::currentDateTime()) + if (end > TQDateTime::tqcurrentDateTime()) noticeCountdownStarted(end); else noticeCountdownStopped(); @@ -95,7 +95,7 @@ void ITimeControlClient::noticeDisconnectedI(cmplInterface *, bool /*pointer_val noticeAlarmsChanged(queryAlarms()); noticeNextAlarmChanged(queryNextAlarm()); TQDateTime end = queryCountdownEnd(); - if (end > TQDateTime::currentDateTime()) + if (end > TQDateTime::tqcurrentDateTime()) noticeCountdownStarted(end); else noticeCountdownStopped(); diff --git a/kradio3/src/widgetplugins.cpp b/kradio3/src/widgetplugins.cpp index c7e866d..d01ef88 100644 --- a/kradio3/src/widgetplugins.cpp +++ b/kradio3/src/widgetplugins.cpp @@ -100,7 +100,7 @@ void WidgetPluginBase::pShowOnOrgDesktop() { KWin::setMainWindow(getWidget(), 0); - logDebug(TQString("%1::pShowOnOrgDesktop: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pShowOnOrgDesktop: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) { TQWidget *w = getWidget(); if (!w) return; @@ -131,7 +131,7 @@ void WidgetPluginBase::pShow() { KWin::setMainWindow(getWidget(), 0); - logDebug(TQString("%1::pShow: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pShow: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) { TQWidget *w = getWidget(); if (!w) return; @@ -150,9 +150,9 @@ void WidgetPluginBase::pShow() void WidgetPluginBase::pHide() { - logDebug(TQString("%1::pHide1: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pHide1: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); getKWinState(); - logDebug(TQString("%1::pHide2: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pHide2: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); }