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

10 files changed, 40 insertions, 40 deletions

diff --git a/kwin4/kwin4/kspritecache.cpp b/kwin4/kwin4/kspritecache.cpp
index c49332f7..bd55c418 100644
--- a/kwin4/kwin4/kspritecache.cpp
+++ b/kwin4/kwin4/kspritecache.cpp
@@ -27,8 +27,8 @@
 // KSprite
 #include <math.h>
 
-KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* tqparent,const char * name)
-  : TQObject(tqparent,name)
+KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* parent,const char * name)
+  : TQObject(parent,name)
 {
   kdDebug(11002) << "KSpriteCache:: grafixdir=" << grafixdir << endl;
   mConfig=0;
@@ -155,7 +155,7 @@ TQCanvasItem *KSpriteCache::getItem(TQString name,int no)
 
   return item;
 }
-TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString tqmask,TQString dir)
+TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString mask,TQString dir)
 {
   TQPixmap *newP=new TQPixmap;
   bool result1=false;
@@ -165,21 +165,21 @@ TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString tqmask,TQString dir)
   {
     result1=newP->load(dir+file);
   }
-  if (result1 && !tqmask.isNull())
+  if (result1 && !mask.isNull())
   {
-    TQBitmap bittqmask;
-    if (tqmask==TQString("auto"))  // self tqmask..slow but quick to create
+    TQBitmap bitmask;
+    if (mask==TQString("auto"))  // self mask..slow but quick to create
     {
       newP->setMask( newP->createHeuristicMask() );
       result2=true;
     }
     else
     {
-      result2=bittqmask.load(dir+tqmask);
-      if (result2) newP->setMask(bittqmask);
+      result2=bitmask.load(dir+mask);
+      if (result2) newP->setMask(bitmask);
     }
   }
-  //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<"   tqmask="<<tqmask<<"   result1="<<result1<<"   result2="<<result2<<endl;
+  //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<"   mask="<<mask<<"   result1="<<result1<<"   result2="<<result2<<endl;
   return newP;
 }
 
@@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na
     //kdDebug(11002) << " Reading " << number << " frames " << endl;
 
     TQString pixfile=config->readPathEntry(name+"file");
-    TQString maskfile=config->readPathEntry(name+"tqmask");
+    TQString maskfile=config->readPathEntry(name+"mask");
 
     // Load a given set of images or replace a %d by a sequence if there are
     // less image names than number given
@@ -230,12 +230,12 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na
       // Read images
       for (unsigned int i=0;i<number;i++)
       {
-        TQString tmpfile,tmptqmask;
+        TQString tmpfile,tmpmask;
         tmpfile.sprintf(pixfile.latin1(),i);
-        tmptqmask.sprintf(maskfile.latin1(),i);
+        tmpmask.sprintf(maskfile.latin1(),i);
 
-        pixmap=loadPixmap(tmpfile,tmptqmask);
-        if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with tqmask " << tmptqmask << endl;
+        pixmap=loadPixmap(tmpfile,tmpmask);
+        if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with mask " << tmpmask << endl;
         else
         {
           applyFilter(pixmap,config,name);
@@ -255,7 +255,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na
       double step;
       if (number>1) step=(100.0-finalscale)/100.0/(double)(number-1);
       else step=1.0;
-      //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " tqmask="<<maskfile<<endl;
+      //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<maskfile<<endl;
 
       pixmap=loadPixmap(pixfile,maskfile);
       for (unsigned int j=0;j<(unsigned int)number;j++)
diff --git a/kwin4/kwin4/kspritecache.h b/kwin4/kwin4/kspritecache.h
index 94cb83d9..5a17a8ba 100644
--- a/kwin4/kwin4/kspritecache.h
+++ b/kwin4/kwin4/kspritecache.h
@@ -37,7 +37,7 @@ class KSprite;
 
       public:
         KSpriteNotify() :TQObject(0,0) {mRefCnt=0;}
-        void emitSignal(TQCanvasItem *tqparent,int mode) {emit signalNotify(tqparent,mode);}
+        void emitSignal(TQCanvasItem *parent,int mode) {emit signalNotify(parent,mode);}
         void incRefCnt() {mRefCnt++;}
         void decRefCnt() {mRefCnt--;}
         int refCnt() {return mRefCnt;}
@@ -147,7 +147,7 @@ class KSprite : public TQCanvasSprite
 
     /**
     * Creates a notification object. You can connect to it and it will emit
-    * the signal signalNotify(TQCanvasItem *tqparent, intmode) when a move or
+    * the signal signalNotify(TQCanvasItem *parent, intmode) when a move or
     * animation is finished.
     * Example:
     * <pre>
@@ -244,17 +244,17 @@ class KSprite : public TQCanvasSprite
  * 
  * Example:
  * <pre>
- * # Sprite with three frames and a common tqmask for them
+ * # Sprite with three frames and a common mask for them
  * # z position given but x,y set manually in the program
  *  [arrow]
  *  file=arrow%d.png
- *  tqmask=arrow_tqmask.png
+ *  mask=arrow_mask.png
  *  number=3
  *  offset=19,5
  *  rtti=32
  *  z=9.0
  *
- * # Simple sprite which is already positioned correcly. No tqmask just one file
+ * # Simple sprite which is already positioned correcly. No mask just one file
  *  [board]
  *  file=board.png
  *  rtti=32
@@ -267,7 +267,7 @@ class KSprite : public TQCanvasSprite
  *  [star]
  *  anim0=0,4,2,8
  *  file=star%d.png
- *  tqmask=star%d_tqmask.png
+ *  mask=star%d_mask.png
  *  number=5
  *  offset=19,20
  *  rtti=32
@@ -293,7 +293,7 @@ class KSpriteCache : public TQObject
   * 
   * @param grafixdir - the directory where the configuration file and the graphics reside
   **/
-  KSpriteCache(TQString grafixdir, TQObject* tqparent=0,const char * name=0);
+  KSpriteCache(TQString grafixdir, TQObject* parent=0,const char * name=0);
 
   /**
   * Delete the sprite cache
@@ -369,10 +369,10 @@ class KSpriteCache : public TQObject
 
   /**
   * This function loads a pixmap from the given file. Optional you can also
-  * provide a tqmask file. Also optinal you can provide the directory. Default
+  * provide a mask file. Also optinal you can provide the directory. Default
   * is the directory which is set with this @ref KSpriteCache
   **/
-  TQPixmap * loadPixmap(TQString file,TQString tqmask=TQString(),TQString dir=TQString());
+  TQPixmap * loadPixmap(TQString file,TQString mask=TQString(),TQString dir=TQString());
 
   /** 
   * Deletes a item form the sprite cache given as a pointer to it
@@ -438,7 +438,7 @@ class KSpriteCache : public TQObject
   *   number=(int)      : how many frames to generate
   *   file=(Qstring)    : the filename to load (can contain printf format args
   *                       as %d which are replaced, e.g. file=hello_%d.png
-  *   tqmask=(TQString)    : Same for the tqmask of the pixmaps
+  *   mask=(TQString)    : Same for the mask of the pixmaps
   *   axis=(int)        : (scale only): scale axis (1=x,2=y,3=x+y)
   *   final=(double)    : final scale in percent (default 0.0, i.e. complete scaling)
   *   colorfilter=1,h,s,v: make a HSV transform of all sprite images
diff --git a/kwin4/kwin4/kwin4.cpp b/kwin4/kwin4/kwin4.cpp
index 84056254..dc4e85c0 100644
--- a/kwin4/kwin4/kwin4.cpp
+++ b/kwin4/kwin4/kwin4.cpp
@@ -63,8 +63,8 @@
  * Constructor for the chat widget. This widget
  * is derived from the libkdegames chat widget
  */
-ChatDlg::ChatDlg(KGame *game,TQWidget *tqparent)
-    : KDialogBase(Plain,i18n("Chat Dlg"),Ok,Ok,tqparent,0,false,true),mChat(0), mChatDlg(0)
+ChatDlg::ChatDlg(KGame *game,TQWidget *parent)
+    : KDialogBase(Plain,i18n("Chat Dlg"),Ok,Ok,parent,0,false,true),mChat(0), mChatDlg(0)
 {
  setMinimumSize(TQSize(200,200));
 
@@ -107,7 +107,7 @@ void ChatDlg::setPlayer(Kwin4Player *p)
 /**
  * Construct the main application window 
  */
-Kwin4App::Kwin4App(TQWidget *tqparent, const char *name) : KMainWindow(tqparent,name), view(0), doc(0), mChat(0), mMyChatDlg(0)
+Kwin4App::Kwin4App(TQWidget *parent, const char *name) : KMainWindow(parent,name), view(0), doc(0), mChat(0), mMyChatDlg(0)
 {
   initGUI();
   initStatusBar();
diff --git a/kwin4/kwin4/kwin4.h b/kwin4/kwin4/kwin4.h
index e3ab0ebc..d5a132ad 100644
--- a/kwin4/kwin4/kwin4.h
+++ b/kwin4/kwin4/kwin4.h
@@ -40,7 +40,7 @@ class KDE_EXPORT ChatDlg : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  ChatDlg(KGame *game,TQWidget* tqparent=0);
+  ChatDlg(KGame *game,TQWidget* parent=0);
 
 public slots:  
   void setPlayer(Kwin4Player *p);
@@ -60,7 +60,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-  Kwin4App(TQWidget *tqparent=0, const char *name=0);
+  Kwin4App(TQWidget *parent=0, const char *name=0);
 
 protected:
   void EndGame(TABLE mode);
diff --git a/kwin4/kwin4/kwin4doc.cpp b/kwin4/kwin4/kwin4doc.cpp
index 8c52985b..3cce2df6 100644
--- a/kwin4/kwin4/kwin4doc.cpp
+++ b/kwin4/kwin4/kwin4doc.cpp
@@ -36,7 +36,7 @@
 #include "prefs.h"
 #include "statuswidget.h"
 
-Kwin4Doc::Kwin4Doc(TQWidget *tqparent, const char *) : KGame(1234,TQT_TQOBJECT(tqparent)), pView(0), mHintProcess(0)
+Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,TQT_TQOBJECT(parent)), pView(0), mHintProcess(0)
 {
   connect(this,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)),
           this,TQT_SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *)));
diff --git a/kwin4/kwin4/kwin4doc.h b/kwin4/kwin4/kwin4doc.h
index 0084b854..d501918f 100644
--- a/kwin4/kwin4/kwin4doc.h
+++ b/kwin4/kwin4/kwin4doc.h
@@ -51,7 +51,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-  Kwin4Doc(TQWidget *tqparent, const char *name=0);
+  Kwin4Doc(TQWidget *parent, const char *name=0);
   ~Kwin4Doc();
 
   /** adds a view to the document which represents the document contents. Usually this is your main view. */
diff --git a/kwin4/kwin4/kwin4view.cpp b/kwin4/kwin4/kwin4view.cpp
index 6877860b..e526539e 100644
--- a/kwin4/kwin4/kwin4view.cpp
+++ b/kwin4/kwin4/kwin4view.cpp
@@ -101,8 +101,8 @@ private:
 
 };
 
-Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent, const char *name)
-        : TQCanvasView(0,tqparent, name), doc(theDoc)
+Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *parent, const char *name)
+        : TQCanvasView(0,parent, name), doc(theDoc)
 {
   mLastArrow=-1;
 
@@ -129,8 +129,8 @@ Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent, const char *name)
   //setBackgroundMode(PaletteBase);
   setBackgroundColor(TQColor(0,0,128));
 
-  mCanvas=new TQCanvas(TQT_TQOBJECT(tqparent));
-  mCanvas->resize(tqparent->width(),tqparent->height()); 
+  mCanvas=new TQCanvas(TQT_TQOBJECT(parent));
+  mCanvas->resize(parent->width(),parent->height()); 
   mCanvas->setDoubleBuffering(true);
   mCanvas->setBackgroundColor(TQColor(0,0,128));
   setCanvas(mCanvas);
diff --git a/kwin4/kwin4/kwin4view.h b/kwin4/kwin4/kwin4view.h
index 30bcfce6..f35ed154 100644
--- a/kwin4/kwin4/kwin4view.h
+++ b/kwin4/kwin4/kwin4view.h
@@ -35,7 +35,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-  Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent = 0, const char *name=0);
+  Kwin4View(Kwin4Doc *theDoc, TQWidget *parent = 0, const char *name=0);
 
   void initView(bool deleteall=true);
   void drawBoard(bool remove=false);
diff --git a/kwin4/kwin4/scorewidget.cpp b/kwin4/kwin4/scorewidget.cpp
index ad53f49e..d9c99225 100644
--- a/kwin4/kwin4/scorewidget.cpp
+++ b/kwin4/kwin4/scorewidget.cpp
@@ -31,8 +31,8 @@
 #define COL_STATUSDARK   TQColor(0,0,65)
 #define COL_STATUSLIGHT  TQColor(210,210,255)
 
-ScoreWidget::ScoreWidget( TQWidget* tqparent,  const char* name, WFlags fl )
-    : TQFrame( tqparent, name, fl )
+ScoreWidget::ScoreWidget( TQWidget* parent,  const char* name, WFlags fl )
+    : TQFrame( parent, name, fl )
 {
   setFrameStyle( TQFrame::Box | TQFrame::Raised );
   setLineWidth( 2 );
diff --git a/kwin4/kwin4/scorewidget.h b/kwin4/kwin4/scorewidget.h
index d6476061..7d157812 100644
--- a/kwin4/kwin4/scorewidget.h
+++ b/kwin4/kwin4/scorewidget.h
@@ -14,7 +14,7 @@ class ScoreWidget : public TQFrame
   TQ_OBJECT
 
 public:
-    ScoreWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    ScoreWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     void setMove(int i);
     void setLevel(int i);
     void setChance(int i);