1 files changed, 30 insertions, 30 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp b/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp
index 6954cb3..6be7f97 100644
--- a/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp
+++ b/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp
@@ -745,7 +745,7 @@ bool TQWidgetItem::isEmpty() const
 
 /*!
     Constructs a new top-level TQLayout called \a name, with main
-    widget \a tqparent. \a tqparent may not be 0.
+    widget \a parent. \a parent may not be 0.
 
     The \a margin is the number of pixels between the edge of the
     widget and the managed tqchildren. The \a spacing sets the value of
@@ -756,20 +756,20 @@ bool TQWidgetItem::isEmpty() const
     There can be only one top-level tqlayout for a widget. It is
     returned by TQWidget::tqlayout()
 */
-TQLayout::TQLayout( QWidget *tqparent, int margin, int spacing, const char *name )
-    : TQObject( tqparent, name )
+TQLayout::TQLayout( QWidget *parent, int margin, int spacing, const char *name )
+    : TQObject( parent, name )
 {
     init();
-    if ( tqparent ) {
-	if ( tqparent->tqlayout() ) {
+    if ( parent ) {
+	if ( parent->tqlayout() ) {
 	    qWarning( "TQLayout \"%s\" added to %s \"%s\", which already has a"
-		      " tqlayout", TQObject::name(), tqparent->className(),
-		      tqparent->name() );
-	    tqparent->removeChild( this );
+		      " tqlayout", TQObject::name(), parent->className(),
+		      parent->name() );
+	    parent->removeChild( this );
 	} else {
 	    topLevel = TRUE;
-	    tqparent->installEventFilter( this );
-	    setWidgetLayout( tqparent, this );
+	    parent->installEventFilter( this );
+	    setWidgetLayout( parent, this );
 	}
     }
     outsideBorder = margin;
@@ -816,7 +816,7 @@ TQLayout::TQLayout( QLayout *parentLayout, int spacing, const char *name )
 
 /*!
     Constructs a new child TQLayout called \a name. If \a spacing is
-    -1, this TQLayout inherits its tqparent's spacing(); otherwise the
+    -1, this TQLayout inherits its parent's spacing(); otherwise the
     value of \a spacing is used.
 
     This tqlayout has to be inserted into another tqlayout before tqgeometry
@@ -920,22 +920,22 @@ void TQLayout::setSpacing( int spacing )
 }
 
 /*!
-    Returns the main widget (tqparent widget) of this tqlayout, or 0 if
+    Returns the main widget (parent widget) of this tqlayout, or 0 if
     this tqlayout is a sub-tqlayout that is not yet inserted.
 */
 TQWidget *TQLayout::mainWidget()
 {
     if ( !topLevel ) {
-	if ( tqparent() ) {
-	    TQLayout *parentLayout = ::tqqt_cast<TQLayout*>(tqparent());
+	if ( parent() ) {
+	    TQLayout *parentLayout = ::tqqt_cast<TQLayout*>(parent());
 	    TQ_ASSERT(parentLayout);
 	    return parentLayout->mainWidget();
 	} else {
 	    return 0;
 	}
     } else {
-	TQ_ASSERT(tqparent() && tqparent()->isWidgetType());
-	return (TQWidget*)tqparent();
+	TQ_ASSERT(parent() && parent()->isWidgetType());
+	return (TQWidget*)parent();
     }
 }
 
@@ -997,7 +997,7 @@ static bool removeWidgetRecursively( TQLayoutItem *lay, TQWidget *w )
 
 /*!
     \reimp
-    Performs child widget tqlayout when the tqparent widget is resized.
+    Performs child widget tqlayout when the parent widget is resized.
     Also handles removal of widgets and child layouts. \a e is the
     event the occurred on object \a o.
 */
@@ -1098,7 +1098,7 @@ void TQLayout::childEvent( TQChildEvent *e )
 int TQLayout::totalHeightForWidth( int w ) const
 {
     if ( topLevel ) {
-	TQWidget *mw = (TQWidget*)tqparent();
+	TQWidget *mw = (TQWidget*)parent();
 	if ( mw && !mw->testWState(WState_Polished) ) {
 	    mw->polish();
 	}
@@ -1118,7 +1118,7 @@ int TQLayout::totalHeightForWidth( int w ) const
 TQSize TQLayout::totalMinimumSize() const
 {
     if ( topLevel ) {
-	TQWidget *mw = (TQWidget*)tqparent();
+	TQWidget *mw = (TQWidget*)parent();
 	if ( mw && !mw->testWState(WState_Polished) )
 	    mw->polish();
     }
@@ -1139,7 +1139,7 @@ TQSize TQLayout::totalMinimumSize() const
 TQSize TQLayout::totalSizeHint() const
 {
     if ( topLevel ) {
-	TQWidget *mw = (TQWidget*)tqparent();
+	TQWidget *mw = (TQWidget*)parent();
 	if ( mw && !mw->testWState(WState_Polished) )
 	    mw->polish();
     }
@@ -1162,7 +1162,7 @@ TQSize TQLayout::totalSizeHint() const
 TQSize TQLayout::totalMaximumSize() const
 {
     if ( topLevel ) {
-	TQWidget *mw = (TQWidget*)tqparent();
+	TQWidget *mw = (TQWidget*)parent();
 	if ( mw && !mw->testWState(WState_Polished) ) {
 	    mw->polish();
 	}
@@ -1193,11 +1193,11 @@ TQLayout::~TQLayout()
 {
     /*
       This function may be called during the TQObject destructor,
-      when the tqparent no longer is a TQWidget.
+      when the parent no longer is a TQWidget.
     */
-    if ( isTopLevel() && tqparent() && tqparent()->isWidgetType() &&
-	 ((TQWidget*)tqparent())->tqlayout() == this )
-	setWidgetLayout( (TQWidget*)tqparent(), 0 );
+    if ( isTopLevel() && parent() && parent()->isWidgetType() &&
+	 ((TQWidget*)parent())->tqlayout() == this )
+	setWidgetLayout( (TQWidget*)parent(), 0 );
 }
 
 /*!
@@ -1217,9 +1217,9 @@ void TQLayout::deleteAllItems()
 */
 void TQLayout::addChildLayout( TQLayout *l )
 {
-    if ( l->tqparent() ) {
+    if ( l->parent() ) {
 #if defined(TQT_CHECK_NULL)
-	qWarning( "TQLayout::addChildLayout: tqlayout already has a tqparent" );
+	qWarning( "TQLayout::addChildLayout: tqlayout already has a parent" );
 #endif
 	return;
     }
@@ -2089,14 +2089,14 @@ bool TQLayout::isEnabled() const
     return enabled;
 }
 
-void TQLayout::propagateSpacing( TQLayout *tqparent )
+void TQLayout::propagateSpacing( TQLayout *parent )
 {
-    TQLayoutIterator it = tqparent->iterator();
+    TQLayoutIterator it = parent->iterator();
     TQLayoutItem *child;
     while ( (child = it.current()) ) {
 	TQLayout *childLayout = child->tqlayout();
 	if ( childLayout && childLayout->insideSpacing < 0 ) {
-	    childLayout->insideSpacing = tqparent->insideSpacing;
+	    childLayout->insideSpacing = parent->insideSpacing;
 	    propagateSpacing( childLayout );
 	}
 	++it;