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

9 files changed, 60 insertions, 60 deletions

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;