rename the following methods:

tqparent parent
tqmask mask


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

55 files changed, 264 insertions, 264 deletions

diff --git a/noatun/modules/artseffects/extrastereo_impl.cc b/noatun/modules/artseffects/extrastereo_impl.cc
index 28b02d8e..3dc92705 100644
--- a/noatun/modules/artseffects/extrastereo_impl.cc
+++ b/noatun/modules/artseffects/extrastereo_impl.cc
@@ -134,7 +134,7 @@ public:
 		intense.min(0);
 		intense.max(5);
 		intense.value(e.intensity());
-		intense.tqparent(hbox);
+		intense.parent(hbox);
 		intense.show();
 		connect(intense,"value_changed", e, "intensity");
 		
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 14c1dc20..3a1e2b4e 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -171,8 +171,8 @@ TQString HTMLExport::getColorByEntry(TQString s)
 }
 //////////////////////////////////// Settings ////////////////////////////////////
 
-Prefs::Prefs(TQObject *tqparent)
-	: CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", tqparent)
+Prefs::Prefs(TQObject *parent)
+	: CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", parent)
 {
 
 	// Init Config
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 65f5c5e9..663eaae0 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -57,7 +57,7 @@ class Prefs : public CModule
 Q_OBJECT
   TQ_OBJECT
 public:
-	Prefs(TQObject *tqparent);
+	Prefs(TQObject *parent);
 	virtual void save();
 	virtual void reopen();
 
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index eb9a6fd3..c83326ad 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -51,8 +51,8 @@ Lirc *IRPrefs::s_lirc = 0;
 bool IRPrefs::s_configRead = false;
 TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands;
 
-IRPrefs::IRPrefs(TQObject *tqparent)
-	: CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", tqparent)
+IRPrefs::IRPrefs(TQObject *parent)
+	: CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent)
 {
 	TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
 	tqlayout->setColStretch(1, 1);
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 69d7f41f..747b80c8 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -25,7 +25,7 @@ public:
 		NextSection, PreviousSection
 	};
 	
-	IRPrefs(TQObject *tqparent);
+	IRPrefs(TQObject *parent);
 	
 	virtual void save();
 
diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp
index 57d98c9b..7278b0ec 100644
--- a/noatun/modules/infrared/lirc.cpp
+++ b/noatun/modules/infrared/lirc.cpp
@@ -12,8 +12,8 @@
 
 #include "lirc.h"
 
-Lirc::Lirc(TQObject *tqparent)
-	: TQObject(tqparent),
+Lirc::Lirc(TQObject *parent)
+	: TQObject(parent),
 	  m_socket(0)
 {
 	int sock = ::socket(PF_UNIX, SOCK_STREAM, 0);
diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h
index 5f30d751..81bd5edc 100644
--- a/noatun/modules/infrared/lirc.h
+++ b/noatun/modules/infrared/lirc.h
@@ -18,7 +18,7 @@ public:
 	/**
 	 * Constructor
 	 */
-	Lirc(TQObject *tqparent);
+	Lirc(TQObject *parent);
 	/**
 	 * Destructor
 	 */
diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS
index 0612242c..7cfc61e2 100644
--- a/noatun/modules/kaiman/SKIN-SPECS
+++ b/noatun/modules/kaiman/SKIN-SPECS
@@ -95,8 +95,8 @@ Mask: filename
 (this is DEPRECATED!, for transparent skins just add transparency to the
  Background image, Mask remains merely for backwards compatibility)
  filename
-  The tqmask image file, only needed for skins which are tqshaped windows (not
-  rectangular). Contains a transparency tqmask for the main window.
+  The mask image file, only needed for skins which are tqshaped windows (not
+  rectangular). Contains a transparency mask for the main window.
 
 ==========================
  Text display
@@ -151,9 +151,9 @@ Play/Pause/Stop/Shuffle/Repeat/
 
  clip_filename (optional)
   When specified, defines an image with transparency to be used as the button's
-  draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to
+  draw clip mask. The clip mask is placed at location x, y The transparency is used to
   indicate the portions of the button that should be visible (drawn) and respond to
-  mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced
+  mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced
   such that levels above 50% are visible and those below 50% are not visible.
 
 ==========================
@@ -175,9 +175,9 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename]
 
  clip_filename (optional)
   When specified, defines an image with transparency to be used as the button's
-  draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to
+  draw clip mask. The clip mask is placed at location x, y The transparency is used to
   indicate the portions of the button that should be visible (drawn) and respond to
-  mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced
+  mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced
   such that levels above 50% are visible and those below 50% are not visible.
 
 
@@ -354,15 +354,15 @@ Position/Volume/Balance_Dial: filename has_press_image has_prelight_image revers
 
  x, y, width, height:
   Marks the clipping region to draw the dial, basically the handle is not drawn
-  outside this region. (width and height will be ignored if a clip tqmask image
+  outside this region. (width and height will be ignored if a clip mask image
   is specified (see next option).
 
  clip_filename (optional)
   When specified, defines an image with transparency to be used as the dial's
-  draw clip tqmask. The clip tqmask is placed at x, y (above) and the image's dimensions
+  draw clip mask. The clip mask is placed at x, y (above) and the image's dimensions
   are used in place of width, height (above). The transparency is used to indicate the
   portions of the dial that should be visible (drawn) and respond to mouse clicks.
-  If the image contains a multiple level alpha channel, the tqmask is reduced such that
+  If the image contains a multiple level alpha channel, the mask is reduced such that
   levels above 50% are visible and those below 50% are not visible.
 
 ==============================================================================
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index 87e1a5e2..1077613b 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -31,8 +31,8 @@
 #include "userinterface.h"
 
 
-KaimanPrefDlg::KaimanPrefDlg(TQObject *tqparent )
-    : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", tqparent)
+KaimanPrefDlg::KaimanPrefDlg(TQObject *parent )
+    : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", parent)
 {
     // create widgets
     TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 );
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index dbdf935b..11b19c8b 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -29,7 +29,7 @@ class KaimanPrefDlg : public CModule
     Q_OBJECT
   TQ_OBJECT
     public:
-	KaimanPrefDlg( TQObject *tqparent );
+	KaimanPrefDlg( TQObject *parent );
 	virtual ~KaimanPrefDlg();
 
 	virtual void save();
diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README
index f2071dca..a39fff38 100644
--- a/noatun/modules/kaiman/skins/circle/README
+++ b/noatun/modules/kaiman/skins/circle/README
@@ -4,7 +4,7 @@ Released: November 25, 1998
 Version: 1.0
 URL: http://www.geocities.com/SiliconValley/Haven/5235
 Comments: Skin with a doughnut tqshape to test tqshaped windows.
-          (skins with a tqshape tqmask)
+          (skins with a tqshape mask)
 
 Note: For transparency to work, GQmpeg 0.4.2 is required.
       Previous versions will work, but will be _ugly_.
diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata
index 57c07cc6..8dba21db 100644
--- a/noatun/modules/kaiman/skins/circle/skindata
+++ b/noatun/modules/kaiman/skins/circle/skindata
@@ -7,7 +7,7 @@
 #Author: John Ellis <gqview@geocities.com>
 #URL: http://www.geocities.com/SiliconValley/Haven/5235/
 #Comments: Skin with a doughnut tqshape to test tqshaped windows.
-#          (skins with a tqshape tqmask)
+#          (skins with a tqshape mask)
 
 #run 'gqmpeg -skinhelp' for help with coordinates.
 #simply comment out items you do not want to display
@@ -15,7 +15,7 @@
 Background: back.png
 
 #Mask is an image with transparency used to define a tqshaped window
-Mask: back_tqmask.png
+Mask: back_mask.png
 
 #Title: filename length x y
 Title: letters.png 23 32 86
diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt
index 0bfda442..42661e81 100644
--- a/noatun/modules/kaiman/skins/circle/skindata_alt
+++ b/noatun/modules/kaiman/skins/circle/skindata_alt
@@ -7,7 +7,7 @@
 #Author: John Ellis <gqview@geocities.com>
 #URL: http://www.geocities.com/SiliconValley/Haven/5235/
 #Comments: Skin with a doughnut tqshape to test tqshaped windows.
-#          (skins with a tqshape tqmask)
+#          (skins with a tqshape mask)
 
 #run 'gqmpeg -skinhelp' for help with coordinates.
 #simply comment out items you do not want to display
@@ -15,7 +15,7 @@
 Background: back_sm.png
 
 #Mask is an image with transparency used to define a tqshaped window
-Mask: back_sm_tqmask.png
+Mask: back_sm_mask.png
 
 #Title: filename length x y
 Title: letters.png 21 8 4
diff --git a/noatun/modules/kaiman/skins/k9/skindata b/noatun/modules/kaiman/skins/k9/skindata
index d7d25a56..1fdc4320 100644
--- a/noatun/modules/kaiman/skins/k9/skindata
+++ b/noatun/modules/kaiman/skins/k9/skindata
@@ -10,7 +10,7 @@
 ######################################################
 
 Background: knine-normal2.jpg
-Mask: tqmask.png
+Mask: mask.png
 
 Play_Button: play.jpg FALSE FALSE 55 133 89 166
 Stop_Button: stop.jpg FALSE FALSE 28 124 52 145
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 4f9b5315..bbf55cb3 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -42,8 +42,8 @@ const bool KaimanStyleSlider::optionVertical = 1;
 const bool KaimanStyleSlider::optionReversed = 2;
 const bool KaimanStyleText::optionExtended = 1;
 
-KaimanStyleElement::KaimanStyleElement(TQWidget *tqparent, const char *name)
-    : TQWidget(tqparent, name)
+KaimanStyleElement::KaimanStyleElement(TQWidget *parent, const char *name)
+    : TQWidget(parent, name)
 {
     // Initialize everything to default values
     filename = "";
@@ -122,10 +122,10 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename)
                     bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h);
                     pixmaps.insert(i,part);
 
-                    if(pixmap.tqmask())
+                    if(pixmap.mask())
                     {
                         TQBitmap maskpart(w,h);
-                        bitBlt(&maskpart,0,0,pixmap.tqmask(),sourcex,sourcey,w,h);
+                        bitBlt(&maskpart,0,0,pixmap.mask(),sourcex,sourcey,w,h);
                         part->setMask(maskpart);
                     }
 
@@ -192,8 +192,8 @@ void KaimanStyleElement::dropEvent( TQDropEvent *event )
 /***************************************************************************/
 
 
-KaimanStyleButton::KaimanStyleButton(TQWidget *tqparent, const char *name)
-    : KaimanStyleMasked(tqparent, name)
+KaimanStyleButton::KaimanStyleButton(TQWidget *parent, const char *name)
+    : KaimanStyleMasked(parent, name)
 {
     i_b_lit = i_b_prelit = i_b_down = false;
     i_i_currentState = NormalUp;
@@ -327,8 +327,8 @@ void KaimanStyleButton::updateButtonState() {
 
 /***********************************************************************/
 
-KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name)
-    : KaimanStyleMasked( tqparent, name )
+KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name)
+    : KaimanStyleMasked( parent, name )
 {
     _min = min;
     _max = max;
@@ -486,8 +486,8 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e )
 /***********************************************************************/
 
 
-KaimanStyleBackground::KaimanStyleBackground(TQWidget *tqparent, const char *name)
-    : KaimanStyleMasked( tqparent, name )
+KaimanStyleBackground::KaimanStyleBackground(TQWidget *parent, const char *name)
+    : KaimanStyleMasked( parent, name )
 {
     i_b_move = false;
 }
@@ -533,8 +533,8 @@ void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme)
 
 /***********************************************************************/
 
-KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name)
-    : KaimanStyleMasked( tqparent, name )
+KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *parent, const char *name)
+    : KaimanStyleMasked( parent, name )
 {
     _min = min;
     _max = max;
@@ -571,8 +571,8 @@ void KaimanStyleValue::setValue( int value, int min, int max )
 
 /***********************************************************************/
 
-KaimanStyleNumber::KaimanStyleNumber(TQWidget *tqparent, const char *name)
-    : KaimanStyleElement( tqparent, name )
+KaimanStyleNumber::KaimanStyleNumber(TQWidget *parent, const char *name)
+    : KaimanStyleElement( parent, name )
 {
     //kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl;
     _value = 0;
@@ -640,8 +640,8 @@ void KaimanStyleNumber::paintEvent(TQPaintEvent */*qpe*/)
 
 /***********************************************************************/
 
-KaimanStyleText::KaimanStyleText(TQWidget *tqparent, const char *name)
-    : KaimanStyleElement( tqparent, name )
+KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name)
+    : KaimanStyleElement( parent, name )
 {
     _pos = 0;
     _timer = new TQTimer( this );
@@ -735,8 +735,8 @@ void KaimanStyleText::paintEvent(TQPaintEvent */*qpe*/)
 
 /***********************************************************************/
 
-KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name)
-    : KaimanStyleMasked( tqparent, name )
+KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const char *name)
+    : KaimanStyleMasked( parent, name )
 {
     _delay = delay;
     _frame = 0;
@@ -774,8 +774,8 @@ void KaimanStyleAnimation::timeout()
 
 /***********************************************************************/
 
-KaimanStyleState::KaimanStyleState(TQWidget *tqparent, const char *name)
-    : KaimanStyleMasked( tqparent, name )
+KaimanStyleState::KaimanStyleState(TQWidget *parent, const char *name)
+    : KaimanStyleMasked( parent, name )
 {
     _value = 0;
 }
@@ -799,10 +799,10 @@ void KaimanStyleState::mousePressEvent(TQMouseEvent *qme)
 /***********************************************************************/
 
 
-KaimanStyle::KaimanStyle( TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent, name )
+KaimanStyle::KaimanStyle( TQWidget *parent, const char *name )
+    : TQWidget( parent, name )
 {
-    i_qw_parent = tqparent;
+    i_qw_parent = parent;
     i_eventSemaphore = false;
 }
 
@@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps()
 
     if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) {
 
-        // OK, background and tqmask are defined. So now I can calculate the tqshape
+        // OK, background and mask are defined. So now I can calculate the tqshape
         int l_i_width_Mask  = l_pixmap_Mask->width();
         int l_i_height_Mask = l_pixmap_Mask->height();
 
diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 03ba4f2d..5d3bfcdb 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -34,7 +34,7 @@ class KaimanStyleElement : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleElement(TQWidget *tqparent, const char *name=0);
+    KaimanStyleElement(TQWidget *parent, const char *name=0);
     ~KaimanStyleElement();
 
     virtual void loadPixmaps(TQString &val_s_filename);
@@ -75,14 +75,14 @@ class KaimanStyleMasked : public KaimanStyleElement
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleMasked(TQWidget *tqparent, const char *name=0)
-        : KaimanStyleElement( tqparent, name ) {};
+    KaimanStyleMasked(TQWidget *parent, const char *name=0)
+        : KaimanStyleElement( parent, name ) {};
 
     virtual void loadPixmaps(TQString &val_s_filename)
         {
             KaimanStyleElement::loadPixmaps( val_s_filename );
-            if(pixmaps[0]->tqmask())
-                setMask(*pixmaps[0]->tqmask());
+            if(pixmaps[0]->mask())
+                setMask(*pixmaps[0]->mask());
         };
 };
 
@@ -92,7 +92,7 @@ class KaimanStyleButton : public KaimanStyleMasked
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleButton(TQWidget *tqparent, const char *name=0);
+    KaimanStyleButton(TQWidget *parent, const char *name=0);
     ~KaimanStyleButton();
 
     // Button states.
@@ -130,7 +130,7 @@ class KaimanStyleSlider : public KaimanStyleMasked
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name=0);
+    KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0);
     ~KaimanStyleSlider();
 
     int value() { return _value; };
@@ -169,7 +169,7 @@ class KaimanStyleBackground : public KaimanStyleMasked
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleBackground(TQWidget *tqparent, const char *name=0);
+    KaimanStyleBackground(TQWidget *parent, const char *name=0);
     ~KaimanStyleBackground();
 
 protected:
@@ -189,7 +189,7 @@ class KaimanStyleValue : public KaimanStyleMasked
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name=0);
+    KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0);
     ~KaimanStyleValue();
 
     int value() { return _value; };
@@ -208,7 +208,7 @@ class KaimanStyleState : public KaimanStyleMasked
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleState(TQWidget *tqparent, const char *name=0);
+    KaimanStyleState(TQWidget *parent, const char *name=0);
     ~KaimanStyleState();
 
     int value() { return _value; };
@@ -232,7 +232,7 @@ class KaimanStyleNumber : public KaimanStyleElement
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleNumber(TQWidget *tqparent, const char *name=0);
+    KaimanStyleNumber(TQWidget *parent, const char *name=0);
     ~KaimanStyleNumber();
 
     virtual void loadPixmaps(TQString &val_s_filename);
@@ -257,7 +257,7 @@ class KaimanStyleText : public KaimanStyleElement
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleText(TQWidget *tqparent, const char *name=0);
+    KaimanStyleText(TQWidget *parent, const char *name=0);
     ~KaimanStyleText();
 
     virtual void loadPixmaps(TQString &val_s_filename);
@@ -292,7 +292,7 @@ class KaimanStyleAnimation : public KaimanStyleMasked
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name=0);
+    KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0);
     ~KaimanStyleAnimation();
 
 public slots:
@@ -313,10 +313,10 @@ class KaimanStyle : public TQWidget
  Q_OBJECT
   TQ_OBJECT
 public:
-    KaimanStyle(TQWidget *tqparent, const char *name=0);
+    KaimanStyle(TQWidget *parent, const char *name=0);
     ~KaimanStyle();
 
-    enum { background, tqmask, play_Button, stop_Button, pause_Button, prev_Button, next_Button,  repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider };
+    enum { background, mask, play_Button, stop_Button, pause_Button, prev_Button, next_Button,  repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider };
 
     enum { ParsingError=1, FileNotFound };
 
@@ -327,7 +327,7 @@ public:
     bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" );
     TQString skinName() { return i_skinName; };
 
-    /// Returns the tqmask
+    /// Returns the mask
     TQBitmap* Mask();
 
     virtual bool eventFilter( TQObject *o, TQEvent *e );
@@ -346,13 +346,13 @@ private:
     TQString     i_s_styleBase;
 
 
-    // The tqmask of the complete style. Used for doing tqshaped windows
+    // The mask of the complete style. Used for doing tqshaped windows
     TQBitmap     i_bitmap_Mask;
 
     /// All style elements are stored here.
     TQPtrVector<KaimanStyleElement> I_styleElem;
 
-    // The tqparent window. In other words: The container that holds all the KaimanStyleElement's
+    // The parent window. In other words: The container that holds all the KaimanStyleElement's
     TQWidget*            i_qw_parent;
 
     TQPtrList<TQWidget> i_sliders;
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 877e5846..e1f2286a 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -170,9 +170,9 @@ void Keyz::slotMute()
 
 ///////////////////////////////////////////////////////////////////
 
-KeyzPrefs::KeyzPrefs( TQObject *tqparent ) :
+KeyzPrefs::KeyzPrefs( TQObject *parent ) :
     CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings",
-             tqparent )
+             parent )
 {
     TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
     m_chooser = new KKeyChooser( Keyz::accel(), this );
diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h
index b21e44f8..d1955319 100644
--- a/noatun/modules/keyz/keyz.h
+++ b/noatun/modules/keyz/keyz.h
@@ -39,7 +39,7 @@ class KeyzPrefs : public CModule
   TQ_OBJECT
 
 public:
-    KeyzPrefs( TQObject *tqparent );
+    KeyzPrefs( TQObject *parent );
     virtual void save();
 
 private:
diff --git a/noatun/modules/kjofol-skin/kjbackground.cpp b/noatun/modules/kjofol-skin/kjbackground.cpp
index 543d92cc..5a6e8587 100644
--- a/noatun/modules/kjofol-skin/kjbackground.cpp
+++ b/noatun/modules/kjofol-skin/kjbackground.cpp
@@ -9,18 +9,18 @@
 
 #include "kjbackground.h"
 
-KJBackground::KJBackground(KJLoader *tqparent)
-	: KJWidget(tqparent)
+KJBackground::KJBackground(KJLoader *parent)
+	: KJWidget(parent)
 {
 	TQImage ibackground;
 
-	mBackground = tqparent->pixmap(parser()["backgroundimage"][1]);
-	ibackground = tqparent->image(parser()["backgroundimage"][1]);
+	mBackground = parent->pixmap(parser()["backgroundimage"][1]);
+	ibackground = parent->image(parser()["backgroundimage"][1]);
 
-	tqparent->setMask( getMask(ibackground) );
-	tqparent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) );
+	parent->setMask( getMask(ibackground) );
+	parent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) );
 
-	setRect(0,0,tqparent->width(),tqparent->height());
+	setRect(0,0,parent->width(),parent->height());
 }
 
 void KJBackground::paint(TQPainter *painter, const TQRect &rect)
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 6777c518..edd53e2b 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -30,8 +30,8 @@
  * KJButton
  *******************************************/
 
-KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
-	: TQObject(0), KJWidget(tqparent), mTitle(i[0]), mShowPressed(false)
+KJButton::KJButton(const TQStringList &i, KJLoader *parent)
+	: TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false)
 {
 //	kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl;
 	mPushedPixmap = (i.count() >= 7);
@@ -58,7 +58,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
 			TQString pressedTmp = backgroundPressed((*it));
 			if(!pressedTmp.isEmpty())
 			{
-				mPressed = tqparent->pixmap(pressedTmp);
+				mPressed = parent->pixmap(pressedTmp);
 				gotBack = true;
 			}
 		}
@@ -67,7 +67,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
 			// take background and darken the buttons rectangle
 			// FIXME: what KPixmapEffect causes the desired effect?
 			//        intensity is the wrong one
-			KPixmap temp = tqparent->pixmap(parser()["backgroundimage"][1]);
+			KPixmap temp = parent->pixmap(parser()["backgroundimage"][1]);
 			mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f );
 			gotBack = true;
 		}
@@ -79,7 +79,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
 	{
 		kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" <<
 			mTitle << "', dafulting to backgroundimage" << endl;
-		mPressed = tqparent->pixmap(parser()["backgroundimage"][1]);
+		mPressed = parent->pixmap(parser()["backgroundimage"][1]);
 	}
 
 	// playlistbutton has to show if playlistwindow is open
@@ -152,12 +152,12 @@ TQString KJButton::tip()
 void KJButton::paint(TQPainter *, const TQRect &)
 {
 	if (mShowPressed)
-		bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
+		bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
 }
 
 bool KJButton::mousePress(const TQPoint &)
 {
-	bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
+	bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
 	return true;
 }
 
@@ -201,11 +201,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 
 	// now, find what widget I am and do the proper action
 	if (mTitle=="closebutton")
-		KJWidget::tqparent()->close();
+		KJWidget::parent()->close();
 	else if (mTitle=="minimizebutton")
-		KJWidget::tqparent()->minimize();
+		KJWidget::parent()->minimize();
 	else if (mTitle=="aboutbutton")
-		KJWidget::tqparent()->helpMenu()->aboutApplication();
+		KJWidget::parent()->helpMenu()->aboutApplication();
 	else if (mTitle=="stopbutton")
 		napp->player()->stop();
 	else if (mTitle=="playbutton")
@@ -214,7 +214,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 		napp->player()->playpause();
 	else if (mTitle=="openfilebutton")
 	{
-		KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::tqparent(), i18n("Select File to Play")));
+		KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::parent(), i18n("Select File to Play")));
 		if (file.isValid())
 			napp->player()->openFile(file);
 	}
@@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 		napp->player()->toggleListView();
 	else if (mTitle=="repeatbutton")
 	{
-		KPopupMenu *loopMenu = new KPopupMenu(KJWidget::tqparent(),"loopMenu");
+		KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu");
 		int selectedItem = 0;
 
 		loopMenu->setCheckable(true);
@@ -291,11 +291,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 	else if (mTitle=="rewindbutton")
 		napp->player()->skipTo(napp->player()->getTime()-10000);
 	else if (mTitle=="preferencesbutton")
-		napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::tqparent()->prefs()));
+		napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::parent()->prefs()));
 	else if (mTitle=="dockmodebutton")
-		KJWidget::tqparent()->switchToDockmode();
+		KJWidget::parent()->switchToDockmode();
 	else if (mTitle=="undockmodebutton")
-		KJWidget::tqparent()->returnFromDockmode();
+		KJWidget::parent()->returnFromDockmode();
 	else
 		kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl;
 }
diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp
index 4b260f6f..b84a0185 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.cpp
+++ b/noatun/modules/kjofol-skin/kjequalizer.cpp
@@ -87,8 +87,8 @@ void KJEqualizer::slotUpdateBuffer()
 {
 //	kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl;
 
-	TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent tqmask
-	TQPainter tqmask( &regionMask );
+	TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask
+	TQPainter mask( &regionMask );
 
 	TQPoint destX = TQPoint(0, 0);
 
@@ -103,12 +103,12 @@ void KJEqualizer::slotUpdateBuffer()
 //		kdDebug(66666) << "[KJEqualizer] band=" << band << ", level=" << level << ", picNum=" << picNum << " @ xpos=" << xPos << "." << endl;
 
 		bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), TQt::CopyROP);
-		// make slider opaque in tqmask so you see something on screen
-		tqmask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 );
+		// make slider opaque in mask so you see something on screen
+		mask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 );
 		destX += TQPoint(mXSpace,0);
 
 	} // for()
-	// whole thingy has been drawn, now set the tqmask
+	// whole thingy has been drawn, now set the mask
 	mView->setMask( regionMask );
 	tqrepaint();
 }
diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h
index f2e85678..42c64a45 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -13,7 +13,7 @@ class KJEqualizer : public TQObject, public KJWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-	KJEqualizer(const TQStringList &, KJLoader *tqparent);
+	KJEqualizer(const TQStringList &, KJLoader *parent);
 	~KJEqualizer(void);
 
 	virtual void mouseMove(const TQPoint &pos, bool);
diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp
index cf82fa43..7d5a967f 100644
--- a/noatun/modules/kjofol-skin/kjfont.cpp
+++ b/noatun/modules/kjofol-skin/kjfont.cpp
@@ -23,9 +23,9 @@
  * KJFont
  *******************************************/
 
-KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTransparentRGB(0)
+KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0)
 {
-//	kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *tqparent)" << prefix.latin1() << endl;
+//	kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl;
 
 	if (prefix=="timefont")
 	{
@@ -47,12 +47,12 @@ KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTran
 		mNullChar=' ';
 	}
 
-	mText = tqparent->pixmap(tqparent->item(prefix+"image")[1]);
+	mText = parent->pixmap(parent->item(prefix+"image")[1]);
 
-	if ( tqparent->exist(prefix+"size") )
+	if ( parent->exist(prefix+"size") )
 	{
-		mWidth = tqparent->item(prefix+"size")[1].toInt();
-		mHeight = tqparent->item(prefix+"size")[2].toInt();
+		mWidth = parent->item(prefix+"size")[1].toInt();
+		mHeight = parent->item(prefix+"size")[2].toInt();
 	}
 	else // try to load the font even we are missing important settings
 	{	// this still can cause crashes!
@@ -73,13 +73,13 @@ KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTran
 		mHeight = mText.height();
 
 	// Stupid Skin authors tend to forget keys :/
-	if ( tqparent->exist(prefix+"spacing") )
-		mSpacing = tqparent->item(prefix+"spacing")[1].toInt();
+	if ( parent->exist(prefix+"spacing") )
+		mSpacing = parent->item(prefix+"spacing")[1].toInt();
 	else
 		mSpacing = 0; // FIXME: What's default for this in kjöfol???
 
-	if ( tqparent->exist(prefix+"transparent") )
-		mTransparent = (bool)tqparent->item(prefix+"transparent")[1].toInt();
+	if ( parent->exist(prefix+"transparent") )
+		mTransparent = (bool)parent->item(prefix+"transparent")[1].toInt();
 	else
 		mTransparent = true; // transparency seems to be default in kjöfol
 
@@ -153,8 +153,8 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c
 
 	TQBitmap regionMask(
 		(stringWidth > wide ? stringWidth : wide),
-		mHeight, true); // fully transparent tqmask
-	TQPainter mp(&regionMask); // tqmask painter
+		mHeight, true); // fully transparent mask
+	TQPainter mp(&regionMask); // mask painter
 
 //	kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << endl;
 
@@ -206,8 +206,8 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
 	TQBitmap regionMask(
 			 (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide
 			? string.length()*mWidth+string.length()*mSpacing : wide),
-			 mHeight, true); // fully transparent tqmask
-	TQPainter tqmask( &regionMask );
+			 mHeight, true); // fully transparent mask
+	TQPainter mask( &regionMask );
 
 //	kdDebug(66666) << "draw: {" << str << "}" << endl;
 
@@ -216,7 +216,7 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
 	if ( string.length()*mWidth+string.length()*mSpacing < (unsigned int)wide )
 	{
 		freeSpace = wide - string.length()*mWidth+string.length()*mSpacing;
-		tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
+		mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
 		to += TQPoint ( (freeSpace/2), 0 );
 	}
 
@@ -234,14 +234,14 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
 		// draw according to "spacing"
 		if ( (charPos < string.length()-1) && mSpacing > 0 )
 		{	// make the spacing-area transparent
-			tqmask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 );
+			mask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 );
 			to += TQPoint ( mSpacing, 0 );
 		}
 	}
 
 	if (freeSpace > 0)
 	{
-		tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
+		mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
 		to += TQPoint ( (freeSpace/2), 0 );
 	}
 
@@ -260,12 +260,12 @@ void KJFont::drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to,
 
 	bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), TQt::CopyROP);
 
-	// bitBlt tqmask for transparency
+	// bitBlt mask for transparency
 	if ( mTransparent )
 	{
 		bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP);
 	}
-	else // fill tqmask
+	else // fill mask
 	{
 		TQPainter tempPainter (devMask);
 		tempPainter.fillRect ( to.x(), 0, xs,ys, TQt::color1 );
diff --git a/noatun/modules/kjofol-skin/kjfont.h b/noatun/modules/kjofol-skin/kjfont.h
index 626ed027..69e12052 100644
--- a/noatun/modules/kjofol-skin/kjfont.h
+++ b/noatun/modules/kjofol-skin/kjfont.h
@@ -11,7 +11,7 @@ class KJLoader;
 class KJFont
 {
 public:
-	KJFont(const TQString &prefix, KJLoader *tqparent);
+	KJFont(const TQString &prefix, KJLoader *parent);
 	// draw the string str to dev at position pos, within rectangle limit in relation to pos
 	TQPixmap draw(const TQCString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const;
 	TQPixmap draw(const TQString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index 6c433e74..ae25f152 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -72,8 +72,8 @@
 class KJToolTip : public TQToolTip
 {
 public:
-	KJToolTip(KJLoader *tqparent)
-		: TQToolTip(tqparent), mParent(tqparent)
+	KJToolTip(KJLoader *parent)
+		: TQToolTip(parent), mParent(parent)
 	{}
 
 protected:
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 9e3727b6..4231d0ff 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -45,8 +45,8 @@
 
 static TQString expand(TQString s);
 
-KJPrefs::KJPrefs(TQObject* tqparent)
-	: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", tqparent)
+KJPrefs::KJPrefs(TQObject* parent)
+	: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent)
 {
 	cfg = KGlobal::config();
 
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index a0849d17..89991dea 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -27,7 +27,7 @@ class KJPrefs : public CModule
 Q_OBJECT
   TQ_OBJECT
 public:
-	KJPrefs(TQObject* tqparent);
+	KJPrefs(TQObject* parent);
 
 	// Save which Skin is currently selected
 	virtual void save();
diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp
index 24fc2da1..e82a1f8e 100644
--- a/noatun/modules/kjofol-skin/kjseeker.cpp
+++ b/noatun/modules/kjofol-skin/kjseeker.cpp
@@ -22,24 +22,24 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 	{
 		kdDebug(66666) << k_funcinfo << "No pressed background found for seeker," <<
 			" using default background!" << endl;
-		tqparent()->image(parser()["backgroundimage"][1]);
+		parent()->image(parser()["backgroundimage"][1]);
 	}
 	else
-		mActive = tqparent()->image(activeBg);
+		mActive = parent()->image(activeBg);
 
-	mScale = tqparent()->image(parser()["seekimage"][1]);
-	TQImage pixmapNoPress = tqparent()->image(parser()["backgroundimage"][1]);
+	mScale = parent()->image(parser()["seekimage"][1]);
+	TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]);
 
-	// generate transparent tqmask
+	// generate transparent mask
 	int x, y, xs, ys;
 	x=i[1].toInt();
 	y=i[2].toInt();
 	xs=i[3].toInt()-x;
 	ys=i[4].toInt()-y;
 	setRect(x,y,xs,ys);
-	TQImage transtqmask(xs, ys, 1, 2, TQImage::LittleEndian);
-	transtqmask.setColor(1, tqRgb(0,0,0));
-	transtqmask.setColor(0, tqRgb(255,255,255));
+	TQImage transmask(xs, ys, 1, 2, TQImage::LittleEndian);
+	transmask.setColor(1, tqRgb(0,0,0));
+	transmask.setColor(0, tqRgb(255,255,255));
 
 	// clear the pointers
 	memset(barmodeImages, 0, 256*sizeof(TQImage*));
@@ -55,10 +55,10 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 			// am I transparent?
 			if (!isGray(checkmScale))
 			{
-				setPixel1BPP(transtqmask, ix-x, iy-y, 0);
+				setPixel1BPP(transmask, ix-x, iy-y, 0);
 				continue;
 			}
-			setPixel1BPP(transtqmask, ix-x, iy-y, 1);
+			setPixel1BPP(transmask, ix-x, iy-y, 1);
 
 			// what is the level
 			int level=grayRgb(checkmScale)+1;
@@ -89,9 +89,9 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 
 	// create the blank one
 	barmode[0]=new TQPixmap(xs, ys);
-	TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]);
+	TQPixmap px=parent()->pixmap(parser()["backgroundimage"][1]);
 	bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP);
-	px.convertFromImage(transtqmask);
+	px.convertFromImage(transmask);
 	barModeMask=px;
 
 //	kdDebug(66666) << "END KJSeeker constructor" << endl;
@@ -180,7 +180,7 @@ void KJSeeker::timeUpdate(int sec)
 
 	g = sec * 255 / length;
 	//kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl;
-	TQPainter p(tqparent());
+	TQPainter p(parent());
 	paint(&p, rect());
 }
 
diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp
index b1e03b7a..589f994f 100644
--- a/noatun/modules/kjofol-skin/kjsliders.cpp
+++ b/noatun/modules/kjofol-skin/kjsliders.cpp
@@ -44,8 +44,8 @@ KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p)
 
 //	kdDebug(66666) << "x: " << x << " y: " << y << " w: " << xs << " h: " << ys << endl;
 
-	mBack   = tqparent()->pixmap(parser()["backgroundimage"][1]);
-	mSlider = tqparent()->pixmap(parser()["volumecontrolimage"][1]);
+	mBack   = parent()->pixmap(parser()["backgroundimage"][1]);
+	mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]);
 }
 
 TQString KJVolumeBar::tip()
@@ -133,8 +133,8 @@ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p)
 	mWidth = parser()["volumecontrolimagexsize"][1].toInt();
 	mCount = parser()["volumecontrolimagenb"][1].toInt()-1;
 
-	mImages = tqparent()->pixmap(parser()["volumecontrolimage"][1]);
-	mPos = tqparent()->image(parser()["volumecontrolimageposition"][1]);
+	mImages = parent()->pixmap(parser()["volumecontrolimage"][1]);
+	mPos = parent()->image(parser()["volumecontrolimageposition"][1]);
 	timeUpdate(0);
 }
 
@@ -208,12 +208,12 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
 	mWidth = parser()["pitchcontrolimagexsize"][1].toInt();
 	mCount = parser()["pitchcontrolimagenb"][1].toInt()-1;
 
-	mImages = tqparent()->pixmap(parser()["pitchcontrolimage"][1]);
-	mPos = tqparent()->image(parser()["pitchcontrolimageposition"][1]);
+	mImages = parent()->pixmap(parser()["pitchcontrolimage"][1]);
+	mPos = parent()->image(parser()["pitchcontrolimageposition"][1]);
 
 	// makes all pixels with rgb(255,0,255) transparent
 	TQImage ibackground;
-	ibackground = tqparent()->image(parser()["pitchcontrolimage"][1]);
+	ibackground = parent()->image(parser()["pitchcontrolimage"][1]);
 	mImages.setMask( getMask(ibackground) );
 
 	Arts::PlayObject playobject = napp->player()->engine()->playObject();
diff --git a/noatun/modules/kjofol-skin/kjsliders.h b/noatun/modules/kjofol-skin/kjsliders.h
index 131261c7..bd3c3324 100644
--- a/noatun/modules/kjofol-skin/kjsliders.h
+++ b/noatun/modules/kjofol-skin/kjsliders.h
@@ -12,7 +12,7 @@ class KJVolumeText;
 class KJVolumeBMP : public KJWidget
 {
 public:
-	KJVolumeBMP(const TQStringList &, KJLoader *tqparent);
+	KJVolumeBMP(const TQStringList &, KJLoader *parent);
 
 	virtual void paint(TQPainter *, const TQRect &rect);
 	virtual bool mousePress(const TQPoint &pos);
@@ -36,7 +36,7 @@ private:
 class KJVolumeBar : public KJWidget
 {
 public:
-	KJVolumeBar(const TQStringList &, KJLoader *tqparent);
+	KJVolumeBar(const TQStringList &, KJLoader *parent);
 
 	virtual void paint(TQPainter *, const TQRect &rect);
 	virtual bool mousePress(const TQPoint &pos);
@@ -59,7 +59,7 @@ private:
 class KJPitchBMP : public KJWidget
 {
 public:
-	KJPitchBMP(const TQStringList &, KJLoader *tqparent);
+	KJPitchBMP(const TQStringList &, KJLoader *parent);
 
 	virtual void paint(TQPainter *, const TQRect &rect);
 	virtual bool mousePress(const TQPoint &pos);
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
index ab583a24..e0d3028e 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
@@ -90,12 +90,12 @@ void KJFilename::timerEvent(TQTimerEvent *)
 	int height = mView.height();
 	int width = mView.width();
 
-	TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the tqmask
+	TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask
 	TQPixmap cycle ( mDistance, height );	// temporary-space for moving parts of the pixmap
-	TQBitmap newMask ( *mView.tqmask() );		// save old tqmask
+	TQBitmap newMask ( *mView.mask() );		// save old mask
 
-	// copy tqmask like the same way we're doing it with the pixmap
-	// a tqmask does not get copied on a bitblt automatically, we have to do
+	// copy mask like the same way we're doing it with the pixmap
+	// a mask does not get copied on a bitblt automatically, we have to do
 	// it "by hand"
 	bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, TQt::CopyROP);
 	bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, TQt::CopyROP);
@@ -105,7 +105,7 @@ void KJFilename::timerEvent(TQTimerEvent *)
 	bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, TQt::CopyROP);
 	bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, TQt::CopyROP);
 
-	// apply the newly created tqmask
+	// apply the newly created mask
 	mView.setMask(newMask);
 
 	tqrepaint();
@@ -227,7 +227,7 @@ void KJTime::paint(TQPainter *p, const TQRect &)
 
 	// draw background into buffer
 	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
-	// draw time-display into buffer (that's a pixmap with a tqmask applied)
+	// draw time-display into buffer (that's a pixmap with a mask applied)
 	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 
 	// and draw it on screen
@@ -584,7 +584,7 @@ void KJFileInfo::paint(TQPainter *p, const TQRect &)
 
 	// draw background into buffer
 	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
-	// draw time-display into buffer (that's a pixmap with a tqmask applied)
+	// draw time-display into buffer (that's a pixmap with a mask applied)
 	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 
 	// and draw it on screen
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h
index 0a5caa0a..4997df9d 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.h
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.h
@@ -14,7 +14,7 @@ class KJFilename : public TQObject, public KJWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-	KJFilename(const TQStringList &, KJLoader *tqparent);
+	KJFilename(const TQStringList &, KJLoader *parent);
 	~KJFilename();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -43,7 +43,7 @@ private:
 class KJTime : public KJWidget
 {
 public:
-	KJTime(const TQStringList &, KJLoader *tqparent);
+	KJTime(const TQStringList &, KJLoader *parent);
 	~KJTime();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -73,7 +73,7 @@ private:
 class KJVolumeText : public KJWidget
 {
 public:
-	KJVolumeText(const TQStringList &, KJLoader *tqparent);
+	KJVolumeText(const TQStringList &, KJLoader *parent);
 	~KJVolumeText();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -95,7 +95,7 @@ private:
 class KJPitchText : public KJWidget
 {
 public:
-	KJPitchText(const TQStringList &, KJLoader *tqparent);
+	KJPitchText(const TQStringList &, KJLoader *parent);
 	~KJPitchText();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -118,7 +118,7 @@ private:
 class KJFileInfo : public KJWidget
 {
 public:
-	KJFileInfo(const TQStringList &, KJLoader *tqparent);
+	KJFileInfo(const TQStringList &, KJLoader *parent);
 	~KJFileInfo();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp
index 8915e434..a1a4c840 100644
--- a/noatun/modules/kjofol-skin/kjvis.cpp
+++ b/noatun/modules/kjofol-skin/kjvis.cpp
@@ -35,8 +35,8 @@
 void KJVisScope::swapScope(Visuals newOne)
 {
 	//kdDebug(66666) << k_funcinfo << endl;
-	TQStringList line = tqparent()->item("analyzerwindow");
-	KJLoader *p=tqparent();
+	TQStringList line = parent()->item("analyzerwindow");
+	KJLoader *p=parent();
 	p->removeChild(this);
 	delete this;
 
@@ -66,8 +66,8 @@ void KJVisScope::swapScope(Visuals newOne)
  * KJNullScope
  *******************************************/
 
-KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent)
+KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent)
 {
 	int x  = l[1].toInt();
 	int y  = l[2].toInt();
@@ -75,7 +75,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent)
 	int ys = l[4].toInt() - y;
 
 	// background under vis
-	TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 	setRect ( x, y, xs, ys );
@@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(FFT);
 }
 
@@ -108,7 +108,7 @@ void KJNullScope::readConfig()
 	Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType();
 	if ( v != Null )
 	{
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 	}
 }
@@ -118,8 +118,8 @@ void KJNullScope::readConfig()
  * KJFFT - Analyzer like visualization, mono
  *************************************************/
 
-KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent), MonoFFTScope(50), mGradient(0)
+KJFFT::KJFFT(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent), MonoFFTScope(50), mGradient(0)
 {
 	int x = l[1].toInt();
 	int y = l[2].toInt();
@@ -129,7 +129,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
 	// each bar will be 1px wide
 	mMultiples=1;
 
-	if ( tqparent->exist("analyzercolor") )
+	if ( parent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -140,7 +140,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
 	}
 
 	// background under vis
-	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
@@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			tqparent()->tqrepaint(rect(), false);
+			parent()->tqrepaint(rect(), false);
 		return;
 	}
 
@@ -171,12 +171,12 @@ void KJFFT::scopeEvent(float *d, int size)
 	int h = rect().height();
 
 	TQBitmap mGradientMask ( rect().width(), h, true );
-	TQPainter tqmask( &mGradientMask );
+	TQPainter mask( &mGradientMask );
 
 	float *start = d ;
 	float *end = d + size /*- 1*/;
 
-	// loop creating the tqmask for vis-gradient
+	// loop creating the mask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		// 5 has been 8 before and I have no idea how this scaling works :/
@@ -191,10 +191,10 @@ void KJFFT::scopeEvent(float *d, int size)
 		else if ( amp > h ) amp = h;
 
 		// make a part of the analyzer-gradient visible
-		tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
+		mask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
-	// done creating our tqmask
+	// done creating our mask
 
 	// draw background of vis into it
 	bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
@@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(Mono);
 }
 
@@ -236,7 +236,7 @@ void KJFFT::readConfig()
 	if ( v != FFT )
 	{
 		stop();
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -250,8 +250,8 @@ void KJFFT::readConfig()
  * KJStereoFFT - Analyzer like visualization, stereo
  *************************************************/
 
-KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent), StereoFFTScope(50), mGradient(0)
+KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent), StereoFFTScope(50), mGradient(0)
 {
 	//kdDebug(66666) << k_funcinfo << endl;
 
@@ -263,7 +263,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
 	// each bar will be 1px wide
 	mMultiples=1;
 
-	if ( tqparent->exist("analyzercolor") )
+	if ( parent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -274,7 +274,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
 	}
 
 	// background under vis
-	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
@@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			tqparent()->tqrepaint(rect(), false);
+			parent()->tqrepaint(rect(), false);
 		return;
 	}
 
@@ -305,7 +305,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	int hh = (int)(rect().height()/2);
 
 	TQBitmap mGradientMask ( rect().width(), h, true );
-	TQPainter tqmask( &mGradientMask );
+	TQPainter mask( &mGradientMask );
 
 	float *start = left;
 	float *end = left + len;
@@ -313,7 +313,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	int amp = 0;
 	int x = 0;
 
-	// loop creating the tqmask for vis-gradient
+	// loop creating the mask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		n = log((*start)+1) * (float)hh * 5;
@@ -324,16 +324,16 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 		else if ( amp > hh ) amp = hh;
 
 		// make a part of the analyzer-gradient visible
-		tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
+		mask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
-	// done creating our tqmask
+	// done creating our mask
 
 
 	start = right;
 	end = right + len;
 	x = 0;
-	// loop creating the tqmask for vis-gradient
+	// loop creating the mask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		n = log((*start)+1) * (float)hh * 5;
@@ -344,7 +344,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 		else if ( amp > hh ) amp = hh;
 
 		// make a part of the analyzer-gradient visible
-		tqmask.fillRect ( x, 0, mMultiples, amp, TQt::color1 );
+		mask.fillRect ( x, 0, mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
 
@@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 	stop();
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(Null);
 }
 
@@ -387,7 +387,7 @@ void KJStereoFFT::readConfig()
 	if ( v != StereoFFT )
 	{
 		stop();
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -399,8 +399,8 @@ void KJStereoFFT::readConfig()
  * KJScope - oscilloscope like visualization
  *************************************************/
 
-KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent), MonoScope(50)/*, blurnum(0), mOsci(0)*/
+KJScope::KJScope(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent), MonoScope(50)/*, blurnum(0), mOsci(0)*/
 {
 	int x=l[1].toInt();
 	int y=l[2].toInt();
@@ -411,7 +411,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
 
 //	kdDebug(66666) << "Analyzer Window " << x << "," << y << " " << mWidth << "," << mHeight << endl;
 
-	if ( tqparent->exist("analyzercolor") )
+	if ( parent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -420,7 +420,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
 		mColor.setRgb ( 255, 255, 255 );
 
 	// background under vis
-	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
@@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(/*Null*/ StereoFFT);
 }
 
@@ -528,7 +528,7 @@ void KJScope::readConfig()
 	if ( v != Mono )
 	{
 		stop();
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
diff --git a/noatun/modules/kjofol-skin/kjvis.h b/noatun/modules/kjofol-skin/kjvis.h
index 9f8bec4d..a05103d8 100644
--- a/noatun/modules/kjofol-skin/kjvis.h
+++ b/noatun/modules/kjofol-skin/kjvis.h
@@ -8,7 +8,7 @@ class KPixmap;
 class KJVisScope : public KJWidget
 {
 public:
-	KJVisScope(KJLoader *tqparent) : KJWidget(tqparent) {};
+	KJVisScope(KJLoader *parent) : KJWidget(parent) {};
 	enum Visuals { Null=0, FFT, Mono, StereoFFT };
 	void swapScope(Visuals newOne);
 //	virtual void readConfig();
@@ -19,7 +19,7 @@ public:
 class KJNullScope : public KJVisScope
 {
 public:
-	KJNullScope(const TQStringList &, KJLoader *tqparent);
+	KJNullScope(const TQStringList &, KJLoader *parent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual bool mousePress(const TQPoint&);
 	virtual void mouseRelease(const TQPoint &, bool in);
@@ -35,7 +35,7 @@ private:
 class KJFFT : public KJVisScope, public MonoFFTScope
 {
 public:
-	KJFFT(const TQStringList &, KJLoader *tqparent);
+	KJFFT(const TQStringList &, KJLoader *parent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual void scopeEvent(float *d, int size);
 
@@ -57,7 +57,7 @@ private:
 class KJStereoFFT : public KJVisScope, public StereoFFTScope
 {
 public:
-	KJStereoFFT(const TQStringList &, KJLoader *tqparent);
+	KJStereoFFT(const TQStringList &, KJLoader *parent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual void scopeEvent(float *left, float *right, int len);
 
@@ -79,7 +79,7 @@ private:
 class KJScope : public KJVisScope, public MonoScope
 {
 public:
-	KJScope ( const TQStringList &, KJLoader *tqparent);
+	KJScope ( const TQStringList &, KJLoader *parent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual void scopeEvent(float *d, int size);
 
diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp
index d292637a..f9cb345a 100644
--- a/noatun/modules/kjofol-skin/kjwidget.cpp
+++ b/noatun/modules/kjofol-skin/kjwidget.cpp
@@ -36,11 +36,11 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
 
 void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear)
 {
-	TQPainter p(tqparent());
+	TQPainter p(parent());
 	if (me)
 		paint(&p, r.isValid() ? r : rect());
 	else
-		tqparent()->tqrepaint(r.isValid() ? r : rect(), clear);
+		parent()->tqrepaint(r.isValid() ? r : rect(), clear);
 }
 
 const TQString &KJWidget::backgroundPressed(const TQString &bmp) const
diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h
index 693d4eaa..a678e8a7 100644
--- a/noatun/modules/kjofol-skin/kjwidget.h
+++ b/noatun/modules/kjofol-skin/kjwidget.h
@@ -35,7 +35,7 @@ public:
 
 protected:
 	const TQString &backgroundPressed(const TQString &bmp) const;
-	KJLoader *tqparent() const {return mParent;}
+	KJLoader *parent() const {return mParent;}
 	KJLoader &parser() const {return *mParent;}
 
 	KJFont &textFont() const {return *mParent->mText;}
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index dd4390db..89c123a4 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -158,7 +158,7 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget
          kdWarning() << "Cannot save " << meta_widget.key << " as required type." << endl;
 }
 
-MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent) {
+MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent) {
     TQLabel *tmp_label = 0L;
     KFileMetaInfoItem info_item = meta_info.item(key);
     TQVariant::Type type;
@@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
 
     // Get the correct validator
     if ( info && !groupName.isNull() )
-        validator = info->createValidator( groupName, key, TQT_TQOBJECT(tqparent) );
+        validator = info->createValidator( groupName, key, TQT_TQOBJECT(parent) );
 
     // meta_widget is used for book-keeping internally
     meta_widget = new MetaWidget;
@@ -190,7 +190,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
 
     if ((type == TQVariant::Int) || (type == TQVariant::UInt)) {
         // We're an int, make a spin box
-        TQSpinBox *box = new TQSpinBox(tqparent);
+        TQSpinBox *box = new TQSpinBox(parent);
 
         // Well, normally metatag doesn't care that much about suffixes
         // and prefixes, but this is just too easy.
@@ -226,7 +226,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
            combo_box = validator->isA("KStringListValidator");
 
         if (combo_box) {
-             TQComboBox *combo = new TQComboBox(tqparent);
+             TQComboBox *combo = new TQComboBox(parent);
 
              combo->clear();
              combo->insertStringList(static_cast<
@@ -241,7 +241,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
         else {
              KLineEdit *edit;
 
-             edit = new KLineEdit(tqparent);
+             edit = new KLineEdit(parent);
              edit->setText(info_item.value().toString());
              edit->setValidator(validator);
              connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified()));
@@ -258,7 +258,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
     mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2);
 
     // Add our label. This is the easy part
-    tmp_label = new TQLabel(meta_widget->widget, label + ":", tqparent);
+    tmp_label = new TQLabel(meta_widget->widget, label + ":", parent);
     mGrid->addWidget(tmp_label, mNextRow, 0);
 
 
diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h
index f0e94778..a3aa0947 100644
--- a/noatun/modules/metatag/edit.h
+++ b/noatun/modules/metatag/edit.h
@@ -36,7 +36,7 @@ class Editor:public KDialogBase {
     TQString keyGroup(const KFileMetaInfo &, TQString);
 
     void saveControl(KFileMetaInfo& meta_info, const MetaWidget&);
-    MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent);
+    MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent);
 
     TQPtrList<MetaWidget> mControls;
 
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index 3afd3698..0aeb2fc8 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -205,7 +205,7 @@ void MilkChocolate::popup()
 
 void MilkChocolate::slotPlaying()
 {
-//	connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptRetqparent(WId)));
+//	connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId)));
 	changeStatusbar(napp->player()->current().title(), napp->player()->lengthString());
 	mPlay->setOn(true);
 	mStop->setEnabled(true);
diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp
index 6584f040..d167e02e 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -5,7 +5,7 @@
 #include <tqcheckbox.h>
 #include <klocale.h>
 
-Finder::Finder(TQWidget *tqparent) : KDialogBase(tqparent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find"))
+Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find"))
 {
 	TQWidget *mainWidget = new TQWidget(this);
 	mainWidget->setMinimumWidth(320);
diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h
index 47a53f99..7aa07201 100644
--- a/noatun/modules/splitplaylist/find.h
+++ b/noatun/modules/splitplaylist/find.h
@@ -12,7 +12,7 @@ class Finder : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	Finder(TQWidget *tqparent);
+	Finder(TQWidget *parent);
 
 	bool regexp() const;
 	bool isForward() const;
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 97ccca20..693b57ce 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -43,13 +43,13 @@
 
 #define SPL SplitPlaylist::SPL()
 
-SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text)
-	: TQCheckListItem(tqparent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false)
+SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text)
+	: TQCheckListItem(parent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false)
 {
 	addRef();
 	setUrl(text);
 
-	static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after);
+	static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
 	setOn(true);
 
 	// is this really needed, it makes the listview too wide for me :(
@@ -65,8 +65,8 @@ SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after,
 	PlaylistItemData::added();
 }
 
-SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &props)
-	: TQCheckListItem(tqparent, 0, TQCheckListItem::CheckBox), removed(false)
+SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &props)
+	: TQCheckListItem(parent, 0, TQCheckListItem::CheckBox), removed(false)
 {
 	addRef();
 
@@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after,
 		}
 	}
 
-	static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after);
+	static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
 	modified();
 
 	if (!streamable() && enqueue(url()))
@@ -344,8 +344,8 @@ void SafeListViewItem::remove()
 	PlaylistItemData::removed();
 }
 
-List::List(View *tqparent)
-	: KListView(tqparent), recursiveAddAfter(0), listJob(0)
+List::List(View *parent)
+	: KListView(parent), recursiveAddAfter(0), listJob(0)
 {
 	addColumn(i18n("File"));
 	addColumn(i18n("Time"));
@@ -357,8 +357,8 @@ List::List(View *tqparent)
 	setSelectionMode(TQListView::Extended);
 	connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
 	connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move()));
-	connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), tqparent, TQT_SLOT(setNoSorting()));
-	connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), tqparent, TQT_SLOT(deleteSelected()));
+	connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
+	connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected()));
 }
 
 List::~List()
@@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const
 
 void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
 {
-	static_cast<View*>(TQT_TQWIDGET(tqparent()))->setNoSorting();
+	static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting();
 	KURL::List textlist;
 	if (!KURLDrag::decode(event, textlist)) return;
 	event->acceptAction();
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index c8b71e93..7b803f99 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -21,8 +21,8 @@ class SafeListViewItem
 	, public DownloadItem
 {
 public:
-	SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text);
-	SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &properties);
+	SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text);
+	SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &properties);
 	virtual ~SafeListViewItem();
 
 	virtual TQString property(const TQString &, const TQString & = 0) const;
@@ -61,7 +61,7 @@ Q_OBJECT
   TQ_OBJECT
 friend class View;
 public:
-	List(View *tqparent);
+	List(View *parent);
 	virtual ~List();
 	TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0);
 	TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0);
diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index 61c0f035..95bbb698 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -44,11 +44,11 @@
 
 #include <fixx11h.h>
 
-KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name)
-	: KSystemTray(tqparent, name)
+KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name)
+	: KSystemTray(parent, name)
 {
 	tqsetAlignment(AlignHCenter | AlignVCenter);
-	menu = (KPopupMenu *)tqparent->guiFactory()->container(contextMenu, tqparent);
+	menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
 	menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0);
 	setAcceptDrops(true);
 }
diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h
index d933a19e..153d772a 100644
--- a/noatun/modules/systray/kitsystemtray.h
+++ b/noatun/modules/systray/kitsystemtray.h
@@ -40,7 +40,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name = 0);
+	KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0);
 	void changeTitle(const TQPixmap &, const TQString &);
 protected:
 	virtual void showEvent(TQShowEvent *);
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 57ce2105..c298df37 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -72,7 +72,7 @@ const int COVER_MAXH = 128;
 class PassivePopup : public KPassivePopup
 {
 public:
-	PassivePopup(TQWidget *tqparent = 0, const char *name = 0) : KPassivePopup(tqparent, name) {}
+	PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {}
 
 protected:
 	virtual void enterEvent(TQEvent *)
diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp
index a50db7ff..b90d4b03 100644
--- a/noatun/modules/voiceprint/prefs.cpp
+++ b/noatun/modules/voiceprint/prefs.cpp
@@ -8,8 +8,8 @@
 #include <kcolorbutton.h>
 #include <kconfig.h>
 
-Prefs::Prefs(TQObject* tqparent)
-	: CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", tqparent)
+Prefs::Prefs(TQObject* parent)
+	: CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent)
 {
 	TQVBoxLayout	*king=new TQVBoxLayout(this);
 	TQHBoxLayout *minor;
diff --git a/noatun/modules/voiceprint/prefs.h b/noatun/modules/voiceprint/prefs.h
index 1803fe9b..13977a84 100644
--- a/noatun/modules/voiceprint/prefs.h
+++ b/noatun/modules/voiceprint/prefs.h
@@ -11,7 +11,7 @@ class Prefs : public CModule
 Q_OBJECT
   TQ_OBJECT
 public:
-	Prefs(TQObject* tqparent);
+	Prefs(TQObject* parent);
 	virtual void save();
 	virtual void reopen();
 
diff --git a/noatun/modules/winskin/vis/realFFT.cpp b/noatun/modules/winskin/vis/realFFT.cpp
index 383831b7..330280ea 100644
--- a/noatun/modules/winskin/vis/realFFT.cpp
+++ b/noatun/modules/winskin/vis/realFFT.cpp
@@ -20,7 +20,7 @@
 RealFFT::RealFFT(int fftlen) {
    int i;
    int temp;
-   int tqmask;
+   int mask;
 
    /*
     *  FFT size is only half the number of data points
@@ -43,8 +43,8 @@ RealFFT::RealFFT(int fftlen) {
    for(i=0;i<Points/2;i++)
    {
       temp=0;
-      for(tqmask=Points/4;tqmask>0;tqmask >>= 1)
-         temp=(temp >> 1) + (i&tqmask ? Points/2 : 0);
+      for(mask=Points/4;mask>0;mask >>= 1)
+         temp=(temp >> 1) + (i&mask ? Points/2 : 0);
 
       BitReversed[i]=temp;
    }
diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp
index 5f968b00..f76cdabb 100644
--- a/noatun/modules/winskin/waRegion.cpp
+++ b/noatun/modules/winskin/waRegion.cpp
@@ -31,14 +31,14 @@ WaRegion::WaRegion(TQString filename) {
     KSimpleConfig regionFile(filename, true);
 
     // Clear our variables by default
-    window_tqmask = 0;
-    shade_tqmask = 0;
+    window_mask = 0;
+    shade_mask = 0;
 
     // Make the new bitmaps, default window size
-    window_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true);  
-    shade_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true);  
+    window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true);  
+    shade_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true);  
 
-    // Load the normal window tqmask data
+    // Load the normal window mask data
     regionFile.setGroup("Normal");
     
     TQValueList<int> num_points;
@@ -53,22 +53,22 @@ WaRegion::WaRegion(TQString filename) {
             point_list = parseList(regionFile.readEntry(pointListNames[x]));
     }
 
-    // Now build the tqmask
-    buildPixmap(num_points, point_list, window_tqmask);
+    // Now build the mask
+    buildPixmap(num_points, point_list, window_mask);
 
-    // Load the windowshade tqmask data
+    // Load the windowshade mask data
     regionFile.setGroup("WindowShade");
    
     num_points = parseList(regionFile.readEntry("NumPoints"));
     point_list = parseList(regionFile.readEntry("PointList"));
 
-    // Now build the tqmask
-    buildPixmap(num_points, point_list, shade_tqmask);
+    // Now build the mask
+    buildPixmap(num_points, point_list, shade_mask);
 }
 
 WaRegion::~WaRegion() {
-   delete window_tqmask;
-   delete shade_tqmask;
+   delete window_mask;
+   delete shade_mask;
 }
 
 void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValueList<int> &points_list, TQBitmap *dest) {
@@ -101,7 +101,7 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu
             point_array.setPoint(i, x, y);
         }
 
-        // Now draw it as a filled polygon on the tqmask
+        // Now draw it as a filled polygon on the mask
         bmp.drawPolygon(point_array);
     }
 
diff --git a/noatun/modules/winskin/waRegion.h b/noatun/modules/winskin/waRegion.h
index 737ebdb9..66c7c811 100644
--- a/noatun/modules/winskin/waRegion.h
+++ b/noatun/modules/winskin/waRegion.h
@@ -9,15 +9,15 @@ public:
     WaRegion(TQString filename);
     ~WaRegion();
 
-    const TQBitmap *mainWindowMask() const { return window_tqmask; }
-    const TQBitmap *mainWindowShadeMask() const { return shade_tqmask; }
+    const TQBitmap *mainWindowMask() const { return window_mask; }
+    const TQBitmap *mainWindowShadeMask() const { return shade_mask; }
 
 private:
    TQValueList<int> parseList(const TQString &list) const;
    void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest);
 
-   TQBitmap *window_tqmask;
-   TQBitmap *shade_tqmask;
+   TQBitmap *window_mask;
+   TQBitmap *shade_mask;
 };
 
 extern WaRegion *windowRegion;
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 06573c7f..0cfd7f90 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -23,11 +23,11 @@
 #include "waSkinManager.h"
 #include "winSkinConfig.h"
 
-WinSkinConfig::WinSkinConfig(TQWidget * tqparent, WaSkinManager *waSkinManager) :
+WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
         CModule(i18n("Winskin"),
 	        i18n("Skin Selection for the Winskin Plugin"),
 	        "style",
-	        TQT_TQOBJECT(tqparent))
+	        TQT_TQOBJECT(parent))
 {
     // Make a token horizontal tqlayout box
     vbox = new TQVBoxLayout(this);
diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h
index 047f0805..a047a1f3 100644
--- a/noatun/modules/winskin/winSkinConfig.h
+++ b/noatun/modules/winskin/winSkinConfig.h
@@ -12,7 +12,7 @@ class WinSkinConfig:public CModule {
     Q_OBJECT
   TQ_OBJECT
   public:
-    WinSkinConfig(TQWidget * tqparent, WaSkinManager *waManager);
+    WinSkinConfig(TQWidget * parent, WaSkinManager *waManager);
 
     void save();
 
diff --git a/noatun/modules/winskin/winSkinVis.cpp b/noatun/modules/winskin/winSkinVis.cpp
index f760fac3..8ec025d2 100644
--- a/noatun/modules/winskin/winSkinVis.cpp
+++ b/noatun/modules/winskin/winSkinVis.cpp
@@ -17,8 +17,8 @@
 #define __BANDS     75
 #define __SPAHEIGHT 15
 
-WinSkinVis::WinSkinVis(TQObject *tqparent, const char *name):
-    TQObject(tqparent,name),Visualization(50) {
+WinSkinVis::WinSkinVis(TQObject *parent, const char *name):
+    TQObject(parent,name),Visualization(50) {
 
     m_currentPeaks=new float[__BANDS];
 
diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h
index 3f941c6f..e4164212 100644
--- a/noatun/modules/winskin/winSkinVis.h
+++ b/noatun/modules/winskin/winSkinVis.h
@@ -28,7 +28,7 @@ class WinSkinVis : public TQObject, public Visualization {
   TQ_OBJECT
 
  public:
-  WinSkinVis(TQObject* tqparent,const char* name);
+  WinSkinVis(TQObject* parent,const char* name);
   ~WinSkinVis();
 
   /**