summaryrefslogtreecommitdiffstats
path: root/kradio3/plugins/alsa-sound
diff options
context:
space:
mode:
Diffstat (limited to 'kradio3/plugins/alsa-sound')
-rw-r--r--kradio3/plugins/alsa-sound/alsa-mixer-element.cpp4
-rw-r--r--kradio3/plugins/alsa-sound/alsa-mixer-element.h2
-rw-r--r--kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp4
-rw-r--r--kradio3/plugins/alsa-sound/alsa-sound-configuration.h2
-rw-r--r--kradio3/plugins/alsa-sound/alsa-sound.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp b/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp
index fb544bc..53a7216 100644
--- a/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-mixer-element.cpp
@@ -24,8 +24,8 @@
#include <math.h>
-QAlsaMixerElement::QAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume)
- : AlsaMixerElementUI(tqparent),
+QAlsaMixerElement::QAlsaMixerElement(TQWidget *parent, const TQString &label, bool has_switch, bool has_volume)
+ : AlsaMixerElementUI(parent),
m_HasVolume(has_volume),
m_HasSwitch(has_switch),
m_dirty(false),
diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element.h b/kradio3/plugins/alsa-sound/alsa-mixer-element.h
index b788a60..83d9eaa 100644
--- a/kradio3/plugins/alsa-sound/alsa-mixer-element.h
+++ b/kradio3/plugins/alsa-sound/alsa-mixer-element.h
@@ -25,7 +25,7 @@ class QAlsaMixerElement : public AlsaMixerElementUI
Q_OBJECT
TQ_OBJECT
public:
- QAlsaMixerElement(TQWidget *tqparent, const TQString &label, bool has_switch, bool has_volume);
+ QAlsaMixerElement(TQWidget *parent, const TQString &label, bool has_switch, bool has_volume);
~QAlsaMixerElement();
diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
index 9bd7cca..88c4d57 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
@@ -32,8 +32,8 @@
#include "alsa-sound.h"
-AlsaSoundConfiguration::AlsaSoundConfiguration (TQWidget *tqparent, AlsaSoundDevice *dev)
- : AlsaSoundConfigurationUI(tqparent),
+AlsaSoundConfiguration::AlsaSoundConfiguration (TQWidget *parent, AlsaSoundDevice *dev)
+ : AlsaSoundConfigurationUI(parent),
m_SoundDevice (dev),
m_groupMixerLayout(NULL),
m_groupMixerScrollView(NULL),
diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.h b/kradio3/plugins/alsa-sound/alsa-sound-configuration.h
index 78669ee..9c8a352 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.h
+++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.h
@@ -37,7 +37,7 @@ class AlsaSoundConfiguration : public AlsaSoundConfigurationUI
Q_OBJECT
TQ_OBJECT
public :
- AlsaSoundConfiguration (TQWidget *tqparent, AlsaSoundDevice *);
+ AlsaSoundConfiguration (TQWidget *parent, AlsaSoundDevice *);
~AlsaSoundConfiguration ();
protected slots:
diff --git a/kradio3/plugins/alsa-sound/alsa-sound.cpp b/kradio3/plugins/alsa-sound/alsa-sound.cpp
index 0f64935..84d93d5 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-sound.cpp
@@ -900,7 +900,7 @@ bool AlsaSoundDevice::closeCaptureMixerDevice(bool force)
}
-static int mixer_dummy_callback(snd_mixer_t *, unsigned int /*tqmask*/, snd_mixer_elem_t */*elem*/)
+static int mixer_dummy_callback(snd_mixer_t *, unsigned int /*mask*/, snd_mixer_elem_t */*elem*/)
{
return 0;
}