From 12b885ee134c6d178631873ddda9fc0b6d73d7fd Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 3 Jul 2011 21:54:35 +0000 Subject: [PATCH] Fix kradio FTBFS git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kradio@1239181 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../plugins/alsa-sound/alsa-mixer-element.cpp | 26 +++++++++---------- .../plugins/alsa-sound/alsa-mixer-element.h | 6 ++--- .../alsa-sound/alsa-sound-configuration.cpp | 12 ++++----- .../alsa-sound/alsa-sound-configuration.h | 4 +-- kradio3/plugins/timecontrol/timecontrol.cpp | 10 +++---- kradio3/plugins/timecontrol/timecontrol.h | 6 ++--- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp b/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp index 0843961..fb544bc 100644 --- a/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp +++ b/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp @@ -24,7 +24,7 @@ #include -TQAlsaMixerElement::TQAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume) +QAlsaMixerElement::QAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume) : AlsaMixerElementUI(tqparent), m_HasVolume(has_volume), m_HasSwitch(has_switch), @@ -64,45 +64,45 @@ TQAlsaMixerElement::TQAlsaMixerElement(TQWidget *tqparent, const TQString &label } -TQAlsaMixerElement::~TQAlsaMixerElement() +QAlsaMixerElement::~QAlsaMixerElement() { } -float TQAlsaMixerElement::getVolume() const +float QAlsaMixerElement::getVolume() const { return ((float)m_spinboxVolume->value())/100.0; } -bool TQAlsaMixerElement::getActive() const +bool QAlsaMixerElement::getActive() const { return m_checkboxActive->isChecked(); } -bool TQAlsaMixerElement::getOverride() const +bool QAlsaMixerElement::getOverride() const { return m_checkboxOverride->isChecked(); } -void TQAlsaMixerElement::setLabel(const TQString &label) +void QAlsaMixerElement::setLabel(const TQString &label) { m_labelMixerElementName->setText(label); } -void TQAlsaMixerElement::setOverride(bool ov) +void QAlsaMixerElement::setOverride(bool ov) { m_ignore_updates = true; m_checkboxOverride->setChecked(ov); m_ignore_updates = false; } -void TQAlsaMixerElement::setActive(bool active) +void QAlsaMixerElement::setActive(bool active) { m_ignore_updates = true; m_checkboxActive->setChecked(active); m_ignore_updates = false; } -void TQAlsaMixerElement::setVolume(float vol) +void QAlsaMixerElement::setVolume(float vol) { m_ignore_updates = true; int v = (int)rint(vol*100 + 0.5); @@ -111,18 +111,18 @@ void TQAlsaMixerElement::setVolume(float vol) m_ignore_updates = false; } -void TQAlsaMixerElement::slotSpinboxValueChanged(int v) +void QAlsaMixerElement::slotSpinboxValueChanged(int v) { m_sliderVolume->setValue(100-v); } -void TQAlsaMixerElement::slotSliderValueChanged(int v) +void QAlsaMixerElement::slotSliderValueChanged(int v) { m_spinboxVolume->setValue(100-v); } -void TQAlsaMixerElement::slotSetDirty() +void QAlsaMixerElement::slotSetDirty() { if (!m_dirty && !m_ignore_updates) { m_dirty = true; @@ -131,7 +131,7 @@ void TQAlsaMixerElement::slotSetDirty() } -void TQAlsaMixerElement::slotResetDirty() +void QAlsaMixerElement::slotResetDirty() { m_dirty = false; } diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element.h b/kradio3/plugins/alsa-sound/alsa-mixer-element.h index 3dd7849..b788a60 100644 --- a/kradio3/plugins/alsa-sound/alsa-mixer-element.h +++ b/kradio3/plugins/alsa-sound/alsa-mixer-element.h @@ -20,13 +20,13 @@ #include "alsa-mixer-element-ui.h" -class TQAlsaMixerElement : public AlsaMixerElementUI +class QAlsaMixerElement : public AlsaMixerElementUI { Q_OBJECT TQ_OBJECT public: - TQAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume); - ~TQAlsaMixerElement(); + QAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume); + ~QAlsaMixerElement(); float getVolume() const; diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp index f7d3bf4..6b190ad 100644 --- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp +++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp @@ -126,7 +126,7 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname) TQMap vol_ch2id, sw_ch2id; AlsaSoundDevice::getCaptureMixerChannels(m_name2card[cardname], NULL, vol_list, vol_ch2id, sw_list, sw_ch2id, &all_list); - for (TQMapIterator it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { + for (TQMapIterator it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { delete *it; } m_MixerElements.clear(); @@ -145,7 +145,7 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname) int idx = 0; for (TQValueListConstIterator it = all_list.begin(); it != all_list.end(); ++it, ++idx) { - TQAlsaMixerElement *e = new TQAlsaMixerElement(m_groupMixerSubFrame, *it, + QAlsaMixerElement *e = new QAlsaMixerElement(m_groupMixerSubFrame, *it, sw_list.tqcontains(*it), vol_list.tqcontains(*it)); TQObject::connect(e, TQT_SIGNAL(sigDirty()), this, TQT_SLOT(slotSetDirty())); m_groupMixerLayout->addWidget(e, idx > cols, idx % cols); @@ -158,11 +158,11 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname) void AlsaSoundConfiguration::saveCaptureMixerSettings() { - for (TQMapIterator it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { + for (TQMapIterator it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { const TQString &name = it.key(); int card = m_currentCaptureCard; TQString id = AlsaConfigMixerSetting::getIDString(card, name); - TQAlsaMixerElement *e = *it; + QAlsaMixerElement *e = *it; float vol = e->getVolume(); bool use = e->getOverride(); bool active = e->getActive(); @@ -173,11 +173,11 @@ void AlsaSoundConfiguration::saveCaptureMixerSettings() void AlsaSoundConfiguration::restoreCaptureMixerSettings() { - for (TQMapIterator it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { + for (TQMapIterator it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { const TQString &name = it.key(); int card = m_currentCaptureCard; TQString id = AlsaConfigMixerSetting::getIDString(card, name); - TQAlsaMixerElement *e = *it; + QAlsaMixerElement *e = *it; if (m_MixerSettings.tqcontains(id)) { const AlsaConfigMixerSetting &s = m_MixerSettings[id]; diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.h b/kradio3/plugins/alsa-sound/alsa-sound-configuration.h index 39eda64..78669ee 100644 --- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.h +++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.h @@ -28,7 +28,7 @@ class TQHBoxLayout; class TQGridLayout; -class TQAlsaMixerElement; +class QAlsaMixerElement; class TQScrollView; class TQFrame; @@ -73,7 +73,7 @@ protected: TQGridLayout *m_groupMixerLayout; TQScrollView *m_groupMixerScrollView; TQFrame *m_groupMixerSubFrame; - TQMap m_MixerElements; + TQMap m_MixerElements; TQMap m_MixerSettings; diff --git a/kradio3/plugins/timecontrol/timecontrol.cpp b/kradio3/plugins/timecontrol/timecontrol.cpp index f6525b4..276e602 100644 --- a/kradio3/plugins/timecontrol/timecontrol.cpp +++ b/kradio3/plugins/timecontrol/timecontrol.cpp @@ -51,8 +51,8 @@ TimeControl::TimeControl (const TQString &n) m_alarmTimer(this), m_countdownTimer(this) { - TQObject::connect(&m_alarmTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTQTimerAlarmTimeout())); - TQObject::connect(&m_countdownTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTQTimerCountdownTimeout())); + TQObject::connect(&m_alarmTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotQTimerAlarmTimeout())); + TQObject::connect(&m_countdownTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotQTimerCountdownTimeout())); } @@ -82,7 +82,7 @@ bool TimeControl::setAlarms (const AlarmVector &al) m_alarms = al; - slotTQTimerAlarmTimeout(); + slotQTimerAlarmTimeout(); notifyAlarmsChanged(m_alarms); } @@ -166,7 +166,7 @@ TQDateTime TimeControl::getCountdownEnd () const } -void TimeControl::slotTQTimerCountdownTimeout() +void TimeControl::slotQTimerCountdownTimeout() { stopCountdown(); @@ -174,7 +174,7 @@ void TimeControl::slotTQTimerCountdownTimeout() } -void TimeControl::slotTQTimerAlarmTimeout() +void TimeControl::slotQTimerAlarmTimeout() { if (m_waitingFor) { notifyAlarm(*m_waitingFor); diff --git a/kradio3/plugins/timecontrol/timecontrol.h b/kradio3/plugins/timecontrol/timecontrol.h index 7d9b946..4e26b00 100644 --- a/kradio3/plugins/timecontrol/timecontrol.h +++ b/kradio3/plugins/timecontrol/timecontrol.h @@ -32,7 +32,7 @@ class TimeControl : public TQObject, public PluginBase, public ITimeControl { -Q_OBJECT + Q_OBJECT TQ_OBJECT protected: AlarmVector m_alarms; @@ -87,8 +87,8 @@ ANSWERS: // slots for receiving timeout messages of timers protected slots: - virtual void slotTQTimerAlarmTimeout(); - virtual void slotTQTimerCountdownTimeout(); + virtual void slotQTimerAlarmTimeout(); + virtual void slotQTimerCountdownTimeout(); };