diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:12:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:12:01 -0600 |
commit | c97b553d6150c31db243502b996e1f4919628413 (patch) | |
tree | edea2051c436fa4bf6db98d816c43614129970cd /kradio3/plugins/alsa-sound | |
parent | d9b70de56a7c1ce685cc8fd119d9b004e1fbfdee (diff) | |
download | tderadio-c97b553d6150c31db243502b996e1f4919628413.tar.gz tderadio-c97b553d6150c31db243502b996e1f4919628413.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kradio3/plugins/alsa-sound')
4 files changed, 9 insertions, 9 deletions
diff --git a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp index 2377337..26f30fa 100644 --- a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp +++ b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp @@ -28,7 +28,7 @@ AlsaConfigMixerSetting::AlsaConfigMixerSetting() { } -AlsaConfigMixerSetting::AlsaConfigMixerSetting(KConfig *c, const TQString &prefix) +AlsaConfigMixerSetting::AlsaConfigMixerSetting(TDEConfig *c, const TQString &prefix) { m_card = c->readNumEntry (prefix+"card", -1); m_name = c->readEntry (prefix+"name", TQString()); @@ -55,7 +55,7 @@ TQString AlsaConfigMixerSetting::getIDString(int card, const TQString &name) return TQString::number(card) + "-" + name; } -void AlsaConfigMixerSetting::saveState(KConfig *c, const TQString &prefix) const +void AlsaConfigMixerSetting::saveState(TDEConfig *c, const TQString &prefix) const { c->writeEntry(prefix+"card", m_card); c->writeEntry(prefix+"name", m_name); diff --git a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h index 88140e8..94a995f 100644 --- a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h +++ b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h @@ -20,20 +20,20 @@ #include <tqstring.h> -class KConfig; +class TDEConfig; class AlsaConfigMixerSetting { public: AlsaConfigMixerSetting(); - AlsaConfigMixerSetting(KConfig *c, const TQString &prefix); + AlsaConfigMixerSetting(TDEConfig *c, const TQString &prefix); AlsaConfigMixerSetting(int card, const TQString &name, bool use, bool active, float volume); ~AlsaConfigMixerSetting(); TQString getIDString() const { return getIDString(m_card, m_name); } static TQString getIDString(int card, const TQString &m_name); - void saveState(KConfig *c, const TQString &prefix) const; + void saveState(TDEConfig *c, const TQString &prefix) const; int m_card; TQString m_name; diff --git a/kradio3/plugins/alsa-sound/alsa-sound.cpp b/kradio3/plugins/alsa-sound/alsa-sound.cpp index 4ba8c2c..8da08fc 100644 --- a/kradio3/plugins/alsa-sound/alsa-sound.cpp +++ b/kradio3/plugins/alsa-sound/alsa-sound.cpp @@ -132,7 +132,7 @@ void AlsaSoundDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_vali // PluginBase -void AlsaSoundDevice::saveState (KConfig *c) const +void AlsaSoundDevice::saveState (TDEConfig *c) const { c->setGroup(TQString("alsa-sound-") + PluginBase::name()); @@ -157,7 +157,7 @@ void AlsaSoundDevice::saveState (KConfig *c) const } -void AlsaSoundDevice::restoreState (KConfig *c) +void AlsaSoundDevice::restoreState (TDEConfig *c) { c->setGroup(TQString("alsa-sound-") + PluginBase::name()); diff --git a/kradio3/plugins/alsa-sound/alsa-sound.h b/kradio3/plugins/alsa-sound/alsa-sound.h index 211c2be..4a79832 100644 --- a/kradio3/plugins/alsa-sound/alsa-sound.h +++ b/kradio3/plugins/alsa-sound/alsa-sound.h @@ -101,8 +101,8 @@ public: // PluginBase public: - virtual void saveState (KConfig *) const; - virtual void restoreState (KConfig *); + virtual void saveState (TDEConfig *) const; + virtual void restoreState (TDEConfig *); virtual TQString pluginClassName() const { return "AlsaSoundDevice"; } |