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

1 files changed, 18 insertions, 18 deletions

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;