rename the following methods:

tqparent parent
tqmask mask

2 files changed, 16 insertions, 16 deletions

diff --git a/tqtinterface/qt4/src/table/tqtable.cpp b/tqtinterface/qt4/src/table/tqtable.cpp
index cb1d068..e6d4d3a 100644
--- a/tqtinterface/qt4/src/table/tqtable.cpp
+++ b/tqtinterface/qt4/src/table/tqtable.cpp
@@ -90,7 +90,7 @@ public:
 	Selected
     };
 
-    TQTableHeader( int, TQTable *t, TQWidget* tqparent=0, const char* name=0 );
+    TQTableHeader( int, TQTable *t, TQWidget* parent=0, const char* name=0 );
     ~TQTableHeader() {};
     void addLabel( const TQString &s, int size );
     void setLabel( int section, const TQString & s, int size = -1 );
@@ -782,7 +782,7 @@ implementation creates a TQLineEdit.
 If the function returns 0, the cell is read-only.
 
 The returned widget should preferably be invisible, ideally with
-TQTable::viewport() as tqparent.
+TQTable::viewport() as parent.
 
 If you reimplement this function you'll almost certainly need to
 reimplement setContentFromEditor(), and may need to reimplement
@@ -2027,7 +2027,7 @@ TQSize TQCheckTableItem::tqsizeHint() const
 
 /*!
     Creates an empty table object called \a name as a child of \a
-    tqparent.
+    parent.
 
     Call setNumRows() and setNumCols() to set the table size before
     populating the table if you're using TQTableItems.
@@ -2035,8 +2035,8 @@ TQSize TQCheckTableItem::tqsizeHint() const
     \sa TQWidget::clearWFlags() TQt::WidgetFlags
 */
 
-TQTable::TQTable( TQWidget *tqparent, const char *name )
-    : TQScrollView( tqparent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ),
+TQTable::TQTable( TQWidget *parent, const char *name )
+    : TQScrollView( parent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ),
       leftHeader( 0 ), topHeader( 0 ),
       currentSel( 0 ), lastSortCol( -1 ), sGrid( TRUE ), mRows( FALSE ), mCols( FALSE ),
       asc( TRUE ), doSort( TRUE ), readOnly( FALSE )
@@ -2046,7 +2046,7 @@ TQTable::TQTable( TQWidget *tqparent, const char *name )
 
 /*!
     Constructs an empty table called \a name with \a numRows rows and
-    \a numCols columns. The table is a child of \a tqparent.
+    \a numCols columns. The table is a child of \a parent.
 
     If you're using \l{TQTableItem}s to populate the table's cells, you
     can create TQTableItem, TQComboTableItem and TQCheckTableItem items
@@ -2056,8 +2056,8 @@ TQTable::TQTable( TQWidget *tqparent, const char *name )
     \sa TQWidget::clearWFlags() TQt::WidgetFlags
 */
 
-TQTable::TQTable( int numRows, int numCols, TQWidget *tqparent, const char *name )
-    : TQScrollView( tqparent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ),
+TQTable::TQTable( int numRows, int numCols, TQWidget *parent, const char *name )
+    : TQScrollView( parent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ),
       leftHeader( 0 ), topHeader( 0 ),
       currentSel( 0 ), lastSortCol( -1 ), sGrid( TRUE ), mRows( FALSE ), mCols( FALSE ),
       asc( TRUE ), doSort( TRUE ), readOnly( FALSE )
@@ -2750,10 +2750,10 @@ void TQTable::swapCells( int row1, int col1, int row2, int col2 )
     widgets.setAutoDelete( TRUE );
 }
 
-static bool is_child_of( TQWidget *child, TQWidget *tqparent )
+static bool is_child_of( TQWidget *child, TQWidget *parent )
 {
     while ( child ) {
-	if ( child == tqparent )
+	if ( child == parent )
 	    return TRUE;
 	child = child->parentWidget();
     }
@@ -5999,7 +5999,7 @@ void TQTable::setCellWidget( int row, int col, TQWidget *e )
 
     e->installEventFilter( this );
     clearCellWidget( row, col );
-    if ( e->tqparent() != TQT_TQOBJECT(viewport()) )
+    if ( e->parent() != TQT_TQOBJECT(viewport()) )
 	e->reparent( viewport(), TQPoint( 0,0 ) );
     TQTableItem *itm = item(row, col);
     if (itm && itm->row() >= 0 && itm->col() >= 0) { // get the correct row and col if the item is spanning
@@ -6516,12 +6516,12 @@ void TQTable::setEnabled( bool b )
 
 /*!
     Creates a new table header called \a name with \a i sections. It
-    is a child of widget \a tqparent and attached to table \a t.
+    is a child of widget \a parent and attached to table \a t.
 */
 
 TQTableHeader::TQTableHeader( int i, TQTable *t,
-			    TQWidget *tqparent, const char *name )
-    : TQHeader( i, tqparent, name ), mousePressed(FALSE), startPos(-1),
+			    TQWidget *parent, const char *name )
+    : TQHeader( i, parent, name ), mousePressed(FALSE), startPos(-1),
       table( t ), caching( FALSE ), resizedSection(-1),
       numStretches( 0 )
 {
diff --git a/tqtinterface/qt4/src/table/tqtable.h b/tqtinterface/qt4/src/table/tqtable.h
index 47b37fd..1b8792f 100644
--- a/tqtinterface/qt4/src/table/tqtable.h
+++ b/tqtinterface/qt4/src/table/tqtable.h
@@ -266,9 +266,9 @@ class TQM_EXPORT_TABLE TQTable : public TQScrollView
     friend class TQTableItem;
 
 public:
-    TQTable( TQWidget* tqparent=0, const char* name=0 );
+    TQTable( TQWidget* parent=0, const char* name=0 );
     TQTable( int numRows, int numCols,
-            TQWidget* tqparent=0, const char* name=0 );
+            TQWidget* parent=0, const char* name=0 );
     ~TQTable();
 
     TQHeader *horizontalHeader() const;