rename the following methods:

tqparent parent
tqmask mask

10 files changed, 20 insertions, 20 deletions

diff --git a/experimental/tqtinterface/qt4/tools/qvfb/README b/experimental/tqtinterface/qt4/tools/qvfb/README
index a4fac5895..c62704129 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/README
+++ b/experimental/tqtinterface/qt4/tools/qvfb/README
@@ -10,7 +10,7 @@ framebuffer consists of a shared memory region (the virtual frame buffer)
 and a utility to display the framebuffer in a window.  The display is updated
 periodically, so you will see discrete snapshots of the framebuffer rather
 than each individual drawing operation.  For this reason drawing problems
-such as flickering may not be aptqparent until the program is run using a real
+such as flickering may not be apparent until the program is run using a real
 framebuffer.
 
 To use the virtual framebuffer:
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h b/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h
index 2acd3dab5..b60ae357a 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h
+++ b/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h
@@ -40,9 +40,9 @@ class GammaView: public TQWidget
 {
     TQ_OBJECT
 public:
-    GammaView( TQWidget *tqparent = 0,
+    GammaView( TQWidget *parent = 0,
 		const char *name = 0, WFlags f = 0 ) :
-	TQWidget(tqparent,name,f)
+	TQWidget(parent,name,f)
     { }
 };
 
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp
index 2c7712cc5..93d5e8e71 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp
+++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp
@@ -53,9 +53,9 @@
 #include <tqdragobject.h>
 #include <tqcheckbox.h>
 
-TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *tqparent,
+TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent,
 	    const char *name, uint flags )
-    : TQMainWindow( tqparent, name, flags )
+    : TQMainWindow( parent, name, flags )
 {
     const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( "logo.png" );
     if ( m ) {
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h
index 5906232c3..c36c385a3 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h
+++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h
@@ -44,7 +44,7 @@ class TQVFb: public TQMainWindow
 {
     TQ_OBJECT
 public:
-    TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *tqparent = 0,
+    TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent = 0,
 		const char *name = 0, uint wflags = 0 );
     ~TQVFb();
 
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp
index 9a61c3749..23020f0ae 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp
+++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp
@@ -38,9 +38,9 @@
 #include <tqslider.h>
 #include <tqpushbutton.h>
 
-TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *tqparent, const char *name,
+TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *parent, const char *name,
     bool modal )
-    : TQDialog( tqparent, name, modal )
+    : TQDialog( parent, name, modal )
 {
     oldRate = rate;
 
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h
index 387c28bfc..9a2938441 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h
+++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h
@@ -40,7 +40,7 @@ class TQVFbRateDialog : public TQDialog
 {
     TQ_OBJECT
 public:
-    TQVFbRateDialog( int value, TQWidget *tqparent=0, const char *name=0,
+    TQVFbRateDialog( int value, TQWidget *parent=0, const char *name=0,
 		    bool modal=FALSE );
 
 Q_SIGNALS:
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp
index bc02db737..fe49df11e 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp
+++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp
@@ -65,9 +65,9 @@
 
 //#define TQT_TQWS_EXPERIMENTAL_REVERSE_BIT_ENDIANNESS
 
-TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *tqparent,
+TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent,
 		    const char *name, uint flags )
-    : TQScrollView( tqparent, name, flags ), emulateTouchscreen(FALSE), qwslock(NULL)
+    : TQScrollView( parent, name, flags ), emulateTouchscreen(FALSE), qwslock(NULL)
 {
     displayid = display_id;
     viewport()->setMouseTracking( TRUE );
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h
index df5adcc6c..5f0cb074a 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h
+++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h
@@ -43,7 +43,7 @@ class TQVFbView : public TQScrollView
 {
     TQ_OBJECT
 public:
-    TQVFbView( int display_id, int w, int h, int d, TQWidget *tqparent = 0,
+    TQVFbView( int display_id, int w, int h, int d, TQWidget *parent = 0,
 		const char *name = 0, uint wflags = 0 );
     ~TQVFbView();
 
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp b/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp
index 795de3a58..2ef9ac385 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp
+++ b/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp
@@ -73,16 +73,16 @@ Skin::Skin( TQVFb *p, const TQString &skinFile, int &viewW, int &viewH ) : TQWid
 //	    areas[i].keyCode, areas[i].x1, areas[i].y1, areas[i].x2, areas[i].y2 );
     }
 
-    tqparent = p;
+    parent = p;
     skinImageUp = new TQPixmap( skinImageUpFileName );
     skinImageDown = new TQPixmap( skinImageDownFileName );
 //  setPixmap( ipaq );
     setFixedSize( skinImageUp->size() );
-    TQBitmap tqmask = skinImageUp->createHeuristicMask();
+    TQBitmap mask = skinImageUp->createHeuristicMask();
     int wf = WStyle_Customize | WType_TopLevel | WStyle_NoBorder;
-    tqparent->reparent( 0, wf, pos(), TRUE );
-    tqparent->setMask( tqmask );
-    tqparent->setFixedSize( skinImageUp->size() );
+    parent->reparent( 0, wf, pos(), TRUE );
+    parent->setMask( mask );
+    parent->setFixedSize( skinImageUp->size() );
     buttonPressed = FALSE;
     buttonIndex = 0;
 }
@@ -120,7 +120,7 @@ void Skin::paintEvent( TQPaintEvent * )
 void Skin::mousePressEvent( TQMouseEvent *e )
 {
     if (e->button() == RightButton) {
-	tqparent->popupMenu();
+	parent->popupMenu();
     } else {
 	buttonPressed = FALSE;
 
@@ -154,7 +154,7 @@ void Skin::mouseMoveEvent( TQMouseEvent *e )
 {
     if ( buttonPressed == FALSE ) {
 	TQPoint newpos =  e->globalPos() - clickPos;
-	tqparent->move( newpos );
+	parent->move( newpos );
     }
 }
 
diff --git a/experimental/tqtinterface/qt4/tools/qvfb/skin.h b/experimental/tqtinterface/qt4/tools/qvfb/skin.h
index 5c5d112aa..d9dab3b89 100644
--- a/experimental/tqtinterface/qt4/tools/qvfb/skin.h
+++ b/experimental/tqtinterface/qt4/tools/qvfb/skin.h
@@ -50,7 +50,7 @@ protected:
     virtual void mouseMoveEvent( TQMouseEvent *e );
     virtual void mouseReleaseEvent( TQMouseEvent * );
 private:
-    TQVFb *tqparent;
+    TQVFb *parent;
     TQVFbView *view;
     TQPoint clickPos;
     bool buttonPressed;