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

Fix kradio FTBFS

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kradio@1239181 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 70b9eea2ba
commit 12b885ee13
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -24,7 +24,7 @@
#include <math.h> #include <math.h>
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), : AlsaMixerElementUI(tqparent),
m_HasVolume(has_volume), m_HasVolume(has_volume),
m_HasSwitch(has_switch), 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; return ((float)m_spinboxVolume->value())/100.0;
} }
bool TQAlsaMixerElement::getActive() const bool QAlsaMixerElement::getActive() const
{ {
return m_checkboxActive->isChecked(); return m_checkboxActive->isChecked();
} }
bool TQAlsaMixerElement::getOverride() const bool QAlsaMixerElement::getOverride() const
{ {
return m_checkboxOverride->isChecked(); return m_checkboxOverride->isChecked();
} }
void TQAlsaMixerElement::setLabel(const TQString &label) void QAlsaMixerElement::setLabel(const TQString &label)
{ {
m_labelMixerElementName->setText(label); m_labelMixerElementName->setText(label);
} }
void TQAlsaMixerElement::setOverride(bool ov) void QAlsaMixerElement::setOverride(bool ov)
{ {
m_ignore_updates = true; m_ignore_updates = true;
m_checkboxOverride->setChecked(ov); m_checkboxOverride->setChecked(ov);
m_ignore_updates = false; m_ignore_updates = false;
} }
void TQAlsaMixerElement::setActive(bool active) void QAlsaMixerElement::setActive(bool active)
{ {
m_ignore_updates = true; m_ignore_updates = true;
m_checkboxActive->setChecked(active); m_checkboxActive->setChecked(active);
m_ignore_updates = false; m_ignore_updates = false;
} }
void TQAlsaMixerElement::setVolume(float vol) void QAlsaMixerElement::setVolume(float vol)
{ {
m_ignore_updates = true; m_ignore_updates = true;
int v = (int)rint(vol*100 + 0.5); int v = (int)rint(vol*100 + 0.5);
@ -111,18 +111,18 @@ void TQAlsaMixerElement::setVolume(float vol)
m_ignore_updates = false; m_ignore_updates = false;
} }
void TQAlsaMixerElement::slotSpinboxValueChanged(int v) void QAlsaMixerElement::slotSpinboxValueChanged(int v)
{ {
m_sliderVolume->setValue(100-v); m_sliderVolume->setValue(100-v);
} }
void TQAlsaMixerElement::slotSliderValueChanged(int v) void QAlsaMixerElement::slotSliderValueChanged(int v)
{ {
m_spinboxVolume->setValue(100-v); m_spinboxVolume->setValue(100-v);
} }
void TQAlsaMixerElement::slotSetDirty() void QAlsaMixerElement::slotSetDirty()
{ {
if (!m_dirty && !m_ignore_updates) { if (!m_dirty && !m_ignore_updates) {
m_dirty = true; m_dirty = true;
@ -131,7 +131,7 @@ void TQAlsaMixerElement::slotSetDirty()
} }
void TQAlsaMixerElement::slotResetDirty() void QAlsaMixerElement::slotResetDirty()
{ {
m_dirty = false; m_dirty = false;
} }

6
kradio3/plugins/alsa-sound/alsa-mixer-element.h
Unescape View File

@ -20,13 +20,13 @@
#include "alsa-mixer-element-ui.h" #include "alsa-mixer-element-ui.h"
class TQAlsaMixerElement : public AlsaMixerElementUI class QAlsaMixerElement : public AlsaMixerElementUI
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
TQAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume); QAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume);
~TQAlsaMixerElement(); ~QAlsaMixerElement();
float getVolume() const; float getVolume() const;

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

@ -126,7 +126,7 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname)
TQMap<TQString, AlsaMixerElement> vol_ch2id, sw_ch2id; TQMap<TQString, AlsaMixerElement> vol_ch2id, sw_ch2id;
AlsaSoundDevice::getCaptureMixerChannels(m_name2card[cardname], NULL, vol_list, vol_ch2id, sw_list, sw_ch2id, &all_list); AlsaSoundDevice::getCaptureMixerChannels(m_name2card[cardname], NULL, vol_list, vol_ch2id, sw_list, sw_ch2id, &all_list);
for (TQMapIterator<TQString, TQAlsaMixerElement*> it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { for (TQMapIterator<TQString, QAlsaMixerElement*> it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) {
delete *it; delete *it;
} }
m_MixerElements.clear(); m_MixerElements.clear();
@ -145,7 +145,7 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname)
int idx = 0; int idx = 0;
for (TQValueListConstIterator<TQString> it = all_list.begin(); it != all_list.end(); ++it, ++idx) { for (TQValueListConstIterator<TQString> it = all_list.begin(); it != all_list.end(); ++it, ++idx) {
TQAlsaMixerElement *e = new TQAlsaMixerElement(m_groupMixerSubFrame, *it, QAlsaMixerElement *e = new QAlsaMixerElement(m_groupMixerSubFrame, *it,
sw_list.tqcontains(*it), vol_list.tqcontains(*it)); sw_list.tqcontains(*it), vol_list.tqcontains(*it));
TQObject::connect(e, TQT_SIGNAL(sigDirty()), this, TQT_SLOT(slotSetDirty())); TQObject::connect(e, TQT_SIGNAL(sigDirty()), this, TQT_SLOT(slotSetDirty()));
m_groupMixerLayout->addWidget(e, idx > cols, idx % cols); m_groupMixerLayout->addWidget(e, idx > cols, idx % cols);
@ -158,11 +158,11 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname)
void AlsaSoundConfiguration::saveCaptureMixerSettings() void AlsaSoundConfiguration::saveCaptureMixerSettings()
{ {
for (TQMapIterator<TQString, TQAlsaMixerElement*> it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { for (TQMapIterator<TQString, QAlsaMixerElement*> it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) {
const TQString &name = it.key(); const TQString &name = it.key();
int card = m_currentCaptureCard; int card = m_currentCaptureCard;
TQString id = AlsaConfigMixerSetting::getIDString(card, name); TQString id = AlsaConfigMixerSetting::getIDString(card, name);
TQAlsaMixerElement *e = *it; QAlsaMixerElement *e = *it;
float vol = e->getVolume(); float vol = e->getVolume();
bool use = e->getOverride(); bool use = e->getOverride();
bool active = e->getActive(); bool active = e->getActive();
@ -173,11 +173,11 @@ void AlsaSoundConfiguration::saveCaptureMixerSettings()
void AlsaSoundConfiguration::restoreCaptureMixerSettings() void AlsaSoundConfiguration::restoreCaptureMixerSettings()
{ {
for (TQMapIterator<TQString, TQAlsaMixerElement*> it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) { for (TQMapIterator<TQString, QAlsaMixerElement*> it = m_MixerElements.begin(); it != m_MixerElements.end(); ++it) {
const TQString &name = it.key(); const TQString &name = it.key();
int card = m_currentCaptureCard; int card = m_currentCaptureCard;
TQString id = AlsaConfigMixerSetting::getIDString(card, name); TQString id = AlsaConfigMixerSetting::getIDString(card, name);
TQAlsaMixerElement *e = *it; QAlsaMixerElement *e = *it;
if (m_MixerSettings.tqcontains(id)) { if (m_MixerSettings.tqcontains(id)) {
const AlsaConfigMixerSetting &s = m_MixerSettings[id]; const AlsaConfigMixerSetting &s = m_MixerSettings[id];

4
kradio3/plugins/alsa-sound/alsa-sound-configuration.h
Unescape View File

@ -28,7 +28,7 @@
class TQHBoxLayout; class TQHBoxLayout;
class TQGridLayout; class TQGridLayout;
class TQAlsaMixerElement; class QAlsaMixerElement;
class TQScrollView; class TQScrollView;
class TQFrame; class TQFrame;
@ -73,7 +73,7 @@ protected:
TQGridLayout *m_groupMixerLayout; TQGridLayout *m_groupMixerLayout;
TQScrollView *m_groupMixerScrollView; TQScrollView *m_groupMixerScrollView;
TQFrame *m_groupMixerSubFrame; TQFrame *m_groupMixerSubFrame;
TQMap<TQString, TQAlsaMixerElement*> m_MixerElements; TQMap<TQString, QAlsaMixerElement*> m_MixerElements;
TQMap<TQString, AlsaConfigMixerSetting> m_MixerSettings; TQMap<TQString, AlsaConfigMixerSetting> m_MixerSettings;

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

@ -51,8 +51,8 @@ TimeControl::TimeControl (const TQString &n)
m_alarmTimer(this), m_alarmTimer(this),
m_countdownTimer(this) m_countdownTimer(this)
{ {
TQObject::connect(&m_alarmTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTQTimerAlarmTimeout())); TQObject::connect(&m_alarmTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotQTimerAlarmTimeout()));
TQObject::connect(&m_countdownTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTQTimerCountdownTimeout())); TQObject::connect(&m_countdownTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotQTimerCountdownTimeout()));
} }
@ -82,7 +82,7 @@ bool TimeControl::setAlarms (const AlarmVector &al)
m_alarms = al; m_alarms = al;
slotTQTimerAlarmTimeout(); slotQTimerAlarmTimeout();
notifyAlarmsChanged(m_alarms); notifyAlarmsChanged(m_alarms);
} }
@ -166,7 +166,7 @@ TQDateTime TimeControl::getCountdownEnd () const
} }
void TimeControl::slotTQTimerCountdownTimeout() void TimeControl::slotQTimerCountdownTimeout()
{ {
stopCountdown(); stopCountdown();
@ -174,7 +174,7 @@ void TimeControl::slotTQTimerCountdownTimeout()
} }
void TimeControl::slotTQTimerAlarmTimeout() void TimeControl::slotQTimerAlarmTimeout()
{ {
if (m_waitingFor) { if (m_waitingFor) {
notifyAlarm(*m_waitingFor); notifyAlarm(*m_waitingFor);

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

@ -32,7 +32,7 @@ class TimeControl : public TQObject,
public PluginBase, public PluginBase,
public ITimeControl public ITimeControl
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
protected: protected:
AlarmVector m_alarms; AlarmVector m_alarms;
@ -87,8 +87,8 @@ ANSWERS:
// slots for receiving timeout messages of timers // slots for receiving timeout messages of timers
protected slots: protected slots:
virtual void slotTQTimerAlarmTimeout(); virtual void slotQTimerAlarmTimeout();
virtual void slotTQTimerCountdownTimeout(); virtual void slotQTimerCountdownTimeout();
}; };

Write Preview
Loading…
Cancel
Save