rename the following methods:

tqparent parent
tqmask mask

1 files changed, 22 insertions, 22 deletions

diff --git a/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/tqtinterface/qt4/src/widgets/tqmenubar.cpp
index e932f18..eee9314 100644
--- a/tqtinterface/qt4/src/widgets/tqmenubar.cpp
+++ b/tqtinterface/qt4/src/widgets/tqmenubar.cpp
@@ -99,8 +99,8 @@ extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
     setItemEnabled().
 
     There is no need to lay out a menu bar. It automatically sets its
-    own tqgeometry to the top of the tqparent widget and changes it
-    appropriately whenever the tqparent is resized.
+    own tqgeometry to the top of the parent widget and changes it
+    appropriately whenever the parent is resized.
 
     \important insertItem removeItem clear insertSeparator setItemEnabled isItemEnabled setItemVisible isItemVisible
 
@@ -260,10 +260,10 @@ static const int gtkItemVMargin = 8;
 
 
 /*!
-    Constructs a menu bar called \a name with tqparent \a tqparent.
+    Constructs a menu bar called \a name with parent \a parent.
 */
-TQMenuBar::TQMenuBar( TQWidget *tqparent, const char *name )
-    : TQFrame( tqparent, name, TQt::WNoAutoErase )
+TQMenuBar::TQMenuBar( TQWidget *parent, const char *name )
+    : TQFrame( parent, name, TQt::WNoAutoErase )
 {
 #if defined( TQ_WS_MAC ) && !defined(TQMAC_TQMENUBAR_NO_NATIVE)
     mac_eaten_menubar = FALSE;
@@ -284,13 +284,13 @@ TQMenuBar::TQMenuBar( TQWidget *tqparent, const char *name )
     toggleclose = 0;
     pendingDelayedContentsChanges = 0;
     pendingDelayedStateChanges = 0;
-    if ( tqparent ) {
-	// filter tqparent events for resizing
-	tqparent->installEventFilter( this );
+    if ( parent ) {
+	// filter parent events for resizing
+	parent->installEventFilter( this );
 
 	// filter top-level-widget events for accelerators
 	TQWidget *tlw = tqtopLevelWidget();
-	if ( tlw != tqparent )
+	if ( tlw != parent )
 	    tlw->installEventFilter( this );
     }
     installEventFilter( this );
@@ -392,7 +392,7 @@ void TQMenuBar::performDelayedContentsChanged()
     if ( isVisible() ) {
 	update();
 #ifndef TQT_NO_MAINWINDOW
-	TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(tqparent());
+	TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parent());
 	if ( mw ) {
 	    mw->triggerLayout();
 	    mw->update();
@@ -503,17 +503,17 @@ void TQMenuBar::languageChange()
     \internal
 
     This function is used to adjust the menu bar's tqgeometry to the
-    tqparent widget's tqgeometry. Note that this is \e not part of the
+    parent widget's tqgeometry. Note that this is \e not part of the
     public interface - the function is \c public only because
     TQObject::eventFilter() is.
 
-    Resizes the menu bar to fit in the tqparent widget when the tqparent
+    Resizes the menu bar to fit in the parent widget when the parent
     receives a resize event.
 */
 
 bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
 {
-    if ( object == tqparent() && object
+    if ( object == parent() && object
 #ifndef TQT_NO_TOOLBAR
 	 && !::tqqt_cast<TQToolBar*>(object)
 #endif
@@ -568,7 +568,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
 	    // this key and don't wait for Alt on this widget
 	    if ( waitforalt ) {
 		waitforalt = 0;
-		if ( object->tqparent() )
+		if ( object->parent() )
 		    object->removeEventFilter( this );
 		ke->accept();
 		return TRUE;
@@ -603,7 +603,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
 #endif
     // look for Alt release
     if ( TQT_TQOBJECT(((TQWidget*)object)->tqfocusWidget()) == object ||
-	 (object->tqparent() == 0 && ((TQWidget*)object)->tqfocusWidget() == 0) ) {
+	 (object->parent() == 0 && ((TQWidget*)object)->tqfocusWidget() == 0) ) {
 	if ( waitforalt && event->type() == TQEvent::KeyRelease &&
 	    ( ke->key() == Qt::Key_Alt || ke->key() == Qt::Key_Meta )
 #if defined(TQ_WS_X11)
@@ -611,7 +611,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
 #endif
 	    ) {
 	    setAltMode( TRUE );
-	    if ( object->tqparent() )
+	    if ( object->parent() )
 		object->removeEventFilter( this );
 	    TQWidget * tlw = ((TQWidget *)object)->tqtopLevelWidget();
 	    if ( tlw ) {
@@ -626,7 +626,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
 	} else if ( !hasFocus() && (event->type() == TQEvent::AccelOverride ) &&
 		    !(((TQKeyEvent *)event)->key() == Qt::Key_Alt ||
 		      ((TQKeyEvent *)event)->key() == Qt::Key_Meta) ) {
-	    if ( object->tqparent() )
+	    if ( object->parent() )
 		object->removeEventFilter( this );
 	    setAltMode( FALSE );
 	}
@@ -767,7 +767,7 @@ void TQMenuBar::openActPopup()
 	return;
 
     TQ_ASSERT( popup->parentMenu == 0 );
-    popup->parentMenu = this;			// set tqparent menu
+    popup->parentMenu = this;			// set parent menu
 
     popup->snapToMouse = FALSE;
     popup->popup( pos );
@@ -843,7 +843,7 @@ void TQMenuBar::show()
 #endif
 
 #ifndef TQT_NO_MAINWINDOW
-    TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(tqparent());
+    TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parent());
     if ( mw ) //### ugly workaround
 	mw->triggerLayout();
 #endif
@@ -861,7 +861,7 @@ void TQMenuBar::hide()
     setAltMode( FALSE );
     hidePopups();
 #ifndef TQT_NO_MAINWINDOW
-    TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(tqparent());
+    TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parent());
     if ( mw ) //### ugly workaround
 	mw->triggerLayout();
 #endif
@@ -1064,7 +1064,7 @@ int TQMenuBar::calculateRects( int max_width )
 
 /*!
     Returns the height that the menu would resize itself to if its
-    tqparent (and hence itself) resized to the given \a max_width. This
+    parent (and hence itself) resized to the given \a max_width. This
     can be useful for simple tqlayout tasks in which the height of the
     menu bar is needed after items have been inserted. See \l
     showimg/showimg.cpp for an example of the usage.
@@ -1638,7 +1638,7 @@ TQSize TQMenuBar::tqsizeHint() const
 TQSize TQMenuBar::tqminimumSize() const
 {
 #ifndef TQT_NO_TOOLBAR
-    TQToolBar *tb = ::tqqt_cast<TQToolBar*>(tqparent());
+    TQToolBar *tb = ::tqqt_cast<TQToolBar*>(parent());
     if ( tb )
 	return tqsizeHint();
 #endif