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

53 files changed, 88 insertions, 88 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;
 }
diff --git a/kradio3/plugins/gui-docking-menu/docking-configuration.cpp b/kradio3/plugins/gui-docking-menu/docking-configuration.cpp
index 7fbd591..489df58 100644
--- a/kradio3/plugins/gui-docking-menu/docking-configuration.cpp
+++ b/kradio3/plugins/gui-docking-menu/docking-configuration.cpp
@@ -26,8 +26,8 @@
 
 using namespace std;
 
-DockingConfiguration::DockingConfiguration (RadioDocking *docking, TQWidget *tqparent)
-    : StationSelector(tqparent),
+DockingConfiguration::DockingConfiguration (RadioDocking *docking, TQWidget *parent)
+    : StationSelector(parent),
       m_docking(docking),
       m_disableGUIUpdates(false)
 {
diff --git a/kradio3/plugins/gui-docking-menu/docking-configuration.h b/kradio3/plugins/gui-docking-menu/docking-configuration.h
index 13d7849..462c691 100644
--- a/kradio3/plugins/gui-docking-menu/docking-configuration.h
+++ b/kradio3/plugins/gui-docking-menu/docking-configuration.h
@@ -33,7 +33,7 @@ class DockingConfiguration : public StationSelector
 Q_OBJECT
   TQ_OBJECT
 public :
-    DockingConfiguration (RadioDocking *docking, TQWidget *tqparent);
+    DockingConfiguration (RadioDocking *docking, TQWidget *parent);
     ~DockingConfiguration ();
 
 protected slots:
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
index 23b8e14..499ec8d 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
@@ -56,9 +56,9 @@ TQLayoutItem *ButtonFlowLayoutIterator::takeCurrent()
 
 /**************************************************************/
 
-ButtonFlowLayout::ButtonFlowLayout( TQWidget *tqparent, int margin, int spacing,
+ButtonFlowLayout::ButtonFlowLayout( TQWidget *parent, int margin, int spacing,
         const char *name )
-  : TQLayout( tqparent, margin, spacing, name ),
+  : TQLayout( parent, margin, spacing, name ),
   cached_width(0)
 {
 }
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
index 16a0b45..885f6f7 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
@@ -29,7 +29,7 @@
 class ButtonFlowLayout : public TQLayout
 {
 public:
-    ButtonFlowLayout( TQWidget *tqparent, int margin = 0, int spacing=-1,
+    ButtonFlowLayout( TQWidget *parent, int margin = 0, int spacing=-1,
                       const char *name=0 );
 
     ButtonFlowLayout( TQLayout* parentLayout, int spacing=-1, const char *name=0 );
diff --git a/kradio3/plugins/gui-quickbar/quickbar-configuration.cpp b/kradio3/plugins/gui-quickbar/quickbar-configuration.cpp
index e9c784e..7fcedb1 100644
--- a/kradio3/plugins/gui-quickbar/quickbar-configuration.cpp
+++ b/kradio3/plugins/gui-quickbar/quickbar-configuration.cpp
@@ -19,8 +19,8 @@
 
 using namespace std;
 
-QuickbarConfiguration::QuickbarConfiguration (TQWidget *tqparent)
-	: StationSelector(tqparent)
+QuickbarConfiguration::QuickbarConfiguration (TQWidget *parent)
+	: StationSelector(parent)
 {
 }
 
diff --git a/kradio3/plugins/gui-quickbar/quickbar-configuration.h b/kradio3/plugins/gui-quickbar/quickbar-configuration.h
index c2ba4f8..3ff0213 100644
--- a/kradio3/plugins/gui-quickbar/quickbar-configuration.h
+++ b/kradio3/plugins/gui-quickbar/quickbar-configuration.h
@@ -29,7 +29,7 @@ class QuickbarConfiguration : public StationSelector
 Q_OBJECT
   TQ_OBJECT
 public :
-    QuickbarConfiguration (TQWidget *tqparent);
+    QuickbarConfiguration (TQWidget *parent);
     ~QuickbarConfiguration ();
 
 };
diff --git a/kradio3/plugins/gui-standard-display/displaycfg.cpp b/kradio3/plugins/gui-standard-display/displaycfg.cpp
index d194751..0e92da7 100644
--- a/kradio3/plugins/gui-standard-display/displaycfg.cpp
+++ b/kradio3/plugins/gui-standard-display/displaycfg.cpp
@@ -25,8 +25,8 @@
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
-DisplayConfiguration::DisplayConfiguration(TQWidget *tqparent)
-    : TQWidget (tqparent),
+DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
+    : TQWidget (parent),
       m_dirty(true),
       m_ignore_gui_updates(false)
 {
diff --git a/kradio3/plugins/gui-standard-display/displaycfg.h b/kradio3/plugins/gui-standard-display/displaycfg.h
index 94101c1..1d39b56 100644
--- a/kradio3/plugins/gui-standard-display/displaycfg.h
+++ b/kradio3/plugins/gui-standard-display/displaycfg.h
@@ -34,7 +34,7 @@ class DisplayConfiguration : public TQWidget,
 Q_OBJECT
   TQ_OBJECT
 public:
-    DisplayConfiguration(TQWidget *tqparent);
+    DisplayConfiguration(TQWidget *parent);
     ~DisplayConfiguration();
 
 // Interface
diff --git a/kradio3/plugins/gui-standard-display/radioview-configuration.cpp b/kradio3/plugins/gui-standard-display/radioview-configuration.cpp
index f8349c3..64af3ed 100644
--- a/kradio3/plugins/gui-standard-display/radioview-configuration.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview-configuration.cpp
@@ -17,8 +17,8 @@
 
 #include "radioview-configuration.h"
  
-RadioViewConfiguration::RadioViewConfiguration(TQWidget *tqparent)
-	: TQTabWidget (tqparent),
+RadioViewConfiguration::RadioViewConfiguration(TQWidget *parent)
+	: TQTabWidget (parent),
       m_dirty(true)
 {
 }
diff --git a/kradio3/plugins/gui-standard-display/radioview-configuration.h b/kradio3/plugins/gui-standard-display/radioview-configuration.h
index e368b08..3a1d11a 100644
--- a/kradio3/plugins/gui-standard-display/radioview-configuration.h
+++ b/kradio3/plugins/gui-standard-display/radioview-configuration.h
@@ -31,7 +31,7 @@ class RadioViewConfiguration : public TQTabWidget
 Q_OBJECT
   TQ_OBJECT
 public :
-    RadioViewConfiguration(TQWidget *tqparent = NULL);
+    RadioViewConfiguration(TQWidget *parent = NULL);
     ~RadioViewConfiguration();
 
     void addTab    (TQWidget *child, const TQString &label);
diff --git a/kradio3/plugins/gui-standard-display/radioview_element.cpp b/kradio3/plugins/gui-standard-display/radioview_element.cpp
index 0ba5ba7..7ad8bb1 100644
--- a/kradio3/plugins/gui-standard-display/radioview_element.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_element.cpp
@@ -17,7 +17,7 @@
 
 #include "radioview_element.h"
  
-RadioViewElement::RadioViewElement (TQWidget * /*tqparent*/, const TQString & /*name*/,
+RadioViewElement::RadioViewElement (TQWidget * /*parent*/, const TQString & /*name*/,
                                     RadioViewClass cls)
  : myClass(cls)
 {
diff --git a/kradio3/plugins/gui-standard-display/radioview_element.h b/kradio3/plugins/gui-standard-display/radioview_element.h
index a354b82..67097de 100644
--- a/kradio3/plugins/gui-standard-display/radioview_element.h
+++ b/kradio3/plugins/gui-standard-display/radioview_element.h
@@ -40,7 +40,7 @@ class RadioViewElement : public TQFrame,
 Q_OBJECT
   TQ_OBJECT
 public:
-    RadioViewElement (TQWidget *tqparent, const TQString &name, RadioViewClass myClass);
+    RadioViewElement (TQWidget *parent, const TQString &name, RadioViewClass myClass);
     virtual ~RadioViewElement();
 
     bool connectI   (Interface *) { return false; }   // default behaviour, please overwrite in derived class
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index b0db2bd..17afde3 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -25,8 +25,8 @@
 #include "radioview_frequencyradio.h"
 #include "displaycfg.h"
 
-RadioViewFrequencyRadio::RadioViewFrequencyRadio(TQWidget *tqparent, const TQString &name )
-    : RadioViewElement(tqparent, name, clsRadioDisplay),
+RadioViewFrequencyRadio::RadioViewFrequencyRadio(TQWidget *parent, const TQString &name )
+    : RadioViewElement(parent, name, clsRadioDisplay),
       m_power(false),
       m_valid(false),
       m_frequency(0),
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h
index d89ce44..914c79f 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h
@@ -36,7 +36,7 @@ class RadioViewFrequencyRadio : public RadioViewElement,  // is a TQObject, must
 Q_OBJECT
   TQ_OBJECT
 public:
-    RadioViewFrequencyRadio(TQWidget *tqparent, const TQString &name);
+    RadioViewFrequencyRadio(TQWidget *parent, const TQString &name);
     ~RadioViewFrequencyRadio();
 
     float getUsability (Interface *) const;
@@ -88,7 +88,7 @@ RECEIVERS:
 
 public:
 
-    void reparent (TQWidget *tqparent, WFlags f, const TQPoint &p, bool showIt = FALSE);
+    void reparent (TQWidget *parent, WFlags f, const TQPoint &p, bool showIt = FALSE);
 
 protected:
 
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
index f29f1dd..e334e45 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
@@ -27,8 +27,8 @@
 
 #include "radioview_frequencyseeker.h"
 
-RadioViewFrequencySeeker::RadioViewFrequencySeeker(TQWidget *tqparent, const TQString &name)
-  : RadioViewElement(tqparent, name, clsRadioSeek),
+RadioViewFrequencySeeker::RadioViewFrequencySeeker(TQWidget *parent, const TQString &name)
+  : RadioViewElement(parent, name, clsRadioSeek),
     m_btnSearchLeft(NULL),
     m_btnStepLeft(NULL),
     m_btnStepRight(NULL),
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.h b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.h
index 1580464..4390a6f 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.h
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.h
@@ -31,7 +31,7 @@ class RadioViewFrequencySeeker : public RadioViewElement,  // is a TQObject, mus
 Q_OBJECT
   TQ_OBJECT
 public:
-    RadioViewFrequencySeeker(TQWidget *tqparent, const TQString &name);
+    RadioViewFrequencySeeker(TQWidget *parent, const TQString &name);
     ~RadioViewFrequencySeeker();
 
     float getUsability(Interface *) const;
diff --git a/kradio3/plugins/gui-standard-display/radioview_volume.cpp b/kradio3/plugins/gui-standard-display/radioview_volume.cpp
index 3f25d5e..abde874 100644
--- a/kradio3/plugins/gui-standard-display/radioview_volume.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_volume.cpp
@@ -30,8 +30,8 @@
 #define SLIDER_MAXVAL   32768
 #define SLIDER_RANGE    (SLIDER_MAXVAL - SLIDER_MINVAL)
 
-RadioViewVolume::RadioViewVolume(TQWidget *tqparent, const TQString &name)
-  : RadioViewElement (tqparent, name, clsRadioSound),
+RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
+  : RadioViewElement (parent, name, clsRadioSound),
     m_slider(NULL),
     m_handlingSlot(false)
 {
diff --git a/kradio3/plugins/gui-standard-display/radioview_volume.h b/kradio3/plugins/gui-standard-display/radioview_volume.h
index b88f8b4..c293d3a 100644
--- a/kradio3/plugins/gui-standard-display/radioview_volume.h
+++ b/kradio3/plugins/gui-standard-display/radioview_volume.h
@@ -36,7 +36,7 @@ class RadioViewVolume : public RadioViewElement,  // is a TQObject, must be firs
 Q_OBJECT
   TQ_OBJECT
 public:
-    RadioViewVolume(TQWidget *tqparent, const TQString &name);
+    RadioViewVolume(TQWidget *parent, const TQString &name);
     ~RadioViewVolume();
 
     float getUsability(Interface *) const;
diff --git a/kradio3/plugins/lirc/lirc-configuration.cpp b/kradio3/plugins/lirc/lirc-configuration.cpp
index 02e3a06..c82007e 100644
--- a/kradio3/plugins/lirc/lirc-configuration.cpp
+++ b/kradio3/plugins/lirc/lirc-configuration.cpp
@@ -25,8 +25,8 @@
 #include "lircsupport.h"
 #include "listviewitem_lirc.h"
 
-LIRCConfiguration::LIRCConfiguration (TQWidget *tqparent, LircSupport *dev)
- : LIRCConfigurationUI(tqparent),
+LIRCConfiguration::LIRCConfiguration (TQWidget *parent, LircSupport *dev)
+ : LIRCConfigurationUI(parent),
    m_LIRC (dev),
    m_dirty(true),
    m_ignore_gui_updates(false)
diff --git a/kradio3/plugins/lirc/lirc-configuration.h b/kradio3/plugins/lirc/lirc-configuration.h
index 4e1af19..8fc5498 100644
--- a/kradio3/plugins/lirc/lirc-configuration.h
+++ b/kradio3/plugins/lirc/lirc-configuration.h
@@ -31,7 +31,7 @@ class LIRCConfiguration : public LIRCConfigurationUI
 Q_OBJECT
   TQ_OBJECT
 public :
-    LIRCConfiguration (TQWidget *tqparent, LircSupport *);
+    LIRCConfiguration (TQWidget *parent, LircSupport *);
     ~LIRCConfiguration ();
 
 protected slots:
diff --git a/kradio3/plugins/lirc/listviewitem_lirc.cpp b/kradio3/plugins/lirc/listviewitem_lirc.cpp
index 326bba3..8735916 100644
--- a/kradio3/plugins/lirc/listviewitem_lirc.cpp
+++ b/kradio3/plugins/lirc/listviewitem_lirc.cpp
@@ -17,8 +17,8 @@
 
 #include "listviewitem_lirc.h"
 
-ListViewItemLirc::ListViewItemLirc(TQListView *tqparent, TQListViewItem *after)
-    : KListViewItem(tqparent, after),
+ListViewItemLirc::ListViewItemLirc(TQListView *parent, TQListViewItem *after)
+    : KListViewItem(parent, after),
       m_renamingInProcess(-1)
 {
 }
diff --git a/kradio3/plugins/lirc/listviewitem_lirc.h b/kradio3/plugins/lirc/listviewitem_lirc.h
index 12a821c..785fb17 100644
--- a/kradio3/plugins/lirc/listviewitem_lirc.h
+++ b/kradio3/plugins/lirc/listviewitem_lirc.h
@@ -29,7 +29,7 @@ class ListViewItemLirc : public TQObject, public KListViewItem
 Q_OBJECT
   TQ_OBJECT
 public:
-    ListViewItemLirc(TQListView *tqparent, TQListViewItem *after);
+    ListViewItemLirc(TQListView *parent, TQListViewItem *after);
     ~ListViewItemLirc();
 
     bool isRenamingInProcess() const { return m_renamingInProcess >= 0; }
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;
diff --git a/kradio3/plugins/radio/radio-configuration.cpp b/kradio3/plugins/radio/radio-configuration.cpp
index f306aeb..4cbf764 100644
--- a/kradio3/plugins/radio/radio-configuration.cpp
+++ b/kradio3/plugins/radio/radio-configuration.cpp
@@ -48,8 +48,8 @@
 #include <kurlrequester.h>
 #include <klocale.h>
 
-RadioConfiguration::RadioConfiguration (TQWidget *tqparent, const IErrorLogClient &logger)
-    : RadioConfigurationUI(tqparent),
+RadioConfiguration::RadioConfiguration (TQWidget *parent, const IErrorLogClient &logger)
+    : RadioConfigurationUI(parent),
       ignoreChanges(false),
       devicePopup(NULL),
       m_logger(logger),
diff --git a/kradio3/plugins/radio/radio-configuration.h b/kradio3/plugins/radio/radio-configuration.h
index b9c52b0..7e69268 100644
--- a/kradio3/plugins/radio/radio-configuration.h
+++ b/kradio3/plugins/radio/radio-configuration.h
@@ -39,7 +39,7 @@ class RadioConfiguration : public RadioConfigurationUI,
 Q_OBJECT
   TQ_OBJECT
 public :
-    RadioConfiguration (TQWidget *tqparent, const IErrorLogClient &m_logger);
+    RadioConfiguration (TQWidget *parent, const IErrorLogClient &m_logger);
     ~RadioConfiguration ();
 
     bool connectI (Interface *i);
diff --git a/kradio3/plugins/recording/encoder.cpp b/kradio3/plugins/recording/encoder.cpp
index 5f051d6..da8bfeb 100644
--- a/kradio3/plugins/recording/encoder.cpp
+++ b/kradio3/plugins/recording/encoder.cpp
@@ -32,11 +32,11 @@
 #include <kdeversion.h>
 #include <klocale.h>
 
-RecordingEncoding::RecordingEncoding(TQObject *tqparent,            SoundStreamID ssid,
+RecordingEncoding::RecordingEncoding(TQObject *parent,            SoundStreamID ssid,
                                      const RecordingConfig &cfg, const RadioStation *rs,
                                      const TQString &filename)
     :
-      m_parent(tqparent),
+      m_parent(parent),
       m_config(cfg),
       m_RadioStation(rs ? rs->copy() : NULL),
       m_SoundStreamID(ssid),
diff --git a/kradio3/plugins/recording/encoder.h b/kradio3/plugins/recording/encoder.h
index c127316..b0c442d 100644
--- a/kradio3/plugins/recording/encoder.h
+++ b/kradio3/plugins/recording/encoder.h
@@ -53,7 +53,7 @@ protected:
 class RecordingEncoding : public TQThread
 {
 public:
-    RecordingEncoding(TQObject *tqparent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
+    RecordingEncoding(TQObject *parent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
     virtual ~RecordingEncoding();
 
     void run();
diff --git a/kradio3/plugins/recording/encoder_mp3.cpp b/kradio3/plugins/recording/encoder_mp3.cpp
index 71646c7..8d76fe2 100644
--- a/kradio3/plugins/recording/encoder_mp3.cpp
+++ b/kradio3/plugins/recording/encoder_mp3.cpp
@@ -20,10 +20,10 @@
 #include <tqmutex.h>
 #include <klocale.h>
 
-RecordingEncodingMP3::RecordingEncodingMP3(TQObject *tqparent,            SoundStreamID ssid,
+RecordingEncodingMP3::RecordingEncodingMP3(TQObject *parent,            SoundStreamID ssid,
                                            const RecordingConfig &cfg, const RadioStation *rs,
                                            const TQString &filename)
-    : RecordingEncoding(tqparent, ssid, cfg, rs, filename)
+    : RecordingEncoding(parent, ssid, cfg, rs, filename)
 #ifdef HAVE_LAME
       ,
       m_MP3Buffer(NULL),
diff --git a/kradio3/plugins/recording/encoder_mp3.h b/kradio3/plugins/recording/encoder_mp3.h
index 2b72714..aaa912c 100644
--- a/kradio3/plugins/recording/encoder_mp3.h
+++ b/kradio3/plugins/recording/encoder_mp3.h
@@ -31,7 +31,7 @@
 class RecordingEncodingMP3 : public RecordingEncoding
 {
 public:
-    RecordingEncodingMP3(TQObject *tqparent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
+    RecordingEncodingMP3(TQObject *parent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
     virtual ~RecordingEncodingMP3();
 
     bool               openOutput(const TQString &outputFile);
diff --git a/kradio3/plugins/recording/encoder_ogg.cpp b/kradio3/plugins/recording/encoder_ogg.cpp
index 4cd7b58..b51eedd 100644
--- a/kradio3/plugins/recording/encoder_ogg.cpp
+++ b/kradio3/plugins/recording/encoder_ogg.cpp
@@ -20,10 +20,10 @@
 #include <klocale.h>
 #include <stdlib.h>
 
-RecordingEncodingOgg::RecordingEncodingOgg(TQObject *tqparent,            SoundStreamID ssid,
+RecordingEncodingOgg::RecordingEncodingOgg(TQObject *parent,            SoundStreamID ssid,
                                            const RecordingConfig &cfg, const RadioStation *rs,
                                            const TQString &filename)
-    : RecordingEncoding(tqparent, ssid, cfg, rs, filename)
+    : RecordingEncoding(parent, ssid, cfg, rs, filename)
 #ifdef HAVE_OGG
       ,
       m_OggOutput(NULL),
diff --git a/kradio3/plugins/recording/encoder_ogg.h b/kradio3/plugins/recording/encoder_ogg.h
index 44fc1a7..586c96e 100644
--- a/kradio3/plugins/recording/encoder_ogg.h
+++ b/kradio3/plugins/recording/encoder_ogg.h
@@ -31,7 +31,7 @@
 class RecordingEncodingOgg : public RecordingEncoding
 {
 public:
-    RecordingEncodingOgg(TQObject *tqparent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
+    RecordingEncodingOgg(TQObject *parent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
     virtual ~RecordingEncodingOgg();
 
     bool               openOutput(const TQString &outputFile);
diff --git a/kradio3/plugins/recording/encoder_pcm.cpp b/kradio3/plugins/recording/encoder_pcm.cpp
index a5e6488..85da6ee 100644
--- a/kradio3/plugins/recording/encoder_pcm.cpp
+++ b/kradio3/plugins/recording/encoder_pcm.cpp
@@ -20,10 +20,10 @@
 
 #include <klocale.h>
 
-RecordingEncodingPCM::RecordingEncodingPCM(TQObject *tqparent,            SoundStreamID ssid,
+RecordingEncodingPCM::RecordingEncodingPCM(TQObject *parent,            SoundStreamID ssid,
                                            const RecordingConfig &cfg, const RadioStation *rs,
                                            const TQString &filename)
-    : RecordingEncoding(tqparent, ssid, cfg, rs, filename),
+    : RecordingEncoding(parent, ssid, cfg, rs, filename),
       m_output(NULL)
 {
     m_config.m_SoundFormat.m_Encoding = "raw";
diff --git a/kradio3/plugins/recording/encoder_pcm.h b/kradio3/plugins/recording/encoder_pcm.h
index 667e523..40e6cf4 100644
--- a/kradio3/plugins/recording/encoder_pcm.h
+++ b/kradio3/plugins/recording/encoder_pcm.h
@@ -29,7 +29,7 @@
 class RecordingEncodingPCM : public RecordingEncoding
 {
 public:
-    RecordingEncodingPCM(TQObject *tqparent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
+    RecordingEncodingPCM(TQObject *parent, SoundStreamID id, const RecordingConfig &cfg, const RadioStation *rs, const TQString &filename);
     virtual ~RecordingEncodingPCM();
 
     bool               openOutput(const TQString &outputFile);
diff --git a/kradio3/plugins/recording/recording-configuration.cpp b/kradio3/plugins/recording/recording-configuration.cpp
index c80b0ac..f35f7dd 100644
--- a/kradio3/plugins/recording/recording-configuration.cpp
+++ b/kradio3/plugins/recording/recording-configuration.cpp
@@ -27,8 +27,8 @@
 #include <ktabwidget.h>
 
 
-RecordingConfiguration::RecordingConfiguration (TQWidget *tqparent)
-    : RecordingConfigurationUI(tqparent),
+RecordingConfiguration::RecordingConfiguration (TQWidget *parent)
+    : RecordingConfigurationUI(parent),
       m_dirty(true),
       m_ignore_gui_updates(false)
 {
diff --git a/kradio3/plugins/recording/recording-configuration.h b/kradio3/plugins/recording/recording-configuration.h
index bbc24dc..af32ecd 100644
--- a/kradio3/plugins/recording/recording-configuration.h
+++ b/kradio3/plugins/recording/recording-configuration.h
@@ -82,7 +82,7 @@ class RecordingConfiguration : public RecordingConfigurationUI,
 Q_OBJECT
   TQ_OBJECT
 public :
-    RecordingConfiguration (TQWidget *tqparent);
+    RecordingConfiguration (TQWidget *parent);
     ~RecordingConfiguration ();
 
 // IRecCfgClient
diff --git a/kradio3/plugins/recording/recording-datamonitor.cpp b/kradio3/plugins/recording/recording-datamonitor.cpp
index 797ca9c..8f22b1a 100644
--- a/kradio3/plugins/recording/recording-datamonitor.cpp
+++ b/kradio3/plugins/recording/recording-datamonitor.cpp
@@ -33,8 +33,8 @@
 #define BLOCK_W_MIN     10
 #define W_MIN           (20 * (BLOCK_W_MIN))
 
-RecordingDataMonitor::RecordingDataMonitor(TQWidget *tqparent, const char *name)
-    : TQFrame(tqparent, name),
+RecordingDataMonitor::RecordingDataMonitor(TQWidget *parent, const char *name)
+    : TQFrame(parent, name),
       m_channelsMax(NULL),
       m_channelsAvg(NULL),
       m_maxValue(INT_MAX),
diff --git a/kradio3/plugins/recording/recording-datamonitor.h b/kradio3/plugins/recording/recording-datamonitor.h
index 427354f..0e58d6b 100644
--- a/kradio3/plugins/recording/recording-datamonitor.h
+++ b/kradio3/plugins/recording/recording-datamonitor.h
@@ -31,7 +31,7 @@ class RecordingDataMonitor : public TQFrame//,
 Q_OBJECT
   TQ_OBJECT
 public:
-    RecordingDataMonitor(TQWidget *tqparent, const char *name);
+    RecordingDataMonitor(TQWidget *parent, const char *name);
     ~RecordingDataMonitor();
 
     bool noticeSoundStreamData(SoundStreamID id,
diff --git a/kradio3/plugins/streaming/streaming-configuration.cpp b/kradio3/plugins/streaming/streaming-configuration.cpp
index 89a5949..2c519db 100644
--- a/kradio3/plugins/streaming/streaming-configuration.cpp
+++ b/kradio3/plugins/streaming/streaming-configuration.cpp
@@ -28,8 +28,8 @@
 #include "streaming-configuration.h"
 #include "streaming.h"
 
-StreamingConfiguration::StreamingConfiguration (TQWidget *tqparent, StreamingDevice *streamer)
- : StreamingConfigurationUI(tqparent),
+StreamingConfiguration::StreamingConfiguration (TQWidget *parent, StreamingDevice *streamer)
+ : StreamingConfigurationUI(parent),
    m_ignore_updates(false),
    m_dirty(true),
    m_StreamingDevice(streamer)
diff --git a/kradio3/plugins/streaming/streaming-configuration.h b/kradio3/plugins/streaming/streaming-configuration.h
index a252662..0ceef6d 100644
--- a/kradio3/plugins/streaming/streaming-configuration.h
+++ b/kradio3/plugins/streaming/streaming-configuration.h
@@ -52,7 +52,7 @@ class StreamingConfiguration : public StreamingConfigurationUI
 Q_OBJECT
   TQ_OBJECT
 public :
-    StreamingConfiguration (TQWidget *tqparent, StreamingDevice *streamer);
+    StreamingConfiguration (TQWidget *parent, StreamingDevice *streamer);
     ~StreamingConfiguration ();
 
 protected slots:
diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
index c49906d..31ec3db 100644
--- a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
@@ -47,8 +47,8 @@ public:
 
 };
 
-TimeControlConfiguration::TimeControlConfiguration (TQWidget *tqparent)
-    : TimeControlConfigurationUI(tqparent),
+TimeControlConfiguration::TimeControlConfiguration (TQWidget *parent)
+    : TimeControlConfigurationUI(parent),
       ITimeControlClient(),
       IRadioClient(),
       ignoreChanges(false),
@@ -258,17 +258,17 @@ void TimeControlConfiguration::slotWeekdaysChanged ()
 {
     if (ignoreChanges) return;
 
-    int tqmask = 0;
+    int mask = 0;
     for (int i = 0; i < 7; ++i) {
         if (listWeekdays->isSelected(i)) {
-            tqmask |= (1 << i);
+            mask |= (1 << i);
         }
     }
 
     int idx = listAlarms->currentItem();
     if (idx >= 0 && (unsigned)idx < alarms.size()) {
         Alarm &a = alarms[idx];
-        a.setWeekdayMask(tqmask);
+        a.setWeekdayMask(mask);
 
         ignoreChanges = true;
         bool oldBlock = listAlarms->signalsBlocked();
diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration.h b/kradio3/plugins/timecontrol/timecontrol-configuration.h
index 64d5cb6..814814a 100644
--- a/kradio3/plugins/timecontrol/timecontrol-configuration.h
+++ b/kradio3/plugins/timecontrol/timecontrol-configuration.h
@@ -35,7 +35,7 @@ class TimeControlConfiguration : public TimeControlConfigurationUI,
 Q_OBJECT
   TQ_OBJECT
 public :
-    TimeControlConfiguration (TQWidget *tqparent);
+    TimeControlConfiguration (TQWidget *parent);
     ~TimeControlConfiguration ();
 
     bool connectI (Interface *i);
diff --git a/kradio3/plugins/timeshifter/timeshifter-configuration.cpp b/kradio3/plugins/timeshifter/timeshifter-configuration.cpp
index 167509a..45fbb90 100644
--- a/kradio3/plugins/timeshifter/timeshifter-configuration.cpp
+++ b/kradio3/plugins/timeshifter/timeshifter-configuration.cpp
@@ -36,8 +36,8 @@
 #include "timeshifter-configuration.h"
 #include "timeshifter.h"
 
-TimeShifterConfiguration::TimeShifterConfiguration (TQWidget *tqparent, TimeShifter *shifter)
-  : TimeShifterConfigurationUI(tqparent),
+TimeShifterConfiguration::TimeShifterConfiguration (TQWidget *parent, TimeShifter *shifter)
+  : TimeShifterConfigurationUI(parent),
     m_ignoreGUIChanges(false),
     m_myControlChange(0),
     m_PlaybackMixerHelper(comboPlaybackMixerDevice, StringListHelper::SORT_BY_DESCR),
diff --git a/kradio3/plugins/timeshifter/timeshifter-configuration.h b/kradio3/plugins/timeshifter/timeshifter-configuration.h
index 6c0b722..d8aee64 100644
--- a/kradio3/plugins/timeshifter/timeshifter-configuration.h
+++ b/kradio3/plugins/timeshifter/timeshifter-configuration.h
@@ -36,7 +36,7 @@ class TimeShifterConfiguration : public TimeShifterConfigurationUI,
 Q_OBJECT
   TQ_OBJECT
 public :
-    TimeShifterConfiguration (TQWidget *tqparent, TimeShifter *shifter);
+    TimeShifterConfiguration (TQWidget *parent, TimeShifter *shifter);
     ~TimeShifterConfiguration ();
 
     bool connectI (Interface *i);
diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration.cpp b/kradio3/plugins/v4lradio/v4lradio-configuration.cpp
index 4abccf2..ecb05fa 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration.cpp
@@ -39,8 +39,8 @@
 #include "v4lradio-configuration.h"
 #include "v4lradio.h"
 
-V4LRadioConfiguration::V4LRadioConfiguration (TQWidget *tqparent, SoundStreamID ssid)
-  : V4LRadioConfigurationUI(tqparent),
+V4LRadioConfiguration::V4LRadioConfiguration (TQWidget *parent, SoundStreamID ssid)
+  : V4LRadioConfigurationUI(parent),
     m_SoundStreamID(ssid),
     m_ignoreGUIChanges(false),
     m_myControlChange(0),
diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration.h b/kradio3/plugins/v4lradio/v4lradio-configuration.h
index e6cf60b..db4a8bf 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration.h
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration.h
@@ -41,7 +41,7 @@ class V4LRadioConfiguration : public V4LRadioConfigurationUI,
 Q_OBJECT
   TQ_OBJECT
 public :
-    V4LRadioConfiguration (TQWidget *tqparent, SoundStreamID id);
+    V4LRadioConfiguration (TQWidget *parent, SoundStreamID id);
     ~V4LRadioConfiguration ();
 
     bool connectI (Interface *i);