rename the following methods:

tqparent parent
tqmask mask

1 files changed, 24 insertions, 24 deletions

diff --git a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp
index e7ff8f4..771a332 100644
--- a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp
+++ b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp
@@ -104,7 +104,7 @@ class TQToolBarSeparator : public TQWidget
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
+    TQToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 );
 
     TQSize tqsizeHint() const;
     Qt::Orientation orientation() const { return orient; }
@@ -164,14 +164,14 @@ void TQToolBarExtensionWidget::layOut()
     tb->setGeometry( 2, 2, width() - 4, height() - 4 );
 }
 
-TQToolBarSeparator::TQToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent,
+TQToolBarSeparator::TQToolBarSeparator(Qt::Orientation o , TQToolBar *parent,
 				     const char* name )
-    : TQWidget( tqparent, name )
+    : TQWidget( parent, name )
 {
-    connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)),
+    connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)),
 	     this, TQT_SLOT(setOrientation(Qt::Orientation)) );
     setOrientation( o );
-    setBackgroundMode( tqparent->backgroundMode() );
+    setBackgroundMode( parent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
     tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 }
@@ -303,29 +303,29 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
 /*!
     Constructs an empty toolbar.
 
-    The toolbar is called \a name and is a child of \a tqparent and is
-    managed by \a tqparent. It is initially located in dock area \a dock
+    The toolbar is called \a name and is a child of \a parent and is
+    managed by \a parent. It is initially located in dock area \a dock
     and is labeled \a label. If \a newLine is TRUE the toolbar will be
     placed on a new line in the dock area.
 */
 
 TQToolBar::TQToolBar( const TQString &label,
-		    TQMainWindow * tqparent, TQt::ToolBarDock dock,
+		    TQMainWindow * parent, TQt::ToolBarDock dock,
 		    bool newLine, const char * name )
-    : TQDockWindow( InDock, tqparent, name, 0, TRUE )
+    : TQDockWindow( InDock, parent, name, 0, TRUE )
 {
-    mw = tqparent;
+    mw = parent;
     init();
 
-    if ( tqparent )
-	tqparent->addToolBar( this, label, dock, newLine );
+    if ( parent )
+	parent->addToolBar( this, label, dock, newLine );
 }
 
 
 /*!
     Constructs an empty horizontal toolbar.
 
-    The toolbar is called \a name and is a child of \a tqparent and is
+    The toolbar is called \a name and is a child of \a parent and is
     managed by \a mainWindow. The \a label and \a newLine parameters
     are passed straight to TQMainWindow::addDockWindow(). \a name and
     the widget flags \a f are passed on to the TQDockWindow constructor.
@@ -336,15 +336,15 @@ TQToolBar::TQToolBar( const TQString &label,
 */
 
 TQToolBar::TQToolBar( const TQString &label, TQMainWindow * mainWindow,
-		    TQWidget * tqparent, bool newLine, const char * name,
+		    TQWidget * parent, bool newLine, const char * name,
 		    WFlags f )
-    : TQDockWindow( InDock, tqparent, name, f, TRUE )
+    : TQDockWindow( InDock, parent, name, f, TRUE )
 {
     mw = mainWindow;
     init();
 
     clearWFlags( (WFlags)(TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) );
-    reparent( tqparent, TQPoint( 0, 0 ), FALSE );
+    reparent( parent, TQPoint( 0, 0 ), FALSE );
 
     if ( mainWindow )
 	mainWindow->addToolBar( this, label, TQt::DockUnmanaged, newLine );
@@ -354,19 +354,19 @@ TQToolBar::TQToolBar( const TQString &label, TQMainWindow * mainWindow,
 /*!
     \overload
 
-    Constructs an empty toolbar called \a name, with tqparent \a tqparent,
-    in its \a tqparent's top dock area, without any label and without
+    Constructs an empty toolbar called \a name, with parent \a parent,
+    in its \a parent's top dock area, without any label and without
     requiring a newline.
 */
 
-TQToolBar::TQToolBar( TQMainWindow * tqparent, const char * name )
-    : TQDockWindow( InDock, tqparent, name, 0, TRUE )
+TQToolBar::TQToolBar( TQMainWindow * parent, const char * name )
+    : TQDockWindow( InDock, parent, name, 0, TRUE )
 {
-    mw = tqparent;
+    mw = parent;
     init();
 
-    if ( tqparent )
-	tqparent->addToolBar( this, TQString(), TQt::DockTop );
+    if ( parent )
+	parent->addToolBar( this, TQString(), TQt::DockTop );
 }
 
 /*!
@@ -521,7 +521,7 @@ bool TQToolBar::event( TQEvent * e )
     if ( e->type() == TQEvent::ChildInserted ) {
 	TQObject * child = TQT_TQOBJECT(((TQChildEvent*)e)->child());
 	if ( child && child->isWidgetType() && !(TQT_TQWIDGET(child)->isTopLevel())
-	     && TQT_BASE_OBJECT(child->tqparent()) == TQT_BASE_OBJECT(this)
+	     && TQT_BASE_OBJECT(child->parent()) == TQT_BASE_OBJECT(this)
 	     && tqstrcmp("qt_dockwidget_internal", child->name()) != 0 ) {
 	    boxLayout()->addWidget( (TQWidget*)child );
 	    if ( isVisible() ) {