rename the following methods:

tqparent parent
tqmask mask


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

4 files changed, 9 insertions, 9 deletions

diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp
index 28329b06..3a3f1120 100644
--- a/ksame/KSameWidget.cpp
+++ b/ksame/KSameWidget.cpp
@@ -46,8 +46,8 @@ static int default_colors=3;
 
 #define Board 	KScoreDialog::Custom1
 
-KSameWidget::KSameWidget(TQWidget *tqparent, const char* name, WFlags fl) :
-             KMainWindow(tqparent,name,fl)
+KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) :
+             KMainWindow(parent,name,fl)
 {
 	KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(m_new()), actionCollection(), "game_new");
 	restart = new KAction(i18n("&Restart This Board"), CTRL+Key_R, TQT_TQOBJECT(this),
diff --git a/ksame/KSameWidget.h b/ksame/KSameWidget.h
index 0d7f833b..ff24c2b0 100644
--- a/ksame/KSameWidget.h
+++ b/ksame/KSameWidget.h
@@ -32,7 +32,7 @@ class KSameWidget: public KMainWindow {
   TQ_OBJECT
 
 public:
-     KSameWidget(TQWidget *tqparent=0, const char* name=0, WFlags fl=0);
+     KSameWidget(TQWidget *parent=0, const char* name=0, WFlags fl=0);
 
 private slots:
      /* File Menu */
diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp
index 3109c33e..586aeefd 100644
--- a/ksame/StoneWidget.cpp
+++ b/ksame/StoneWidget.cpp
@@ -46,8 +46,8 @@ struct StoneSlice {
 };
 
 
-StoneWidget::StoneWidget( TQWidget *tqparent, int x, int y )
-    : TQWidget(tqparent,"StoneWidget"), stonefield(x,y)
+StoneWidget::StoneWidget( TQWidget *parent, int x, int y )
+    : TQWidget(parent,"StoneWidget"), stonefield(x,y)
 {
     setBackgroundPixmap(TQPixmap(locate("wallpaper", "Time-For-Lunch-2.jpg")));
     TQPixmap stonemap(locate("appdata", "stones.png"));
@@ -65,7 +65,7 @@ StoneWidget::StoneWidget( TQWidget *tqparent, int x, int y )
     stone_height=stonemap.height()/maxcolors;
 
     map = new StoneSlice*[maxcolors];
-    TQBitmap tqmask;
+    TQBitmap mask;
     for (int c = 0; c < maxcolors; c++) {
         map[c] = new StoneSlice[maxslices];
 
@@ -77,8 +77,8 @@ StoneWidget::StoneWidget( TQWidget *tqparent, int x, int y )
                    c*stone_height,
                    stone_width,stone_height,CopyROP,false);
             TQImage im = map[c][s].stone.convertToImage();
-            tqmask.convertFromImage(im.createHeuristicMask());
-            map[c][s].stone.setMask(tqmask);
+            mask.convertFromImage(im.createHeuristicMask());
+            map[c][s].stone.setMask(mask);
         }
     }
 
diff --git a/ksame/StoneWidget.h b/ksame/StoneWidget.h
index 01e64ebe..616ef835 100644
--- a/ksame/StoneWidget.h
+++ b/ksame/StoneWidget.h
@@ -47,7 +47,7 @@ class StoneWidget : public TQWidget {
     StoneSlice **map;
 
 public:
-    StoneWidget( TQWidget *tqparent=0, int x=10,int y=10);
+    StoneWidget( TQWidget *parent=0, int x=10,int y=10);
     ~StoneWidget();
 
     unsigned int board();