rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kradio@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 12 insertions, 12 deletions

diff --git a/kradio3/plugins/oss-sound/oss-sound-configuration.cpp b/kradio3/plugins/oss-sound/oss-sound-configuration.cpp
index 1aca790..2a0a783 100644
--- a/kradio3/plugins/oss-sound/oss-sound-configuration.cpp
+++ b/kradio3/plugins/oss-sound/oss-sound-configuration.cpp
@@ -23,8 +23,8 @@
 #include "oss-sound-configuration.h"
 #include "oss-sound.h"
 
-OSSSoundConfiguration::OSSSoundConfiguration (TQWidget *tqparent, OSSSoundDevice *dev)
- : OSSSoundConfigurationUI(tqparent),
+OSSSoundConfiguration::OSSSoundConfiguration (TQWidget *parent, OSSSoundDevice *dev)
+ : OSSSoundConfigurationUI(parent),
    m_SoundDevice (dev),
    m_dirty(true),
    m_ignore_gui_updates(false)
diff --git a/kradio3/plugins/oss-sound/oss-sound-configuration.h b/kradio3/plugins/oss-sound/oss-sound-configuration.h
index fdbcd26..3fcc8da 100644
--- a/kradio3/plugins/oss-sound/oss-sound-configuration.h
+++ b/kradio3/plugins/oss-sound/oss-sound-configuration.h
@@ -30,7 +30,7 @@ class OSSSoundConfiguration : public OSSSoundConfigurationUI
 Q_OBJECT
   TQ_OBJECT
 public :
-    OSSSoundConfiguration (TQWidget *tqparent, OSSSoundDevice *);
+    OSSSoundConfiguration (TQWidget *parent, OSSSoundDevice *);
     ~OSSSoundConfiguration ();
 
 protected slots:
diff --git a/kradio3/plugins/oss-sound/oss-sound.cpp b/kradio3/plugins/oss-sound/oss-sound.cpp
index 37d3c3e..2ac0f6e 100644
--- a/kradio3/plugins/oss-sound/oss-sound.cpp
+++ b/kradio3/plugins/oss-sound/oss-sound.cpp
@@ -654,10 +654,10 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen)
 
     // setup buffer, ask for 40ms latency
     int tmp  = (400 * m_DSPFormat.frameSize() * m_DSPFormat.m_SampleRate) / 1000;
-    int tqmask = -1;    for (; tmp; tmp >>= 1) ++tqmask;
-    if (tqmask < 8) tqmask = 12;  // default 4kB
-    tqmask |= 0x7FFF0000;
-    err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &tqmask);
+    int mask = -1;    for (; tmp; tmp >>= 1) ++mask;
+    if (mask < 8) mask = 12;  // default 4kB
+    mask |= 0x7FFF0000;
+    err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &mask);
     if (err)
         logError(i18n("Cannot set buffers for %1").tqarg(m_DSPDeviceName));
 
@@ -758,17 +758,17 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS
     }
 
     if (fd >= 0) {
-        int tqmask = 0;
-        if ( ioctl(fd, MIXER_READ(query), &tqmask) == 0 ) {
+        int mask = 0;
+        if ( ioctl(fd, MIXER_READ(query), &mask) == 0 ) {
             for (int i = 0; i < SOUND_MIXER_NRDEVICES; ++i) {
-                if (tqmask & (1 << i)) {
+                if (mask & (1 << i)) {
                     static const char *labels[] = SOUND_DEVICE_LABELS;
                     retval.append(i18n(labels[i]));
                     revmap.insert(i18n(labels[i]), i);
                 }
             }
         } else {
-            logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device tqmask on device %1").tqarg(m_MixerDeviceName));
+            logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device mask on device %1").tqarg(m_MixerDeviceName));
         }
     }
     if (fd != m_Mixer_fd)
diff --git a/kradio3/plugins/oss-sound/oss-sound.h b/kradio3/plugins/oss-sound/oss-sound.h
index c8dadfd..9de783b 100644
--- a/kradio3/plugins/oss-sound/oss-sound.h
+++ b/kradio3/plugins/oss-sound/oss-sound.h
@@ -104,7 +104,7 @@ ANSWERS:
     // ISoundStreamClient: mixer access
 
 protected:
-    void getMixerChannels(int query_playback_or_rec_tqmask, TQStringList &retval, TQMap<TQString, int> &revmap) const;
+    void getMixerChannels(int query_playback_or_rec_mask, TQStringList &retval, TQMap<TQString, int> &revmap) const;
 
 ANSWERS:
     const TQStringList &getPlaybackChannels() const;