7 files changed, 26 insertions, 26 deletions
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();
 
   /**