1 files changed, 18 insertions, 18 deletions

diff --git a/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp b/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp
index ff78a7b..93be95f 100644
--- a/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp
+++ b/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp
@@ -200,7 +200,7 @@ int TQWidgetStack::addWidget(TQWidget * w, int id)
     }
 
     w->hide();
-    if (w->parent() != this)
+    if (w->QWidget::parent() != this)
         w->reparent(this, contentsRect().topLeft(), false);
     w->setGeometry(contentsRect());
     updateGeometry();
@@ -271,7 +271,7 @@ static bool isChildOf(TQWidget* child, TQWidget *parent)
 
 void TQWidgetStack::raiseWidget(TQWidget *w)
 {
-    if (!w || w == invisible || w->parent() != this || w == topWidget)
+    if (!w || w == invisible || w->QWidget::parent() != this || w == topWidget)
         return;
 
     if (id(w) == -1)
@@ -629,7 +629,7 @@ public:
     class Invisible: public TQWidget
     {
     public:
-	Invisible( TQWidgetStack * tqparent ): TQWidget( tqparent, "qt_invisible_widgetstack" )
+	Invisible( TQWidgetStack * parent ): TQWidget( parent, "qt_invisible_widgetstack" )
 	{
 	    setBackgroundMode( TQt::NoBackground );
 	}
@@ -655,14 +655,14 @@ class TQWidgetStackEventFilter : public TQObject
 	bool TQWidgetStack::event( TQEvent* e )
 	{
 	    if ( e->type() == TQEvent::LayoutHint )
-		updateGeometry(); // propgate tqlayout hints to tqparent
+		updateGeometry(); // propgate tqlayout hints to parent
 	    return TQFrame::event( e );
 	}
     */
 public:
 
-    TQWidgetStackEventFilter( TQObject *tqparent = 0, const char * name = 0 )
-	: TQObject( tqparent, name ) {}
+    TQWidgetStackEventFilter( TQObject *parent = 0, const char * name = 0 )
+	: TQObject( parent, name ) {}
     bool eventFilter( TQObject *o, TQEvent * e ) {
 	if ( e->type() == TQEvent::LayoutHint && o->isWidgetType() )
 	    ((TQWidget*)o)->updateGeometry();
@@ -682,7 +682,7 @@ public:
     The application programmer can move any widget to the top of the
     stack at any time using raiseWidget(), and add or remove widgets
     using addWidget() and removeWidget(). It is not sufficient to pass
-    the widget stack as tqparent to a widget which should be inserted into
+    the widget stack as parent to a widget which should be inserted into
     the widgetstack.
 
     visibleWidget() is the \e get equivalent of raiseWidget(); it
@@ -709,12 +709,12 @@ public:
 /*!
     Constructs an empty widget stack.
 
-    The \a tqparent and \a name arguments are passed to the TQFrame
+    The \a parent and \a name arguments are passed to the TQFrame
     constructor.
 */
 
-TQWidgetStack::TQWidgetStack( TQWidget * tqparent, const char *name )
-    : TQFrame( tqparent, name )
+TQWidgetStack::TQWidgetStack( TQWidget * parent, const char *name )
+    : TQFrame( parent, name )
 {
     init();
 }
@@ -722,11 +722,11 @@ TQWidgetStack::TQWidgetStack( TQWidget * tqparent, const char *name )
 /*!
   Constructs an empty widget stack.
 
-  The \a tqparent, \a name and \a f arguments are passed to the TQFrame
+  The \a parent, \a name and \a f arguments are passed to the TQFrame
   constructor.
 */
-TQWidgetStack::TQWidgetStack( TQWidget * tqparent, const char *name, WFlags f )
-    : TQFrame( tqparent, name, f ) //## merge constructors in 4.0
+TQWidgetStack::TQWidgetStack( TQWidget * parent, const char *name, WFlags f )
+    : TQFrame( parent, name, f ) //## merge constructors in 4.0
 {
     init();
 }
@@ -808,7 +808,7 @@ int TQWidgetStack::addWidget( TQWidget * w, int id )
     }
 
     w->hide();
-    if ( w->tqparent() != TQT_TQOBJECT(this) )
+    if ( w->parent() != TQT_TQOBJECT(this) )
 	w->reparent( this, contentsRect().topLeft(), FALSE );
     w->setGeometry( contentsRect() );
     updateGeometry();
@@ -855,11 +855,11 @@ void TQWidgetStack::raiseWidget( int id )
 	raiseWidget( w );
 }
 
-static bool isChildOf( TQWidget* child, TQWidget *tqparent )
+static bool isChildOf( TQWidget* child, TQWidget *parent )
 {
-    if ( !child || !tqparent->childrenListObject().isEmpty() )
+    if ( !child || !parent->childrenListObject().isEmpty() )
 	return FALSE;
-    TQObjectListIt it(tqparent->childrenListObject());
+    TQObjectListIt it(parent->childrenListObject());
     TQObject *obj;
     while ( (obj = it.current()) ) {
 	++it;
@@ -880,7 +880,7 @@ static bool isChildOf( TQWidget* child, TQWidget *tqparent )
 
 void TQWidgetStack::raiseWidget( TQWidget *w )
 {
-    if ( !w || w == invisible || w->tqparent() != TQT_TQOBJECT(this) || w == topWidget )
+    if ( !w || w == invisible || w->parent() != TQT_TQOBJECT(this) || w == topWidget )
 	return;
 
     if ( id(w) == -1 )