rename the following methods:

tqparent parent
tqmask mask

77 files changed, 992 insertions, 992 deletions

diff --git a/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps b/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps
index 9ea2dc093..527501672 100644
--- a/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps
+++ b/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps
@@ -45,7 +45,7 @@
 /Cx  0 d                             % current x position
 /Cy  0 d                             % current y position
 /WFi false d                 % winding fill
-/OMo false d                 % opaque mode (not transtqparent)
+/OMo false d                 % opaque mode (not transparent)
 
 /BCol  [ 1 1 1 ] d                   % brush color
 /PCol  [ 0 0 0 ] d                   % pen color
@@ -252,13 +252,13 @@
 
 % general image drawing routine, used from the postscript driver
 %
-% Draws images with and without tqmask with 1, 8 and 24(rgb) bits depth.
+% Draws images with and without mask with 1, 8 and 24(rgb) bits depth.
 %
-%     width height matrix image 1|8|24 tqmask|false x y di
+%     width height matrix image 1|8|24 mask|false x y di
 %
 % width and height specify the width/height of the image,
 % matrix a transformation matrix, image a procedure holding the image data
-% (same for tqmask) and x/y an additional translation.
+% (same for mask) and x/y an additional translation.
 %
 % ### should move the translation into the matrix!!!
 /di 
@@ -266,7 +266,7 @@
   gsave
     translate
     1 index 1 eq { % bitmap
-      false eq { % no tqmask, draw solid background
+      false eq { % no mask, draw solid background
 	pop
 	true 3 1 roll % width height false matrix image
 	4 index
@@ -274,17 +274,17 @@
 	false
 	4 index
 	4 index
-	imagetqmask
+	imagemask
 	BkCol SC
-	imagetqmask
+	imagemask
       } { 
 	pop
 	false 3 1 roll % width height false matrix image
-	imagetqmask
+	imagemask
       } ifelse
     } { 
       dup false ne { 
-	% have a tqmask, see if we can use it
+	% have a mask, see if we can use it
 	/languagelevel where {
 	  pop
 	  languagelevel 3 ge 
@@ -294,9 +294,9 @@
       } ifelse
 
       {
-	% languagelevel3, we can use image tqmask and dicts
+	% languagelevel3, we can use image mask and dicts
 
-	% store the image tqmask
+	% store the image mask
 	/ma exch d
 	% select colorspace according to 8|24 bit depth and set the decode array /dc
 	8 eq {
@@ -325,7 +325,7 @@
 	  /BitsPerComponent	8 d
 	  /Decode		        dc d
 	end d
-	% the tqmask dictionary
+	% the mask dictionary
 	/md
 	7 dict dup begin
 	  /ImageType		1 d
@@ -345,7 +345,7 @@
 	end 
 	image
       } {
-	pop % no tqmask or can't use it, get rid of it
+	pop % no mask or can't use it, get rid of it
 	8 % width height image 8|24 8 matrix
 	4 1 roll
 	8 eq { % grayscale
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp
index 6954cb3d4..6be7f97b2 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp
+++ b/experimental/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;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp b/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp
index 96a3470f4..0e5d66c76 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp
@@ -1060,9 +1060,9 @@ QT_END_NAMESPACE
     TQGroupBox, TQLabel (with TQLabel::setBuddy()), TQMenuBar and TQTabBar.
     Example:
     \code
-	TQPushButton p( "&Exit", tqparent ); // automatic shortcut ALT+Key_E
-	TQPopupMenu *fileMenu = new fileMenu( tqparent );
-	fileMenu->insertItem( "Undo", tqparent, TQT_SLOT(undo()), CTRL+Key_Z );
+	TQPushButton p( "&Exit", parent ); // automatic shortcut ALT+Key_E
+	TQPopupMenu *fileMenu = new fileMenu( parent );
+	fileMenu->insertItem( "Undo", parent, TQT_SLOT(undo()), CTRL+Key_Z );
     \endcode
 
     A TQAccel contains a list of accelerator items that can be
@@ -1103,7 +1103,7 @@ QT_END_NAMESPACE
     The function setWhatsThis() specifies a help text that appears
     when the user presses an accelerator key in What's This mode.
 
-    The accelerator will be deleted when \e tqparent is deleted,
+    The accelerator will be deleted when \e parent is deleted,
     and will consume relevant key events until then.
 
     Please note that the accelerator
@@ -1151,7 +1151,7 @@ public:
     bool enabled;
     TQGuardedPtr<TQWidget> watch;
     bool ignorewhatsthis;
-    TQAccel* tqparent;
+    TQAccel* parent;
 
     void activate( TQAccelItem* item );
     void activateAmbiguously( TQAccelItem* item );
@@ -1215,7 +1215,7 @@ bool TQAccelManager::correctSubWindow( TQWidget* w, TQAccelPrivate* d ) {
     TQWidget* tlw = w->tqtopLevelWidget();
     TQWidget* wtlw = d->watch->tqtopLevelWidget();
 
-    /* if we live in a floating dock window, keep our tqparent's
+    /* if we live in a floating dock window, keep our parent's
      * accelerators working */
 #ifndef TQT_NO_MAINWINDOW
     if ( tlw->isDialog() && tlw->parentWidget() && ::tqqt_cast<TQDockWindow*>(tlw) )	// [FIXME] Can I safely use the TQT_TQOBJECT macro here?
@@ -1503,7 +1503,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 #ifndef TQT_NO_STATUSBAR
 	if ( maintqStatusBar &&
 	     !lastitem->signal &&
-	     !(lastaccel->tqparent->tqreceivers( "activatedAmbiguously(int)" )) )
+	     !(lastaccel->parent->tqreceivers( "activatedAmbiguously(int)" )) )
 	    maintqStatusBar->message( message, 2000 );
 #endif
 	lastaccel->activateAmbiguously( lastitem );
@@ -1514,7 +1514,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 #ifndef TQT_NO_STATUSBAR
 	if ( maintqStatusBar &&
 	     !firstitem->signal &&
-	     !(firstaccel->tqparent->tqreceivers( "activatedAmbiguously(int)" )) )
+	     !(firstaccel->parent->tqreceivers( "activatedAmbiguously(int)" )) )
 	    maintqStatusBar->message( message, 2000 );
 #endif
 	firstaccel->activateAmbiguously( firstitem );
@@ -1524,7 +1524,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 }
 
 TQAccelPrivate::TQAccelPrivate( TQAccel* p )
-    : tqparent( p )
+    : parent( p )
 {
     TQAccelManager::self()->registerAccel( this );
     aitems.setAutoDelete( TRUE );
@@ -1553,55 +1553,55 @@ static TQAccelItem *find_key( TQAccelList &list, const TQKeySequence &key )
 }
 
 /*!
-    Constructs a TQAccel object called \a name, with tqparent \a tqparent.
-    The accelerator operates on \a tqparent.
+    Constructs a TQAccel object called \a name, with parent \a parent.
+    The accelerator operates on \a parent.
 */
 
-TQAccel::TQAccel( TQWidget *tqparent, const char *name )
-    : TQObject( TQT_TQOBJECT(tqparent), name )
+TQAccel::TQAccel( TQWidget *parent, const char *name )
+    : TQObject( TQT_TQOBJECT(parent), name )
 {
     d = new TQAccelPrivate( this );
     d->enabled = TRUE;
-    d->watch = tqparent;
+    d->watch = parent;
 #if defined(TQT_CHECK_NULL)
     if ( !d->watch )
-	qWarning( "TQAccel: An accelerator must have a tqparent or a watch widget" );
+	qWarning( "TQAccel: An accelerator must have a parent or a watch widget" );
 #endif
 }
 
 /*!
     Constructs a TQAccel object called \a name, that operates on \a
-    watch, and is a child of \a tqparent.
+    watch, and is a child of \a parent.
 
     This constructor is not needed for normal application programming.
 */
-TQAccel::TQAccel( TQWidget* watch, TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+TQAccel::TQAccel( TQWidget* watch, TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     d = new TQAccelPrivate( this );
     d->enabled = TRUE;
     d->watch = watch;
 #if defined(TQT_CHECK_NULL)
     if ( !d->watch )
-	qWarning( "TQAccel: An accelerator must have a tqparent or a watch widget" );
+	qWarning( "TQAccel: An accelerator must have a parent or a watch widget" );
 #endif
 }
 
 /*!
     Constructs a TQAccel object called \a name, that operates on \a
-    watch, and is a child of \a tqparent.
+    watch, and is a child of \a parent.
 
     This constructor is not needed for normal application programming.
 */
-TQAccel::TQAccel( TQWidget* watch, TQWidget *tqparent, const char *name )
-    : TQObject( TQT_TQOBJECT(tqparent), name )
+TQAccel::TQAccel( TQWidget* watch, TQWidget *parent, const char *name )
+    : TQObject( TQT_TQOBJECT(parent), name )
 {
     d = new TQAccelPrivate( this );
     d->enabled = TRUE;
     d->watch = watch;
 #if defined(TQT_CHECK_NULL)
     if ( !d->watch )
-	qWarning( "TQAccel: An accelerator must have a tqparent or a watch widget" );
+	qWarning( "TQAccel: An accelerator must have a parent or a watch widget" );
 #endif
 }
 
@@ -1843,7 +1843,7 @@ void TQAccelPrivate::activate( TQAccelItem* item )
     if ( item->signal )
 	item->signal->activate();
     else
-	emit tqparent->activated( item->id );
+	emit parent->activated( item->id );
 }
 
 void TQAccelPrivate::activateAmbiguously( TQAccelItem* item )
@@ -1851,7 +1851,7 @@ void TQAccelPrivate::activateAmbiguously( TQAccelItem* item )
     if ( item->signal )
 	item->signal->activate();
     else
-	emit tqparent->activatedAmbiguously( item->id );
+	emit parent->activatedAmbiguously( item->id );
 }
 
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqaccel.h b/experimental/tqtinterface/qt4/src/kernel/tqaccel.h
index 1726aca4b..d8740d08c 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqaccel.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqaccel.h
@@ -173,9 +173,9 @@ class TQ_EXPORT TQAccel : public TQObject			// accelerator class
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQAccel( TQWidget *tqparent, const char *name=0 );
-    TQAccel( TQWidget* watch, TQObject *tqparent, const char *name=0 );
-    TQAccel( TQWidget* watch, TQWidget *tqparent, const char *name=0 );
+    TQAccel( TQWidget *parent, const char *name=0 );
+    TQAccel( TQWidget* watch, TQObject *parent, const char *name=0 );
+    TQAccel( TQWidget* watch, TQWidget *parent, const char *name=0 );
     ~TQAccel();
 
     bool isEnabled() const;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp b/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp
index 8d7e588a2..118e1c10c 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp
@@ -362,7 +362,7 @@ void AccessibleCache::removeObject(TQObject *object)
     The function uses the \link TQObject::className() classname
     \endlink of \a object to find a suitable implementation. If no
     implementation for the object's class is available the function
-    tries to find an implementation for the object's tqparent class.
+    tries to find an implementation for the object's parent class.
 
     This function is called to answer an accessibility client's
     request for object information. You should never need to call this
@@ -466,7 +466,7 @@ bool TQAccessible::isActive()
     \fn TQRESULT TQAccessibleInterface::queryParent( TQAccessibleInterface **iface ) const
 
     Sets \a iface to point to the implementation of the
-    TQAccessibleInterface for the tqparent object, or to 0 if there is
+    TQAccessibleInterface for the parent object, or to 0 if there is
     no such implementation or object.
 
     All objects provide this information.
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp
index 0e3b55cdc..d2cc4a2bd 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp
@@ -545,7 +545,7 @@ TQ_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) {
     if ( !top || modal == top )			// don't block event
 	return TRUE;
 
-    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a tqparent of our widget
+    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
     while ( p ) {
 	if ( p == top )
 	    return TRUE;
@@ -1397,22 +1397,22 @@ static TQVFuncList *postRList = 0;		// list of post routines
   long before the TQApplication destructor is called, for example.
 
   For modules and libraries, using a reference-counted initialization
-  manager or TQt' tqparent-child delete mechanism may be better. Here is
-  an example of a private class which uses the tqparent-child mechanism
+  manager or TQt' parent-child delete mechanism may be better. Here is
+  an example of a private class which uses the parent-child mechanism
   to call a cleanup function at the right time:
 
   \code
     class MyPrivateInitStuff: public TQObject {
     private:
-	MyPrivateInitStuff( TQObject * tqparent ): TQObject( tqparent) {
+	MyPrivateInitStuff( TQObject * parent ): TQObject( parent) {
 	    // initialization goes here
 	}
 	MyPrivateInitStuff * p;
 
     public:
-	static MyPrivateInitStuff * initStuff( TQObject * tqparent ) {
+	static MyPrivateInitStuff * initStuff( TQObject * parent ) {
 	    if ( !p )
-		p = new MyPrivateInitStuff( tqparent );
+		p = new MyPrivateInitStuff( parent );
 	    return p;
 	}
 
@@ -1422,7 +1422,7 @@ static TQVFuncList *postRList = 0;		// list of post routines
     }
   \endcode
 
-  By selecting the right tqparent widget/object, this can often be made
+  By selecting the right parent widget/object, this can often be made
   to clean up the module's data at the exact right moment.
 */
 
@@ -2920,7 +2920,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets,
 
 	// make sure the application font is complete
 	app_font->detach();
-	app_font->d->tqmask = TQFontPrivate::Complete;
+	app_font->d->mask = TQFontPrivate::Complete;
 
 	all = app_fonts != 0;
 	delete app_fonts;
@@ -3226,7 +3226,7 @@ void TQApplication::aboutTQt()
   Returns the value that is returned from the receiver's event handler.
 
   For certain types of events (e.g. mouse and key events),
-  the event will be propagated to the receiver's tqparent and so on up to
+  the event will be propagated to the receiver's parent and so on up to
   the top-level object if the receiver is not interested in the event
   (i.e., it returns FALSE).
 
@@ -4656,7 +4656,7 @@ TQ_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) {
     if ( !top || modal == top )			// don't block event
 	return TRUE;
 
-    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a tqparent of our widget
+    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
     while ( p ) {
 	if ( p == top )
 	    return TRUE;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
index 64a270475..f4e3bad23 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
@@ -332,7 +332,7 @@ static int xsync_errorbase;
 // modifier masks for alt/meta - detected when the application starts
 static long qt_alt_mask = 0;
 static long qt_meta_mask = 0;
-// modifier tqmask to remove mode switch from modifiers that have alt/meta set
+// modifier mask to remove mode switch from modifiers that have alt/meta set
 // this problem manifests itself on HP/UX 10.20 at least, and without it
 // modifiers do not work at all...
 static long qt_mode_switch_remove_mask = 0;
@@ -2909,7 +2909,7 @@ TQ_EXPORT bool qt_use_xrender = FALSE;
 // modifier masks for alt/meta - detected when the application starts
 static long qt_alt_mask = 0;
 static long qt_meta_mask = 0;
-// modifier tqmask to remove mode switch from modifiers that have alt/meta set
+// modifier mask to remove mode switch from modifiers that have alt/meta set
 // this problem manifests itself on HP/UX 10.20 at least, and without it
 // modifiers do not work at all...
 static long qt_mode_switch_remove_mask = 0;
@@ -5301,7 +5301,7 @@ void TQApplication::setMainWidget( TQWidget *mainWidget )
     if ( mainWidget && mainWidget->parentWidget() &&
 	 ! mainWidget->parentWidget()->isDesktop() )
 	qWarning( "TQApplication::setMainWidget(): New main widget (%s/%s) "
-		  "has a tqparent!",
+		  "has a parent!",
 		  mainWidget->className(), mainWidget->name() );
 #endif
     main_widget = mainWidget;
@@ -5531,7 +5531,7 @@ Window qt_x11_findClientWindow( Window win, Atom property, bool leaf )
     int	   format, i;
     ulong  nitems, after;
     uchar *data;
-    Window root, tqparent, target=0, *tqchildren=0;
+    Window root, parent, target=0, *tqchildren=0;
     uint   ntqchildren;
     if ( XGetWindowProperty( appDpy, win, property, 0, 0, FALSE, AnyPropertyType,
 			     &type, &format, &nitems, &after, &data ) == Success ) {
@@ -5540,7 +5540,7 @@ Window qt_x11_findClientWindow( Window win, Atom property, bool leaf )
 	if ( type )
 	    return win;
     }
-    if ( !XQueryTree(appDpy,win,&root,&tqparent,&tqchildren,&ntqchildren) ) {
+    if ( !XQueryTree(appDpy,win,&root,&parent,&tqchildren,&ntqchildren) ) {
 	if ( tqchildren )
 	    XFree( (char *)tqchildren );
 	return 0;
@@ -6251,17 +6251,17 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 					ReparentNotify,
 					event ) )
 	    ;	// skip old reparent events
-	if ( event->xreparent.tqparent == TQPaintDevice::x11AppRootWindow() ) {
+	if ( event->xreparent.parent == TQPaintDevice::x11AppRootWindow() ) {
 	    if ( widget->isTopLevel() ) {
-		widget->topData()->parentWinId = event->xreparent.tqparent;
+		widget->topData()->parentWinId = event->xreparent.parent;
 		if ( qt_deferred_map_contains( widget ) ) {
 		    qt_deferred_map_take( widget );
 		    XMapWindow( appDpy, widget->winId() );
 		}
 	    }
 	} else
-	    // store the tqparent. Useful for many things, embedding for instance.
-	    widget->topData()->parentWinId = event->xreparent.tqparent;
+	    // store the parent. Useful for many things, embedding for instance.
+	    widget->topData()->parentWinId = event->xreparent.parent;
 	if ( widget->isTopLevel() ) {
 	    // the widget frame strut should also be invalidated
 	    widget->topData()->fleft = widget->topData()->fright =
@@ -6269,9 +6269,9 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 
 	    if ( qt_focus_model != FocusModel_Unknown ) {
 		// toplevel reparented...
-		TQWidget *newtqparent = TQWidget::find( event->xreparent.tqparent );
-		if ( ! newtqparent || newtqparent->isDesktop() ) {
-		    // we dont' know about the new tqparent (or we've been
+		TQWidget *newparent = TQWidget::find( event->xreparent.parent );
+		if ( ! newparent || newparent->isDesktop() ) {
+		    // we dont' know about the new parent (or we've been
 		    // reparented to root), perhaps a window manager
 		    // has been (re)started?  reset the focus model to unknown
 		    qt_focus_model = FocusModel_Unknown;
@@ -6350,8 +6350,8 @@ bool TQApplication::x11EventFilter( XEvent * )
 /*****************************************************************************
   Modal widgets; Since Xlib has little support for this we roll our own
   modal widget mechanism.
-  A modal widget without a tqparent becomes application-modal.
-  A modal widget with a tqparent becomes modal to its tqparent and grandparents..
+  A modal widget without a parent becomes application-modal.
+  A modal widget with a parent becomes modal to its parent and grandparents..
 
   qt_enter_modal()
 	Enters modal state
@@ -7238,7 +7238,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event)
 		    // WM_STATE property (ICCCM 4.1.3.1)
 		    XDeleteProperty(appDpy, winId(), qt_wm_state);
 
-		    // set the tqparent id to zero, so that show() will
+		    // set the parent id to zero, so that show() will
 		    // work again
 		    topData()->parentWinId = 0;
 		    // map the window if we were waiting for a
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp b/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp
index 8c6ba7471..6c8121edd 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp
@@ -762,7 +762,7 @@ void TQGIFFormat::disposePrevious( TQImage& img, TQImageConsumer* consumer )
 	break;
       case RestoreBackground:
 	if (trans_index>=0) {
-	    // Easy:  we use the transtqparent color
+	    // Easy:  we use the transparent color
 	    fillRect(img, l, t, r-l+1, b-t+1, TQ_TRANSPARENT);
 	} else if (bgcol>=0) {
 	    // Easy:  we use the bgcol given
@@ -944,7 +944,7 @@ int TQGIFFormat::decode(TQImage& img, TQImageConsumer* consumer,
 		frame++;
 		if ( frame == 0 ) {
 		    if ( left || top || width<swidth || height<sheight ) {
-			// Not full-size image - erase with bg or transtqparent
+			// Not full-size image - erase with bg or transparent
 			if ( trans_index >= 0 ) {
 			    fillRect(img, 0, 0, swidth, sheight, color(trans_index));
 			    if (consumer) consumer->changed(TQRect(0,0,swidth,sheight));
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp
index 3e2ee39f0..e44b37e61 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp
@@ -128,8 +128,8 @@ void TQBitmap::resize_helper(const QSize s)
     }
 
     // Mask too....
-    if (!mask().isNull()) {
-        TQBitmap m = mask();
+    if (!QBitmap::mask().isNull()) {
+        TQBitmap m = QBitmap::mask();
         if (m.size() != QSize(w,h)) {
             TQBitmap pmr(QSize(w, h));
             pmr.fill(Qt::color0);
@@ -153,8 +153,8 @@ void TQBitmap::resize_helper(const QSize s)
 }
 
 // This is the only correct way to return a pointer to an object returned by another function
-const TQBitmap *TQBitmap::tqmask() const {
-	const QBitmap& ptrRef = mask();
+const TQBitmap *TQBitmap::mask() const {
+	const QBitmap& ptrRef = QBitmap::mask();
 	if (ptrRef.isNull() == true) {
 		return 0;
 	}
@@ -196,7 +196,7 @@ TQBitmap &TQBitmap::operator=( const TQImage &image )
     using the  TQColor objects \c TQt::color0 and \c TQt::color1.
     Painting with \c color0 sets the bitmap bits to 0, and painting
     with \c color1 sets the bits to 1. For a bitmap, 0-bits indicate
-    background (or transtqparent) and 1-bits indicate foreground (or
+    background (or transparent) and 1-bits indicate foreground (or
     opaque). Using the \c black and \c white TQColor objects make no
     sense because the TQColor::pixel() value is not necessarily 0 for
     black and 1 for white.
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h
index e4a2fd9ad..74b8cff21 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h
@@ -75,7 +75,7 @@ public:
 
 	bool convertFromImage(const QImage &img, int flags = Qt::AutoColor);
 	TQBitmap xForm(const QMatrix &matrix) const;
-	const TQBitmap *tqmask() const;
+	const TQBitmap *mask() const;
 
 private:
 	void resize_helper(const QSize s);
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp
index 4c2b3415a..045e1f62b 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp
@@ -336,8 +336,8 @@ void TQClipboard::setData(QMimeSource *source, Mode mode)
     more than one object to represent it is almost certainly an error.
 */
 
-TQClipboard::TQClipboard( TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+TQClipboard::TQClipboard( TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     // nothing
 }
@@ -583,7 +583,7 @@ void TQClipboard::setImage( const TQImage &image )
     contain a pixmap. Note that this can lose information. For
     example, if the image is 24-bit and the display is 8-bit, the
     result is converted to 8 bits, and if the image has an alpha
-    channel, the result just has a tqmask.
+    channel, the result just has a mask.
 
     The \a mode argument is used to control which part of the system
     clipboard is used.  If \a mode is TQClipboard::Clipboard, the
@@ -695,7 +695,7 @@ TQMimeSource *TQClipboard::data() const
     The TQDragObject subclasses are reasonable objects to put into the
     clipboard (but do not try to call TQDragObject::drag() on the same
     object). Any TQDragObject placed in the clipboard should have a
-    tqparent of 0. Do not put TQDragMoveEvent or TQDropEvent subclasses in
+    parent of 0. Do not put TQDragMoveEvent or TQDropEvent subclasses in
     the clipboard, as they do not belong to the event handler which
     receives them.
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h
index 8e49f8d9d..783300612 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h
@@ -66,7 +66,7 @@ class TQClipboardPrivate;
 class TQ_EXPORT TQClipboard : public QClipboard, virtual public TQt
 {
 public:
-// 	TQClipboard( TQT_BASE_OBJECT_NAME *tqparent=0, const char *name=0 ) : QClipboard( tqparent ) { setObjectName(QString::fromAscii(name)); }
+// 	TQClipboard( TQT_BASE_OBJECT_NAME *parent=0, const char *name=0 ) : QClipboard( parent ) { setObjectName(QString::fromAscii(name)); }
 
 	TQMimeSource *data(Mode mode = Clipboard) const;
 	void setData(QMimeSource*, Mode mode = Clipboard);
@@ -86,7 +86,7 @@ class TQ_EXPORT TQClipboard : public TQObject
     Q_OBJECT
     TQ_OBJECT
 private:
-    TQClipboard( TQObject *tqparent=0, const char *name=0 );
+    TQClipboard( TQObject *parent=0, const char *name=0 );
     ~TQClipboard();
 
 public:
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp
index f6fcce61c..e307663f7 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp
@@ -223,7 +223,7 @@ void TQColor::initGlobalColors()
     The colors \c color0 (zero pixel value) and \c color1 (non-zero
     pixel value) are special colors for drawing in \link TQBitmap
     bitmaps\endlink. Painting with \c color0 sets the bitmap bits to 0
-    (transtqparent, i.e. background), and painting with \c color1 sets the
+    (transparent, i.e. background), and painting with \c color1 sets the
     bits to 1 (opaque, i.e. foreground).
 
     The TQColor class has an efficient, dynamic color allocation
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp
index 16e74cf59..3be2c23c7 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp
@@ -64,7 +64,7 @@
     of the mouse cursor.
 
     TQt has a number of standard cursor tqshapes, but you can also make
-    custom cursor tqshapes based on a TQBitmap, a tqmask and a hotspot.
+    custom cursor tqshapes based on a TQBitmap, a mask and a hotspot.
 
     To associate a cursor with a widget, use TQWidget::setCursor(). To
     associate a cursor with all widgets (normally for a short period
@@ -75,7 +75,7 @@
     of the predefined cursors defined in the \l tqCursorShape enum.
 
     If you want to create a cursor with your own bitmap, either use
-    the TQCursor constructor which takes a bitmap and a tqmask or the
+    the TQCursor constructor which takes a bitmap and a mask or the
     constructor which takes a pixmap as arguments.
 
     To set or get the position of the mouse cursor use the static
@@ -165,7 +165,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c )
     s << (TQ_INT16)c.tqshape();			// write tqshape id to stream
     if ( c.tqshape() == TQt::BitmapCursor ) {		// bitmap cursor
 #if !defined(TQT_NO_IMAGEIO)
-	s << *c.bitmap() << *c.tqmask();
+	s << *c.bitmap() << *c.mask();
 	s << c.hotSpot();
 #else
 	qWarning("No Image Cursor I/O");
@@ -205,7 +205,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCursor &c )
 /*!
     Constructs a custom pixmap cursor.
 
-    \a pixmap is the image. It is usual to give it a tqmask (set using
+    \a pixmap is the image. It is usual to give it a mask (set using
     TQPixmap::setMask()). \a hotX and \a hotY define the cursor's hot
     spot.
 
@@ -229,13 +229,13 @@ TQCursor::TQCursor( const TQPixmap &pixmap, int hotX, int hotY )
     TQBitmap bm;
     bm.convertFromImage( img, TQt::ThresholdDither|TQt::AvoidDither );
     TQBitmap bmm;
-    if ( bm.tqmask() ) {
-	bmm = *bm.tqmask();
+    if ( bm.mask() ) {
+	bmm = *bm.mask();
 	TQBitmap nullBm;
 	bm.setMask( nullBm );
     }
-    else if ( pixmap.tqmask() ) {
-	TQImage mimg = pixmap.tqmask()->convertToImage().
+    else if ( pixmap.mask() ) {
+	TQImage mimg = pixmap.mask()->convertToImage().
 	              convertDepth( 8, TQt::ThresholdDither|TQt::AvoidDither );
 	bmm.convertFromImage( mimg, TQt::ThresholdDither|TQt::AvoidDither );
     }
@@ -253,18 +253,18 @@ TQCursor::TQCursor( const TQPixmap &pixmap, int hotX, int hotY )
     Constructs a custom bitmap cursor.
 
     \a bitmap and
-    \a tqmask make up the bitmap.
+    \a mask make up the bitmap.
     \a hotX and
     \a hotY define the cursor's hot spot.
 
     If \a hotX is negative, it is set to the \c{bitmap().width()/2}.
     If \a hotY is negative, it is set to the \c{bitmap().height()/2}.
 
-    The cursor \a bitmap (B) and \a tqmask (M) bits are combined like this:
+    The cursor \a bitmap (B) and \a mask (M) bits are combined like this:
     \list
     \i B=1 and M=1 gives black.
     \i B=0 and M=1 gives white.
-    \i B=0 and M=0 gives transtqparent.
+    \i B=0 and M=0 gives transparent.
     \i B=1 and M=0 gives an undefined result.
     \endlist
 
@@ -279,10 +279,10 @@ TQCursor::TQCursor( const TQPixmap &pixmap, int hotX, int hotY )
     \sa TQBitmap::TQBitmap(), TQBitmap::setMask()
 */
 
-TQCursor::TQCursor( const TQBitmap &bitmap, const TQBitmap &tqmask,
+TQCursor::TQCursor( const TQBitmap &bitmap, const TQBitmap &mask,
 		  int hotX, int hotY )
 {
-    setBitmap(bitmap,tqmask,hotX,hotY);
+    setBitmap(bitmap,mask,hotX,hotY);
 }
 
 #endif // USE_QT4
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcursor.h b/experimental/tqtinterface/qt4/src/kernel/tqcursor.h
index 1c1d4c12a..135a44f63 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqcursor.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqcursor.h
@@ -64,7 +64,7 @@ public:
 	TQCursor() : QCursor() {}
 	TQCursor( int tqshape ) : QCursor( tqshape ) {}
 	TQCursor( Qt::CursorShape shape ) : QCursor( shape ) {}
-	TQCursor( const QBitmap &bitmap, const QBitmap &tqmask, int hotX=-1, int hotY=-1 ) : QCursor( bitmap, tqmask, hotX, hotY ) {}
+	TQCursor( const QBitmap &bitmap, const QBitmap &mask, int hotX=-1, int hotY=-1 ) : QCursor( bitmap, mask, hotX, hotY ) {}
 	TQCursor( const QPixmap &pixmap, int hotX=-1, int hotY=-1 ) : QCursor( pixmap, hotX, hotY ) {}
 	TQCursor( const QCursor & c ) : QCursor( c ) {}
 
@@ -106,7 +106,7 @@ class TQ_EXPORT TQCursor : public TQt
 public:
     TQCursor();				// create default arrow cursor
     TQCursor( int tqshape );
-    TQCursor( const TQBitmap &bitmap, const TQBitmap &tqmask,
+    TQCursor( const TQBitmap &bitmap, const TQBitmap &mask,
 	     int hotX=-1, int hotY=-1 );
     TQCursor( const TQPixmap &pixmap,
 	     int hotX=-1, int hotY=-1 );
@@ -118,7 +118,7 @@ public:
     void	  setShape( int );
 
     const TQBitmap *bitmap() const;
-    const TQBitmap *tqmask()   const;
+    const TQBitmap *mask()   const;
     TQPoint	  hotSpot() const;
 
 #if defined(TQ_WS_WIN)
@@ -144,7 +144,7 @@ public:
     static int 	  x11Screen();
 #endif
 private:
-    void	  setBitmap( const TQBitmap &bitmap, const TQBitmap &tqmask,
+    void	  setBitmap( const TQBitmap &bitmap, const TQBitmap &mask,
 				 int hotX, int hotY );
     void	  update() const;
     TQCursorData	 *data;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp
index aac333607..4b9bd069d 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp
@@ -404,13 +404,13 @@ TQCursor::TQCursor( HANDLE cursor )
 
 
 
-void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &tqmask,
+void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &mask,
 			 int hotX, int hotY )
 {
     if ( !initialized )
 	initialize();
-    if ( bitmap.depth() != 1 || tqmask.depth() != 1 ||
-	 bitmap.size() != tqmask.size() ) {
+    if ( bitmap.depth() != 1 || mask.depth() != 1 ||
+	 bitmap.size() != mask.size() ) {
 #if defined(TQT_CHECK_NULL)
 	qWarning( "TQCursor: Cannot create bitmap cursor; invalid bitmap(s)" );
 #endif
@@ -422,7 +422,7 @@ void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &tqmask,
     data = new TQCursorData;
     TQ_CHECK_PTR( data );
     data->bm  = new TQBitmap( bitmap );
-    data->bmm = new TQBitmap( tqmask );
+    data->bmm = new TQBitmap( mask );
     data->hcurs = 0;
     data->ctqshape = BitmapCursor;
     data->hx = hotX >= 0 ? hotX : bitmap.width()/2;
@@ -526,11 +526,11 @@ const TQBitmap *TQCursor::bitmap() const
 }
 
 /*!
-    Returns the cursor bitmap tqmask, or 0 if it is one of the standard
+    Returns the cursor bitmap mask, or 0 if it is one of the standard
     cursors.
 */
 
-const TQBitmap *TQCursor::tqmask() const
+const TQBitmap *TQCursor::mask() const
 {
     if ( !initialized )
 	initialize();
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp
index 471df7008..6292a07a5 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp
@@ -270,7 +270,7 @@ public:
 
     void setPixmap(TQPixmap pm, TQPoint hot)
     {
-	int bmser = pm.tqmask() ? pm.tqmask()->serialNumber() : 0;
+	int bmser = pm.mask() ? pm.mask()->serialNumber() : 0;
 	if( oldpmser == pm.serialNumber() && oldbmser == bmser
 	    && oldhot == hot )
 	    return;
@@ -283,17 +283,17 @@ public:
 // of finding this pixmap, and therefore there won't be needed any (slow) search for the window
 // using findRealWindow()
 	if( hotspot_in ) {
-	    TQBitmap tqmask = pm.tqmask() ? *pm.tqmask() : TQBitmap( pm.width(), pm.height());
-	    if( !pm.tqmask())
-		tqmask.fill( TQt::color1 );
-	    TQPainter p( &tqmask );
+	    TQBitmap mask = pm.mask() ? *pm.mask() : TQBitmap( pm.width(), pm.height());
+	    if( !pm.mask())
+		mask.fill( TQt::color1 );
+	    TQPainter p( &mask );
 	    p.setPen( TQt::color0 );
 	    p.drawPoint( hot.x(), hot.y());
 	    p.end();
-    	    pm.setMask( tqmask );
-    	    setMask( tqmask );
-	} else if ( pm.tqmask() ) {
-	    setMask( *pm.tqmask() );
+    	    pm.setMask( mask );
+    	    setMask( mask );
+	} else if ( pm.mask() ) {
+	    setMask( *pm.mask() );
 	} else {
 	    clearMask();
 	}
@@ -913,10 +913,10 @@ void TQDragManager::timerEvent( TQTimerEvent* e )
         if( need_modifiers_check ) {
             Window root, child;
             int root_x, root_y, win_x, win_y;
-            unsigned int tqmask;
+            unsigned int mask;
             XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ),
-                &root, &child, &root_x, &root_y, &win_x, &win_y, &tqmask );
-            if( updateMode( (ButtonState)qt_x11_translateButtonState( tqmask )))
+                &root, &child, &root_x, &root_y, &win_x, &win_y, &mask );
+            if( updateMode( (ButtonState)qt_x11_translateButtonState( mask )))
                 qt_xdnd_source_sameanswer = TQRect(); // force move
         }
         need_modifiers_check = TRUE;
@@ -1737,7 +1737,7 @@ const char* TQDropEvent::format( int n ) const
 
 bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode )
 {
-    if ( object == o || !o || !o->tqparent() )
+    if ( object == o || !o || !o->parent() )
 	return FALSE;
 
     if ( object ) {
@@ -1781,7 +1781,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode )
     object = o;
     updatePixmap();
 
-    dragSource = (TQWidget *)(object->tqparent());
+    dragSource = (TQWidget *)(object->parent());
 
     qt_xdnd_deco->x11SetWindowTransient( dragSource->tqtopLevelWidget());
     tqApp->installEventFilter( this );
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp
index 579eab8cf..c062bfd89 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp
@@ -2136,8 +2136,8 @@ bool TQDragObject::drag( DragMode mode )
 
 TQWidget * TQDragObject::source()
 {
-    if ( tqparent() && tqparent()->isWidgetType() )
-	return (TQWidget *)tqparent();
+    if ( parent() && parent()->isWidgetType() )
+	return (TQWidget *)parent();
     else
 	return 0;
 }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp
index 07e2bb4ba..b220e5863 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp
@@ -621,27 +621,27 @@ void qDrawItem( TQPainter *p, TQt::GUIStyle gs,
 	    x += w - pm.width();
 
 	if ( !enabled ) {
-	    if ( pm.tqmask() ) {			// pixmap with a tqmask
-		if ( !pm.selfMask() ) {		// tqmask is not pixmap itself
-		    TQPixmap pmm( *pm.tqmask() );
+	    if ( pm.mask() ) {			// pixmap with a mask
+		if ( !pm.selfMask() ) {		// mask is not pixmap itself
+		    TQPixmap pmm( *pm.mask() );
 		    pmm.setMask( *((TQBitmap *)&pmm) );
 		    pm = pmm;
 		}
-	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no tqmask
+	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no mask
 		pm.setMask( *((TQBitmap *)&pm) );
 #ifndef TQT_NO_IMAGE_HEURISTIC_MASK
-	    } else {				// color pixmap, no tqmask
+	    } else {				// color pixmap, no mask
 		TQString k;
 		k.sprintf( "$qt-drawitem-%x", pm.serialNumber() );
-		TQPixmap *tqmask = TQPixmapCache::find(k);
+		TQPixmap *mask = TQPixmapCache::find(k);
 		bool del=FALSE;
-		if ( !tqmask ) {
-		    tqmask = new TQPixmap( pm.createHeuristicMask() );
-		    tqmask->setMask( *((TQBitmap*)tqmask) );
-		    del = !TQPixmapCache::insert( k, tqmask );
+		if ( !mask ) {
+		    mask = new TQPixmap( pm.createHeuristicMask() );
+		    mask->setMask( *((TQBitmap*)mask) );
+		    del = !TQPixmapCache::insert( k, mask );
 		}
-		pm = *tqmask;
-		if (del) delete tqmask;
+		pm = *mask;
+		if (del) delete mask;
 #endif
 	    }
 	    if ( gs == TQt::WindowsStyle ) {
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h b/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h
index cd650fae0..5beb6fdd6 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h
@@ -51,7 +51,7 @@ class TQWidget;
 
 class TQ_EXPORT TQDropSite {
 public:
-    TQDropSite( TQWidget* tqparent );
+    TQDropSite( TQWidget* parent );
     virtual ~TQDropSite();
 };
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp b/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp
index 6b9f90b5d..eebcf5074 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp
@@ -235,9 +235,9 @@ TQCustomEvent::TQCustomEvent( int type )
     \value AltButton  an Alt key on the keyboard is also pressed.
     \value MetaButton a Meta key on the keyboard is also pressed.
     \value Keypad  a keypad button is pressed.
-    \value KeyButtonMask a tqmask for ShiftButton, ControlButton,
+    \value KeyButtonMask a mask for ShiftButton, ControlButton,
     AltButton and MetaButton.
-    \value MouseButtonMask a tqmask for LeftButton, RightButton and MidButton.
+    \value MouseButtonMask a mask for LeftButton, RightButton and MidButton.
 */
 
 /*!
@@ -286,10 +286,10 @@ TQCustomEvent::TQCustomEvent( int type )
     \value WindowDeactivate  Window was deactivated.
     \value CaptionChange  Widget's caption changed.
     \value IconChange  Widget's icon changed.
-    \value ParentFontChange  Font of the tqparent widget changed.
+    \value ParentFontChange  Font of the parent widget changed.
     \value ApplicationFontChange  Default application font changed.
     \value PaletteChange  Palette of the widget changed.
-    \value ParentPaletteChange  Palette of the tqparent widget changed.
+    \value ParentPaletteChange  Palette of the parent widget changed.
     \value ApplicationPaletteChange  Default application palette changed.
     \value Clipboard  Clipboard contents have changed.
     \value SockAct  Socket activated, used to implement \l{TQSocketNotifier}.
@@ -309,7 +309,7 @@ TQCustomEvent::TQCustomEvent( int type )
     \value Quit  Reserved.
     \value Create  Reserved.
     \value Destroy  Reserved.
-    \value Retqparent  Reserved.
+    \value Reparent  Reserved.
     \value Speech  Reserved for speech input.
     \value TabletMove  A Wacom Tablet Move Event.
     \value Style  Internal use only
@@ -403,7 +403,7 @@ TQCustomEvent::TQCustomEvent( int type )
     A mouse event contains a special accept flag that indicates
     whether the receiver wants the event. You should call
     TQMouseEvent::ignore() if the mouse event is not handled by your
-    widget. A mouse event is propagated up the tqparent widget chain
+    widget. A mouse event is propagated up the parent widget chain
     until a widget accepts it with TQMouseEvent::accept() or an event
     filter consumes it.
 
@@ -595,7 +595,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const
 
     Setting the accept parameter indicates that the receiver of the
     event wants the mouse event. Unwanted mouse events are sent to the
-    tqparent widget.
+    parent widget.
 
     The accept flag is set by default.
 
@@ -610,7 +610,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const
 
     Clearing the accept parameter indicates that the event receiver
     does not want the mouse event. Unwanted mouse events are sent to
-    the tqparent widget.
+    the parent widget.
 
     The accept flag is set by default.
 
@@ -632,7 +632,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const
     A wheel event contains a special accept flag that indicates
     whether the receiver wants the event. You should call
     TQWheelEvent::accept() if you handle the wheel event; otherwise it
-    will be sent to the tqparent widget.
+    will be sent to the parent widget.
 
     The TQWidget::setEnable() function can be used to enable or disable
     mouse and keyboard events for a widget.
@@ -783,7 +783,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio
 
     Setting the accept parameter indicates that the receiver of the
     event wants the wheel event. Unwanted wheel events are sent to the
-    tqparent widget.
+    parent widget.
 
     The accept flag is set by default.
 
@@ -797,7 +797,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio
 
     Clearing the accept parameter indicates that the event receiver
     does not want the wheel event. Unwanted wheel events are sent to
-    the tqparent widget. The accept flag is set by default.
+    the parent widget. The accept flag is set by default.
 
     \sa accept()
 */
@@ -813,7 +813,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio
     \value META the Meta keys.
     \value CTRL the Ctrl keys.
     \value ALT the normal Alt keys, but not e.g. AltGr.
-    \value MODIFIER_MASK is a tqmask of Shift, Ctrl, Alt and Meta.
+    \value MODIFIER_MASK is a mask of Shift, Ctrl, Alt and Meta.
     \value UNICODE_ACCEL the accelerator is specified as a Unicode code
     point, not as a TQt Key.
 */
@@ -830,7 +830,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio
   A key event contains a special accept flag that indicates whether the
   receiver wants the key event.  You should call TQKeyEvent::ignore() if the
   key press or release event is not handled by your widget. A key event is
-  propagated up the tqparent widget chain until a widget accepts it with
+  propagated up the parent widget chain until a widget accepts it with
   TQKeyEvent::accept() or an event filter consumes it.
   Key events for multi media keys are ignored by default. You should call
   TQKeyEvent::accept() if your widget handles those events.
@@ -951,7 +951,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const
 
     Setting the accept parameter indicates that the receiver of the
     event wants the key event. Unwanted key events are sent to the
-    tqparent widget.
+    parent widget.
 
     The accept flag is set by default.
 
@@ -985,7 +985,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const
 
     Clearing the accept parameter indicates that the event receiver
     does not want the key event. Unwanted key events are sent to the
-    tqparent widget.
+    parent widget.
 
     The accept flag is set by default.
 
@@ -1473,7 +1473,7 @@ void TQFocusEvent::resetReason()
     \ingroup events
 
     Move events are sent to widgets that have been moved to a new position
-    relative to their tqparent.
+    relative to their parent.
 
     The event handler TQWidget::moveEvent() receives move events.
 
@@ -1835,7 +1835,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
 
     Setting the consume flag indicates that the receiver of this event
     does not want the event to be propagated further (i.e. not sent to
-    tqparent classes.)
+    parent classes.)
 
     The consumed flag is not set by default.
 
@@ -2063,7 +2063,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
     A tablet event contains a special accept flag that indicates
     whether the receiver wants the event. You should call
     TQTabletEvent::accept() if you handle the tablet event; otherwise
-    it will be sent to the tqparent widget.
+    it will be sent to the parent widget.
 
     The TQWidget::setEnabled() function can be used to enable or
     disable mouse and keyboard events for a widget.
@@ -2083,7 +2083,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
 
     \value NoDevice    No tqdevice, or an unknown tqdevice.
     \value Puck    A Puck (a tqdevice that is similar to a flat mouse with
-    a transtqparent circle with cross-hairs).
+    a transparent circle with cross-hairs).
     \value Stylus  A Stylus (the narrow end of the pen).
     \value Eraser  An Eraser (the broad end of the pen).
     \omit
@@ -2252,7 +2252,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
 
     Setting the accept flag indicates that the receiver of the event
     wants the tablet event. Unwanted tablet events are sent to the
-    tqparent widget.
+    parent widget.
 
     The accept flag is set by default.
 
@@ -2266,7 +2266,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
 
     Clearing the accept flag indicates that the event receiver does
     not want the tablet event. Unwanted tablet events are sent to the
-    tqparent widget.
+    parent widget.
 
     The accept flag is set by default.
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqevent.h b/experimental/tqtinterface/qt4/src/kernel/tqevent.h
index 143c766f6..9dc10ad4a 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqevent.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqevent.h
@@ -417,13 +417,13 @@ public:
 	Hide = 18,				// widget is hidden
 	Close = 19,				// request to close widget
 	Quit = 20,				// request to quit application
-	Retqparent = 21,				// widget has been reparented
+	Reparent = 21,				// widget has been reparented
 	ShowMinimized = 22,		       	// widget is shown minimized
 	ShowNormal = 23,	       		// widget is shown normal
 	WindowActivate = 24,	       		// window was activated
 	WindowDeactivate = 25,	       		// window was deactivated
-	ShowToParent = 26,	       		// widget is shown to tqparent
-	HideToParent = 27,	       		// widget is hidden to tqparent
+	ShowToParent = 26,	       		// widget is shown to parent
+	HideToParent = 27,	       		// widget is hidden to parent
 	ShowMaximized = 28,		       	// widget is shown maximized
 	ShowFullScreen = 29,			// widget is shown full-screen
 	Accel = 30,				// accelerator event
@@ -431,9 +431,9 @@ public:
 	AccelAvailable = 32,			// accelerator available event
 	CaptionChange = 33,			// caption changed
 	IconChange = 34,			// icon changed
-	ParentFontChange = 35,			// tqparent font changed
+	ParentFontChange = 35,			// parent font changed
 	ApplicationFontChange = 36,		// application font changed
-	ParentPaletteChange = 37,		// tqparent palette changed
+	ParentPaletteChange = 37,		// parent palette changed
 	ApplicationPaletteChange = 38,		// application palette changed
 	PaletteChange = 39,			// widget palette changed
 	Clipboard = 40,				// internal clipboard event
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp
index 704fc4388..57dfca1cb 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp
@@ -94,10 +94,10 @@
     by calling TQApplication::eventLoop(). To create your own event loop object create 
     it before you instantiate the TQApplication object.
     
-    The \a tqparent and \a name arguments are passed on to the TQObject constructor.
+    The \a parent and \a name arguments are passed on to the TQObject constructor.
 */
-TQEventLoop::TQEventLoop( TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+TQEventLoop::TQEventLoop( TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
 #if defined(TQT_CHECK_STATE)
     if ( TQApplication::eventloop )
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h
index d837a75d9..3ec45cf70 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h
@@ -63,7 +63,7 @@ class TQ_EXPORT TQEventLoop : public TQObject
     TQ_OBJECT
 
 public:
-    TQEventLoop( TQObject *tqparent = 0, const char *name = 0 );
+    TQEventLoop( TQObject *parent = 0, const char *name = 0 );
     ~TQEventLoop();
 
     enum ProcessEvents {
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp
index 5570afd9e..e054114c8 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp
@@ -151,7 +151,7 @@ bool TQFontDef::operator==( const TQFontDef &other ) const
 TQFontPrivate::TQFontPrivate()
     : engineData( 0 ), painttqdevice( 0 ),
       rawMode( FALSE ), underline( FALSE ), overline( FALSE ), strikeOut( FALSE ),
-      tqmask( 0 )
+      mask( 0 )
 {
 #ifdef TQ_WS_X11
     screen = TQPaintDevice::x11AppScreen();
@@ -164,7 +164,7 @@ TQFontPrivate::TQFontPrivate( const TQFontPrivate &other )
     : TQShared(), request( other.request ), engineData( 0 ),
       painttqdevice( other.painttqdevice ), screen( other.screen ),
       rawMode( other.rawMode ), underline( other.underline ), overline( other.overline ),
-      strikeOut( other.strikeOut ), tqmask( other.tqmask )
+      strikeOut( other.strikeOut ), mask( other.mask )
 {
 }
 
@@ -181,42 +181,42 @@ void TQFontPrivate::resolve( const TQFontPrivate *other )
     TQ_ASSERT( other != 0 );
 #endif
 
-    if ( ( tqmask & Complete ) == Complete ) return;
+    if ( ( mask & Complete ) == Complete ) return;
 
     // assign the unset-bits with the set-bits of the other font def
-    if ( ! ( tqmask & Family ) )
+    if ( ! ( mask & Family ) )
 	request.family = other->request.family;
 
-    if ( ! ( tqmask & Size ) ) {
+    if ( ! ( mask & Size ) ) {
 	request.pointSize = other->request.pointSize;
 	request.pixelSize = other->request.pixelSize;
     }
 
-    if ( ! ( tqmask & StyleHint ) )
+    if ( ! ( mask & StyleHint ) )
 	request.tqstyleHint = other->request.tqstyleHint;
 
-    if ( ! ( tqmask & StyleStrategy ) )
+    if ( ! ( mask & StyleStrategy ) )
 	request.styleStrategy = other->request.styleStrategy;
 
-    if ( ! ( tqmask & Weight ) )
+    if ( ! ( mask & Weight ) )
 	request.weight = other->request.weight;
 
-    if ( ! ( tqmask & Italic ) )
+    if ( ! ( mask & Italic ) )
 	request.italic = other->request.italic;
 
-    if ( ! ( tqmask & FixedPitch ) )
+    if ( ! ( mask & FixedPitch ) )
 	request.fixedPitch = other->request.fixedPitch;
 
-    if ( ! ( tqmask & Stretch ) )
+    if ( ! ( mask & Stretch ) )
 	request.stretch = other->request.stretch;
 
-    if ( ! ( tqmask & Underline ) )
+    if ( ! ( mask & Underline ) )
 	underline = other->underline;
 
-    if ( ! ( tqmask & Overline ) )
+    if ( ! ( mask & Overline ) )
 	overline = other->overline;
 
-    if ( ! ( tqmask & StrikeOut ) )
+    if ( ! ( mask & StrikeOut ) )
 	strikeOut = other->strikeOut;
 }
 
@@ -578,12 +578,12 @@ void TQFont::detach()
 
     /*
       if this font is a copy of the application default font, set the
-      fontdef tqmask to zero to indicate that *nothing* has been
+      fontdef mask to zero to indicate that *nothing* has been
       explicitly set by the programmer.
     */
     const TQFont appfont = TQApplication::font();
     if ( old_d == appfont.d )
-	d->tqmask = 0;
+	d->mask = 0;
 
     if ( old_d->deref() )
 	delete old_d;
@@ -624,18 +624,18 @@ TQFont::TQFont( const TQString &family, int pointSize, int weight, bool italic )
     d = new TQFontPrivate;
     TQ_CHECK_PTR( d );
 
-    d->tqmask = TQFontPrivate::Family;
+    d->mask = TQFontPrivate::Family;
 
     if (pointSize <= 0) {
 	pointSize = 12;
     } else {
-	d->tqmask |= TQFontPrivate::Size;
+	d->mask |= TQFontPrivate::Size;
     }
 
     if (weight < 0) {
 	weight = Normal;
     } else {
-	d->tqmask |= TQFontPrivate::Weight | TQFontPrivate::Italic;
+	d->mask |= TQFontPrivate::Weight | TQFontPrivate::Italic;
     }
 
     d->request.family = family;
@@ -713,7 +713,7 @@ void TQFont::setFamily( const TQString &family )
     d->request.addStyle = TQString::null;
 #endif // TQ_WS_X11
 
-    d->tqmask |= TQFontPrivate::Family;
+    d->mask |= TQFontPrivate::Family;
 }
 
 /*!
@@ -762,7 +762,7 @@ void TQFont::setPointSize( int pointSize )
     d->request.pointSize = pointSize * 10;
     d->request.pixelSize = -1;
 
-    d->tqmask |= TQFontPrivate::Size;
+    d->mask |= TQFontPrivate::Size;
 }
 
 /*!
@@ -786,7 +786,7 @@ void TQFont::setPointSizeFloat( float pointSize )
     d->request.pointSize = tqRound(pointSize * 10.0);
     d->request.pixelSize = -1;
 
-    d->tqmask |= TQFontPrivate::Size;
+    d->mask |= TQFontPrivate::Size;
 }
 
 /*!
@@ -823,7 +823,7 @@ void TQFont::setPixelSize( int pixelSize )
     d->request.pixelSize = pixelSize;
     d->request.pointSize = -1;
 
-    d->tqmask |= TQFontPrivate::Size;
+    d->mask |= TQFontPrivate::Size;
 }
 
 /*!
@@ -869,7 +869,7 @@ void TQFont::setItalic( bool enable )
     detach();
 
     d->request.italic = enable;
-    d->tqmask |= TQFontPrivate::Italic;
+    d->mask |= TQFontPrivate::Italic;
 }
 
 /*!
@@ -919,7 +919,7 @@ void TQFont::setWeight( int weight )
     detach();
 
     d->request.weight = weight;
-    d->tqmask |= TQFontPrivate::Weight;
+    d->mask |= TQFontPrivate::Weight;
 }
 
 /*!
@@ -964,7 +964,7 @@ void TQFont::setUnderline( bool enable )
     detach();
 
     d->underline = enable;
-    d->tqmask |= TQFontPrivate::Underline;
+    d->mask |= TQFontPrivate::Underline;
 }
 
 /*!
@@ -987,7 +987,7 @@ void TQFont::setOverline( bool enable )
     detach();
 
     d->overline = enable;
-    d->tqmask |= TQFontPrivate::Overline;
+    d->mask |= TQFontPrivate::Overline;
 }
 
 /*!
@@ -1011,7 +1011,7 @@ void TQFont::setStrikeOut( bool enable )
     detach();
 
     d->strikeOut = enable;
-    d->tqmask |= TQFontPrivate::StrikeOut;
+    d->mask |= TQFontPrivate::StrikeOut;
 }
 
 /*!
@@ -1036,7 +1036,7 @@ void TQFont::setFixedPitch( bool enable )
 
     d->request.fixedPitch = enable;
     d->request.ignorePitch = FALSE;
-    d->tqmask |= TQFontPrivate::FixedPitch;
+    d->mask |= TQFontPrivate::FixedPitch;
 }
 
 /*!
@@ -1138,15 +1138,15 @@ void TQFont::setStyleHint( StyleHint hint, StyleStrategy strategy )
 {
     detach();
 
-    if ( ( d->tqmask & ( TQFontPrivate::StyleHint | TQFontPrivate::StyleStrategy ) ) &&
+    if ( ( d->mask & ( TQFontPrivate::StyleHint | TQFontPrivate::StyleStrategy ) ) &&
 	 (StyleHint) d->request.tqstyleHint == hint &&
 	 (StyleStrategy) d->request.styleStrategy == strategy )
 	return;
 
     d->request.tqstyleHint = hint;
     d->request.styleStrategy = strategy;
-    d->tqmask |= TQFontPrivate::StyleHint;
-    d->tqmask |= TQFontPrivate::StyleStrategy;
+    d->mask |= TQFontPrivate::StyleHint;
+    d->mask |= TQFontPrivate::StyleStrategy;
 
 #if defined(TQ_WS_X11)
     d->request.addStyle = TQString::null;
@@ -1162,12 +1162,12 @@ void TQFont::setStyleStrategy( StyleStrategy s )
 {
     detach();
 
-    if ( ( d->tqmask & TQFontPrivate::StyleStrategy ) &&
+    if ( ( d->mask & TQFontPrivate::StyleStrategy ) &&
 	 s == (StyleStrategy)d->request.styleStrategy )
 	return;
 
     d->request.styleStrategy = s;
-    d->tqmask |= TQFontPrivate::StyleStrategy;
+    d->mask |= TQFontPrivate::StyleStrategy;
 }
 
 
@@ -1229,12 +1229,12 @@ void TQFont::setStretch( int factor )
 
     detach();
 
-    if ( ( d->tqmask & TQFontPrivate::Stretch ) &&
+    if ( ( d->mask & TQFontPrivate::Stretch ) &&
 	 d->request.stretch == (uint)factor )
 	return;
 
     d->request.stretch = (uint)factor;
-    d->tqmask |= TQFontPrivate::Stretch;
+    d->mask |= TQFontPrivate::Stretch;
 }
 
 /*!
@@ -1341,7 +1341,7 @@ bool TQFont::rawMode() const
 */
 TQFont TQFont::resolve( const TQFont &other ) const
 {
-    if ( *this == other && d->tqmask == other.d->tqmask )
+    if ( *this == other && d->mask == other.d->mask )
 	return *this;
 
     TQFont font( *this );
@@ -1349,12 +1349,12 @@ TQFont TQFont::resolve( const TQFont &other ) const
 
     /*
       if this font is a copy of the application default font, set the
-      fontdef tqmask to zero to indicate that *nothing* has been
+      fontdef mask to zero to indicate that *nothing* has been
       explicitly set by the programmer.
     */
     const TQFont appfont = TQApplication::font();
     if ( d == appfont.d )
-	font.d->tqmask = 0;
+	font.d->mask = 0;
 
     font.d->resolve( other.d );
 
@@ -1782,7 +1782,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font )
     if (font.d->deref()) delete font.d;
 
     font.d = new TQFontPrivate;
-    font.d->tqmask = TQFontPrivate::Complete;
+    font.d->mask = TQFontPrivate::Complete;
 
     TQ_INT16 pointSize, pixelSize = -1;
     TQ_UINT8 tqstyleHint, styleStrategy = TQFont::PreferDefault, charSet, weight, bits;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp
index fda292f4b..55e0bee89 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp
@@ -535,7 +535,7 @@ void TQFont::setRawName( const TQString &name )
 	setFamily( name );
 	setRawMode( TRUE );
     } else {
-	d->tqmask = TQFontPrivate::Complete;
+	d->mask = TQFontPrivate::Complete;
     }
 }
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h b/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h
index 36b709ff8..28fc990e3 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h
@@ -187,7 +187,7 @@ public:
 	Complete      = 0x07ff
     };
 
-    uint tqmask;
+    uint mask;
 
     void resolve( const TQFontPrivate *other );
 };
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp b/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp
index 09a1126c1..95656c05e 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp
@@ -794,11 +794,11 @@ TQPixmap *TQIconSet::createScaled( Size size, const TQPixmap *suppliedPix ) cons
     img = img.smoothScale( imgSize );
 
     TQPixmap *pixmap = new TQPixmap( img );
-    if ( !pixmap->tqmask() ) {
-	TQBitmap tqmask;
-	tqmask.convertFromImage( img.createHeuristicMask(),
+    if ( !pixmap->mask() ) {
+	TQBitmap mask;
+	mask.convertFromImage( img.createHeuristicMask(),
 			       TQt::MonoOnly | TQt::ThresholdDither );
-	pixmap->setMask( tqmask );
+	pixmap->setMask( mask );
     }
     return pixmap;
 }
@@ -816,8 +816,8 @@ TQPixmap *TQIconSet::createDisabled( Size size, State state ) const
     TQImage img;
     TQPixmap *pixmap = 0;
     TQBitmap normalMask;
-    if ( normalPix.tqmask() ) {
-	normalMask = *normalPix.tqmask();
+    if ( normalPix.mask() ) {
+	normalMask = *normalPix.mask();
     } else {
 	img = normalPix.convertToImage();
 	normalMask.convertFromImage( img.createHeuristicMask(),
@@ -837,16 +837,16 @@ TQPixmap *TQIconSet::createDisabled( Size size, State state ) const
     painter.drawPixmap( 0, 0, normalMask );
     painter.end();
 
-    if ( !normalMask.tqmask() )
+    if ( !normalMask.mask() )
 	normalMask.setMask( normalMask );
 
-    TQBitmap tqmask( pixmap->size() );
-    tqmask.fill( TQt::color0 );
-    painter.begin( &tqmask );
+    TQBitmap mask( pixmap->size() );
+    mask.fill( TQt::color0 );
+    painter.begin( &mask );
     painter.drawPixmap( 0, 0, normalMask );
     painter.drawPixmap( 1, 1, normalMask );
     painter.end();
-    pixmap->setMask( tqmask );
+    pixmap->setMask( mask );
     return pixmap;
 }
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp b/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp
index 2a99fc929..3483e2a56 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp
@@ -1606,12 +1606,12 @@ TQDataStream &operator<<( TQDataStream &s, const BMP_INFOHDR &bi )
 }
 
 static
-int calc_shift(int tqmask)
+int calc_shift(int mask)
 {
     int result = 0;
-    while (!(tqmask & 1)) {
+    while (!(mask & 1)) {
 	result++;
-	tqmask >>= 1;
+	mask >>= 1;
     }
     return result;
 }
@@ -4224,10 +4224,10 @@ void TQImage::setNumColors( int numColors )
     contain the alpha component.
 
     The alpha component specifies the transparency of a pixel. 0 means
-    completely transtqparent and 255 means opaque. The alpha component
+    completely transparent and 255 means opaque. The alpha component
     is ignored if you do not enable alpha buffer mode.
 
-    The alpha buffer is used to set a tqmask when a TQImage is translated
+    The alpha buffer is used to set a mask when a TQImage is translated
     to a TQPixmap.
 
     \sa hasAlphaBuffer() createAlphaMask()
@@ -4430,7 +4430,7 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
     const int tablesize = 997; // prime
     TQRgbMap table[tablesize];
     int   pix=0;
-    TQRgb atqmask = src->hasAlphaBuffer() ? 0xffffffff : 0x00ffffff;
+    TQRgb amask = src->hasAlphaBuffer() ? 0xffffffff : 0x00ffffff;
     if ( src->hasAlphaBuffer() )
 	dst->setAlphaBuffer(TRUE);
 
@@ -4441,10 +4441,10 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
 	// Almost same code as pixel insertion below
 	while ( palette_count-- > 0 ) {
 	    // Find in table...
-	    int hash = (*p & atqmask) % tablesize;
+	    int hash = (*p & amask) % tablesize;
 	    for (;;) {
 		if ( table[hash].used() ) {
-		    if ( table[hash].rgb == (*p & atqmask) ) {
+		    if ( table[hash].rgb == (*p & amask) ) {
 			// Found previous insertion - use it
 			break;
 		    } else {
@@ -4455,9 +4455,9 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
 		    // Cannot be in table
 		    TQ_ASSERT ( pix != 256 );	// too many colors
 		    // Insert into table at this unused position
-		    dst->setColor( pix, (*p & atqmask) );
+		    dst->setColor( pix, (*p & amask) );
 		    table[hash].pix = pix++;
-		    table[hash].rgb = *p & atqmask;
+		    table[hash].rgb = *p & amask;
 		    break;
 		}
 	    }
@@ -4474,10 +4474,10 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
 	    x = src->width();
 	    while ( x-- ) {
 		// Find in table...
-		int hash = (*p & atqmask) % tablesize;
+		int hash = (*p & amask) % tablesize;
 		for (;;) {
 		    if ( table[hash].used() ) {
-			if ( table[hash].rgb == (*p & atqmask) ) {
+			if ( table[hash].rgb == (*p & amask) ) {
 			    // Found previous insertion - use it
 			    break;
 			} else {
@@ -4493,9 +4493,9 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
 			    y = src->height();
 			} else {
 			    // Insert into table at this unused position
-			    dst->setColor( pix, (*p & atqmask) );
+			    dst->setColor( pix, (*p & amask) );
 			    table[hash].pix = pix++;
-			    table[hash].rgb = (*p & atqmask);
+			    table[hash].rgb = (*p & amask);
 			}
 			break;
 		    }
@@ -4548,7 +4548,7 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
 	    for ( gc=0; gc<=MAX_G; gc++ )
 		for ( bc=0; bc<=MAX_B; bc++ ) {
 		    dst->setColor( INDEXOF(rc,gc,bc),
-			(atqmask&0xff000000)
+			(amask&0xff000000)
 			| tqRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) );
 		}
 
@@ -4679,12 +4679,12 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
 #ifndef TQT_NO_IMAGE_DITHER_TO_1
 	if ( src->hasAlphaBuffer() ) {
 	    const int trans = 216;
-	    dst->setColor(trans, 0x00000000);	// transtqparent
-	    TQImage tqmask = src->createAlphaMask(conversion_flags);
+	    dst->setColor(trans, 0x00000000);	// transparent
+	    TQImage mask = src->createAlphaMask(conversion_flags);
 	    uchar* m;
 	    for ( y=0; y < src->height(); y++ ) {
 		uchar bit = 0x80;
-		m = tqmask.scanLine(y);
+		m = mask.scanLine(y);
 		b = dst->scanLine(y);
 		int w = src->width();
 		for ( x = 0; x<w; x++ ) {
@@ -5045,7 +5045,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst,
 		if ( fromalpha ) {
 		    while ( p < end ) {
 			if ( (*p++ >> 24) >= 128 )
-			    *m |= 1 << bit;	// Set tqmask "on"
+			    *m |= 1 << bit;	// Set mask "on"
 			if ( bit == 0 ) {
 			    m++;
 			    bit = 7;
@@ -5077,7 +5077,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst,
 		int bit = 7;
 		while ( p < end ) {
 		    if ( gray[*p++] < 128 )
-			*m |= 1 << bit;		// Set tqmask "on"/ pixel "black"
+			*m |= 1 << bit;		// Set mask "on"/ pixel "black"
 		    if ( bit == 0 ) {
 			m++;
 			bit = 7;
@@ -6040,7 +6040,7 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const
 	    break;
 	case 8:
 	    if ( dImage.data->ncols < 256 ) {
-		// colors are left in the color table, so pick that one as transtqparent
+		// colors are left in the color table, so pick that one as transparent
 		dImage.setNumColors( dImage.data->ncols+1 );
 		dImage.setColor( dImage.data->ncols-1, 0x00 );
 		memset( dImage.bits(), dImage.data->ncols-1, dImage.numBytes() );
@@ -6069,7 +6069,7 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const
 #endif
 
 /*!
-    Builds and returns a 1-bpp tqmask from the alpha buffer in this
+    Builds and returns a 1-bpp mask from the alpha buffer in this
     image. Returns a \link isNull() null\endlink image if \link
     setAlphaBuffer() alpha buffer mode\endlink is disabled.
 
@@ -6099,15 +6099,15 @@ TQImage TQImage::createAlphaMask( int conversion_flags ) const
 		.createAlphaMask( conversion_flags );
     }
 
-    TQImage tqmask1;
-    dither_to_1( this, &tqmask1, conversion_flags, TRUE );
-    return tqmask1;
+    TQImage mask1;
+    dither_to_1( this, &mask1, conversion_flags, TRUE );
+    return mask1;
 }
 #endif
 
 #ifndef TQT_NO_IMAGE_HEURISTIC_MASK
 /*!
-    Creates and returns a 1-bpp heuristic tqmask for this image. It
+    Creates and returns a 1-bpp heuristic mask for this image. It
     works by selecting a color from one of the corners, then chipping
     away pixels of that color starting at all the edges.
 
@@ -6118,8 +6118,8 @@ TQImage TQImage::createAlphaMask( int conversion_flags ) const
     The returned image has little-endian bit order, which you can
     convert to big-endianness using convertBitOrder().
 
-    If \a clipTight is TRUE the tqmask is just large enough to cover the
-    pixels; otherwise, the tqmask is larger than the data pixels.
+    If \a clipTight is TRUE the mask is just large enough to cover the
+    pixels; otherwise, the mask is larger than the data pixels.
 
     This function disregards the \link hasAlphaBuffer() alpha buffer
     \endlink.
@@ -7644,12 +7644,12 @@ TQDataStream &operator<<( TQDataStream &s, const BMP_INFOHDR &bi )
 }
 
 static
-int calc_shift(int tqmask)
+int calc_shift(int mask)
 {
     int result = 0;
-    while (!(tqmask & 1)) {
+    while (!(mask & 1)) {
 	result++;
-	tqmask >>= 1;
+	mask >>= 1;
     }
     return result;
 }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp
index 79d95424a..d6e7d750c 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp
@@ -298,8 +298,8 @@ public:
     holderWidget is set immediately after this constructor has been
     returned on the X11 platform.
 */
-TQInputContext::TQInputContext( TQObject *tqparent )
-    : TQObject( tqparent )
+TQInputContext::TQInputContext( TQObject *parent )
+    : TQObject( parent )
 {
     d = new TQInputContextPrivate;
 }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h
index 14a1a7e25..b8fb6604d 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h
@@ -67,7 +67,7 @@ class TQInputContext : public TQObject
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQInputContext( TQObject *tqparent = 0 );
+    TQInputContext( TQObject *parent = 0 );
     virtual ~TQInputContext();
 
     virtual TQString identifierName();
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
index 9c3132a03..f42cf8ef3 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
@@ -63,7 +63,7 @@ int menuBarHeightForWidth( QWidget *menubar_w, int w )
 	return 0;
 }
 
-TQLayout::TQLayout( QWidget *tqparent, int margin, int spacing, const char *name ) : QLayout( tqparent ), autoNewChild(false)
+TQLayout::TQLayout( QWidget *parent, int margin, int spacing, const char *name ) : QLayout( parent ), autoNewChild(false)
 {
 	setObjectName(QString::fromAscii(name));
 	setMargin(margin);
@@ -71,8 +71,8 @@ TQLayout::TQLayout( QWidget *tqparent, int margin, int spacing, const char *name
 		setSpacing(margin);
 	else
 		setSpacing(spacing);
-	if ( tqparent ) tqparent->installEventFilter( this );
-	TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent)
+	if ( parent ) parent->installEventFilter( this );
+	TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent)
 }
 
 TQLayout::TQLayout( QLayout *parentLayout, int spacing, const char *name ) : QLayout(), autoNewChild(false)
@@ -497,7 +497,7 @@ void TQLayout::mouseDoubleClickEvent( TQMouseEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQWheelEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -517,7 +517,7 @@ void TQLayout::wheelEvent( TQWheelEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQTabletEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -539,10 +539,10 @@ void TQLayout::tabletEvent( TQTabletEvent *e )
 
     If you reimplement this handler, it is very important that you
     explicitly \link TQKeyEvent::ignore() ignore\endlink the event
-    if you do not understand it, so that the widget's tqparent can
+    if you do not understand it, so that the widget's parent can
     interpret it; otherwise, the event will be implicitly accepted.
     Although top-level widgets are able to choose whether to accept
-    or ignore unknown events because they have no tqparent widgets that
+    or ignore unknown events because they have no parent widgets that
     could otherwise handle them, it is good practice to explicitly
     ignore events to make widgets as reusable as possible.
 
@@ -568,7 +568,7 @@ void TQLayout::keyPressEvent( TQKeyEvent * )
 
     If you reimplement this handler, it is very important that you
     \link TQKeyEvent ignore()\endlink the release if you do not
-    understand it, so that the widget's tqparent can interpret it.
+    understand it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -1003,7 +1003,7 @@ void TQGridLayout::mouseDoubleClickEvent( TQMouseEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQWheelEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -1023,7 +1023,7 @@ void TQGridLayout::wheelEvent( TQWheelEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQTabletEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -1045,10 +1045,10 @@ void TQGridLayout::tabletEvent( TQTabletEvent *e )
 
     If you reimplement this handler, it is very important that you
     explicitly \link TQKeyEvent::ignore() ignore\endlink the event
-    if you do not understand it, so that the widget's tqparent can
+    if you do not understand it, so that the widget's parent can
     interpret it; otherwise, the event will be implicitly accepted.
     Although top-level widgets are able to choose whether to accept
-    or ignore unknown events because they have no tqparent widgets that
+    or ignore unknown events because they have no parent widgets that
     could otherwise handle them, it is good practice to explicitly
     ignore events to make widgets as reusable as possible.
 
@@ -1074,7 +1074,7 @@ void TQGridLayout::keyPressEvent( TQKeyEvent * )
 
     If you reimplement this handler, it is very important that you
     \link TQKeyEvent ignore()\endlink the release if you do not
-    understand it, so that the widget's tqparent can interpret it.
+    understand it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -2277,7 +2277,7 @@ inline TQGridLayoutDataIterator::TQGridLayoutDataIterator( TQGridLayoutData *d )
     \ingroup appearance
     \mainclass
 
-    TQGridLayout takes the space made available to it (by its tqparent
+    TQGridLayout takes the space made available to it (by its parent
     tqlayout or by the mainWidget()), divides it up into rows and
     columns, and puts each widget it manages into the correct cell.
 
@@ -2321,7 +2321,7 @@ inline TQGridLayoutDataIterator::TQGridLayoutDataIterator( TQGridLayoutData *d )
 
     If the TQGridLayout is not the top-level tqlayout (i.e. does not
     manage all of the widget's area and tqchildren), you must add it to
-    its tqparent tqlayout when you create it, but before you do anything
+    its parent tqlayout when you create it, but before you do anything
     with it. The normal way to add a tqlayout is by calling
     parentLayout-\>addLayout().
 
@@ -2388,16 +2388,16 @@ static bool checkWidget( TQLayout *l, TQWidget *w )
 
 /*!
     Constructs a new TQGridLayout with \a nRows rows, \a nCols columns
-    and tqparent widget, \a  tqparent. \a tqparent may not be 0. The grid
+    and parent widget, \a  parent. \a parent may not be 0. The grid
     tqlayout is called \a name.
 
     \a margin is the number of pixels between the edge of the widget
     and its managed tqchildren. \a space is the default number of pixels
     between cells. If \a space is -1, the value of \a margin is used.
 */
-TQGridLayout::TQGridLayout( TQWidget *tqparent, int nRows, int nCols, int margin,
+TQGridLayout::TQGridLayout( TQWidget *parent, int nRows, int nCols, int margin,
 			  int space, const char *name )
-    : TQLayout( tqparent, margin, space, name )
+    : TQLayout( parent, margin, space, name )
 {
     init( nRows, nCols );
 }
@@ -2405,7 +2405,7 @@ TQGridLayout::TQGridLayout( TQWidget *tqparent, int nRows, int nCols, int margin
 /*!
     Constructs a new grid that is placed inside \a parentLayout with
     \a nRows rows and \a nCols columns. If \a spacing is -1, this
-    TQGridLayout inherits its tqparent's spacing(); otherwise \a spacing
+    TQGridLayout inherits its parent's spacing(); otherwise \a spacing
     is used. The grid tqlayout is called \a name.
 
     This grid is placed according to \a parentLayout's default
@@ -2420,7 +2420,7 @@ TQGridLayout::TQGridLayout( TQLayout *parentLayout, int nRows, int nCols,
 
 /*!
     Constructs a new grid with \a nRows rows and \a nCols columns. If
-    \a spacing is -1, this TQGridLayout inherits its tqparent's
+    \a spacing is -1, this TQGridLayout inherits its parent's
     spacing(); otherwise \a spacing is used. The grid tqlayout is called
     \a name.
 
@@ -2691,9 +2691,9 @@ void TQGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow,
 
     \a tqlayout becomes a child of the grid tqlayout.
 
-    When a tqlayout is constructed with another tqlayout as its tqparent,
+    When a tqlayout is constructed with another tqlayout as its parent,
     you don't need to call addLayout(); the child tqlayout is
-    automatically added to the tqparent tqlayout as it is constructed.
+    automatically added to the parent tqlayout as it is constructed.
 
     \sa addMultiCellLayout()
 */
@@ -3046,7 +3046,7 @@ private:
     \ingroup geomanagement
     \ingroup appearance
 
-    TQBoxLayout takes the space it gets (from its tqparent tqlayout or from
+    TQBoxLayout takes the space it gets (from its parent tqlayout or from
     the mainWidget()), divides it up into a row of boxes, and makes
     each managed widget fill one box.
 
@@ -3071,7 +3071,7 @@ private:
 
     If the TQBoxLayout is not the top-level tqlayout (i.e. it is not
     managing all of the widget's area and tqchildren), you must add it
-    to its tqparent tqlayout before you can do anything with it. The
+    to its parent tqlayout before you can do anything with it. The
     normal way to add a tqlayout is by calling
     parentLayout-\>addLayout().
 
@@ -3107,7 +3107,7 @@ private:
     \endlist
 
     The margin defaults to 0. The spacing defaults to the same as the
-    margin width for a top-level tqlayout, or to the same as the tqparent
+    margin width for a top-level tqlayout, or to the same as the parent
     tqlayout. Both are parameters to the constructor.
 
     To remove a widget from a tqlayout, call remove(). Calling
@@ -3140,7 +3140,7 @@ static inline bool horz( TQBoxLayout::Direction dir )
 
 /*!
     Constructs a new TQBoxLayout with direction \a d and main widget \a
-    tqparent. \a tqparent may not be 0.
+    parent. \a parent may not be 0.
 
     The \a margin is the number of pixels between the edge of the
     widget and its managed tqchildren. The \a spacing is the default
@@ -3151,9 +3151,9 @@ static inline bool horz( TQBoxLayout::Direction dir )
 
     \sa direction()
 */
-TQBoxLayout::TQBoxLayout( TQWidget *tqparent, Direction d,
+TQBoxLayout::TQBoxLayout( TQWidget *parent, Direction d,
 			int margin, int spacing, const char *name )
-    : TQLayout( tqparent, margin, spacing, name )
+    : TQLayout( parent, margin, spacing, name )
 {
     data = new TQBoxLayoutData;
     dir = d;
@@ -3166,7 +3166,7 @@ TQBoxLayout::TQBoxLayout( TQWidget *tqparent, Direction d,
 
     The \a spacing is the default number of pixels between neighboring
     tqchildren. If \a spacing is -1, the tqlayout will inherit its
-    tqparent's spacing().
+    parent's spacing().
 */
 TQBoxLayout::TQBoxLayout( TQLayout *parentLayout, Direction d, int spacing,
 			const char *name )
@@ -3180,7 +3180,7 @@ TQBoxLayout::TQBoxLayout( TQLayout *parentLayout, Direction d, int spacing,
 /*!
     Constructs a new TQBoxLayout called \a name, with direction \a d.
 
-    If \a spacing is -1, the tqlayout will inherit its tqparent's
+    If \a spacing is -1, the tqlayout will inherit its parent's
     spacing(); otherwise \a spacing is used.
 
     You must insert this box into another tqlayout.
@@ -3606,9 +3606,9 @@ void TQBoxLayout::addWidget( TQWidget *widget, int stretch,
     Adds \a tqlayout to the end of the box, with serial stretch factor
     \a stretch.
 
-    When a tqlayout is constructed with another tqlayout as its tqparent,
+    When a tqlayout is constructed with another tqlayout as its parent,
     you don't need to call addLayout(); the child tqlayout is
-    automatically added to the tqparent tqlayout as it is constructed.
+    automatically added to the parent tqlayout as it is constructed.
 
     \sa insertLayout(), setAutoAdd(), addWidget(), addSpacing()
 */
@@ -3920,16 +3920,16 @@ void TQBoxLayout::calcHfw( int w )
 
 /*!
     Constructs a new top-level horizontal box called \a name, with
-    tqparent \a tqparent.
+    parent \a parent.
 
     The \a margin is the number of pixels between the edge of the
     widget and its managed tqchildren. The \a spacing is the default
     number of pixels between neighboring tqchildren. If \a spacing is -1
     the value of \a margin is used for \a spacing.
 */
-TQHBoxLayout::TQHBoxLayout( TQWidget *tqparent, int margin,
+TQHBoxLayout::TQHBoxLayout( TQWidget *parent, int margin,
 			  int spacing, const char *name )
-    : TQBoxLayout( tqparent, LeftToRight, margin, spacing, name )
+    : TQBoxLayout( parent, LeftToRight, margin, spacing, name )
 {
 }
 
@@ -3939,7 +3939,7 @@ TQHBoxLayout::TQHBoxLayout( TQWidget *tqparent, int margin,
 
     The \a spacing is the default number of pixels between neighboring
     tqchildren. If \a spacing is -1, this TQHBoxLayout will inherit its
-    tqparent's spacing().
+    parent's spacing().
 */
 TQHBoxLayout::TQHBoxLayout( TQLayout *parentLayout, int spacing,
 			  const char *name )
@@ -3953,7 +3953,7 @@ TQHBoxLayout::TQHBoxLayout( TQLayout *parentLayout, int spacing,
 
     The \a spacing is the default number of pixels between neighboring
     tqchildren. If \a spacing is -1, this TQHBoxLayout will inherit its
-    tqparent's spacing().
+    parent's spacing().
 */
 TQHBoxLayout::TQHBoxLayout( int spacing, const char *name )
     : TQBoxLayout( LeftToRight, spacing, name )
@@ -3995,16 +3995,16 @@ TQHBoxLayout::~TQHBoxLayout()
 
 /*!
     Constructs a new top-level vertical box called \a name, with
-    tqparent \a tqparent.
+    parent \a parent.
 
     The \a margin is the number of pixels between the edge of the
     widget and its managed tqchildren. The \a spacing is the default
     number of pixels between neighboring tqchildren. If \a spacing is -1
     the value of \a margin is used for \a spacing.
 */
-TQVBoxLayout::TQVBoxLayout( TQWidget *tqparent, int margin, int spacing,
+TQVBoxLayout::TQVBoxLayout( TQWidget *parent, int margin, int spacing,
 			  const char *name )
-    : TQBoxLayout( tqparent, TopToBottom, margin, spacing, name )
+    : TQBoxLayout( parent, TopToBottom, margin, spacing, name )
 {
 
 }
@@ -4015,7 +4015,7 @@ TQVBoxLayout::TQVBoxLayout( TQWidget *tqparent, int margin, int spacing,
 
     The \a spacing is the default number of pixels between neighboring
     tqchildren. If \a spacing is -1, this TQVBoxLayout will inherit its
-    tqparent's spacing().
+    parent's spacing().
 */
 TQVBoxLayout::TQVBoxLayout( TQLayout *parentLayout, int spacing,
 			  const char *name )
@@ -4029,7 +4029,7 @@ TQVBoxLayout::TQVBoxLayout( TQLayout *parentLayout, int spacing,
 
     The \a spacing is the default number of pixels between neighboring
     tqchildren. If \a spacing is -1, this TQVBoxLayout will inherit its
-    tqparent's spacing().
+    parent's spacing().
 */
 TQVBoxLayout::TQVBoxLayout( int spacing, const char *name )
     : TQBoxLayout( TopToBottom, spacing, name )
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h
index 38dd33e2b..0778bc186 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h
@@ -363,7 +363,7 @@ public:
 		Auto = QLayout::SetDefaultConstraint
 	};
 
-	TQLayout( QWidget *tqparent, int margin = 0, int spacing = -1, const char *name = 0 );
+	TQLayout( QWidget *parent, int margin = 0, int spacing = -1, const char *name = 0 );
 	TQLayout( QLayout *parentLayout, int spacing = -1, const char *name = 0 );
 	TQLayout( int spacing = -1, const char *name = 0 );
 	virtual TQ_SPExpandData expandingDirections() const;
@@ -547,7 +547,7 @@ public:
     // ### TQt 4.0: put 'Auto' first in enum
     enum ResizeMode { FreeResize, Minimum, Fixed, Auto };
 
-    TQLayout( TQWidget *tqparent, int margin = 0, int spacing = -1,
+    TQLayout( TQWidget *parent, int margin = 0, int spacing = -1,
 	     const char *name = 0 );
     TQLayout( TQLayout *parentLayout, int spacing = -1, const char *name = 0 );
     TQLayout( int spacing = -1, const char *name = 0 );
@@ -686,14 +686,14 @@ class TQ_EXPORT TQGridLayout : public QGridLayout, virtual public TQt
 	Q_OBJECT
 	TQ_OBJECT
 public:
-	TQGridLayout( TQWidget *tqparent, int nRows = 1, int nCols = 1, int border = 0, int spacing = -1, const char *name = 0 ) : QGridLayout( tqparent ), autoNewChild(false)
+	TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0, int spacing = -1, const char *name = 0 ) : QGridLayout( parent ), autoNewChild(false)
 	{
 		expand(nRows, nCols);
 		setMargin(border);
 		setSpacing(spacing < 0 ? border : spacing);
 		setObjectName(QString::fromAscii(name));
-		if ( tqparent ) tqparent->installEventFilter( this );
-		TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent)
+		if ( parent ) parent->installEventFilter( this );
+		TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent)
 	}
 	TQGridLayout( int nRows = 1, int nCols = 1, int spacing = -1, const char *name = 0 ) : QGridLayout(), autoNewChild(false)
 	{
@@ -948,7 +948,7 @@ class TQ_EXPORT TQGridLayout : public TQLayout
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQGridLayout( TQWidget *tqparent, int nRows = 1, int nCols = 1, int border = 0,
+    TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0,
 		 int spacing = -1, const char *name = 0 );
     TQGridLayout( int nRows = 1, int nCols = 1, int spacing = -1,
 		 const char *name = 0 );
@@ -1037,7 +1037,7 @@ public:
     enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop,
 		     Down = TopToBottom, Up = BottomToTop };
 
-    TQBoxLayout( TQWidget *tqparent, Direction, int border = 0, int spacing = -1,
+    TQBoxLayout( TQWidget *parent, Direction, int border = 0, int spacing = -1,
 		const char *name = 0 );
     TQBoxLayout( TQLayout *parentLayout, Direction, int spacing = -1,
 		const char *name = 0 );
@@ -1107,7 +1107,7 @@ class TQ_EXPORT TQHBoxLayout : public TQBoxLayout
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQHBoxLayout( TQWidget *tqparent, int border = 0,
+    TQHBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
     TQHBoxLayout( TQLayout *parentLayout,
 		 int spacing = -1, const char *name = 0 );
@@ -1127,7 +1127,7 @@ class TQ_EXPORT TQVBoxLayout : public TQBoxLayout
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQVBoxLayout( TQWidget *tqparent, int border = 0,
+    TQVBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
     TQVBoxLayout( TQLayout *parentLayout,
 		 int spacing = -1, const char *name = 0 );
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp
index 6b2b17f65..0476c8b6a 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp
@@ -206,8 +206,8 @@ bool TQMetaProperty::stdSet() const
 //     if ( !testFlags( Override ) || testFlags( Writable ) )
 // 	return testFlags( StdSet );
 //     const TQMetaObject* mo = (*meta);
-//     const TQMetaProperty* tqparent = mo->resolveProperty( this );
-//     return tqparent ? tqparent->stdSet() : FALSE;
+//     const TQMetaProperty* parent = mo->resolveProperty( this );
+//     return parent ? parent->stdSet() : FALSE;
 
 	// [FIXME]
 	printf("[WARNING] bool TQMetaProperty::stdSet() const unimplemented\n\r");
@@ -1182,7 +1182,7 @@ int TQMetaObject::indexOfProperty( const TQMetaProperty* prop, bool super ) cons
 
 /*!\internal
 
-  Returns the tqparent property of property \a p or 0, if the property
+  Returns the parent property of property \a p or 0, if the property
   cannot be resolved.
 
   \a p has to be contained in this meta object
@@ -1535,8 +1535,8 @@ bool TQMetaProperty::writable() const
     if ( !testFlags( Override ) || testFlags( Writable ) )
 	return testFlags( Writable );
     const TQMetaObject* mo = (*meta);
-    const TQMetaProperty* tqparent = mo->resolveProperty( this );
-    return tqparent ? tqparent->writable() : FALSE;
+    const TQMetaProperty* parent = mo->resolveProperty( this );
+    return parent ? parent->writable() : FALSE;
 }
 
 /*!\internal
@@ -1546,8 +1546,8 @@ bool TQMetaProperty::stdSet() const
     if ( !testFlags( Override ) || testFlags( Writable ) )
 	return testFlags( StdSet );
     const TQMetaObject* mo = (*meta);
-    const TQMetaProperty* tqparent = mo->resolveProperty( this );
-    return tqparent ? tqparent->stdSet() : FALSE;
+    const TQMetaProperty* parent = mo->resolveProperty( this );
+    return parent ? parent->stdSet() : FALSE;
 }
 
 /*!\internal
@@ -1577,8 +1577,8 @@ bool TQMetaProperty::isValid() const
     if ( !testFlags( Override ) || testFlags( Readable ) )
 	return testFlags( Readable );
     const TQMetaObject* mo = (*meta);
-    const TQMetaProperty* tqparent = mo->resolveProperty( this );
-    return tqparent ? tqparent->isValid() : FALSE;
+    const TQMetaProperty* parent = mo->resolveProperty( this );
+    return parent ? parent->isValid() : FALSE;
 }
 
 bool TQMetaProperty::isSetType() const
@@ -1659,8 +1659,8 @@ bool TQMetaProperty::designable( TQObject* o ) const
     }
     if ( testFlags( DesignableOverride ) ) {
 	const TQMetaObject* mo = (*meta);
-	const TQMetaProperty* tqparent = mo->resolveProperty( this );
-	return tqparent ? tqparent->designable() : FALSE;
+	const TQMetaProperty* parent = mo->resolveProperty( this );
+	return parent ? parent->designable() : FALSE;
     }
     return !testFlags( NotDesignable );
 }
@@ -1680,8 +1680,8 @@ bool TQMetaProperty::scriptable( TQObject* o ) const
     }
     if ( testFlags( ScriptableOverride ) ) {
 	const TQMetaObject* mo = (*meta);
-	const TQMetaProperty* tqparent = mo->resolveProperty( this );
-	return tqparent ? tqparent->scriptable() : FALSE;
+	const TQMetaProperty* parent = mo->resolveProperty( this );
+	return parent ? parent->scriptable() : FALSE;
     }
     return !testFlags( NotScriptable );
 }
@@ -1703,8 +1703,8 @@ bool TQMetaProperty::stored( TQObject* o ) const
     }
     if ( testFlags( StoredOverride ) ) {
 	const TQMetaObject* mo = (*meta);
-	const TQMetaProperty* tqparent = mo->resolveProperty( this );
-	return tqparent ? tqparent->stored() : FALSE;
+	const TQMetaProperty* parent = mo->resolveProperty( this );
+	return parent ? parent->stored() : FALSE;
     }
     return !testFlags( NotStored );
 }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp b/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp
index 87a339c1c..68d3a5c69 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp
@@ -203,7 +203,7 @@ public:
     TQDataPump *pump;
     TQDataSource *source;
     TQPixmap mypixmap;
-    TQBitmap mytqmask;
+    TQBitmap mymask;
     TQColor bg;
 
     int error;
@@ -388,12 +388,12 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off,
     } else {
 	if (gimg.hasAlphaBuffer()) {
 	    // Resize to size of image
-	    if (mytqmask.isNull()) {
-		mytqmask.resize(gimg.width(), gimg.height());
-		mytqmask.fill( TQt::color1 );
+	    if (mymask.isNull()) {
+		mymask.resize(gimg.width(), gimg.height());
+		mymask.fill( TQt::color1 );
 	    }
 	}
-	mypixmap.setMask(TQBitmap()); // Remove reference to my tqmask
+	mypixmap.setMask(TQBitmap()); // Remove reference to my mask
 	copyBlt( &mypixmap, area.left(), area.top(),
 		 &lines, off.x(), off.y(), area.width(), area.height() );
     }
@@ -786,8 +786,8 @@ TQMovie& TQMovie::operator=(const TQMovie& movie)
 
 /*!
     Sets the background color of the pixmap to \a c. If the background
-    color isValid(), the pixmap will never have a tqmask because the
-    background color will be used in transtqparent regions of the image.
+    color isValid(), the pixmap will never have a mask because the
+    background color will be used in transparent regions of the image.
 
     \sa backgroundColor()
 */
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp
index 4f465d1aa..6c93075d2 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp
@@ -73,9 +73,9 @@ public:
 
 */
 
-TQObject::TQObject( TQT_BASE_OBJECT_NAME *tqparent, const char *name ) : TQT_BASE_OBJECT_NAME ( tqparent ) {
+TQObject::TQObject( TQT_BASE_OBJECT_NAME *parent, const char *name ) : TQT_BASE_OBJECT_NAME ( parent ) {
 	setObjectName(QString::fromAscii(name));
-	TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent)
+	TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent)
 }
 
 const char * TQObject::name(const char *defaultName) const {
@@ -166,7 +166,7 @@ const TQObjectList TQObject::objectTreesListObject() {
 	return TQObjectList();
 }
 
-TQObject *TQObject::tqparent() const {
+TQObject *TQObject::parent() const {
 	return static_cast<TQObject*>(parent());
 }
 
@@ -675,7 +675,7 @@ static void objSearch( TQObjectList *result,
     without notice (as soon as the user closes a window you may have
     dangling pointers, for example).
 
-    \sa child() childrenListObject(), tqparent(), inherits(), name(), TQRegExp
+    \sa child() childrenListObject(), parent(), inherits(), name(), TQRegExp
 */
 
 TQObjectList *TQObject::queryList( const char *inheritsClass,
@@ -851,7 +851,7 @@ void TQObject::customEvent( TQCustomEvent * )
     class MyMainWindow : public TQMainWindow
     {
     public:
-        MyMainWindow( TQWidget *tqparent = 0, const char *name = 0 );
+        MyMainWindow( TQWidget *parent = 0, const char *name = 0 );
 
     protected:
         bool eventFilter( TQObject *obj, TQEvent *ev );
@@ -860,8 +860,8 @@ void TQObject::customEvent( TQCustomEvent * )
         TQTextEdit *textEdit;
     };
 
-    MyMainWindow::MyMainWindow( TQWidget *tqparent, const char *name )
-        : TQMainWindow( tqparent, name )
+    MyMainWindow::MyMainWindow( TQWidget *parent, const char *name )
+        : TQMainWindow( parent, name )
     {
         textEdit = new TQTextEdit( this );
         setCentralWidget( textEdit );
@@ -879,7 +879,7 @@ void TQObject::customEvent( TQCustomEvent * )
                 return FALSE;
             }
         } else {
-            // pass the event on to the tqparent class
+            // pass the event on to the parent class
             return TQMainWindow::eventFilter( obj, ev );
         }
     }
@@ -906,7 +906,7 @@ bool TQObject::eventFilter( TQObject * /* watched */, TQEvent * /* e */ )
     \relates TQObject
 
     Returns a pointer to the object named \a name that inherits \a
-    type and with a given \a tqparent.
+    type and with a given \a parent.
 
     Returns 0 if there is no such child.
 
@@ -918,10 +918,10 @@ bool TQObject::eventFilter( TQObject * /* watched */, TQEvent * /* e */ )
     \endcode
 */
 
-void *qt_find_obj_child( TQObject *tqparent, const char *type, const char *name )
+void *qt_find_obj_child( TQObject *parent, const char *type, const char *name )
 {
-    if ( !tqparent->childrenListObject().isEmpty() ) {
-	TQObjectListIt it( tqparent->childrenListObject() );
+    if ( !parent->childrenListObject().isEmpty() ) {
+	TQObjectListIt it( parent->childrenListObject() );
 	TQObject *obj;
 	while ( (obj = it.current()) ) {
 	    ++it;
@@ -1099,9 +1099,9 @@ public:
     possible to track connections.
 
     TQObjects organize themselves in object trees. When you create a
-    TQObject with another object as tqparent, the object will
-    automatically do an insertChild() on the tqparent and thus show up
-    in the tqparent's childrenListObject() list. The tqparent takes ownership of the
+    TQObject with another object as parent, the object will
+    automatically do an insertChild() on the parent and thus show up
+    in the parent's childrenListObject() list. The parent takes ownership of the
     object i.e. it will automatically delete its tqchildren in its
     destructor. You can look for an object by name and optionally type
     using child() or queryList(), and get the list of tree roots using
@@ -1216,7 +1216,7 @@ static void removeObjFromList( TQObjectList *objList, const TQObject *obj,
     \relates TQObject
 
     Returns a pointer to the object named \a name that inherits \a
-    type and with a given \a tqparent.
+    type and with a given \a parent.
 
     Returns 0 if there is no such child.
 
@@ -1228,10 +1228,10 @@ static void removeObjFromList( TQObjectList *objList, const TQObject *obj,
     \endcode
 */
 
-void *qt_find_obj_child( TQObject *tqparent, const char *type, const char *name )
+void *qt_find_obj_child( TQObject *parent, const char *type, const char *name )
 {
-    if ( !tqparent->childrenListObject().isEmpty() ) {
-	TQObjectListIt it( tqparent->childrenListObject() );
+    if ( !parent->childrenListObject().isEmpty() ) {
+	TQObjectListIt it( parent->childrenListObject() );
 	TQObject *obj;
 	while ( (obj = it.current()) ) {
 	    ++it;
@@ -1340,15 +1340,15 @@ static void remove_tree( TQObject* obj )
  *****************************************************************************/
 
 /*!
-    Constructs an object called \a name with tqparent object, \a tqparent.
+    Constructs an object called \a name with parent object, \a parent.
 
-    The tqparent of an object may be viewed as the object's owner. For
-    instance, a \link TQDialog dialog box\endlink is the tqparent of the
+    The parent of an object may be viewed as the object's owner. For
+    instance, a \link TQDialog dialog box\endlink is the parent of the
     "OK" and "Cancel" buttons it contains.
 
-    The destructor of a tqparent object destroys all child objects.
+    The destructor of a parent object destroys all child objects.
 
-    Setting \a tqparent to 0 constructs an object with no tqparent. If the
+    Setting \a parent to 0 constructs an object with no parent. If the
     object is a widget, it will become a top-level window.
 
     The object name is some text that can be used to identify a
@@ -1357,10 +1357,10 @@ static void remove_tree( TQObject* obj )
     object by name (and type) using child(). To find several objects
     use queryList().
 
-    \sa tqparent(), name(), child(), queryList()
+    \sa parent(), name(), child(), queryList()
 */
 
-TQObject::TQObject( TQObject *tqparent, const char *name )
+TQObject::TQObject( TQObject *parent, const char *name )
     :
     isSignal( FALSE ),				// assume not a signal object
     isWidget( FALSE ), 				// assume not a widget object
@@ -1369,7 +1369,7 @@ TQObject::TQObject( TQObject *tqparent, const char *name )
     wasDeleted( FALSE ),       			// double-delete catcher
     isTree( FALSE ), 				// no tree yet
     objname( name ? qstrdup(name) : 0 ),        // set object name
-    parentObj( 0 ),				// no tqparent yet. It is set by insertChild()
+    parentObj( 0 ),				// no parent yet. It is set by insertChild()
     childObjects( 0 ), 				// no tqchildren yet
     connections( 0 ),				// no connections yet
     senderObjects( 0 ),        			// no Q_SIGNALS connected yet
@@ -1380,8 +1380,8 @@ TQObject::TQObject( TQObject *tqparent, const char *name )
     if ( !metaObj )				// will create object dict
 	(void) staticMetaObject();
 
-    if ( tqparent ) {				// add object to tqparent
-	tqparent->insertChild( this );
+    if ( parent ) {				// add object to parent
+	parent->insertChild( this );
     } else {
 	insert_tree( this );
 	isTree = TRUE;
@@ -1397,7 +1397,7 @@ TQObject::TQObject( TQObject *tqparent, const char *name )
     \warning All child objects are deleted. If any of these objects
     are on the stack or global, sooner or later your program will
     crash. We do not recommend holding pointers to child objects from
-    outside the tqparent. If you still do, the TQObject::destroyed()
+    outside the parent. If you still do, the TQObject::destroyed()
     signal gives you an opportunity to detect when an object is
     destroyed.
 
@@ -1431,7 +1431,7 @@ TQObject::~TQObject()
 	remove_tree( this );		// remove from global root list
 	isTree = FALSE;
     }
-    if ( parentObj )				// remove it from tqparent object
+    if ( parentObj )				// remove it from parent object
 	parentObj->removeChild( this );
     register TQObject *obj;
     if ( senderObjects ) {			// disconnect from senders
@@ -1810,7 +1810,7 @@ void TQObject::customEvent( TQCustomEvent * )
     class MyMainWindow : public TQMainWindow
     {
     public:
-        MyMainWindow( TQWidget *tqparent = 0, const char *name = 0 );
+        MyMainWindow( TQWidget *parent = 0, const char *name = 0 );
 
     protected:
         bool eventFilter( TQObject *obj, TQEvent *ev );
@@ -1819,8 +1819,8 @@ void TQObject::customEvent( TQCustomEvent * )
         TQTextEdit *textEdit;
     };
 
-    MyMainWindow::MyMainWindow( TQWidget *tqparent, const char *name )
-        : TQMainWindow( tqparent, name )
+    MyMainWindow::MyMainWindow( TQWidget *parent, const char *name )
+        : TQMainWindow( parent, name )
     {
         textEdit = new TQTextEdit( this );
         setCentralWidget( textEdit );
@@ -1838,7 +1838,7 @@ void TQObject::customEvent( TQCustomEvent * )
                 return FALSE;
             }
         } else {
-            // pass the event on to the tqparent class
+            // pass the event on to the parent class
             return TQMainWindow::eventFilter( obj, ev );
         }
     }
@@ -1938,14 +1938,14 @@ void TQObject::blockSignals( bool block )
     {
 	TQ_OBJECT
     public:
-	MyObject( TQObject *tqparent = 0, const char *name = 0 );
+	MyObject( TQObject *parent = 0, const char *name = 0 );
 
     protected:
 	void timerEvent( TQTimerEvent * );
     };
 
-    MyObject::MyObject( TQObject *tqparent, const char *name )
-	: TQObject( tqparent, name )
+    MyObject::MyObject( TQObject *parent, const char *name )
+	: TQObject( parent, name )
     {
 	startTimer( 50 );    // 50-millisecond timer
 	startTimer( 1000 );  // 1-second timer
@@ -2043,9 +2043,9 @@ static void objSearch( TQObjectList *result,
 }
 
 /*!
-    \fn TQObject *TQObject::tqparent() const
+    \fn TQObject *TQObject::parent() const
 
-    Returns a pointer to the tqparent object.
+    Returns a pointer to the parent object.
 
     \sa childrenListObject()
 */
@@ -2070,7 +2070,7 @@ static void objSearch( TQObjectList *result,
     in the list, and a widget that is lowered becomes the first object
     in the list.
 
-    \sa child(), queryList(), tqparent(), insertChild(), removeChild()
+    \sa child(), queryList(), parent(), insertChild(), removeChild()
 */
 
 
@@ -2085,7 +2085,7 @@ static void objSearch( TQObjectList *result,
     first\endlink object in the list and the first root object added
     is the \link TQPtrList::last() last\endlink object in the list.
 
-    \sa childrenListObject(), tqparent(), insertChild(), removeChild()
+    \sa childrenListObject(), parent(), insertChild(), removeChild()
 */
 const TQObjectList *TQObject::objectTrees()
 {
@@ -2140,7 +2140,7 @@ const TQObjectList *TQObject::objectTrees()
     without notice (as soon as the user closes a window you may have
     dangling pointers, for example).
 
-    \sa child() childrenListObject(), tqparent(), inherits(), name(), TQRegExp
+    \sa child() childrenListObject(), parent(), inherits(), name(), TQRegExp
 */
 
 TQObjectList *TQObject::queryList( const char *inheritsClass,
@@ -2220,7 +2220,7 @@ TQConnectionList *TQObject::tqreceivers( int signal ) const
 
     \warning This function cannot be used to make one widget the child
     widget of another widget. Child widgets can only be created by
-    setting the tqparent widget in the constructor or by calling
+    setting the parent widget in the constructor or by calling
     TQWidget::reparent().
 
     \sa removeChild(), TQWidget::reparent()
@@ -2262,7 +2262,7 @@ void TQObject::insertChild( TQObject *obj )
     Removes the child object \a obj from the list of tqchildren.
 
     \warning This function will not remove a child widget from the
-    screen. It will only remove it from the tqparent widget's list of
+    screen. It will only remove it from the parent widget's list of
     tqchildren.
 
     \sa insertChild(), TQWidget::reparent()
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqobject.h b/experimental/tqtinterface/qt4/src/kernel/tqobject.h
index 347cafe8d..7e5be4a07 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqobject.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqobject.h
@@ -93,9 +93,9 @@ class TQObject: public QObject, virtual public TQt
 	Q_OBJECT
 	TQ_OBJECT
 public:
-	TQObject( TQT_BASE_OBJECT_NAME *tqparent=0, const char *name=0 );
+	TQObject( TQT_BASE_OBJECT_NAME *parent=0, const char *name=0 );
 
-	TQObject *tqparent() const;
+	TQObject *parent() const;
 	TQObjectList childrenListObject();
 	const TQObjectList childrenListObject() const;
 	const char *tqname() const;
@@ -223,7 +223,7 @@ class TQ_EXPORT TQObject: public TQt
     Q_PROPERTY( TQCString name READ name WRITE setName )
 
 public:
-    TQObject( TQObject *tqparent=0, const char *name=0 );
+    TQObject( TQObject *parent=0, const char *name=0 );
     virtual ~TQObject();
 
 #ifdef TQ_TQDOC
@@ -308,7 +308,7 @@ Q_SIGNALS:
     void	 destroyed( TQObject* obj );
 
 public:
-    TQObject	*tqparent() const { return parentObj; }
+    TQObject	*parent() const { return parentObj; }
 
 public Q_SLOTS:
     void	deleteLater();
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h b/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h
index c87689897..454019a3c 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h
@@ -248,8 +248,8 @@ class TQObjectListIt;
 class TQMemberDict;
 
 TQ_EXPORT void *qt_find_obj_child( TQObject *, const char *, const char * );
-#define TQ_CHILD(tqparent,type,name) \
-	((type*)qt_find_obj_child(tqparent,#type,name))
+#define TQ_CHILD(parent,type,name) \
+	((type*)qt_find_obj_child(parent,#type,name))
 
 TQ_EXPORT void *qt_inheritedBy( TQMetaObject *super, const TQObject *cls );
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp
index fd4cc0b36..de0695f5f 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp
@@ -248,7 +248,7 @@ int TQPaintDevice::x11AppDpiY(int screen)
     TQt::RasterOp documentation defines all the possible values.
 
     If \a ignoreMask is FALSE (the default) and \a src is a
-    masked TQPixmap, the entire blit is masked by \a{src}->tqmask().
+    masked TQPixmap, the entire blit is masked by \a{src}->mask().
 
     If \a src, \a dst, \a sw or \a sh is 0, bitBlt() does nothing. If
     \a sw or \a sh is negative bitBlt() copies starting at \a sx (and
@@ -311,11 +311,11 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic
 // 		 sw != pm->width() || sh != pm->height() || ignoreMask ) {
 // 		TQPixmap *tmp = new TQPixmap( sw, sh, pm->depth() );
 // 		bitBlt( tmp, 0, 0, pm, sx, sy, sw, sh, TQt::CopyROP, TRUE );
-// 		if ( pm->tqmask() && !ignoreMask ) {
-// 		    TQBitmap tqmask( sw, sh );
-// 		    bitBlt( &tqmask, 0, 0, pm->tqmask(), sx, sy, sw, sh,
+// 		if ( pm->mask() && !ignoreMask ) {
+// 		    TQBitmap mask( sw, sh );
+// 		    bitBlt( &mask, 0, 0, pm->mask(), sx, sy, sw, sh,
 // 			    TQt::CopyROP, TRUE );
-// 		    tmp->setMask( tqmask );
+// 		    tmp->setMask( mask );
 // 		}
 // 		pm = tmp;
 // 	    } else {
@@ -389,18 +389,18 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic
 //     bool include_inferiors = FALSE;
 //     bool graphics_exposure = FALSE;
 //     TQPixmap *src_pm;
-//     TQBitmap *tqmask;
+//     TQBitmap *mask;
 //
 //     if ( ts == TQInternal::Pixmap ) {
 // 	src_pm = (TQPixmap*)src;
 //     	if ( src_pm->x11Screen() != dst->x11Screen() )
 //     	    src_pm->x11SetScreen( dst->x11Screen() );
 // 	mono_src = src_pm->depth() == 1;
-// 	tqmask = ignoreMask ? 0 : src_pm->data->tqmask;
+// 	mask = ignoreMask ? 0 : src_pm->data->mask;
 //     } else {
 // 	src_pm = 0;
 // 	mono_src = FALSE;
-// 	tqmask = 0;
+// 	mask = 0;
 // 	include_inferiors = ((TQWidget*)src)->testWFlags(TQt::WPaintUnclipped);
 // 	graphics_exposure = td == TQInternal::Widget;
 //     }
@@ -430,25 +430,25 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic
 // 	    alpha->x11RenderHandle() &&
 // 	    dst->x11RenderHandle()) {
 // 	    XRenderPictureAttributes pattr;
-// 	    ulong pictqmask = 0;
+// 	    ulong picmask = 0;
 // 	    if (include_inferiors) {
 // 		pattr.subwindow_mode = IncludeInferiors;
-// 		pictqmask |= CPSubwindowMode;
+// 		picmask |= CPSubwindowMode;
 // 	    }
 // 	    if (graphics_exposure) {
 // 		pattr.graphics_exposures = TRUE;
-// 		pictqmask |= CPGraphicsExposure;
+// 		picmask |= CPGraphicsExposure;
 // 	    }
-// 	    if (pictqmask)
-// 		XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr);
+// 	    if (picmask)
+// 		XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr);
 // 	    XRenderComposite(dpy, PictOpOver, src->x11RenderHandle(),
 // 			     alpha->x11RenderHandle(), dst->x11RenderHandle(),
 // 			     sx, sy, sx, sy, dx, dy, sw, sh);
 // 	    // restore attributes
 // 	    pattr.subwindow_mode = ClipByChildren;
 // 	    pattr.graphics_exposures = FALSE;
-// 	    if (pictqmask)
-// 		XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr);
+// 	    if (picmask)
+// 		XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr);
 // 	    return;
 // 	}
 //     }
@@ -456,25 +456,25 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic
 //
 //     GC gc;
 //
-//     if ( tqmask && !mono_src ) {			// fast masked blt
+//     if ( mask && !mono_src ) {			// fast masked blt
 // 	bool temp_gc = FALSE;
-// 	if ( tqmask->data->maskgc ) {
-// 	    gc = (GC)tqmask->data->maskgc;	// we have a premade tqmask GC
+// 	if ( mask->data->maskgc ) {
+// 	    gc = (GC)mask->data->maskgc;	// we have a premade mask GC
 // 	} else {
 // 	    if ( FALSE && src_pm->optimization() == TQPixmap::NormalOptim ) { // #### cache disabled
 // 		// Compete for the global cache
 // 		gc = cache_mask_gc( dpy, dst->handle(),
-// 				    tqmask->data->ser_no,
-// 				    tqmask->handle() );
+// 				    mask->data->ser_no,
+// 				    mask->handle() );
 // 	    } else {
-// 		// Create a new tqmask GC. If BestOptim, we store the tqmask GC
-// 		// with the tqmask (not at the pixmap). This way, many pixmaps
-// 		// which have a common tqmask will be optimized at no extra cost.
+// 		// Create a new mask GC. If BestOptim, we store the mask GC
+// 		// with the mask (not at the pixmap). This way, many pixmaps
+// 		// which have a common mask will be optimized at no extra cost.
 // 		gc = XCreateGC( dpy, dst->handle(), 0, 0 );
 // 		XSetGraphicsExposures( dpy, gc, False );
-// 		XSetClipMask( dpy, gc, tqmask->handle() );
+// 		XSetClipMask( dpy, gc, mask->handle() );
 // 		if ( src_pm->optimization() == TQPixmap::BestOptim ) {
-// 		    tqmask->data->maskgc = gc;
+// 		    mask->data->maskgc = gc;
 // 		} else {
 // 		    temp_gc = TRUE;
 // 		}
@@ -509,14 +509,14 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic
 // 	XCopyArea( dpy, src->handle(), dst->handle(), gc, sx, sy, sw, sh, dx, dy );
 //     } else if ( mono_src ) {			// src is bitmap
 // 	XGCValues gcvals;
-// 	ulong	  valtqmask = GCBackground | GCForeground | GCFillStyle |
+// 	ulong	  valmask = GCBackground | GCForeground | GCFillStyle |
 // 			    GCStipple | GCTileStipXOrigin | GCTileStipYOrigin;
 // 	if ( td == TQInternal::Widget ) {	// set GC colors
 // 	    TQWidget *w = (TQWidget *)dst;
 // 	    gcvals.background = w->backgroundColor().pixel( dst->x11Screen() );
 // 	    gcvals.foreground = w->foregroundColor().pixel( dst->x11Screen() );
 // 	    if ( include_inferiors ) {
-// 		valtqmask |= GCSubwindowMode;
+// 		valmask |= GCSubwindowMode;
 // 		gcvals.subwindow_mode = IncludeInferiors;
 // 	    }
 // 	} else if ( mono_dst ) {
@@ -532,31 +532,31 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic
 // 	gcvals.ts_x_origin = dx - sx;
 // 	gcvals.ts_y_origin = dy - sy;
 //
-// 	bool cliptqmask = FALSE;
-// 	if ( tqmask ) {
+// 	bool clipmask = FALSE;
+// 	if ( mask ) {
 // 	    if ( ((TQPixmap*)src)->data->selfmask ) {
 // 		gcvals.fill_style = FillStippled;
 // 	    } else {
-// 		XSetClipMask( dpy, gc, tqmask->handle() );
+// 		XSetClipMask( dpy, gc, mask->handle() );
 // 		XSetClipOrigin( dpy, gc, dx-sx, dy-sy );
-// 		cliptqmask = TRUE;
+// 		clipmask = TRUE;
 // 	    }
 // 	}
 //
-// 	XChangeGC( dpy, gc, valtqmask, &gcvals );
+// 	XChangeGC( dpy, gc, valmask, &gcvals );
 // 	XFillRectangle( dpy,dst->handle(), gc, dx, dy, sw, sh );
 //
-// 	valtqmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin;
+// 	valmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin;
 // 	gcvals.fill_style  = FillSolid;
 // 	gcvals.ts_x_origin = 0;
 // 	gcvals.ts_y_origin = 0;
 // 	if ( include_inferiors ) {
-// 	    valtqmask |= GCSubwindowMode;
+// 	    valmask |= GCSubwindowMode;
 // 	    gcvals.subwindow_mode = ClipByChildren;
 // 	}
-// 	XChangeGC( dpy, gc, valtqmask, &gcvals );
+// 	XChangeGC( dpy, gc, valmask, &gcvals );
 //
-// 	if ( cliptqmask ) {
+// 	if ( clipmask ) {
 // 	    XSetClipOrigin( dpy, gc, 0, 0 );
 // 	    XSetClipMask( dpy, gc, None );
 // 	}
@@ -1355,7 +1355,7 @@ static void cleanup_mask_gc()
     }
 }
 
-static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap tqmask )
+static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap mask )
 {
     if ( !init_mask_gc ) {			// first time initialization
 	init_mask_gc = TRUE;
@@ -1369,7 +1369,7 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap tqmask )
 	    p->gc = XCreateGC( dpy, hd, 0, 0 );
 	    XSetGraphicsExposures( dpy, p->gc, False );
 	}
-	XSetClipMask( dpy, p->gc, tqmask );
+	XSetClipMask( dpy, p->gc, mask );
 	p->mask_no = mask_no;
     }
     return p->gc;
@@ -1390,7 +1390,7 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap tqmask )
     TQt::RasterOp documentation defines all the possible values.
 
     If \a ignoreMask is FALSE (the default) and \a src is a
-    masked TQPixmap, the entire blit is masked by \a{src}->tqmask().
+    masked TQPixmap, the entire blit is masked by \a{src}->mask().
 
     If \a src, \a dst, \a sw or \a sh is 0, bitBlt() does nothing. If
     \a sw or \a sh is negative bitBlt() copies starting at \a sx (and
@@ -1450,11 +1450,11 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 		 sw != pm->width() || sh != pm->height() || ignoreMask ) {
 		TQPixmap *tmp = new TQPixmap( sw, sh, pm->depth() );
 		bitBlt( tmp, 0, 0, pm, sx, sy, sw, sh, TQt::CopyROP, TRUE );
-		if ( pm->tqmask() && !ignoreMask ) {
-		    TQBitmap tqmask( sw, sh );
-		    bitBlt( &tqmask, 0, 0, pm->tqmask(), sx, sy, sw, sh,
+		if ( pm->mask() && !ignoreMask ) {
+		    TQBitmap mask( sw, sh );
+		    bitBlt( &mask, 0, 0, pm->mask(), sx, sy, sw, sh,
 			    TQt::CopyROP, TRUE );
-		    tmp->setMask( tqmask );
+		    tmp->setMask( mask );
 		}
 		pm = tmp;
 	    } else {
@@ -1528,18 +1528,18 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
     bool include_inferiors = FALSE;
     bool graphics_exposure = FALSE;
     TQPixmap *src_pm;
-    TQBitmap *tqmask;
+    TQBitmap *mask;
 
     if ( ts == TQInternal::Pixmap ) {
 	src_pm = (TQPixmap*)src;
     	if ( src_pm->x11Screen() != dst->x11Screen() )
     	    src_pm->x11SetScreen( dst->x11Screen() );
 	mono_src = src_pm->depth() == 1;
-	tqmask = ignoreMask ? 0 : src_pm->data->tqmask;
+	mask = ignoreMask ? 0 : src_pm->data->mask;
     } else {
 	src_pm = 0;
 	mono_src = FALSE;
-	tqmask = 0;
+	mask = 0;
 	include_inferiors = ((TQWidget*)src)->testWFlags(TQt::WPaintUnclipped);
 	graphics_exposure = td == TQInternal::Widget;
     }
@@ -1569,25 +1569,25 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 	    alpha->x11RenderHandle() &&
 	    dst->x11RenderHandle()) {
 	    XRenderPictureAttributes pattr;
-	    ulong pictqmask = 0;
+	    ulong picmask = 0;
 	    if (include_inferiors) {
 		pattr.subwindow_mode = IncludeInferiors;
-		pictqmask |= CPSubwindowMode;
+		picmask |= CPSubwindowMode;
 	    }
 	    if (graphics_exposure) {
 		pattr.graphics_exposures = TRUE;
-		pictqmask |= CPGraphicsExposure;
+		picmask |= CPGraphicsExposure;
 	    }
-	    if (pictqmask)
-		XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr);
+	    if (picmask)
+		XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr);
 	    XRenderComposite(dpy, PictOpOver, src->x11RenderHandle(),
 			     alpha->x11RenderHandle(), dst->x11RenderHandle(),
 			     sx, sy, sx, sy, dx, dy, sw, sh);
 	    // restore attributes
 	    pattr.subwindow_mode = ClipByChildren;
 	    pattr.graphics_exposures = FALSE;
-	    if (pictqmask)
-		XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr);
+	    if (picmask)
+		XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr);
 	    return;
 	}
     }
@@ -1595,25 +1595,25 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 
     GC gc;
 
-    if ( tqmask && !mono_src ) {			// fast masked blt
+    if ( mask && !mono_src ) {			// fast masked blt
 	bool temp_gc = FALSE;
-	if ( tqmask->data->maskgc ) {
-	    gc = (GC)tqmask->data->maskgc;	// we have a premade tqmask GC
+	if ( mask->data->maskgc ) {
+	    gc = (GC)mask->data->maskgc;	// we have a premade mask GC
 	} else {
 	    if ( FALSE && src_pm->optimization() == TQPixmap::NormalOptim ) { // #### cache disabled
 		// Compete for the global cache
 		gc = cache_mask_gc( dpy, dst->handle(),
-				    tqmask->data->ser_no,
-				    tqmask->handle() );
+				    mask->data->ser_no,
+				    mask->handle() );
 	    } else {
-		// Create a new tqmask GC. If BestOptim, we store the tqmask GC
-		// with the tqmask (not at the pixmap). This way, many pixmaps
-		// which have a common tqmask will be optimized at no extra cost.
+		// Create a new mask GC. If BestOptim, we store the mask GC
+		// with the mask (not at the pixmap). This way, many pixmaps
+		// which have a common mask will be optimized at no extra cost.
 		gc = XCreateGC( dpy, dst->handle(), 0, 0 );
 		XSetGraphicsExposures( dpy, gc, False );
-		XSetClipMask( dpy, gc, tqmask->handle() );
+		XSetClipMask( dpy, gc, mask->handle() );
 		if ( src_pm->optimization() == TQPixmap::BestOptim ) {
-		    tqmask->data->maskgc = gc;
+		    mask->data->maskgc = gc;
 		} else {
 		    temp_gc = TRUE;
 		}
@@ -1648,14 +1648,14 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 	XCopyArea( dpy, src->handle(), dst->handle(), gc, sx, sy, sw, sh, dx, dy );
     } else if ( mono_src ) {			// src is bitmap
 	XGCValues gcvals;
-	ulong	  valtqmask = GCBackground | GCForeground | GCFillStyle |
+	ulong	  valmask = GCBackground | GCForeground | GCFillStyle |
 			    GCStipple | GCTileStipXOrigin | GCTileStipYOrigin;
 	if ( td == TQInternal::Widget ) {	// set GC colors
 	    TQWidget *w = (TQWidget *)dst;
 	    gcvals.background = w->backgroundColor().pixel( dst->x11Screen() );
 	    gcvals.foreground = w->foregroundColor().pixel( dst->x11Screen() );
 	    if ( include_inferiors ) {
-		valtqmask |= GCSubwindowMode;
+		valmask |= GCSubwindowMode;
 		gcvals.subwindow_mode = IncludeInferiors;
 	    }
 	} else if ( mono_dst ) {
@@ -1671,31 +1671,31 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 	gcvals.ts_x_origin = dx - sx;
 	gcvals.ts_y_origin = dy - sy;
 
-	bool cliptqmask = FALSE;
-	if ( tqmask ) {
+	bool clipmask = FALSE;
+	if ( mask ) {
 	    if ( ((TQPixmap*)src)->data->selfmask ) {
 		gcvals.fill_style = FillStippled;
 	    } else {
-		XSetClipMask( dpy, gc, tqmask->handle() );
+		XSetClipMask( dpy, gc, mask->handle() );
 		XSetClipOrigin( dpy, gc, dx-sx, dy-sy );
-		cliptqmask = TRUE;
+		clipmask = TRUE;
 	    }
 	}
 
-	XChangeGC( dpy, gc, valtqmask, &gcvals );
+	XChangeGC( dpy, gc, valmask, &gcvals );
 	XFillRectangle( dpy,dst->handle(), gc, dx, dy, sw, sh );
 
-	valtqmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin;
+	valmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin;
 	gcvals.fill_style  = FillSolid;
 	gcvals.ts_x_origin = 0;
 	gcvals.ts_y_origin = 0;
 	if ( include_inferiors ) {
-	    valtqmask |= GCSubwindowMode;
+	    valmask |= GCSubwindowMode;
 	    gcvals.subwindow_mode = ClipByChildren;
 	}
-	XChangeGC( dpy, gc, valtqmask, &gcvals );
+	XChangeGC( dpy, gc, valmask, &gcvals );
 
-	if ( cliptqmask ) {
+	if ( clipmask ) {
 	    XSetClipOrigin( dpy, gc, 0, 0 );
 	    XSetClipMask( dpy, gc, None );
 	}
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp
index 6d481280c..0ed8c1554 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp
@@ -1528,7 +1528,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
     \i pen() is the currently set pen; the color or stipple that's
     used for drawing lines or boundaries.
 
-    \i backgroundMode() is \c Opaque or \c Transtqparent, i.e. whether
+    \i backgroundMode() is \c Opaque or \c Transparent, i.e. whether
     backgroundColor() is used or not.
 
     \i backgroundColor() only applies when backgroundMode() is Opaque
@@ -1821,7 +1821,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
 
     \value DashDotDotLine  one dash, two dots, one dash, two dots.
 
-    \value MPenStyle tqmask of the pen styles.
+    \value MPenStyle mask of the pen styles.
 
     \img pen-styles.png Pen Styles
 */
@@ -1837,7 +1837,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
     \value SquareCap  a square line end that covers the end point and
 	extends beyond it with half the line width.
     \value RoundCap  a rounded line end.
-    \value MPenCapStyle tqmask of the pen cap styles.
+    \value MPenCapStyle mask of the pen cap styles.
 
     \img pen-cap-styles.png Pen Cap Styles
 */
@@ -1853,7 +1853,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
 	meet at an angle, and this area is filled.
     \value BevelJoin  The triangular notch between the two lines is filled.
     \value RoundJoin  A circular arc between the two lines is filled.
-    \value MPenJoinStyle tqmask of the pen join styles.
+    \value MPenJoinStyle mask of the pen join styles.
 
     \img pen-join-styles.png Pen Join Styles
 */
@@ -5203,7 +5203,7 @@ TQBrush TQBrush::copy() const
     \row \i CustomPattern \i set when a pixmap pattern is being used.
     \endtable
 
-    On Windows, dense and custom patterns cannot be transtqparent.
+    On Windows, dense and custom patterns cannot be transparent.
 
     See the \link #details Detailed Description\endlink for a picture
     of all the styles.
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp
index 05d5c76ad..7e68625f9 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp
@@ -1474,7 +1474,7 @@ void TQPainter::flush()
 
     The background color is the color that is filled in when drawing
     opaque text, stippled lines and bitmaps. The background color has
-    no effect in transtqparent background mode (which is the default).
+    no effect in transparent background mode (which is the default).
 
     \sa backgroundColor() setBackgroundMode() BackgroundMode
 */
@@ -1504,7 +1504,7 @@ void TQPainter::setBackgroundColor( const TQColor &c )
     Sets the background mode of the painter to \a m, which must be
     either \c TransparentMode (the default) or \c OpaqueMode.
 
-    Transtqparent mode draws stippled lines and text without setting the
+    Transparent mode draws stippled lines and text without setting the
     background pixels. Opaque mode fills these space with the current
     background color.
 
@@ -2736,7 +2736,7 @@ void TQPainter::drawCubicBezier( const TQPointArray &a, int index )
     The default, (-1, -1), means all the way to the bottom right of
     the pixmap.
 
-    Currently the tqmask of the pixmap or it's alpha channel are ignored
+    Currently the mask of the pixmap or it's alpha channel are ignored
     when painting on a TQPrinter.
 
     \sa bitBlt(), TQPixmap::setMask()
@@ -2786,11 +2786,11 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
                  sw != pixmap.width() || sh != pixmap.height() ) {
                 TQPixmap tmp( sw, sh, pixmap.depth() );
                 bitBlt( &tmp, 0, 0, &pixmap, sx, sy, sw, sh, CopyROP, TRUE );
-                if ( pixmap.tqmask() ) {
-                    TQBitmap tqmask( sw, sh );
-                    bitBlt( &tqmask, 0, 0, pixmap.tqmask(), sx, sy, sw, sh,
+                if ( pixmap.mask() ) {
+                    TQBitmap mask( sw, sh );
+                    bitBlt( &mask, 0, 0, pixmap.mask(), sx, sy, sw, sh,
                             CopyROP, TRUE );
-                    tmp.setMask( tqmask );
+                    tmp.setMask( mask );
                 }
                 drawPixmap( x, y, tmp );
                 return;
@@ -2809,7 +2809,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
                               dx(),  dy() );
                 mat = TQPixmap::trueMatrix( mat, sw, sh );
                 TQPixmap pm = pixmap.xForm( mat );
-                if ( !pm.tqmask() && txop == TxRotShear ) {
+                if ( !pm.mask() && txop == TxRotShear ) {
                     TQBitmap bm_clip( sw, sh, 1 );
                     bm_clip.fill( color1 );
                     pm.setMask( bm_clip.xForm(mat) );
@@ -2827,10 +2827,10 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
         map( x, y, &x, &y );
     }
 
-    TQBitmap *tqmask = (TQBitmap *)pixmap.tqmask();
+    TQBitmap *mask = (TQBitmap *)pixmap.mask();
     bool mono = pixmap.depth() == 1;
 
-    if ( tqmask && !hasClipping() && pdev != paintEventDevice ) {
+    if ( mask && !hasClipping() && pdev != paintEventDevice ) {
         if ( mono ) {                           // needs GCs pen color
             bool selfmask = pixmap.data->selfmask;
             if ( selfmask ) {
@@ -2839,7 +2839,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
             } else {
                 XSetFillStyle( dpy, gc, FillOpaqueStippled );
                 XSetStipple( dpy, gc, pixmap.handle() );
-                XSetClipMask( dpy, gc, tqmask->handle() );
+                XSetClipMask( dpy, gc, mask->handle() );
                 XSetClipOrigin( dpy, gc, x-sx, y-sy );
             }
             XSetTSOrigin( dpy, gc, x-sx, y-sy );
@@ -2861,9 +2861,9 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
 
     TQRegion rgn = crgn;
 
-    if ( tqmask ) {                               // pixmap has clip tqmask
+    if ( mask ) {                               // pixmap has clip mask
         // Implies that clipping is on, either explicit or implicit
-        // Create a new tqmask that combines the tqmask with the clip region
+        // Create a new mask that combines the mask with the clip region
 
         if ( pdev == paintEventDevice && paintEventClipRegion ) {
             if ( hasClipping() )
@@ -2883,15 +2883,15 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
 	XRectangle *rects = (XRectangle *)qt_getClipRects( rgn, num );
         XSetClipRectangles( dpy, cgc, -x, -y, rects, num, YXBanded );
         XSetFillStyle( dpy, cgc, FillOpaqueStippled );
-        XSetStipple( dpy, cgc, tqmask->handle() );
+        XSetStipple( dpy, cgc, mask->handle() );
         XSetTSOrigin( dpy, cgc, -sx, -sy );
         XFillRectangle( dpy, comb->handle(), cgc, 0, 0, sw, sh );
         XSetTSOrigin( dpy, cgc, 0, 0 );         // restore cgc
         XSetFillStyle( dpy, cgc, FillSolid );
         XSetClipMask( dpy, cgc, None );
-        tqmask = comb;                            // it's deleted below
+        mask = comb;                            // it's deleted below
 
-        XSetClipMask( dpy, gc, tqmask->handle() );
+        XSetClipMask( dpy, gc, mask->handle() );
         XSetClipOrigin( dpy, gc, x, y );
     }
 
@@ -2920,10 +2920,10 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
         }
     }
 
-    if ( tqmask ) {                               // restore clipping
+    if ( mask ) {                               // restore clipping
         XSetClipOrigin( dpy, gc, 0, 0 );
         XSetRegion( dpy, gc, rgn.handle() );
-        delete tqmask;                            // delete comb, created above
+        delete mask;                            // delete comb, created above
     }
 }
 
@@ -3010,11 +3010,11 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h,
       - not an external tqdevice
       - not scale or rotshear
       - not mono pixmap
-      - no tqmask
+      - no mask
     */
-    TQBitmap *tqmask = (TQBitmap *)pixmap.tqmask();
+    TQBitmap *mask = (TQBitmap *)pixmap.mask();
     if ( !testf(ExtDev) && txop <= TxTranslate && pixmap.depth() > 1 &&
-         tqmask == 0 ) {
+         mask == 0 ) {
         if ( txop == TxTranslate )
             map( x, y, &x, &y );
 
@@ -3074,10 +3074,10 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h,
         }
         TQPixmap tile( tw, th, pixmap.depth(), TQPixmap::NormalOptim );
         fillTile( &tile, pixmap );
-        if ( tqmask ) {
-            TQBitmap tiletqmask( tw, th, TQPixmap::NormalOptim );
-            fillTile( &tiletqmask, *tqmask );
-            tile.setMask( tiletqmask );
+        if ( mask ) {
+            TQBitmap tilemask( tw, th, TQPixmap::NormalOptim );
+            fillTile( &tilemask, *mask );
+            tile.setMask( tilemask );
         }
         drawTile( this, x, y, w, h, tile, sx, sy );
     } else {
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp
index 8fb53805b..0e0cfeec1 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp
@@ -60,7 +60,7 @@
 
 #define VERIFY_TQPIXMAP_OBJECT_FUNCTION(x)	\
 if (!dynamic_cast<const TQPixmap*>(static_cast<const QPixmap*>(this))) {	\
-	printf("[WARNING] An attempt was made to access the TQPixmap::tqmask method from an object not of type TQPixmap [possibly QPixmap]\n\r\tThis may indicate creation and subsequent [illegal] downcasting of a QPixmap object to a TQPixmap object within your application\n\r\tNo pixmap was returned\n\r");	\
+	printf("[WARNING] An attempt was made to access the TQPixmap::mask method from an object not of type TQPixmap [possibly QPixmap]\n\r\tThis may indicate creation and subsequent [illegal] downcasting of a QPixmap object to a TQPixmap object within your application\n\r\tNo pixmap was returned\n\r");	\
 	return x;				\
 }
 
@@ -201,12 +201,12 @@ TQt::HANDLE TQPixmap::x11AppRootWindow( int screen ) {
 	return QX11Info::appRootWindow(screen);
 }
 
-const TQBitmap *TQPixmap::tqmask() const {
+const TQBitmap *TQPixmap::mask() const {
 	// HACK
 	// Make absolutely sure that this is a TQPixmap object!
 	VERIFY_TQPIXMAP_OBJECT_FUNCTION(0)
 
-	const QBitmap& ptrRef = mask();
+	const QBitmap& ptrRef = QPixmap::mask();
 	if (ptrRef.isNull() == true) {
 		return 0;
 	}
@@ -241,8 +241,8 @@ void TQPixmap::resize_helper(const QSize s)
     }
 
     // Mask too....
-    if (!mask().isNull()) {
-        TQBitmap m = mask();
+    if (!QPixmap::mask().isNull()) {
+        TQBitmap m = QPixmap::mask();
         if (m.size() != QSize(w,h)) {
             TQBitmap pmr(QSize(w, h));
             pmr.fill(Qt::color0);
@@ -466,8 +466,8 @@ TQBitmap TQPixmap::createHeuristicMask( bool clipTight ) const {
     You can retrieve the width(), height(), depth() and size() of a
     pixmap. The enclosing rectangle is given by rect(). Pixmaps can be
     filled with fill() and resized with resize(). You can create and
-    set a tqmask with createHeuristicMask() and setMask(). Use
-    selfMask() to see if the pixmap is identical to its tqmask.
+    set a mask with createHeuristicMask() and setMask(). Use
+    selfMask() to see if the pixmap is identical to its mask.
 
     In addition to loading a pixmap from file using load() you can
     also loadFromData(). You can control optimization with
@@ -1047,11 +1047,11 @@ void TQPixmap::resize( int w, int h )
 	qWarning("TQPixmap::resize: TODO: resize alpha data");
     else
 #endif // TQ_WS_X11
-	if ( data->tqmask ) {				// resize tqmask as well
-	    if ( data->selfmask ) {			// preserve self-tqmask
+	if ( data->mask ) {				// resize mask as well
+	    if ( data->selfmask ) {			// preserve self-mask
 		pm.setMask( *((TQBitmap*)&pm) );
-	    } else {				// independent tqmask
-		TQBitmap m = *data->tqmask;
+	    } else {				// independent mask
+		TQBitmap m = *data->mask;
 		m.resize( w, h );
 		pm.setMask( m );
 	    }
@@ -1061,53 +1061,53 @@ void TQPixmap::resize( int w, int h )
 
 
 /*!
-    \fn const TQBitmap *TQPixmap::tqmask() const
+    \fn const TQBitmap *TQPixmap::mask() const
 
-    Returns the tqmask bitmap, or 0 if no tqmask has been set.
+    Returns the mask bitmap, or 0 if no mask has been set.
 
     \sa setMask(), TQBitmap, hasAlpha()
 */
 
 /*!
-    Sets a tqmask bitmap.
+    Sets a mask bitmap.
 
-    The \a newtqmask bitmap defines the clip tqmask for this pixmap. Every
-    pixel in \a newtqmask corresponds to a pixel in this pixmap. Pixel
-    value 1 means opaque and pixel value 0 means transtqparent. The tqmask
+    The \a newmask bitmap defines the clip mask for this pixmap. Every
+    pixel in \a newmask corresponds to a pixel in this pixmap. Pixel
+    value 1 means opaque and pixel value 0 means transparent. The mask
     must have the same size as this pixmap.
 
-    \warning Setting the tqmask on a pixmap will cause any alpha channel
+    \warning Setting the mask on a pixmap will cause any alpha channel
     data to be cleared. For example:
     \code
 	TQPixmap alpha( "image-with-alpha.png" );
 	TQPixmap alphacopy = alpha;
-	alphacopy.setMask( *alphacopy.tqmask() );
+	alphacopy.setMask( *alphacopy.mask() );
     \endcode
     Now, alpha and alphacopy are visually different.
 
-    Setting a \link isNull() null\endlink tqmask resets the tqmask.
+    Setting a \link isNull() null\endlink mask resets the mask.
 
-    \sa tqmask(), createHeuristicMask(), TQBitmap
+    \sa mask(), createHeuristicMask(), TQBitmap
 */
 
-void TQPixmap::setMask( const TQBitmap &newtqmask )
+void TQPixmap::setMask( const TQBitmap &newmask )
 {
-    const TQPixmap *tmp = &newtqmask;		// dec cxx bug
+    const TQPixmap *tmp = &newmask;		// dec cxx bug
     if ( (data == tmp->data) ||
-	 ( newtqmask.handle() && newtqmask.handle() == handle() ) ) {
+	 ( newmask.handle() && newmask.handle() == handle() ) ) {
 	TQPixmap m = tmp->copy( TRUE );
 	setMask( *((TQBitmap*)&m) );
-	data->selfmask = TRUE;			// tqmask == pixmap
+	data->selfmask = TRUE;			// mask == pixmap
 	return;
     }
 
-    if ( newtqmask.isNull() ) {			// reset the tqmask
-	if (data->tqmask) {
+    if ( newmask.isNull() ) {			// reset the mask
+	if (data->mask) {
 	    detach();
 	    data->selfmask = FALSE;
 
-	    delete data->tqmask;
-	    data->tqmask = 0;
+	    delete data->mask;
+	    data->mask = 0;
 	}
 	return;
     }
@@ -1115,48 +1115,48 @@ void TQPixmap::setMask( const TQBitmap &newtqmask )
     detach();
     data->selfmask = FALSE;
 
-    if ( newtqmask.width() != width() || newtqmask.height() != height() ) {
+    if ( newmask.width() != width() || newmask.height() != height() ) {
 #if defined(TQT_CHECK_RANGE)
-	qWarning( "TQPixmap::setMask: The pixmap and the tqmask must have "
+	qWarning( "TQPixmap::setMask: The pixmap and the mask must have "
 		  "the same size" );
 #endif
 	return;
     }
 #if defined(TQ_WS_MAC) || (defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE))
-    // when setting the tqmask, we get rid of the alpha channel completely
+    // when setting the mask, we get rid of the alpha channel completely
     delete data->alphapm;
     data->alphapm = 0;
 #endif // TQ_WS_X11 && !TQT_NO_XFTFREETYPE
 
-    delete data->tqmask;
+    delete data->mask;
     TQBitmap* newmaskcopy;
-    if ( newtqmask.tqmask() )
+    if ( newmask.mask() )
 	newmaskcopy = (TQBitmap*)new TQPixmap( tmp->copy( TRUE ) );
     else
-	newmaskcopy = new TQBitmap( newtqmask );
+	newmaskcopy = new TQBitmap( newmask );
 #ifdef TQ_WS_X11
     newmaskcopy->x11SetScreen( x11Screen() );
 #endif
-    data->tqmask = newmaskcopy;
+    data->mask = newmaskcopy;
 }
 
 
 /*!
     \fn bool TQPixmap::selfMask() const
 
-    Returns TRUE if the pixmap's tqmask is identical to the pixmap
+    Returns TRUE if the pixmap's mask is identical to the pixmap
     itself; otherwise returns FALSE.
 
-    \sa tqmask()
+    \sa mask()
 */
 
 #ifndef TQT_NO_IMAGE_HEURISTIC_MASK
 /*!
-    Creates and returns a heuristic tqmask for this pixmap. It works by
+    Creates and returns a heuristic mask for this pixmap. It works by
     selecting a color from one of the corners and then chipping away
     pixels of that color, starting at all the edges.
 
-    The tqmask may not be perfect but it should be reasonable, so you
+    The mask may not be perfect but it should be reasonable, so you
     can do things such as the following:
     \code
     pm->setMask( pm->createHeuristicMask() );
@@ -1166,8 +1166,8 @@ void TQPixmap::setMask( const TQBitmap &newtqmask )
     TQImage, non-trivial computations and a transformation back to a
     TQBitmap.
 
-    If \a clipTight is TRUE the tqmask is just large enough to cover the
-    pixels; otherwise, the tqmask is larger than the data pixels.
+    If \a clipTight is TRUE the mask is just large enough to cover the
+    pixels; otherwise, the mask is larger than the data pixels.
 
     \sa TQImage::createHeuristicMask()
 */
@@ -1505,7 +1505,7 @@ static TQPixmap grabChildWidgets( TQWidget * w )
 		 ((TQWidget *)child)->tqgeometry().intersects( w->rect() ) ) {
 		// those conditions aren't quite right, it's possible
 		// to have a grandchild completely outside its
-		// grandtqparent, but partially inside its tqparent.  no
+		// grandparent, but partially inside its parent.  no
 		// point in optimizing for that.
 
 		// make sure to evaluate pos() first - who knows what
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h
index 13a0a2c34..a48970697 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h
@@ -99,7 +99,7 @@ public:
 	TQBitmap createHeuristicMask( bool clipTight = TRUE ) const;
 #endif
 
-	const TQBitmap *tqmask() const;
+	const TQBitmap *mask() const;
 	TQImage convertToImage() const;
 	bool selfMask() const;
 
@@ -237,7 +237,7 @@ public:
     void	resize( int width, int height );
     void	resize( const TQSize & );
 
-    const TQBitmap *tqmask() const;
+    const TQBitmap *mask() const;
     void	setMask( const TQBitmap & );
     bool	selfMask() const;
     bool	hasAlpha() const;
@@ -340,7 +340,7 @@ protected:
 	uint	mcp	 : 1;
 #endif
 	int	ser_no;
-	TQBitmap *tqmask;
+	TQBitmap *mask;
 #if defined(TQ_WS_WIN)
 	TQPixmap *maskpm;
 	union {
@@ -425,9 +425,9 @@ inline void TQPixmap::resize( const TQSize &s )
     resize( s.width(), s.height() );
 }
 
-inline const TQBitmap *TQPixmap::tqmask() const
+inline const TQBitmap *TQPixmap::mask() const
 {
-    return data->tqmask;
+    return data->mask;
 }
 
 inline bool TQPixmap::selfMask() const
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp
index 37bb0ee09..1caf3a352 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp
@@ -482,7 +482,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim )
 void TQPixmap::deref()
 {
     if ( data && data->deref() ) {			// last reference lost
-	delete data->tqmask;
+	delete data->mask;
 	delete data->alphapm;
 	if ( data->ximage )
 	    qSafeXDestroyImage( (XImage*)data->ximage );
@@ -617,8 +617,8 @@ int TQPixmap::defaultDepth()
     Sets pixmap drawing optimization for this pixmap.
 
     The \a optimization setting affects pixmap operations, in
-    particular drawing of transtqparent pixmaps (bitBlt() a pixmap with
-    a tqmask set) and pixmap transformations (the xForm() function).
+    particular drawing of transparent pixmaps (bitBlt() a pixmap with
+    a mask set) and pixmap transformations (the xForm() function).
 
     Pixmap optimization involves keeping intermediate results in a
     cache buffer and using the cache to speed up bitBlt() and xForm().
@@ -781,7 +781,7 @@ TQImage TQPixmap::convertToImage() const
 	return image;
     }
 
-    const TQPixmap* msk = tqmask();
+    const TQPixmap* msk = mask();
     const TQPixmap *alf = data->alphapm;
 
     TQImage alpha;
@@ -1032,7 +1032,7 @@ TQImage TQPixmap::convertToImage() const
 		image.setColor( trans, 0x00000000 );
 	    } else {
 		image.setNumColors( ncols );	// create color table
-		// oh dear... no spare "transtqparent" pixel.
+		// oh dear... no spare "transparent" pixel.
 		// use first pixel in image (as good as any).
 		trans = image.scanLine( i )[0];
 	    }
@@ -1128,9 +1128,9 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
     if ( w >= 32768 || h >= 32768 )
         return FALSE;
 
-    // get rid of the tqmask
-    delete data->tqmask;
-    data->tqmask = 0;
+    // get rid of the mask
+    delete data->mask;
+    data->mask = 0;
 
     // get rid of alpha pixmap
     delete data->alphapm;
@@ -1404,18 +1404,18 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 		        ? g << green_shift : g >> -green_shift; \
 		    b = blue_shift  > 0 \
 		        ? b << blue_shift  : b >> -blue_shift; \
-		    pixel = (r & red_tqmask)|(g & green_tqmask) | (b & blue_tqmask) \
+		    pixel = (r & red_mask)|(g & green_mask) | (b & blue_mask) \
 			    | ~(blue_mask | green_mask | red_mask); \
 		}
 
-// optimized case - no d8 case, shift only once instead of twice, tqmask only once instead of twice,
+// optimized case - no d8 case, shift only once instead of twice, mask only once instead of twice,
 // use direct values instead of variables, and use only one statement
 // (*p >> 16), (*p >> 8 ) and (*p) are tqRed(),tqGreen() and tqBlue() without masking
 // shifts have to be passed including the shift operator (e.g. '>>3'), because of the direction
-#define GET_PIXEL_OPT(red_shift,green_shift,blue_shift,red_tqmask,green_tqmask,blue_tqmask) \
-                int pixel = ((( *p >> 16 ) red_shift ) & red_tqmask ) \
-                    | ((( *p >> 8 ) green_shift ) & green_tqmask ) \
-                    | ((( *p ) blue_shift ) & blue_tqmask ); \
+#define GET_PIXEL_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask) \
+                int pixel = ((( *p >> 16 ) red_shift ) & red_mask ) \
+                    | ((( *p >> 8 ) green_shift ) & green_mask ) \
+                    | ((( *p ) blue_shift ) & blue_mask ); \
                 ++p;
 
 
@@ -1443,7 +1443,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 
 // again, optimized case
 // can't be optimized that much :(
-#define GET_PIXEL_DITHER_TC_OPT(red_shift,green_shift,blue_shift,red_tqmask,green_tqmask,blue_tqmask, \
+#define GET_PIXEL_DITHER_TC_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask, \
                                 rbits,gbits,bbits) \
 		const int thres = D[x%16][y%16]; \
 		int r = tqRed  ( *p ); \
@@ -1458,9 +1458,9 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 		if ( b <= (255-(1<<(8-bbits))) && ((b<<bbits) & 255) \
 			> thres) \
 		    b += (1<<(8-bbits)); \
-                int pixel = (( r red_shift ) & red_tqmask ) \
-                    | (( g green_shift ) & green_tqmask ) \
-                    | (( b blue_shift ) & blue_tqmask );
+                int pixel = (( r red_shift ) & red_mask ) \
+                    | (( g green_shift ) & green_mask ) \
+                    | (( b blue_shift ) & blue_mask );
 
 #define CYCLE(body) \
 	for ( uint y=0; y<h; y++ ) { \
@@ -1841,7 +1841,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	setMask( m );
 
 #ifndef TQT_NO_XFTFREETYPE
-	// does this image have an alphamap (and not just a 1bpp tqmask)?
+	// does this image have an alphamap (and not just a 1bpp mask)?
 	bool alphamap = image.depth() == 32;
 	if (image.depth() == 8) {
 	    const TQRgb * const rgb = image.colorTable();
@@ -2221,11 +2221,11 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 	TQPixmap pm( w, h, dptr, TQImage::systemBitOrder() != TQImage::BigEndian );
 	pm.data->bitmap = data->bitmap;
 	free( dptr );
-	if ( data->tqmask ) {
-	    if ( data->selfmask )		// pixmap == tqmask
+	if ( data->mask ) {
+	    if ( data->selfmask )		// pixmap == mask
 		pm.setMask( *((TQBitmap*)(&pm)) );
 	    else
-		pm.setMask( data->tqmask->xForm(matrix) );
+		pm.setMask( data->mask->xForm(matrix) );
 	}
 	return pm;
     } else {					// color pixmap
@@ -2246,8 +2246,8 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 	}
 #endif
 
-	if ( data->tqmask ) // xform tqmask, too
-	    pm.setMask( data->tqmask->xForm(matrix) );
+	if ( data->mask ) // xform mask, too
+	    pm.setMask( data->mask->xForm(matrix) );
 
 #ifndef TQT_NO_XFTFREETYPE
 	if ( qt_use_xrender && qt_has_xft && data->alphapm ) { // xform the alpha channel
@@ -2359,23 +2359,23 @@ void TQPixmap::x11SetScreen( int screen )
 }
 
 /*!
-    Returns TRUE this pixmap has an alpha channel or a tqmask.
+    Returns TRUE this pixmap has an alpha channel or a mask.
 
-    \sa hasAlphaChannel() tqmask()
+    \sa hasAlphaChannel() mask()
 */
 bool TQPixmap::hasAlpha() const
 {
-    return data->alphapm || data->tqmask;
+    return data->alphapm || data->mask;
 }
 
 /*!
     Returns TRUE if the pixmap has an alpha channel; otherwise it
     returns FALSE.
 
-    NOTE: If the pixmap has a tqmask but not alpha channel, this
+    NOTE: If the pixmap has a mask but not alpha channel, this
     function returns FALSE.
 
-    \sa hasAlpha() tqmask()
+    \sa hasAlpha() mask()
 */
 bool TQPixmap::hasAlphaChannel() const
 {
@@ -2386,7 +2386,7 @@ bool TQPixmap::hasAlphaChannel() const
     \relates TQPixmap
 
     Copies a block of pixels from \a src to \a dst.  The alpha channel
-    and tqmask data (if any) is also copied from \a src.  NOTE: \a src
+    and mask data (if any) is also copied from \a src.  NOTE: \a src
     is \e not alpha blended or masked when copied to \a dst.  Use
     bitBlt() or TQPainter::drawPixmap() to perform alpha blending or
     masked drawing.
@@ -2416,17 +2416,17 @@ TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy,
     // copy pixel data
     bitBlt( dst, dx, dy, src, sx, sy, sw, sh, TQt::CopyROP, TRUE );
 
-    // copy tqmask data
-    if ( src->data->tqmask ) {
-	if ( ! dst->data->tqmask ) {
-	    dst->data->tqmask = new TQBitmap( dst->width(), dst->height() );
+    // copy mask data
+    if ( src->data->mask ) {
+	if ( ! dst->data->mask ) {
+	    dst->data->mask = new TQBitmap( dst->width(), dst->height() );
 
 	    // new masks are fully opaque by default
-	    dst->data->tqmask->fill( TQt::color1 );
+	    dst->data->mask->fill( TQt::color1 );
 	}
 
-	bitBlt( dst->data->tqmask, dx, dy,
-		src->data->tqmask, sx, sy, sw, sh, TQt::CopyROP, TRUE );
+	bitBlt( dst->data->mask, dx, dy,
+		src->data->mask, sx, sy, sw, sh, TQt::CopyROP, TRUE );
     }
 
 #ifndef TQT_NO_XFTFREETYPE
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprinter.h b/experimental/tqtinterface/qt4/src/kernel/tqprinter.h
index a719a95fb..e1e6cc5be 100755
--- a/experimental/tqtinterface/qt4/src/kernel/tqprinter.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqprinter.h
@@ -203,7 +203,7 @@ public:
     bool        abort();
     bool        aborted()       const;
 
-    bool        setup( TQWidget *tqparent = 0 );
+    bool        setup( TQWidget *parent = 0 );
 
     PaperSource paperSource()   const;
     virtual void setPaperSource( PaperSource );
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp b/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp
index 047247949..80946867d 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp
@@ -137,7 +137,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p )
 // 
 // 			// try to replace this process with "true" - this prevents
 // 			// global destructors from being called (that could possibly
-// 			// do wrong things to the tqparent process)
+// 			// do wrong things to the parent process)
 // 			(void)execlp("true", "true", (char *)0);
 // 			(void)execl("/bin/true", "true", (char *)0);
 // 			(void)execl("/usr/bin/true", "true", (char *)0);
@@ -200,13 +200,13 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p )
 // 			(void)execv( "/usr/bin/lpr", lprargs);
 // 		    }
 // 		    // if we couldn't exec anything, close the fd,
-// 		    // wait for a second so the tqparent process (the
+// 		    // wait for a second so the parent process (the
 // 		    // child of the GUI process) has exited.  then
 // 		    // exit.
 // 		    ::close( 0 );
 // 		    (void)::sleep( 1 );
 // 		    ::exit( 0 );
-// 		} else {                // tqparent process
+// 		} else {                // parent process
 // 		    ::close( fds[0] );
 // 		    pdrv = new TQPSPrinter( this, fds[1] );
 // 		    state = PST_ACTIVE;
@@ -419,7 +419,7 @@ static void deleteGlobalPrinterDefaults()
 }
 
 /*!
-    Opens a printer setup dialog, with tqparent \a tqparent, and asks the
+    Opens a printer setup dialog, with parent \a parent, and asks the
     user to specify which printer they wish to use and what settings
     it should have.
 
@@ -427,10 +427,10 @@ static void deleteGlobalPrinterDefaults()
     user canceled the operation.
 */
 
-bool TQPrinter::setup( TQWidget * tqparent )
+bool TQPrinter::setup( TQWidget * parent )
 {
 #ifndef TQT_NO_PRINTDIALOG
-    bool result = TQPrintDialog::getPrinterSetup( this, tqparent  );
+    bool result = TQPrintDialog::getPrinterSetup( this, parent  );
 #else
     bool result = FALSE;
 #endif
@@ -556,7 +556,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p )
 
 			// try to replace this process with "true" - this prevents
 			// global destructors from being called (that could possibly
-			// do wrong things to the tqparent process)
+			// do wrong things to the parent process)
 			(void)execlp("true", "true", (char *)0);
 			(void)execl("/bin/true", "true", (char *)0);
 			(void)execl("/usr/bin/true", "true", (char *)0);
@@ -619,13 +619,13 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p )
 			(void)execv( "/usr/bin/lpr", lprargs);
 		    }
 		    // if we couldn't exec anything, close the fd,
-		    // wait for a second so the tqparent process (the
+		    // wait for a second so the parent process (the
 		    // child of the GUI process) has exited.  then
 		    // exit.
 		    ::close( 0 );
 		    (void)::sleep( 1 );
 		    ::exit( 0 );
-		} else {                // tqparent process
+		} else {                // parent process
 		    ::close( fds[0] );
 		    pdrv = new TQPSPrinter( this, fds[1] );
 		    state = PST_ACTIVE;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp b/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp
index c85e2debf..8249ff251 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp
@@ -219,13 +219,13 @@
 */
 
 /*!
-    Constructs a TQProcess object. The \a tqparent and \a name parameters
+    Constructs a TQProcess object. The \a parent and \a name parameters
     are passed to the TQObject constructor.
 
     \sa setArguments() addArgument() start()
 */
-TQProcess::TQProcess( TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
+TQProcess::TQProcess( TQObject *parent, const char *name )
+    : TQObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
     wroteToStdinConnected( FALSE ),
     readStdoutCalled( FALSE ), readStderrCalled( FALSE ),
     comms( Stdin|Stdout|Stderr )
@@ -235,7 +235,7 @@ TQProcess::TQProcess( TQObject *tqparent, const char *name )
 
 /*!
     Constructs a TQProcess with \a arg0 as the command to be executed.
-    The \a tqparent and \a name parameters are passed to the TQObject
+    The \a parent and \a name parameters are passed to the TQObject
     constructor.
 
     The process is not started. You must call start() or launch() to
@@ -243,8 +243,8 @@ TQProcess::TQProcess( TQObject *tqparent, const char *name )
 
     \sa setArguments() addArgument() start()
 */
-TQProcess::TQProcess( const TQString& arg0, TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
+TQProcess::TQProcess( const TQString& arg0, TQObject *parent, const char *name )
+    : TQObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
     wroteToStdinConnected( FALSE ),
     readStdoutCalled( FALSE ), readStderrCalled( FALSE ),
     comms( Stdin|Stdout|Stderr )
@@ -257,7 +257,7 @@ TQProcess::TQProcess( const TQString& arg0, TQObject *tqparent, const char *name
     Constructs a TQProcess with \a args as the arguments of the
     process. The first element in the list is the command to be
     executed. The other elements in the list are the arguments to this
-    command. The \a tqparent and \a name parameters are passed to the
+    command. The \a parent and \a name parameters are passed to the
     TQObject constructor.
 
     The process is not started. You must call start() or launch() to
@@ -265,8 +265,8 @@ TQProcess::TQProcess( const TQString& arg0, TQObject *tqparent, const char *name
 
     \sa setArguments() addArgument() start()
 */
-TQProcess::TQProcess( const TQStringList& args, TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
+TQProcess::TQProcess( const TQStringList& args, TQObject *parent, const char *name )
+    : TQObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
     wroteToStdinConnected( FALSE ),
     readStdoutCalled( FALSE ), readStderrCalled( FALSE ),
     comms( Stdin|Stdout|Stderr )
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprocess.h b/experimental/tqtinterface/qt4/src/kernel/tqprocess.h
index ad00b303b..741077c0b 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqprocess.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqprocess.h
@@ -58,9 +58,9 @@ class TQ_EXPORT TQProcess : public TQObject
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQProcess( TQObject *tqparent=0, const char *name=0 );
-    TQProcess( const TQString& arg0, TQObject *tqparent=0, const char *name=0 );
-    TQProcess( const TQStringList& args, TQObject *tqparent=0, const char *name=0 );
+    TQProcess( TQObject *parent=0, const char *name=0 );
+    TQProcess( const TQString& arg0, TQObject *parent=0, const char *name=0 );
+    TQProcess( const TQStringList& args, TQObject *parent=0, const char *name=0 );
     ~TQProcess();
 
     // set and get the arguments and working directory
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp
index f881bf8e0..010951278 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp
@@ -148,8 +148,8 @@ static const char *const ps_header =
 "TQCIcolor length 3 idiv 1 sub{/TQCIindex ED/x TQCIindex 3 mul d TQCIgray\n"
 "TQCIindex TQCIcolor x get 0.30 mul TQCIcolor x 1 add get 0.59 mul TQCIcolor x 2\n"
 "add get 0.11 mul add add cvi put}for TQCIgray image}ie}D/di{gsave TR 1 i 1 eq\n"
-"{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagetqmask BkCol SC\n"
-"imagetqmask}{pop false 3 1 roll imagetqmask}ie}{dup false ne{/languagelevel\n"
+"{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagemask BkCol SC\n"
+"imagemask}{pop false 3 1 roll imagemask}ie}{dup false ne{/languagelevel\n"
 "where{pop languagelevel 3 ge}{false}ie}{false}ie{/ma ED 8 eq{/dc[0 1]d\n"
 "/DeviceGray}{/dc[0 1 0 1 0 1]d/DeviceRGB}ie scs/im ED/mt ED/h ED/w ED/id 7\n"
 "DB/ImageType 1 d/Width w d/Height h d/ImageMatrix mt d/DataSource im d\n"
@@ -1379,7 +1379,7 @@ public:
     void resetDrawingTools( TQPainter * );
     void emitHeader( bool finished );
     void setFont( const TQFont &, int script );
-    void drawImage( TQPainter *, float x, float y, float w, float h, const TQImage &img, const TQImage &tqmask );
+    void drawImage( TQPainter *, float x, float y, float w, float h, const TQImage &img, const TQImage &mask );
     void initPage( TQPainter *paint );
     void flushPage( bool last = FALSE );
 
@@ -5807,7 +5807,7 @@ static const char * psJoin( TQt::PenJoinStyle p ) {
 
 
 void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, float h,
-				   const TQImage &img, const TQImage &tqmask )
+				   const TQImage &img, const TQImage &mask )
 {
     if ( !w || !h || img.isNull() ) return;
 
@@ -5831,7 +5831,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w,
         while( suby < height ) {
             drawImage(paint, x, y + suby/scaleY, w, TQMIN( subheight, height-suby )/scaleY,
 		      img.copy( 0, suby, width, TQMIN( subheight, height-suby ) ),
-		      tqmask.isNull() ? tqmask : tqmask.copy( 0, suby, width, TQMIN( subheight, height-suby ) ));
+		      mask.isNull() ? mask : mask.copy( 0, suby, width, TQMIN( subheight, height-suby ) ));
             suby += subheight;
         }
     } else {
@@ -5839,10 +5839,10 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w,
 	int size = 0;
 	const char *bits;
 
-	if ( !tqmask.isNull() ) {
-	    out = ::compress( tqmask, TRUE );
+	if ( !mask.isNull() ) {
+	    out = ::compress( mask, TRUE );
 	    size = (width+7)/8*height;
-	    pageStream << "/tqmask " << size << " string uc\n";
+	    pageStream << "/mask " << size << " string uc\n";
 	    ps_r7( pageStream, out, out.size() );
 	    pageStream << "d\n";
 	}
@@ -5862,7 +5862,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w,
 	ps_r7( pageStream, out, out.size() );
 	pageStream << "d\n"
 		   << width << ' ' << height << "[" << scaleX << " 0 0 " << scaleY << " 0 0]sl "
-		   << bits << (!tqmask.isNull() ? "tqmask " : "false ")
+		   << bits << (!mask.isNull() ? "mask " : "false ")
 		   << x << ' ' << y << " di\n";
     }
 }
@@ -6486,10 +6486,10 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p )
         TQRect r = *p[0].rect;
         TQImage img;
         img = *(p[1].pixmap);
-	TQImage tqmask;
-	if ( p[1].pixmap->tqmask() )
-	    tqmask = *(p[1].pixmap->tqmask());
-        d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, tqmask);
+	TQImage mask;
+	if ( p[1].pixmap->mask() )
+	    mask = *(p[1].pixmap->mask());
+        d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, mask);
         break;
     }
     case PdcDrawImage: {
@@ -6497,12 +6497,12 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p )
             break;
         TQRect r = *(p[0].rect);
         TQImage img = *(p[1].image);
-	TQImage tqmask;
+	TQImage mask;
 #ifndef TQT_NO_IMAGE_DITHER_TO_1
 	if ( img.hasAlphaBuffer() )
-	    tqmask = img.createAlphaMask();
+	    mask = img.createAlphaMask();
 #endif
-        d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, tqmask);
+        d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, mask);
         break;
     }
     case PdcSetBkColor:
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp
index e8e91b3df..644255bed 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp
@@ -6724,7 +6724,7 @@ TQTextImage::TQTextImage(TQTextDocument *p, const QMap<TQString, TQString> &attr
             }
         }
         if (pm.hasAlphaChannel()) {
-            QRegion mask(pm.mask());
+            QRegion mask(pm.QPixmap::mask());
             QRegion all(0, 0, pm.width(), pm.height());
             reg = new QRegion(all.subtracted(mask));
         }
@@ -8954,7 +8954,7 @@ void TQTextCursor::insert( const QString &str, bool checkNewLine, TQMemArray<TQT
     para->format( -1, TRUE );
     if ( h != para->rect().height() )
 	invalidateNested();
-    else if ( para->document() && para->document()->tqparent() )
+    else if ( para->document() && para->document()->parent() )
 	para->document()->nextDoubleBuffered = TRUE;
 
     fixCursorPosition();
@@ -9597,7 +9597,7 @@ bool TQTextCursor::remove()
 	para->format( -1, TRUE );
 	if ( h != para->rect().height() )
 	    invalidateNested();
-	else if ( para->document() && para->document()->tqparent() )
+	else if ( para->document() && para->document()->parent() )
 	    para->document()->nextDoubleBuffered = TRUE;
 	return FALSE;
     } else if ( para->next() ) {
@@ -9621,7 +9621,7 @@ bool TQTextCursor::removePreviousChar()
 	para->format( -1, TRUE );
 	if ( h != para->rect().height() )
 	    invalidateNested();
-	else if ( para->document() && para->document()->tqparent() )
+	else if ( para->document() && para->document()->parent() )
 	    para->document()->nextDoubleBuffered = TRUE;
 	return FALSE;
     } else if ( para->prev() ) {
@@ -11025,7 +11025,7 @@ bool TQTextDocument::setSelectionEnd( int id, const TQTextCursor &cursor )
 	    if ( p == lastParagraph() && c.atParagEnd() )
 		break;
 	} else {
-	    if ( p->document()->tqparent() )
+	    if ( p->document()->parent() )
 		do {
 		    c.gotoNextLetter();
 		} while ( c.paragraph() == p );
@@ -11090,7 +11090,7 @@ bool TQTextDocument::removeSelection( int id )
 	    p = start.paragraph();
 	    p->removeSelection( id );
 	    //### avoid endless loop by all means necessary, did somebody mention refactoring?
-	    if ( !tqparent() && p == lParag )
+	    if ( !parent() && p == lParag )
 		break;
 	}
 	start.gotoNextLetter();
@@ -11147,7 +11147,7 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const
 
     // end selection 3.0.3 improvement
 
-    if ( asRichText && !tqparent() ) {
+    if ( asRichText && !parent() ) {
 	richTextExportStart = &c1;
 	richTextExportEnd = &c2;
 
@@ -11670,7 +11670,7 @@ TQTextParagraph *TQTextDocument::draw( TQPainter *p, int cx, int cy, int cw, int
 
  floating:
     if ( parag->rect().y() + parag->rect().height() < parag->document()->height() ) {
-	if ( !parag->document()->tqparent() ) {
+	if ( !parag->document()->parent() ) {
 	    TQRect fillRect = TQRect( 0, parag->rect().y() + parag->rect().height(), parag->document()->width(),
 		parag->document()->height() - ( parag->rect().y() + parag->rect().height() ) );
 	    if ( TQRect( cx, cy, cw, ch ).intersects( fillRect ) )
@@ -14444,7 +14444,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd )
 
 TQTextFormat *TQTextFormatCollection::format( TQTextFormat *f )
 {
-    if ( f->tqparent() == this || f == defFormat ) {
+    if ( f->parent() == this || f == defFormat ) {
 	lastFormat = f;
 	lastFormat->addRef();
 	return lastFormat;
@@ -14998,10 +14998,10 @@ TQTextImage::TQTextImage( TQTextDocument *p, const QMap<TQString, TQString> &att
 		pmi.ref++;
 	    }
 	}
-	if ( pm.tqmask() ) {
-	    TQRegion tqmask( *pm.tqmask() );
+	if ( pm.mask() ) {
+	    TQRegion mask( *pm.mask() );
 	    TQRegion all( 0, 0, pm.width(), pm.height() );
-	    reg = new TQRegion( all.subtract( tqmask ) );
+	    reg = new TQRegion( all.subtract( mask ) );
 	}
     }
 
@@ -16261,7 +16261,7 @@ bool TQTextTable::enterAt( TQTextCursor *c, TQTextDocument *&doc, TQTextParagrap
     doc = cell->richText();
     parag = doc->firstParagraph();
     idx = 0;
-    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x();
+    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x();
     oy += cell->tqgeometry().y() + cell->verticalAlignmentOffset() + outerborder;
     return TRUE;
 }
@@ -16294,7 +16294,7 @@ bool TQTextTable::next( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *
     doc = cell->richText();
     parag = doc->firstParagraph();
     idx = 0;
-    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x();
+    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x();
     oy += cell->tqgeometry().y() + cell->verticalAlignmentOffset() + outerborder;
     return TRUE;
 }
@@ -16327,7 +16327,7 @@ bool TQTextTable::prev( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *
     doc = cell->richText();
     parag = doc->lastParagraph();
     idx = parag->length() - 1;
-    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x();
+    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x();
     oy += cell->tqgeometry().y()  + cell->verticalAlignmentOffset() + outerborder;
     return TRUE;
 }
@@ -16365,7 +16365,7 @@ bool TQTextTable::down( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *
 	return FALSE;
     parag = doc->firstParagraph();
     idx = 0;
-    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x();
+    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x();
     oy += cell->tqgeometry().y()  + cell->verticalAlignmentOffset() + outerborder;
     return TRUE;
 }
@@ -16403,7 +16403,7 @@ bool TQTextTable::up( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *&p
 	return FALSE;
     parag = doc->lastParagraph();
     idx = parag->length() - 1;
-    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x();
+    ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x();
     oy += cell->tqgeometry().y()  + cell->verticalAlignmentOffset() + outerborder;
     return TRUE;
 }
@@ -16422,12 +16422,12 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table,
     maxw = TQWIDGETSIZE_MAX;
     minw = 0;
 
-    tqparent = table;
+    parent = table;
     row_ = row;
     col_ = column;
     stretch_ = 0;
-    richtext = new TQTextDocument( table->tqparent );
-    richtext->formatCollection()->setPaintDevice( table->tqparent->formatCollection()->paintDevice() );
+    richtext = new TQTextDocument( table->parent );
+    richtext->formatCollection()->setPaintDevice( table->parent->formatCollection()->paintDevice() );
     richtext->bodyText = fmt.color();
     richtext->setTableCell( this );
     TQString a = *attr.find( "align" );
@@ -16451,8 +16451,8 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table,
 	else if ( va == "bottom" )
 	    align |= TQt::AlignBottom;
     }
-    richtext->setFormatter( table->tqparent->formatter() );
-    richtext->setUseFormatCollection( table->tqparent->useFormatCollection() );
+    richtext->setFormatter( table->parent->formatter() );
+    richtext->setUseFormatCollection( table->parent->useFormatCollection() );
     richtext->setMimeSourceFactory( &factory );
     richtext->setStyleSheet( sheet );
     richtext->setRichText( doc, context, &fmt );
@@ -16487,7 +16487,7 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table,
 
     attributes = attr;
 
-    tqparent->addCell( this );
+    parent->addCell( this );
 }
 
 TQTextTableCell::~TQTextTableCell()
@@ -16500,11 +16500,11 @@ TQTextTableCell::~TQTextTableCell()
 
 TQSize TQTextTableCell::tqsizeHint() const
 {
-    int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding + border_tolerance);
+    int extra = 2 * ( parent->innerborder + parent->cellpadding + border_tolerance);
     int used = richtext->widthUsed() + extra;
 
     if  (stretch_ ) {
-	int w = tqparent->width * stretch_ / 100 - 2*tqparent->cellspacing - 2*tqparent->cellpadding;
+	int w = parent->width * stretch_ / 100 - 2*parent->cellspacing - 2*parent->cellpadding;
 	return TQSize( TQMIN( w, maxw ), 0 ).expandedTo( tqminimumSize() );
     }
 
@@ -16513,7 +16513,7 @@ TQSize TQTextTableCell::tqsizeHint() const
 
 TQSize TQTextTableCell::tqminimumSize() const
 {
-    int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding + border_tolerance);
+    int extra = 2 * ( parent->innerborder + parent->cellpadding + border_tolerance);
     return TQSize( TQMAX( richtext->minimumWidth() + extra, minw), 0 );
 }
 
@@ -16533,7 +16533,7 @@ bool TQTextTableCell::isEmpty() const
 }
 void TQTextTableCell::setGeometry( const TQRect& r )
 {
-    int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding );
+    int extra = 2 * ( parent->innerborder + parent->cellpadding );
     if ( r.width() != cached_width )
 	richtext->doLayout( TQTextFormat::painter(), r.width() - extra );
     cached_width = r.width();
@@ -16552,7 +16552,7 @@ bool TQTextTableCell::hasHeightForWidth() const
 
 int TQTextTableCell::heightForWidth( int w ) const
 {
-    int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding );
+    int extra = 2 * ( parent->innerborder + parent->cellpadding );
     w = TQMAX( minw, w );
 
     if ( cached_width != w ) {
@@ -16574,7 +16574,7 @@ void TQTextTableCell::adjustToPainter( TQPainter* p )
 
 int TQTextTableCell::horizontalAlignmentOffset() const
 {
-    return tqparent->cellpadding;
+    return parent->cellpadding;
 }
 
 int TQTextTableCell::verticalAlignmentOffset() const
@@ -16582,14 +16582,14 @@ int TQTextTableCell::verticalAlignmentOffset() const
     if ( (align & TQt::AlignVCenter ) == TQt::AlignVCenter )
 	return ( geom.height() - richtext->height() ) / 2;
     else if ( ( align & TQt::AlignBottom ) == TQt::AlignBottom )
-	return geom.height() - tqparent->cellpadding - richtext->height()  ;
-    return tqparent->cellpadding;
+	return geom.height() - parent->cellpadding - richtext->height()  ;
+    return parent->cellpadding;
 }
 
 void TQTextTableCell::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool )
 {
     if ( cached_width != geom.width() ) {
-	int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding );
+	int extra = 2 * ( parent->innerborder + parent->cellpadding );
 	richtext->doLayout( p, geom.width() - extra );
 	cached_width = geom.width();
     }
@@ -16622,4 +16622,4 @@ void TQTextTableCell::draw( TQPainter* p, int x, int y, int cx, int cy, int cw,
 
 #endif //TQT_NO_RICHTEXT
 
-#endif // USE_QT4
\ No newline at end of file
+#endif // USE_QT4
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp
index 31649dd5c..83927c7c2 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp
@@ -892,7 +892,7 @@ TQTextFormat::TQTextFormat( const TQStyleSheetItem *style )
     addRef();
 }
 
-TQTextFormat::TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *tqparent )
+TQTextFormat::TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *parent )
     : fn( f ), col( c ), fm( TQFontMetrics( f ) ), linkColor( TRUE ),
       logicalFontSize( 3 ), stdSize( f.pointSize() )
 {
@@ -902,7 +902,7 @@ TQTextFormat::TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatColle
 	stdSize = f.pixelSize();
 	usePixelSizes = TRUE;
     }
-    collection = tqparent;
+    collection = parent;
     leftBearing = fm.minLeftBearing();
     rightBearing = fm.minRightBearing();
     hei = fm.lineSpacing();
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h
index bcfdb9bc4..90dc963e1 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h
@@ -2619,7 +2619,7 @@ class TQ_EXPORT TQTextCustomItem
 {
 public:
     TQTextCustomItem( TQTextDocument *p )
-	:  xpos(0), ypos(-1), width(-1), height(0), tqparent( p )
+	:  xpos(0), ypos(-1), width(-1), height(0), parent( p )
     {}
     virtual ~TQTextCustomItem();
     virtual void draw(TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ) = 0;
@@ -2657,7 +2657,7 @@ public:
     virtual void setParagraph( TQTextParagraph *p ) { parag = p; }
     TQTextParagraph *paragraph() const { return parag; }
 
-    TQTextDocument *tqparent;
+    TQTextDocument *parent;
     TQTextParagraph *parag;
 
     virtual void pageBreak( int  y, TQTextFlow* flow );
@@ -2808,7 +2808,7 @@ public:
     int stretch() const { return stretch_; }
 
     TQTextDocument* richText()  const { return richtext; }
-    TQTextTable* table() const { return tqparent; }
+    TQTextTable* table() const { return parent; }
 
     void draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected );
 
@@ -2820,7 +2820,7 @@ public:
 
 private:
     TQRect geom;
-    TQTextTable* tqparent;
+    TQTextTable* parent;
     TQTextDocument* richtext;
     int row_;
     int col_;
@@ -2953,7 +2953,7 @@ public:
     TQTextDocument( TQTextDocument *p );
     virtual ~TQTextDocument();
 
-    TQTextDocument *tqparent() const { return par; }
+    TQTextDocument *parent() const { return par; }
     TQTextParagraph *parentParagraph() const { return parentPar; }
 
     void setText( const TQString &text, const TQString &context );
@@ -3665,7 +3665,7 @@ public:
     virtual ~TQTextFormat();
 
     TQTextFormat( const TQStyleSheetItem *s );
-    TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *tqparent = 0 );
+    TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *parent = 0 );
     TQTextFormat( const TQTextFormat &fm );
     TQTextFormat makeTextFormat( const TQStyleSheetItem *style, const TQMap<TQString,TQString>& attr, double scaleFontsFactor ) const;
     TQTextFormat& operator=( const TQTextFormat &fm );
@@ -3696,7 +3696,7 @@ public:
     void setVAlign( VerticalAlignment a );
 
     bool operator==( const TQTextFormat &f ) const;
-    TQTextFormatCollection *tqparent() const;
+    TQTextFormatCollection *parent() const;
     const TQString &key() const;
 
     static TQString getKey( const TQFont &f, const TQColor &c, bool misspelled, VerticalAlignment vAlign );
@@ -4006,7 +4006,7 @@ inline void TQTextDocument::takeFlow()
 
 inline bool TQTextDocument::useDoubleBuffer( TQTextParagraph *parag, TQPainter *p )
 {
-    return ( !parag->document()->tqparent() || parag->document()->nextDoubleBuffered ) &&
+    return ( !parag->document()->parent() || parag->document()->nextDoubleBuffered ) &&
 	( !p || !p->tqdevice() || p->tqdevice()->devType() != TQInternal::Printer );
 }
 
@@ -4037,7 +4037,7 @@ inline bool TQTextFormat::operator==( const TQTextFormat &f ) const
     return k == f.k;
 }
 
-inline TQTextFormatCollection *TQTextFormat::tqparent() const
+inline TQTextFormatCollection *TQTextFormat::parent() const
 {
     return collection;
 }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp b/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp
index 0bb29fc7d..2156fe872 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp
@@ -564,8 +564,8 @@ enum ArabicGroup {
     // NonJoining
     ArabicNone,
     ArabicSpace,
-    // Transtqparent
-    Transtqparent,
+    // Transparent
+    Transparent,
     // Causing
     Center,
     Kashida,
@@ -641,8 +641,8 @@ static const unsigned char arabic_group[0x150] = {
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, ArabicNone, ArabicNone,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
@@ -659,12 +659,12 @@ static const unsigned char arabic_group[0x150] = {
     // 0x640
     Kashida, Feh, Qaf, Kaf,
     Lam, Meem, Noon, Heh,
-    Waw, Yeh, Yeh, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
+    Waw, Yeh, Yeh, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, ArabicNone, ArabicNone, ArabicNone,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
@@ -672,7 +672,7 @@ static const unsigned char arabic_group[0x150] = {
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, Beh, Qaf,
 
-    Transtqparent, Alef, Alef, Alef,
+    Transparent, Alef, Alef, Alef,
     ArabicNone, Alef, Waw, Waw,
     Yeh, Beh, Beh, Beh,
     Beh, Beh, Beh, Beh,
@@ -705,14 +705,14 @@ static const unsigned char arabic_group[0x150] = {
     Yeh, YehWithTail, Yeh, Waw,
 
     Yeh, Yeh, YehBarre, YehBarre,
-    ArabicNone, TehMarbuta, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, ArabicNone, ArabicNone, Transtqparent,
+    ArabicNone, TehMarbuta, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, ArabicNone, ArabicNone, Transparent,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, ArabicNone, ArabicNone, Transtqparent,
-    Transtqparent, ArabicNone, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Dal, Reh,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, ArabicNone, ArabicNone, Transparent,
+    Transparent, ArabicNone, Transparent, Transparent,
+    Transparent, Transparent, Dal, Reh,
 
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
@@ -725,7 +725,7 @@ static const unsigned char arabic_group[0x150] = {
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
-    Alaph, Transtqparent, Beth, Gamal,
+    Alaph, Transparent, Beth, Gamal,
     Gamal, Dalath, Dalath, He,
     SyriacWaw, Zain, Heth, Teth,
     Teth, Yudh, YudhHe, Kaph,
@@ -735,14 +735,14 @@ static const unsigned char arabic_group[0x150] = {
     Sadhe, Qaph, Dalath, Shin,
     Taw, Beth, Gamal, Dalath,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, ArabicNone,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, ArabicNone,
     ArabicNone, Zain, Kaph, Fe,
 };
 
@@ -763,15 +763,15 @@ static inline ArabicGroup arabicGroup(unsigned short uc)
    Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on
    arabic).
 
-   Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transtqparent).
-   transtqparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks.
+   Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transparent).
+   transparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks.
 
    Right join-causing: dual + center
    Left join-causing: dual + right + center
 
    Rules are as follows (for a string already in visual order, as we have it here):
 
-   R1 Transtqparent characters do not affect joining behaviour.
+   R1 Transparent characters do not affect joining behaviour.
    R2 A right joining character, that has a right join-causing char on the right will get form XRight
    (R3 A left joining character, that has a left join-causing char on the left will get form XLeft)
    Note: the above rule is meaningless, as there are no pure left joining characters defined in Unicode
@@ -785,7 +785,7 @@ static inline ArabicGroup arabicGroup(unsigned short uc)
 
    Additionally we have to do the minimal ligature support for lam-alef ligatures:
 
-   L1 Transtqparent characters do not affect ligature behaviour.
+   L1 Transparent characters do not affect ligature behaviour.
    L2 Any sequence of Alef(XRight) + Lam(XMedial) will form the ligature Alef.Lam(XLeft)
    L3 Any sequence of Alef(XRight) + Lam(XLeft) will form the ligature Alef.Lam(XIsolated)
 
@@ -807,7 +807,7 @@ enum Joining {
     JCausing,
     JDual,
     JRight,
-    JTranstqparent
+    JTransparent
 };
 
 
@@ -815,8 +815,8 @@ static const Joining joining_for_group[ArabicGroupsEnd] = {
     // NonJoining
     JNone, // ArabicNone
     JNone, // ArabicSpace
-    // Transtqparent
-    JTranstqparent, // Transtqparent
+    // Transparent
+    JTransparent, // Transparent
     // Causing
     JCausing, // Center
     JCausing, // Kashida
@@ -919,7 +919,7 @@ static void getArabicProperties(const unsigned short *chars, int len, TQArabicPr
         group = arabicGroup(chars[i]);
         j = joining_for_group[group];
 
-        if (j == JTranstqparent) {
+        if (j == JTransparent) {
             properties[i].tqshape = XIsolated;
             continue;
         }
@@ -959,8 +959,8 @@ static void getArabicProperties(const unsigned short *chars, int len, TQArabicPr
 
         switch(group) {
         case ArabicNone:
-        case Transtqparent:
-        // ### Center should probably be treated as transtqparent when it comes to justification.
+        case Transparent:
+        // ### Center should probably be treated as transparent when it comes to justification.
         case Center:
             break;
         case ArabicSpace:
@@ -1351,7 +1351,7 @@ static inline const TQChar nextChar(const TQString *str, int pos)
         //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
         if(::category(*ch) != TQChar::Mark_NonSpacing)
             return *ch;
-        // assume it's a transtqparent char, this might not be 100% correct
+        // assume it's a transparent char, this might not be 100% correct
         pos++;
         ch++;
     }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp
index 836f87084..2d6dbac00 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp
@@ -341,12 +341,12 @@ QT_END_NAMESPACE
 */
 
 /*!
-    Constructs a signal object called \a name, with the tqparent object
-    \a tqparent. These arguments are passed directly to TQObject.
+    Constructs a signal object called \a name, with the parent object
+    \a parent. These arguments are passed directly to TQObject.
 */
 
-TQSignal::TQSignal( TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+TQSignal::TQSignal( TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     isSignal = TRUE;
 #ifndef TQT_NO_VARIANT
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignal.h b/experimental/tqtinterface/qt4/src/kernel/tqsignal.h
index 72fd88019..f4da0ee8b 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsignal.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsignal.h
@@ -111,7 +111,7 @@ class TQ_EXPORT TQSignal : public TQObject
     TQ_OBJECT
 
 public:
-    TQSignal( TQObject *tqparent=0, const char *name=0 );
+    TQSignal( TQObject *parent=0, const char *name=0 );
     ~TQSignal();
 
     bool	connect( const TQT_BASE_OBJECT_NAME *receiver, const char *member );
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp
index 40b08eeb0..560640ba9 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp
@@ -78,11 +78,11 @@ public:
 */
 
 /*!
-    Constructs a TQSignalMapper called \a name, with tqparent \a tqparent.
-    Like all TQObjects, it will be deleted when the tqparent is deleted.
+    Constructs a TQSignalMapper called \a name, with parent \a parent.
+    Like all TQObjects, it will be deleted when the parent is deleted.
 */
-TQSignalMapper::TQSignalMapper( TQObject* tqparent, const char* name ) :
-    TQObject( tqparent, name )
+TQSignalMapper::TQSignalMapper( TQObject* parent, const char* name ) :
+    TQObject( parent, name )
 {
     d = new TQSignalMapperData;
 }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h
index 903dad241..fbe25b3ba 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h
@@ -53,7 +53,7 @@ class TQ_EXPORT TQSignalMapper : public TQObject {
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQSignalMapper( TQObject* tqparent, const char* name=0 );
+    TQSignalMapper( TQObject* parent, const char* name=0 );
     ~TQSignalMapper();
 
     virtual void setMapping( const TQObject* sender, int identifier );
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp
index bcea2dbec..96d3c816b 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp
@@ -106,10 +106,10 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w )
 
 /*!
     Constructs a resize corner called \a name, as a child widget of \a
-    tqparent.
+    parent.
 */
-TQSizeGrip::TQSizeGrip( TQWidget * tqparent, const char* name )
-    : TQWidget( tqparent, name )
+TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
+    : TQWidget( parent, name )
 {
 #ifndef TQT_NO_CURSOR
 #ifndef TQ_WS_MAC
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h
index fa893a286..94e8c608a 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h
@@ -52,7 +52,7 @@ class TQ_EXPORT TQSizeGrip: public TQWidget
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQSizeGrip( TQWidget* tqparent, const char* name=0 );
+    TQSizeGrip( TQWidget* parent, const char* name=0 );
     ~TQSizeGrip();
 
     TQSize tqsizeHint() const;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp
index a9b394365..770b710dc 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp
@@ -51,7 +51,7 @@
 #if 0
 //#ifdef USE_QT4
 
-TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, const char *name ) : QSocketNotifier(socket, type, tqparent) {
+TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *parent, const char *name ) : QSocketNotifier(socket, type, parent) {
 	setObjectName(name);
 }
 
@@ -139,8 +139,8 @@ TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, c
 
 
 /*!
-    Constructs a socket notifier called \a name, with the tqparent, \a
-    tqparent. It watches \a socket for \a type events, and enables it.
+    Constructs a socket notifier called \a name, with the parent, \a
+    parent. It watches \a socket for \a type events, and enables it.
 
     It is generally advisable to explicitly enable or disable the
     socket notifier, especially for write notifiers.
@@ -148,9 +148,9 @@ TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, c
     \sa setEnabled(), isEnabled()
 */
 
-TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent,
+TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *parent,
 				  const char *name )
-    : TQObject( tqparent, name )
+    : TQObject( parent, name )
 {
 #if defined(TQT_CHECK_RANGE)
     if ( socket < 0 )
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h
index 490447139..816f83926 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h
@@ -62,7 +62,7 @@ class TQ_EXPORT TQSocketNotifier : public QSocketNotifier
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQSocketNotifier( int socket, Type type, TQObject *tqparent=0, const char *name=0 );
+    TQSocketNotifier( int socket, Type type, TQObject *parent=0, const char *name=0 );
 };
 
 #else // USE_QT4
@@ -74,7 +74,7 @@ class TQ_EXPORT TQSocketNotifier : public TQObject
 public:
     enum Type { Read, Write, Exception };
 
-    TQSocketNotifier( int socket, Type, TQObject *tqparent=0, const char *name=0 );
+    TQSocketNotifier( int socket, Type, TQObject *parent=0, const char *name=0 );
    ~TQSocketNotifier();
 
     int		 socket()	const;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp
index afb387126..4a6e96b28 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp
@@ -46,8 +46,8 @@
 
 static TQPtrList<TQAuServer> *servers=0;
 
-TQAuServer::TQAuServer(TQObject* tqparent, const char* name) :
-    TQObject(tqparent,name)
+TQAuServer::TQAuServer(TQObject* parent, const char* name) :
+    TQObject(parent,name)
 {
     if ( !servers ) {
 	servers = new TQPtrList<TQAuServer>;
@@ -161,11 +161,11 @@ void TQSound::play(const TQString& filename)
 
     This may use more memory than the static \c play function.
 
-    The \a tqparent and \a name arguments (default 0) are passed on to
+    The \a parent and \a name arguments (default 0) are passed on to
     the TQObject constructor.
 */
-TQSound::TQSound(const TQString& filename, TQObject* tqparent, const char* name) :
-    TQObject(tqparent,name),
+TQSound::TQSound(const TQString& filename, TQObject* parent, const char* name) :
+    TQObject(parent,name),
     d(new TQSoundData(filename))
 {
     server().init(this);
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsound.h b/experimental/tqtinterface/qt4/src/kernel/tqsound.h
index a24a63f91..043dd1f58 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsound.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsound.h
@@ -55,7 +55,7 @@ public:
     static bool isAvailable();
     static void play(const TQString& filename);
 
-    TQSound(const TQString& filename, TQObject* tqparent=0, const char* name=0);
+    TQSound(const TQString& filename, TQObject* parent=0, const char* name=0);
     ~TQSound();
 
     /* Coming soon...
@@ -106,7 +106,7 @@ class TQAuServer : public TQObject {
     TQ_OBJECT
 
 public:
-    TQAuServer(TQObject* tqparent, const char* name);
+    TQAuServer(TQObject* parent, const char* name);
     ~TQAuServer();
 
     virtual void init(TQSound*);
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp
index 80b6dbf88..52d7523ae 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp
@@ -93,7 +93,7 @@ class TQAuServerNAS : public TQAuServer {
     TQSocketNotifier* sn;
 
 public:
-    TQAuServerNAS(TQObject* tqparent);
+    TQAuServerNAS(TQObject* parent);
     ~TQAuServerNAS();
 
     void init(TQSound*);
@@ -114,8 +114,8 @@ private:
     }
 };
 
-TQAuServerNAS::TQAuServerNAS(TQObject* tqparent) :
-    TQAuServer(tqparent,"Network Audio System")
+TQAuServerNAS::TQAuServerNAS(TQObject* parent) :
+    TQAuServer(parent,"Network Audio System")
 {
     nas = AuOpenServer(NULL, 0, NULL, 0, NULL, NULL);
     if (nas) {
@@ -254,7 +254,7 @@ void TQAuServerNAS::dataReceived()
 
 class TQAuServerNull : public TQAuServer {
 public:
-    TQAuServerNull(TQObject* tqparent);
+    TQAuServerNull(TQObject* parent);
 
     void play(const TQString&) { }
     void play(TQSound*s) { while(decLoop(s) > 0) /* nothing */ ; }
@@ -262,8 +262,8 @@ public:
     bool okay() { return FALSE; }
 };
 
-TQAuServerNull::TQAuServerNull(TQObject* tqparent) :
-    TQAuServer(tqparent,"Null Audio Server")
+TQAuServerNull::TQAuServerNull(TQObject* parent) :
+    TQAuServer(parent,"Null Audio Server")
 {
 }
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp b/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp
index 9aa3a59b9..b2861b076 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp
@@ -217,27 +217,27 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 	    x += w - pm.width();
 
 	if ( !enabled ) {
-	    if ( pm.tqmask() ) {			// pixmap with a tqmask
-		if ( !pm.selfMask() ) {		// tqmask is not pixmap itself
-		    TQPixmap pmm( *pm.tqmask() );
+	    if ( pm.mask() ) {			// pixmap with a mask
+		if ( !pm.selfMask() ) {		// mask is not pixmap itself
+		    TQPixmap pmm( *pm.mask() );
 		    pmm.setMask( *((TQBitmap *)&pmm) );
 		    pm = pmm;
 		}
-	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no tqmask
+	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no mask
 		pm.setMask( *((TQBitmap *)&pm) );
 #ifndef TQT_NO_IMAGE_HEURISTIC_MASK
-	    } else {				// color pixmap, no tqmask
+	    } else {				// color pixmap, no mask
 		TQString k;
 		k.sprintf( "$qt-drawitem-%x", pm.serialNumber() );
-		TQPixmap *tqmask = TQPixmapCache::find(k);
+		TQPixmap *mask = TQPixmapCache::find(k);
 		bool del=FALSE;
-		if ( !tqmask ) {
-		    tqmask = new TQPixmap( pm.createHeuristicMask() );
-		    tqmask->setMask( *((TQBitmap*)tqmask) );
-		    del = !TQPixmapCache::insert( k, tqmask );
+		if ( !mask ) {
+		    mask = new TQPixmap( pm.createHeuristicMask() );
+		    mask->setMask( *((TQBitmap*)mask) );
+		    del = !TQPixmapCache::insert( k, mask );
 		}
-		pm = *tqmask;
-		if (del) delete tqmask;
+		pm = *mask;
+		if (del) delete mask;
 #endif
 	    }
 	    if ( gs == TQt::WindowsStyle ) {
@@ -898,27 +898,27 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 	    x += w - pm.width();
 
 	if ( !enabled ) {
-	    if ( pm.tqmask() ) {			// pixmap with a tqmask
-		if ( !pm.selfMask() ) {		// tqmask is not pixmap itself
-		    TQPixmap pmm( *pm.tqmask() );
+	    if ( pm.mask() ) {			// pixmap with a mask
+		if ( !pm.selfMask() ) {		// mask is not pixmap itself
+		    TQPixmap pmm( *pm.mask() );
 		    pmm.setMask( *((TQBitmap *)&pmm) );
 		    pm = pmm;
 		}
-	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no tqmask
+	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no mask
 		pm.setMask( *((TQBitmap *)&pm) );
 #ifndef TQT_NO_IMAGE_HEURISTIC_MASK
-	    } else {				// color pixmap, no tqmask
+	    } else {				// color pixmap, no mask
 		TQString k;
 		k.sprintf( "$qt-drawitem-%x", pm.serialNumber() );
-		TQPixmap *tqmask = TQPixmapCache::find(k);
+		TQPixmap *mask = TQPixmapCache::find(k);
 		bool del=FALSE;
-		if ( !tqmask ) {
-		    tqmask = new TQPixmap( pm.createHeuristicMask() );
-		    tqmask->setMask( *((TQBitmap*)tqmask) );
-		    del = !TQPixmapCache::insert( k, tqmask );
+		if ( !mask ) {
+		    mask = new TQPixmap( pm.createHeuristicMask() );
+		    mask->setMask( *((TQBitmap*)mask) );
+		    del = !TQPixmapCache::insert( k, mask );
 		}
-		pm = *tqmask;
-		if (del) delete tqmask;
+		pm = *mask;
+		if (del) delete mask;
 #endif
 	    }
 	    if ( gs == TQt::WindowsStyle ) {
@@ -974,10 +974,10 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 
 
     \value PE_Indicator  on/off indicator, for example, a TQCheckBox.
-    \value PE_IndicatorMask  bitmap tqmask for an indicator.
+    \value PE_IndicatorMask  bitmap mask for an indicator.
     \value PE_ExclusiveIndicator  exclusive on/off indicator, for
 	example, a TQRadioButton.
-    \value PE_ExclusiveIndicatorMask  bitmap tqmask for an exclusive indicator.
+    \value PE_ExclusiveIndicatorMask  bitmap mask for an exclusive indicator.
 
 
     \value PE_DockWindowHandle  tear off handle for dock windows and
@@ -1376,7 +1376,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 /*!
     \fn void TQStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& opt) const
 
-    Draw a bittqmask for the ControlElement \a element using the painter
+    Draw a bitmask for the ControlElement \a element using the painter
     \a p in the area \a r. See tqdrawControl() for an explanation of the
     use of the \a widget and \a opt arguments.
 
@@ -1665,7 +1665,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 /*!
     \fn void TQStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& opt) const
 
-    Draw a bittqmask for the ComplexControl \a control using the painter
+    Draw a bitmask for the ComplexControl \a control using the painter
     \a p in the area \a r. See tqdrawComplexControl() for an explanation
     of the use of the \a widget and \a opt arguments.
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstyle.h b/experimental/tqtinterface/qt4/src/kernel/tqstyle.h
index 02682cba1..0ae52a03a 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqstyle.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqstyle.h
@@ -294,7 +294,7 @@ public:
 // 	typedef State SFlags;
 	typedef StandardPixmap StylePixmap;
 
-	TQStyle() : QStyle() { TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent) }
+	TQStyle() : QStyle() { TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent) }
 
 	enum SH_NewTypes {
 		SH_GUIStyle = 0x00000100,
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp
index 08a29dca0..c3fc72fbe 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp
@@ -141,20 +141,20 @@ public:
 
 /*!
     Constructs a new style called \a name for the stylesheet \a
-    tqparent.
+    parent.
 
     All properties in TQStyleSheetItem are initially in the "do not
     change" state, except \link TQStyleSheetItem::DisplayMode display
     mode\endlink, which defaults to \c DisplayInline.
 */
-TQStyleSheetItem::TQStyleSheetItem( TQStyleSheet* tqparent, const TQString& name )
+TQStyleSheetItem::TQStyleSheetItem( TQStyleSheet* parent, const TQString& name )
 {
     d = new TQStyleSheetItemData;
     d->stylename = name.lower();
-    d->sheet = tqparent;
+    d->sheet = parent;
     init();
-    if (tqparent)
-	tqparent->insert( this );
+    if (parent)
+	parent->insert( this );
 }
 
 /*!
@@ -332,7 +332,7 @@ TQStyleSheetItem::VerticalAlignment TQStyleSheetItem::verticalAlignment() const
 
     \value VAlignBaseline align the baseline of the element (or the
 	bottom, if the element doesn't have a baseline) with the
-	baseline of the tqparent
+	baseline of the parent
 
     \value VAlignSub subscript the element
 
@@ -1086,14 +1086,14 @@ int TQStyleSheetItem::lineSpacing() const
 */
 
 /*!
-    Creates a style sheet called \a name, with tqparent \a tqparent. Like
-    any TQObject it will be deleted when its tqparent is destroyed (if
+    Creates a style sheet called \a name, with parent \a parent. Like
+    any TQObject it will be deleted when its parent is destroyed (if
     the child still exists).
 
     By default the style sheet has the tag definitions defined above.
 */
-TQStyleSheet::TQStyleSheet( TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+TQStyleSheet::TQStyleSheet( TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     init();
 }
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h
index 7f650bedf..c207357ed 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h
@@ -59,7 +59,7 @@ class TQStyleSheetItemData;
 class TQ_EXPORT TQStyleSheetItem : public TQt
 {
 public:
-    TQStyleSheetItem( TQStyleSheet* tqparent, const TQString& name );
+    TQStyleSheetItem( TQStyleSheet* parent, const TQString& name );
     TQStyleSheetItem( const TQStyleSheetItem & );
     ~TQStyleSheetItem();
 
@@ -212,7 +212,7 @@ class TQ_EXPORT TQStyleSheet : public TQObject
 {
     TQ_OBJECT
 public:
-    TQStyleSheet( TQObject *tqparent=0, const char *name=0 );
+    TQStyleSheet( TQObject *parent=0, const char *name=0 );
     virtual ~TQStyleSheet();
 
     static TQStyleSheet* defaultSheet();
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp
index 4ad21996c..81d10ac42 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp
@@ -100,11 +100,11 @@ XftDraw *XftDrawCreateAlpha( Display *display,
 
 	XRenderPictFormat *format = 0;
 	XRenderPictFormat req;
-	unsigned long tqmask = PictFormatType | PictFormatDepth | PictFormatAlphaMask;
+	unsigned long mask = PictFormatType | PictFormatDepth | PictFormatAlphaMask;
 	req.type = PictTypeDirect;
 	req.depth = depth;
 	req.direct.alphaMask = 0xff;
-	format = XRenderFindFormat(draw->dpy, tqmask, &req, 0);
+	format = XRenderFindFormat(draw->dpy, mask, &req, 0);
 	if (format) {
 	    draw->render.pict =
 		XRenderCreatePicture(draw->dpy, draw->drawable, format, 0, 0);
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp
index 7062b6a49..c3ddda597 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp
@@ -61,7 +61,7 @@
     emit the timeout() signal.
 
     Note that a TQTimer object is destroyed automatically when its
-    tqparent object is destroyed.
+    parent object is destroyed.
 
     Example:
     \code
@@ -113,14 +113,14 @@ static const int INV_TIMER = -1;		// invalid timer id
 
 
 /*!
-    Constructs a timer called \a name, with the tqparent \a tqparent.
+    Constructs a timer called \a name, with the parent \a parent.
 
-    Note that the tqparent object's destructor will destroy this timer
+    Note that the parent object's destructor will destroy this timer
     object.
 */
 
-TQTimer::TQTimer( TQT_BASE_OBJECT_NAME *tqparent, const char *name )
-    : TQObject( tqparent, name ), id(INV_TIMER), single(0), nulltimer(0)
+TQTimer::TQTimer( TQT_BASE_OBJECT_NAME *parent, const char *name )
+    : TQObject( parent, name ), id(INV_TIMER), single(0), nulltimer(0)
 {
 }
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtimer.h b/experimental/tqtinterface/qt4/src/kernel/tqtimer.h
index 1d2398ac2..111daf48d 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqtimer.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqtimer.h
@@ -51,7 +51,7 @@ class TQ_EXPORT TQTimer : public TQObject
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQTimer( TQT_BASE_OBJECT_NAME *tqparent=0, const char *name=0 );
+    TQTimer( TQT_BASE_OBJECT_NAME *parent=0, const char *name=0 );
    ~TQTimer();
 
     bool	isActive() const;
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp
index fabbb98ef..4a3e34ec0 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp
@@ -1304,11 +1304,11 @@ extern int qt_ntfs_permission_lookup;
 
 /*!
     Constructs an empty message file object that is not connected to
-    any file. The object is called \a name with tqparent \a tqparent.
+    any file. The object is called \a name with parent \a parent.
 */
 
-TQTranslator::TQTranslator( TQObject * tqparent, const char * name )
-    : TQObject( tqparent, name )
+TQTranslator::TQTranslator( TQObject * parent, const char * name )
+    : TQObject( parent, name )
 {
     d = new TQTranslatorPrivate;
 #if defined(TQ_WS_WIN)
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h
index 67135681b..e1726ce59 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h
@@ -123,7 +123,7 @@ class TQ_EXPORT TQTranslator: public QTranslator, virtual public TQt
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQTranslator( TQObject * tqparent = 0, const char * name = 0 ) : QTranslator( tqparent ) { setObjectName(QString::fromAscii(name)); }
+    TQTranslator( TQObject * parent = 0, const char * name = 0 ) : QTranslator( parent ) { setObjectName(QString::fromAscii(name)); }
 
 //    inline TQString find(const char *context, const char *sourceText, const char * comment = 0) const { return translate(context, sourceText, comment); }
 
@@ -218,7 +218,7 @@ class TQ_EXPORT TQTranslator: public TQObject
     Q_OBJECT
     TQ_OBJECT
 public:
-    TQTranslator( TQObject * tqparent = 0, const char * name = 0 );
+    TQTranslator( TQObject * parent = 0, const char * name = 0 );
     ~TQTranslator();
 
 #ifndef TQT_NO_COMPAT
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp
index c6523df35..31b7fc92d 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp
@@ -217,11 +217,11 @@ void TQWidget::destroyInputContext( void ) {
 	printf("[TQT UNIMPLEMENTED CALL] destroyInputContext()\n\r");
 }
 
-TQWidget::TQWidget( QWidget* tqparent, const char* name, WFlags f ) : QWidget( tqparent, (Qt::WindowFlags)(f&(~WTQtFlagMask)) ), TQtUpperWidgetFlags((WFlags)0) {
+TQWidget::TQWidget( QWidget* parent, const char* name, WFlags f ) : QWidget( parent, (Qt::WindowFlags)(f&(~WTQtFlagMask)) ), TQtUpperWidgetFlags((WFlags)0) {
 	TQtUpperWidgetFlags = f & WTQtFlagMask;
 	TQT_TQWIDGET_REQUIRED_INITIALIZATION
 	static_cast<QWidget*>(this)->setObjectName(QString::fromAscii(name));
-	TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent)
+	TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent)
 }
 
 void TQWidget::setActiveWindow( void ) {
@@ -286,7 +286,7 @@ void TQWidget::setName(const char *aName) {
 
 TQWidget *TQWidget::parentWidget( bool sameWindow ) {
 	TQ_UNUSED(sameWindow);
-	return static_cast<TQWidget*>(this->parent());
+	return static_cast<TQWidget*>(this->QWidget::parent());
 }
 
 bool TQWidget::isDialog() const {
@@ -984,11 +984,11 @@ void TQWidget::createTLExtra()
 
 /*!
     \property TQWidget::autoMask
-    \brief whether the auto tqmask feature is enabled for the widget
+    \brief whether the auto mask feature is enabled for the widget
 
-    Transtqparent widgets use a tqmask to define their visible region.
+    Transparent widgets use a mask to define their visible region.
     TQWidget has some built-in support to make the task of
-    recalculating the tqmask easier. When setting auto tqmask to TRUE,
+    recalculating the mask easier. When setting auto mask to TRUE,
     updateMask() will be called whenever the widget is resized or
     changes its focus state. Note that you must reimplement
     updateMask() (which should include a call to setMask()) or nothing
@@ -996,7 +996,7 @@ void TQWidget::createTLExtra()
 
     Note: when you re-implement resizeEvent(), focusInEvent() or
     focusOutEvent() in your custom widgets and still want to ensure
-    that the auto tqmask calculation works, you should add:
+    that the auto mask calculation works, you should add:
 
     \code
 	if ( autoMask() )
@@ -1005,17 +1005,17 @@ void TQWidget::createTLExtra()
 
     at the end of your event handlers. This is true for all member
     functions that change the appearance of the widget in a way that
-    requires a recalculation of the tqmask.
+    requires a recalculation of the mask.
 
     While being a technically appealing concept, masks have a big
     drawback: when using complex masks that cannot be expressed easily
     with relatively simple regions, they can be very slow on some
-    window systems. The classic example is a transtqparent label. The
+    window systems. The classic example is a transparent label. The
     complex tqshape of its contents makes it necessary to represent its
-    tqmask by a bitmap, which consumes both memory and time. If all you
+    mask by a bitmap, which consumes both memory and time. If all you
     want is to blend the background of several neighboring widgets
     together seamlessly, you will probably want to use
-    setBackgroundOrigin() rather than a tqmask.
+    setBackgroundOrigin() rather than a mask.
 
     \sa autoMask() updateMask() setMask() clearMask() setBackgroundOrigin()
 */
@@ -1048,7 +1048,7 @@ void TQWidget::setFocus(TQFocusEvent::Reason reason)
 	setFocus((Qt::FocusReason)reason);
 }
 
-TQObject *TQWidget::tqparent() const {
+TQObject *TQWidget::parent() const {
 	return TQT_TQOBJECT(parent());
 }
 
@@ -1388,8 +1388,8 @@ const TQPixmap TQWidget::iconPixmap() const {
 
 /*!
     This function can be reimplemented in a subclass to support
-    transtqparent widgets. It should be called whenever a widget changes
-    state in a way that means that the tqshape tqmask must be recalculated.
+    transparent widgets. It should be called whenever a widget changes
+    state in a way that means that the tqshape mask must be recalculated.
 
     \sa setAutoMask(), updateMask(), setMask(), clearMask()
 */
@@ -2054,7 +2054,7 @@ void TQWidget::mouseDoubleClickEvent( TQMouseEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQWheelEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -2074,7 +2074,7 @@ void TQWidget::wheelEvent( TQWheelEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQTabletEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -2096,10 +2096,10 @@ void TQWidget::tabletEvent( TQTabletEvent *e )
 
     If you reimplement this handler, it is very important that you
     explicitly \link TQKeyEvent::ignore() ignore\endlink the event
-    if you do not understand it, so that the widget's tqparent can
+    if you do not understand it, so that the widget's parent can
     interpret it; otherwise, the event will be implicitly accepted.
     Although top-level widgets are able to choose whether to accept
-    or ignore unknown events because they have no tqparent widgets that
+    or ignore unknown events because they have no parent widgets that
     could otherwise handle them, it is good practice to explicitly
     ignore events to make widgets as reusable as possible.
 
@@ -2130,7 +2130,7 @@ void TQWidget::keyPressEvent( TQKeyEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQKeyEvent ignore()\endlink the release if you do not
-    understand it, so that the widget's tqparent can interpret it.
+    understand it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -2748,26 +2748,26 @@ WState TQWidget::testWState( TQt::WidgetState s ) const {
     keyboard and other events from the window system, and paints a
     representation of itself on the screen. Every widget is
     rectangular, and they are sorted in a Z-order. A widget is
-    clipped by its tqparent and by the widgets in front of it.
+    clipped by its parent and by the widgets in front of it.
 
-    A widget that isn't embedded in a tqparent widget is called a
+    A widget that isn't embedded in a parent widget is called a
     top-level widget. Usually, top-level widgets are windows with a
     frame and a title bar (although it is also possible to create
     top-level widgets without such decoration if suitable widget flags
     are used). In TQt, TQMainWindow and the various subclasses of
     TQDialog are the most common top-level windows.
 
-    A widget without a tqparent widget is always a top-level widget.
+    A widget without a parent widget is always a top-level widget.
 
     Non-top-level widgets are child widgets. These are child windows
-    in their tqparent widgets. You cannot usually distinguish a child
-    widget from its tqparent visually. Most other widgets in TQt are
+    in their parent widgets. You cannot usually distinguish a child
+    widget from its parent visually. Most other widgets in TQt are
     useful only as child widgets. (It is possible to make, say, a
     button into a top-level widget, but most people prefer to put
     their buttons inside other widgets, e.g. TQDialog.)
 
     If you want to use a TQWidget to hold child widgets you will
-    probably want to add a tqlayout to the tqparent TQWidget. (See \link
+    probably want to add a tqlayout to the parent TQWidget. (See \link
     tqlayout.html Layouts\endlink.)
 
     TQWidget has many member functions, but some of them have little
@@ -2949,10 +2949,10 @@ WState TQWidget::testWState( TQt::WidgetState s ) const {
 
     Every widget's constructor accepts two or three standard arguments:
     \list 1
-    \i \c{TQWidget *tqparent = 0} is the tqparent of the new widget.
+    \i \c{TQWidget *parent = 0} is the parent of the new widget.
     If it is 0 (the default), the new widget will be a top-level window.
-    If not, it will be a child of \e tqparent, and be constrained by \e
-    tqparent's tqgeometry (unless you specify \c WType_TopLevel as
+    If not, it will be a child of \e parent, and be constrained by \e
+    parent's tqgeometry (unless you specify \c WType_TopLevel as
     widget flag).
     \i \c{const char *name = 0} is the widget name of the new
     widget. You can access it using name(). The widget name is little
@@ -3015,7 +3015,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const {
     If your widget only contains child widgets, you probably do not need to
     implement any event handlers. If you want to detect a mouse click in
     a child widget call the child's hasMouse() function inside the
-    tqparent widget's mousePressEvent().
+    parent widget's mousePressEvent().
 
     Widgets that accept keyboard input need to reimplement a few more
     event handlers:
@@ -3070,7 +3070,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const {
     space.
 
     \i moveEvent() - called when the widget has been moved relative to its
-    tqparent.
+    parent.
 
     \i closeEvent() - called when the user closes the widget (or when
     close() is called).
@@ -3258,7 +3258,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
   \i WState_Reparented The widget has been reparented.
   \i WState_ConfigPending A configuration (resize/move) event is pending.
   \i WState_Resized The widget has been resized.
-  \i WState_AutoMask The widget has an automatic tqmask, see setAutoMask().
+  \i WState_AutoMask The widget has an automatic mask, see setAutoMask().
   \i WState_Polished The widget has been "polished" (i.e. late
   initialization) by a TQStyle.
   \i WState_DND The widget supports drag and drop, see setAcceptDrops().
@@ -3294,11 +3294,11 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
     window that should be decorated as a dialog (i.e. typically no
     maximize or minimize buttons in the title bar). If you want to use
     it as a modal dialog it should be launched from another window, or
-    have a tqparent and this flag should be combined with \c WShowModal.
+    have a parent and this flag should be combined with \c WShowModal.
     If you make it modal, the dialog will prevent other top-level
     windows in the application from getting any input. \c WType_Dialog
     implies \c WType_TopLevel. We refer to a top-level window that has
-    a tqparent as a \e secondary window. (See also \c WGroupLeader.)
+    a parent as a \e secondary window. (See also \c WGroupLeader.)
 
     \value WType_Popup  indicates that this widget is a popup
     top-level window, i.e. that it is modal, but has a window system
@@ -3358,8 +3358,8 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
     \value WStyle_Tool  makes the window a tool window. A tool window
     is often a small window with a smaller than usual title bar and
     decoration, typically used for collections of tool buttons. It
-    there is a tqparent, the tool window will always be kept on top of
-    it. If there isn't a tqparent, you may consider passing \c
+    there is a parent, the tool window will always be kept on top of
+    it. If there isn't a parent, you may consider passing \c
     WStyle_StaysOnTop as well. If the window system supports it, a
     tool window can be decorated with a somewhat lighter frame. It can
     also be combined with \c WStyle_NoBorder.
@@ -3370,9 +3370,9 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
     this flag to work correctly.
 
     \value WStyle_Dialog  indicates that the window is a logical
-    subwindow of its tqparent (i.e. a dialog). The window will not get
-    its own taskbar entry and will be kept on top of its tqparent by the
-    window system. Usually it will also be minimized when the tqparent
+    subwindow of its parent (i.e. a dialog). The window will not get
+    its own taskbar entry and will be kept on top of its parent by the
+    window system. Usually it will also be minimized when the parent
     is minimized. If not customized, the window is decorated with a
     slightly simpler title bar. This is the flag TQDialog uses.
 
@@ -3400,7 +3400,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
     system tqrepaint events directly. (This tends to produce more events
     and smaller tqrepaint regions.)
 
-    \value WMouseNoMask  indicates that even if the widget has a tqmask,
+    \value WMouseNoMask  indicates that even if the widget has a mask,
     it wants mouse events for its entire rectangle.
 
     \value WStaticContents  indicates that the widget contents are
@@ -3415,11 +3415,11 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
     \value WResizeNoErase  this value is obsolete; use WNoAutoErase instead.
     \value WRepaintNoErase  this value is obsolete; use WNoAutoErase instead.
     \value WGroupLeader  makes this window a group leader. A group
-    leader should \e not have a tqparent (i.e. it should be a top-level
+    leader should \e not have a parent (i.e. it should be a top-level
     window). Any decendant windows (direct or indirect) of a group
     leader are in its group; other windows are not. If you show a
     secondary window from the group (i.e. show a window whose top-most
-    tqparent is a group leader), that window will be modal with respect
+    parent is a group leader), that window will be modal with respect
     to the other windows in the group, but modeless with respect to
     windows in other groups.
 
@@ -3495,19 +3495,19 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
 */
 
 /*!
-    Constructs a widget which is a child of \a tqparent, with the name
+    Constructs a widget which is a child of \a parent, with the name
     \a name and widget flags set to \a f.
 
-    If \a tqparent is 0, the new widget becomes a top-level window. If
-    \a tqparent is another widget, this widget becomes a child window
-    inside \a tqparent. The new widget is deleted when its \a tqparent is
+    If \a parent is 0, the new widget becomes a top-level window. If
+    \a parent is another widget, this widget becomes a child window
+    inside \a parent. The new widget is deleted when its \a parent is
     deleted.
 
     The \a name is sent to the TQObject constructor.
 
     The widget flags argument, \a f, is normally 0, but it can be set
     to customize the window frame of a top-level widget (i.e. \a
-    tqparent must be 0). To customize the frame, set the \c
+    parent must be 0). To customize the frame, set the \c
     WStyle_Customize flag OR'ed with any of the \l TQt::WidgetFlags.
 
     If you add a child widget to an already visible widget you must
@@ -3526,8 +3526,8 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
     \endcode
 */
 
-TQWidget::TQWidget( TQWidget *tqparent, const char *name, WFlags f )
-    : TQObject( tqparent, name ), TQPaintDevice( TQInternal::Widget )
+TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f )
+    : TQObject( parent, name ), TQPaintDevice( TQInternal::Widget )
 {
 #if defined(TQT_CHECK_STATE) && !defined(TQ_WS_WIN)
     if ( tqApp->type() == TQApplication::Tty ) {
@@ -3633,7 +3633,7 @@ TQWidget::~TQWidget()
     if ( isTopLevel() && isShown() && winId() )
 	hide();
 
-    // A tqparent widget must destroy all its tqchildren before destroying itself
+    // A parent widget must destroy all its tqchildren before destroying itself
     if ( childObjects ) {			// delete tqchildren objects
 	TQObjectListIt it(*childObjects);
 	TQObject *obj;
@@ -3686,7 +3686,7 @@ void TQWidget::destroyMapper()
     register TQWidget *w;
     while ( (w=it.current()) ) {		// remove parents widgets
 	++it;
-	if ( !w->parentObj )			// widget is a tqparent
+	if ( !w->parentObj )			// widget is a parent
 	    w->destroy( TRUE, TRUE );
     }
     delete myMapper;
@@ -4048,14 +4048,14 @@ void TQWidget::styleChange( TQStyle& /* oldStyle */ )
     TQWidget::isPopup() Popup\endlink and \link TQWidget::isDesktop()
     desktop\endlink widgets are also top-level widgets.
 
-    A top-level widget can have a \link TQWidget::parentWidget() tqparent
-    widget\endlink. It will then be grouped with its tqparent and deleted
-    when the tqparent is deleted, minimized when the tqparent is minimized
+    A top-level widget can have a \link TQWidget::parentWidget() parent
+    widget\endlink. It will then be grouped with its parent and deleted
+    when the parent is deleted, minimized when the parent is minimized
     etc. If supported by the window manager, it will also have a
-    common taskbar entry with its tqparent.
+    common taskbar entry with its parent.
 
     TQDialog and TQMainWindow widgets are by default top-level, even if
-    a tqparent widget is specified in the constructor. This behavior is
+    a parent widget is specified in the constructor. This behavior is
     specified by the \c WType_TopLevel widget flag.
 
     \sa tqtopLevelWidget(), isDialog(), isModal(), isPopup(), isDesktop(), parentWidget()
@@ -4066,7 +4066,7 @@ void TQWidget::styleChange( TQStyle& /* oldStyle */ )
     \brief whether the widget is a dialog widget
 
     A dialog widget is a secondary top-level widget, i.e. a top-level
-    widget with a tqparent.
+    widget with a parent.
 
     \sa isTopLevel(), TQDialog
 */
@@ -4307,7 +4307,7 @@ void TQWidget::showNormal()
     Returns TRUE if this widget would become enabled if \a ancestor is
     enabled; otherwise returns FALSE.
 
-    This is the case if neither the widget itself nor every tqparent up
+    This is the case if neither the widget itself nor every parent up
     to but excluding \a ancestor has been explicitly disabled.
 
     isEnabledTo(0) is equivalent to isEnabled().
@@ -4506,7 +4506,7 @@ void TQWidget::windowActivationChange( bool )
 
 /*!
     \property TQWidget::frameGeometry
-    \brief tqgeometry of the widget relative to its tqparent including any
+    \brief tqgeometry of the widget relative to its parent including any
     window frame
 
     See the \link tqgeometry.html Window Geometry documentation\endlink
@@ -4530,7 +4530,7 @@ TQRect TQWidget::frameGeometry() const
 }
 
 /*! \property TQWidget::x
-    \brief the x coordinate of the widget relative to its tqparent including
+    \brief the x coordinate of the widget relative to its parent including
     any window frame
 
     See the \link tqgeometry.html Window Geometry documentation\endlink
@@ -4551,7 +4551,7 @@ int TQWidget::x() const
 
 /*!
     \property TQWidget::y
-    \brief the y coordinate of the widget relative to its tqparent and
+    \brief the y coordinate of the widget relative to its parent and
     including any window frame
 
     See the \link tqgeometry.html Window Geometry documentation\endlink
@@ -4572,7 +4572,7 @@ int TQWidget::y() const
 
 /*!
     \property TQWidget::pos
-    \brief the position of the widget within its tqparent widget
+    \brief the position of the widget within its parent widget
 
     If the widget is a top-level widget, the position is that of the
     widget on the desktop, including its frame.
@@ -4607,7 +4607,7 @@ TQPoint TQWidget::pos() const
 
 /*!
     \property TQWidget::tqgeometry
-    \brief the tqgeometry of the widget relative to its tqparent and
+    \brief the tqgeometry of the widget relative to its parent and
     excluding the window frame
 
     When changing the tqgeometry, the widget, if visible, receives a
@@ -4937,18 +4937,18 @@ void TQWidget::setFixedHeight( int h )
 
 /*!
     Translates the widget coordinate \a pos to the coordinate system
-    of \a tqparent. The \a tqparent must not be 0 and must be a tqparent
+    of \a parent. The \a parent must not be 0 and must be a parent
     of the calling widget.
 
     \sa mapFrom() mapToParent() mapToGlobal() hasMouse()
 */
 
-TQPoint TQWidget::mapTo( TQWidget * tqparent, const TQPoint & pos ) const
+TQPoint TQWidget::mapTo( TQWidget * parent, const TQPoint & pos ) const
 {
     TQPoint p = pos;
-    if ( tqparent ) {
+    if ( parent ) {
 	const TQWidget * w = this;
-	while ( w != tqparent ) {
+	while ( w != parent ) {
 	    p = w->mapToParent( p );
 	    w = w->parentWidget();
 	}
@@ -4959,18 +4959,18 @@ TQPoint TQWidget::mapTo( TQWidget * tqparent, const TQPoint & pos ) const
 
 /*!
     Translates the widget coordinate \a pos from the coordinate system
-    of \a tqparent to this widget's coordinate system. The \a tqparent
-    must not be 0 and must be a tqparent of the calling widget.
+    of \a parent to this widget's coordinate system. The \a parent
+    must not be 0 and must be a parent of the calling widget.
 
     \sa mapTo() mapFromParent() mapFromGlobal() hasMouse()
 */
 
-TQPoint TQWidget::mapFrom( TQWidget * tqparent, const TQPoint & pos ) const
+TQPoint TQWidget::mapFrom( TQWidget * parent, const TQPoint & pos ) const
 {
     TQPoint p( pos );
-    if ( tqparent ) {
+    if ( parent ) {
 	const TQWidget * w = this;
-	while ( w != tqparent ) {
+	while ( w != parent ) {
 	    p = w->mapFromParent( p );
 	    w = w->parentWidget();
 	}
@@ -4981,9 +4981,9 @@ TQPoint TQWidget::mapFrom( TQWidget * tqparent, const TQPoint & pos ) const
 
 /*!
     Translates the widget coordinate \a pos to a coordinate in the
-    tqparent widget.
+    parent widget.
 
-    Same as mapToGlobal() if the widget has no tqparent.
+    Same as mapToGlobal() if the widget has no parent.
 
     \sa mapFromParent() mapTo() mapToGlobal() hasMouse()
 */
@@ -4994,10 +4994,10 @@ TQPoint TQWidget::mapToParent( const TQPoint &pos ) const
 }
 
 /*!
-    Translates the tqparent widget coordinate \a pos to widget
+    Translates the parent widget coordinate \a pos to widget
     coordinates.
 
-    Same as mapFromGlobal() if the widget has no tqparent.
+    Same as mapFromGlobal() if the widget has no parent.
 
     \sa mapToParent() mapFrom() mapFromGlobal() hasMouse()
 */
@@ -5535,7 +5535,7 @@ const TQColorGroup &TQWidget::tqcolorGroup() const
 
     As long as no special palette has been set, or after unsetPalette()
     has been called, this is either a special palette for the widget
-    class, the tqparent's palette or (if this widget is a top level
+    class, the parent's palette or (if this widget is a top level
     widget), the default application palette.
 
     Instead of defining an entirely new palette, you can also use the
@@ -5614,7 +5614,7 @@ void TQWidget::paletteChange( const TQPalette & )
 
     As long as no special font has been set, or after unsetFont() is
     called, this is either a special font for the widget class, the
-    tqparent's font or (if this widget is a top level widget), the
+    parent's font or (if this widget is a top level widget), the
     default application font.
 
     This code fragment sets a 12 point helvetica bold font:
@@ -5631,7 +5631,7 @@ void TQWidget::paletteChange( const TQPalette & )
 void TQWidget::setFont( const TQFont &font )
 {
     own_font = TRUE;
-    if ( fnt == font && fnt.d->tqmask == font.d->tqmask )
+    if ( fnt == font && fnt.d->mask == font.d->mask )
 	return;
     TQFont old = fnt;
     fnt = font.resolve( qt_naturalWidgetFont( this ) );
@@ -5724,7 +5724,7 @@ void TQWidget::fontChange( const TQFont & )
     \endcode
 
     If no cursor has been set, or after a call to unsetCursor(), the
-    tqparent's cursor is used. The function unsetCursor() has no effect
+    parent's cursor is used. The function unsetCursor() has no effect
     on top-level widgets.
 
     \sa TQApplication::setOverrideCursor()
@@ -6066,7 +6066,7 @@ void TQWidget::clearFocus()
     TQWidget::focusNextPrevChild() only when it reaches the last or
     first link on the "page".
 
-    Child widgets call focusNextPrevChild() on their tqparent widgets,
+    Child widgets call focusNextPrevChild() on their parent widgets,
     but only the top-level widget decides where to redirect focus. By
     overriding this method for an object, you thus gain control of
     focus traversal for all child widgets.
@@ -6257,11 +6257,11 @@ bool TQWidget::isActiveWindow() const
     }
 #endif
 #if defined(TQ_WS_WIN32)
-    HWND tqparent = tlw->winId();
-    HWND toptqparent = GetActiveWindow();
-    while ( tqparent ) {
-	tqparent = ::GetParent( tqparent );
-	if ( tqparent && tqparent == toptqparent )
+    HWND parent = tlw->winId();
+    HWND topparent = GetActiveWindow();
+    while ( parent ) {
+	parent = ::GetParent( parent );
+	if ( parent && parent == topparent )
 	    return TRUE;
     }
 #endif
@@ -6344,7 +6344,7 @@ void TQWidget::setTabOrder( TQWidget* first, TQWidget *second )
 /*!\internal
 
   Moves the relevant subwidgets of this widget from the \a oldtlw's
-  tab chain to that of the new tqparent, if there's anything to move and
+  tab chain to that of the new parent, if there's anything to move and
   we're really moving
 
   This function is called from TQWidget::reparent() *after* the widget
@@ -6394,7 +6394,7 @@ void TQWidget::reparentFocusWidgets( TQWidget * oldtlw )
 }
 
 /*!
-  \fn void TQWidget::recreate( TQWidget *tqparent, WFlags f, const TQPoint & p, bool showIt )
+  \fn void TQWidget::recreate( TQWidget *parent, WFlags f, const TQPoint & p, bool showIt )
 
   \obsolete
 
@@ -6423,7 +6423,7 @@ TQSize TQWidget::frameSize() const
     \internal
 
     Recursive function that updates \a widget and all its tqchildren,
-    if they have some tqparent background origin.
+    if they have some parent background origin.
 */
 static void qt_update_bg_recursive( TQWidget *widget )
 {
@@ -6607,7 +6607,7 @@ void TQWidget::show()
     if ( !isTopLevel() && !parentWidget()->isVisible() ) {
 	// we should become visible, but one of our ancestors is
 	// explicitly hidden. Since we cleared the ForceHide flag, our
-	// immediate tqparent will call show() on us again during its
+	// immediate parent will call show() on us again during its
 	// own processing of show().
 	if ( wasHidden ) {
 	    TQEvent showToParentEvent( TQEvent::ShowToParent );
@@ -6741,14 +6741,14 @@ void TQWidget::hide()
 	tqApp->closePopup( this );
 
     // Move test modal here.  Otherwise, a modal dialog could get
-    // destroyed and we lose all access to its tqparent because we haven't
+    // destroyed and we lose all access to its parent because we haven't
     // left modality.  (Eg. modal Progress Dialog)
     if ( testWFlags(WShowModal) )
 	qt_leave_modal( this );
 
 #if defined(TQ_WS_WIN)
     if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() )
-	parentWidget()->setActiveWindow();	// Activate tqparent
+	parentWidget()->setActiveWindow();	// Activate parent
 #endif
 
     hideWindow();
@@ -6772,7 +6772,7 @@ void TQWidget::hide()
 	TQApplication::sendEvent( this, &hideToParentEvent );
     }
 
-    // post tqlayout hint for non toplevels. The tqparent widget check is
+    // post tqlayout hint for non toplevels. The parent widget check is
     // necessary since the function is called in the destructor
     if ( !isTopLevel() && parentWidget() )
 	TQApplication::postEvent( parentWidget(),
@@ -6873,7 +6873,7 @@ void TQWidget::polish()
     if ( isTopLevel() ) {
 	const TQPixmap *pm = icon();
 	if ( !pm || pm->isNull() ) {
-	    TQWidget *mw = (TQWidget *)tqparent();
+	    TQWidget *mw = (TQWidget *)parent();
 	    pm = mw ? mw->icon() : 0;
 	    if ( pm && !pm->isNull() )
 		setIcon( *pm );
@@ -7018,7 +7018,7 @@ bool TQWidget::close( bool alsoDelete )
     \property TQWidget::visible
     \brief whether the widget is visible
 
-    Calling show() sets the widget to visible status if all its tqparent
+    Calling show() sets the widget to visible status if all its parent
     widgets up to the top-level widget are visible. If an ancestor is
     not visible, the widget won't become visible until all its
     ancestors are shown.
@@ -7051,7 +7051,7 @@ bool TQWidget::close( bool alsoDelete )
     Returns TRUE if this widget would become visible if \a ancestor is
     shown; otherwise returns FALSE.
 
-    The TRUE case occurs if neither the widget itself nor any tqparent
+    The TRUE case occurs if neither the widget itself nor any parent
     up to but excluding \a ancestor has been explicitly hidden.
 
     This function will still return TRUE if the widget is obscured by
@@ -7256,9 +7256,9 @@ TQSize TQWidget::tqminimumSizeHint() const
 /*!
     \fn TQWidget *TQWidget::parentWidget( bool sameWindow ) const
 
-    Returns the tqparent of this widget, or 0 if it does not have any
-    tqparent widget. If \a sameWindow is TRUE and the widget is top
-    level returns 0; otherwise returns the widget's tqparent.
+    Returns the parent of this widget, or 0 if it does not have any
+    parent widget. If \a sameWindow is TRUE and the widget is top
+    level returns 0; otherwise returns the widget's parent.
 */
 
 /*!
@@ -7742,7 +7742,7 @@ void TQWidget::mouseDoubleClickEvent( TQMouseEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQWheelEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -7762,7 +7762,7 @@ void TQWidget::wheelEvent( TQWheelEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQTabletEvent ignore()\endlink the event if you do not handle
-    it, so that the widget's tqparent can interpret it.
+    it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -7784,10 +7784,10 @@ void TQWidget::tabletEvent( TQTabletEvent *e )
 
     If you reimplement this handler, it is very important that you
     explicitly \link TQKeyEvent::ignore() ignore\endlink the event
-    if you do not understand it, so that the widget's tqparent can
+    if you do not understand it, so that the widget's parent can
     interpret it; otherwise, the event will be implicitly accepted.
     Although top-level widgets are able to choose whether to accept
-    or ignore unknown events because they have no tqparent widgets that
+    or ignore unknown events because they have no parent widgets that
     could otherwise handle them, it is good practice to explicitly
     ignore events to make widgets as reusable as possible.
 
@@ -7818,7 +7818,7 @@ void TQWidget::keyPressEvent( TQKeyEvent *e )
 
     If you reimplement this handler, it is very important that you
     \link TQKeyEvent ignore()\endlink the release if you do not
-    understand it, so that the widget's tqparent can interpret it.
+    understand it, so that the widget's parent can interpret it.
 
     The default implementation ignores the event.
 
@@ -8285,11 +8285,11 @@ bool TQWidget::qwsEvent( TQWSEvent * )
 
 /*!
     \property TQWidget::autoMask
-    \brief whether the auto tqmask feature is enabled for the widget
+    \brief whether the auto mask feature is enabled for the widget
 
-    Transtqparent widgets use a tqmask to define their visible region.
+    Transparent widgets use a mask to define their visible region.
     TQWidget has some built-in support to make the task of
-    recalculating the tqmask easier. When setting auto tqmask to TRUE,
+    recalculating the mask easier. When setting auto mask to TRUE,
     updateMask() will be called whenever the widget is resized or
     changes its focus state. Note that you must reimplement
     updateMask() (which should include a call to setMask()) or nothing
@@ -8297,7 +8297,7 @@ bool TQWidget::qwsEvent( TQWSEvent * )
 
     Note: when you re-implement resizeEvent(), focusInEvent() or
     focusOutEvent() in your custom widgets and still want to ensure
-    that the auto tqmask calculation works, you should add:
+    that the auto mask calculation works, you should add:
 
     \code
 	if ( autoMask() )
@@ -8306,17 +8306,17 @@ bool TQWidget::qwsEvent( TQWSEvent * )
 
     at the end of your event handlers. This is true for all member
     functions that change the appearance of the widget in a way that
-    requires a recalculation of the tqmask.
+    requires a recalculation of the mask.
 
     While being a technically appealing concept, masks have a big
     drawback: when using complex masks that cannot be expressed easily
     with relatively simple regions, they can be very slow on some
-    window systems. The classic example is a transtqparent label. The
+    window systems. The classic example is a transparent label. The
     complex tqshape of its contents makes it necessary to represent its
-    tqmask by a bitmap, which consumes both memory and time. If all you
+    mask by a bitmap, which consumes both memory and time. If all you
     want is to blend the background of several neighboring widgets
     together seamlessly, you will probably want to use
-    setBackgroundOrigin() rather than a tqmask.
+    setBackgroundOrigin() rather than a mask.
 
     \sa autoMask() updateMask() setMask() clearMask() setBackgroundOrigin()
 */
@@ -8348,9 +8348,9 @@ void TQWidget::setAutoMask( bool enable )
 
     The pixmap is drawn using the:
     \value WidgetOrigin  widget's coordinate system.
-    \value ParentOrigin  tqparent's coordinate system.
+    \value ParentOrigin  parent's coordinate system.
     \value WindowOrigin  top-level window's coordinate system.
-    \value AncestorOrigin  same origin as the tqparent uses.
+    \value AncestorOrigin  same origin as the parent uses.
 */
 
 /*!
@@ -8385,8 +8385,8 @@ void TQWidget::setBackgroundOrigin( BackgroundOrigin origin )
 
 /*!
     This function can be reimplemented in a subclass to support
-    transtqparent widgets. It should be called whenever a widget changes
-    state in a way that means that the tqshape tqmask must be recalculated.
+    transparent widgets. It should be called whenever a widget changes
+    state in a way that means that the tqshape mask must be recalculated.
 
     \sa setAutoMask(), updateMask(), setMask(), clearMask()
 */
@@ -8620,22 +8620,22 @@ void TQWidget::updateGeometry()
 
 
 /*!
-    Reparents the widget. The widget gets a new \a tqparent, new widget
+    Reparents the widget. The widget gets a new \a parent, new widget
     flags (\a f, but as usual, use 0) at a new position in its new
-    tqparent (\a p).
+    parent (\a p).
 
     If \a showIt is TRUE, show() is called once the widget has been
     reparented.
 
-    If the new tqparent widget is in a different top-level widget, the
+    If the new parent widget is in a different top-level widget, the
     reparented widget and its tqchildren are appended to the end of the
-    \link setFocusPolicy() tab chain \endlink of the new tqparent
+    \link setFocusPolicy() tab chain \endlink of the new parent
     widget, in the same internal order as before. If one of the moved
     widgets had keyboard focus, reparent() calls clearFocus() for that
     widget.
 
-    If the new tqparent widget is in the same top-level widget as the
-    old tqparent, reparent doesn't change the tab order or keyboard
+    If the new parent widget is in the same top-level widget as the
+    old parent, reparent doesn't change the tab order or keyboard
     focus.
 
     \warning It is extremely unlikely that you will ever need this
@@ -8646,11 +8646,11 @@ void TQWidget::updateGeometry()
     \sa getWFlags()
 */
 
-void TQWidget::reparent( TQWidget *tqparent, WFlags f, const TQPoint &p,
+void TQWidget::reparent( TQWidget *parent, WFlags f, const TQPoint &p,
 			bool showIt )
 {
-    reparentSys( tqparent, f, p, showIt );
-    TQEvent e( TQEvent::Retqparent );
+    reparentSys( parent, f, p, showIt );
+    TQEvent e( TQEvent::Reparent );
     TQApplication::sendEvent( this, &e );
     if (!own_font)
 	unsetFont();
@@ -8668,20 +8668,20 @@ void TQWidget::reparent( TQWidget *tqparent, WFlags f, const TQPoint &p,
     A convenience version of reparent that does not take widget flags
     as argument.
 
-    Calls reparent(\a tqparent, getWFlags() \& ~\l WType_Mask, \a p, \a
+    Calls reparent(\a parent, getWFlags() \& ~\l WType_Mask, \a p, \a
     showIt).
 */
-void  TQWidget::reparent( TQWidget *tqparent, const TQPoint & p,
+void  TQWidget::reparent( TQWidget *parent, const TQPoint & p,
 			 bool showIt )
 {
-    reparent( tqparent, getWFlags() & ~WType_Mask, p, showIt );
+    reparent( parent, getWFlags() & ~WType_Mask, p, showIt );
 }
 
 /*!
     \property TQWidget::ownCursor
     \brief whether the widget uses its own cursor
 
-    If FALSE, the widget uses its tqparent widget's cursor.
+    If FALSE, the widget uses its parent widget's cursor.
 
     \sa cursor
 */
@@ -8690,7 +8690,7 @@ void  TQWidget::reparent( TQWidget *tqparent, const TQPoint & p,
     \property TQWidget::ownFont
     \brief whether the widget uses its own font
 
-    If FALSE, the widget uses its tqparent widget's font.
+    If FALSE, the widget uses its parent widget's font.
 
     \sa font
 */
@@ -8699,7 +8699,7 @@ void  TQWidget::reparent( TQWidget *tqparent, const TQPoint & p,
     \property TQWidget::ownPalette
     \brief whether the widget uses its own palette
 
-    If FALSE, the widget uses its tqparent widget's palette.
+    If FALSE, the widget uses its parent widget's palette.
 
     \sa palette
 */
@@ -8737,16 +8737,16 @@ void TQDesktopWidget::insertChild( TQObject *obj )
   \brief The level of opacity for the window.
 
   The valid range of opacity is from 1.0 (completely opaque) to
-  0.0 (completely transtqparent).
+  0.0 (completely transparent).
 
   By default the value of this property is 1.0.
 
   This feature is only present on Mac OS X and Windows 2000 and up.
 
-  \warning Changing this property from opaque to transtqparent might issue a
+  \warning Changing this property from opaque to transparent might issue a
   paint event that needs to be processed before the window is displayed
   correctly. This affects mainly the use of TQPixmap::grabWindow(). Also note
-  that semi-transtqparent windows update and resize significantely slower than
+  that semi-transparent windows update and resize significantely slower than
   opaque windows.
 */
 
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h
index 6af93ed35..d5f9cb5ff 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h
+++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h
@@ -87,7 +87,7 @@ struct TQTLWExtra : public QTLWExtra, virtual public TQt
 	uint ussize : 1;				// User defined size
 
 #if defined(TQ_WS_X11)
-	WId parentWinId;				// tqparent window Id (valid after reparenting)
+	WId parentWinId;				// parent window Id (valid after reparenting)
 #endif
 };
 
@@ -190,7 +190,7 @@ class TQ_EXPORT TQWidget : public QWidget, virtual public TQt
 	Q_OBJECT
 	TQ_OBJECT
 public:
-	TQObject *tqparent() const;
+	TQObject *parent() const;
 	TQObjectList childrenListObject();
 	const TQObjectList childrenListObject() const;
 
@@ -207,7 +207,7 @@ public:
 
 // TQWidget methods
 public:
-	TQWidget( QWidget* tqparent=0, const char* name=0, WFlags f=0 );
+	TQWidget( QWidget* parent=0, const char* name=0, WFlags f=0 );
 
 	void setWState( uint state );
 	void clearWState( uint flags );
@@ -592,7 +592,7 @@ public:
         X11WindowTypePopup
     };
     void x11SetWindowType( X11WindowType type = X11WindowTypeSelect );
-    void x11SetWindowTransient( TQWidget* tqparent );
+    void x11SetWindowTransient( TQWidget* parent );
 #endif
 };
 
@@ -676,7 +676,7 @@ class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice
     Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
 
 public:
-    TQ_EXPLICIT TQWidget( TQWidget* tqparent=0, const char* name=0, WFlags f=0 );
+    TQ_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0 );
     ~TQWidget();
 
     WId		 winId() const;
@@ -946,13 +946,13 @@ public:
     TQLayout *		tqlayout() const { return lay_out; }
 #endif
     void		updateGeometry();
-    virtual void 	reparent( TQWidget *tqparent, WFlags, const TQPoint &,
+    virtual void 	reparent( TQWidget *parent, WFlags, const TQPoint &,
 				  bool showIt=FALSE );
-    void		reparent( TQWidget *tqparent, const TQPoint &,
+    void		reparent( TQWidget *parent, const TQPoint &,
 				  bool showIt=FALSE );
 #ifndef TQT_NO_COMPAT
-    void		recreate( TQWidget *tqparent, WFlags f, const TQPoint & p,
-				  bool showIt=FALSE ) { reparent(tqparent,f,p,showIt); }
+    void		recreate( TQWidget *parent, WFlags f, const TQPoint & p,
+				  bool showIt=FALSE ) { reparent(parent,f,p,showIt); }
 #endif
 
     void		erase();
@@ -1019,7 +1019,7 @@ public:
         X11WindowTypePopup
     };
     void x11SetWindowType( X11WindowType type = X11WindowTypeSelect );
-    void x11SetWindowTransient( TQWidget* tqparent );
+    void x11SetWindowTransient( TQWidget* parent );
 #endif
     void setWindowOpacity(double level);
     double windowOpacity() const;
@@ -1180,7 +1180,7 @@ private:
     void	 hideWindow();
     void	 showChildren( bool spontaneous );
     void	 hideChildren( bool spontaneous );
-    void	 reparentSys( TQWidget *tqparent, WFlags, const TQPoint &,  bool showIt);
+    void	 reparentSys( TQWidget *parent, WFlags, const TQPoint &,  bool showIt);
     void	 createTLExtra();
     void	 createExtra();
     void	 deleteExtra();
@@ -1434,8 +1434,8 @@ inline void TQWidget::drawText( const TQPoint &p, const TQString &s )
 inline TQWidget *TQWidget::parentWidget( bool sameWindow ) const
 {
     if ( sameWindow )
-	return isTopLevel() ? 0 : (TQWidget *)TQObject::tqparent();
-    return (TQWidget *)TQObject::tqparent();
+	return isTopLevel() ? 0 : (TQWidget *)TQObject::parent();
+    return (TQWidget *)TQObject::parent();
 }
 
 inline TQWidgetMapper *TQWidget::wmapper()
@@ -1530,7 +1530,7 @@ struct TQ_EXPORT TQTLWExtra {
     uint     savedFlags;			// Save widgetflags while showing fullscreen
     short    basew, baseh;			// base sizes
 #if defined(TQ_WS_X11)
-    WId  parentWinId;				// tqparent window Id (valid after reparenting)
+    WId  parentWinId;				// parent window Id (valid after reparenting)
     uint     embedded : 1;			// window is embedded in another TQt application
     uint     spont_unmapped: 1;			// window was spontaneously unmapped
     uint     reserved: 1;			// reserved
@@ -1600,7 +1600,7 @@ struct TQ_EXPORT TQWExtra {
     uint compress_events : 1;
 #endif
 #if defined(TQ_WS_TQWS) || defined(TQ_WS_MAC)
-    TQRegion tqmask;				// widget tqmask
+    TQRegion mask;				// widget mask
 #endif
     char     bg_mode;				// background mode
     char     bg_mode_visual;			// visual background mode
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp
index 60df4121f..532a372e8 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp
@@ -189,7 +189,7 @@ void TQWidget::setMask( const QBitmap bitmap )
 	fixerUpper.drawLine(0, fixedBitmap.height()-1, fixedBitmap.width()-1, fixedBitmap.height()-1);
 	fixerUpper.drawLine(fixedBitmap.width()-1, 0, fixedBitmap.width()-1, fixedBitmap.height()-1);
 	fixerUpper.end();
-	QWidget::setMask(fixedBitmap.mask());
+	QWidget::setMask(fixedBitmap.QBitmap::mask());
 }
 
 /*!
@@ -395,9 +395,9 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type, TQt::But
 #endif
 }
 
-void TQWidget::x11SetWindowTransient( TQWidget* tqparent )
+void TQWidget::x11SetWindowTransient( TQWidget* parent )
 {
-    XSetTransientForHint( x11Display(), winId(), tqparent->winId());
+    XSetTransientForHint( x11Display(), winId(), parent->winId());
 }
 
 // Sets the EWMH (netwm) window type. Needed as a separate function
@@ -551,7 +551,7 @@ extern int qt_curr_events_stylus;
 extern int qt_curr_events_eraser;
 #endif
 
-const uint stdWidgetEventMask =			// X event tqmask
+const uint stdWidgetEventMask =			// X event mask
 	(uint)(
 	    KeyPressMask | KeyReleaseMask |
 	    ButtonPressMask | ButtonReleaseMask |
@@ -564,7 +564,7 @@ const uint stdWidgetEventMask =			// X event tqmask
 	    StructureNotifyMask
 	);
 
-const uint stdDesktopEventMask =			// X event tqmask
+const uint stdDesktopEventMask =			// X event mask
        (uint)(
            KeymapStateMask |
 	   EnterWindowMask | LeaveWindowMask |
@@ -577,13 +577,13 @@ const uint stdDesktopEventMask =			// X event tqmask
 */
 
 Window qt_XCreateWindow( const TQWidget *creator,
-			 Display *display, Window tqparent,
+			 Display *display, Window parent,
 			 int x, int y, uint w, uint h,
 			 int borderwidth, int depth,
 			 uint windowclass, Visual *visual,
-			 ulong valuetqmask, XSetWindowAttributes *attributes );
+			 ulong valuemask, XSetWindowAttributes *attributes );
 Window qt_XCreateSimpleWindow( const TQWidget *creator,
-			       Display *display, Window tqparent,
+			       Display *display, Window parent,
 			       int x, int y, uint w, uint h, int borderwidth,
 			       ulong border, ulong background );
 void qt_XDestroyWindow( const TQWidget *destroyer,
@@ -743,7 +743,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	xd->x_defvisual = TQPaintDevice::x11AppDefaultVisual( xd->x_screen );
 	setX11Data( xd );
     } else if ( parentWidget() &&  parentWidget()->x11Screen() != x11Screen() ) {
-	// if we have a tqparent widget, move to its screen if necessary
+	// if we have a parent widget, move to its screen if necessary
 	TQPaintDeviceX11Data* xd = getX11Data( TRUE );
 	xd->x_screen = parentWidget()->x11Screen();
 	xd->x_depth = TQPaintDevice::x11AppDepth( xd->x_screen );
@@ -955,7 +955,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 				 &wsa );
 	x11SetWindowType();
     } else if ( topLevel && !desktop ) {	// top-level widget
-	TQWidget *p = parentWidget();	// real tqparent
+	TQWidget *p = parentWidget();	// real parent
 	if (p)
 	    p = p->tqtopLevelWidget();
 
@@ -966,7 +966,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 		XSetTransientForHint( dpy, id, root_win );
 	}
 
-	// find the real client leader, i.e. a toplevel without tqparent
+	// find the real client leader, i.e. a toplevel without parent
 	while ( p && p->parentWidget())
 	    p = p->parentWidget()->tqtopLevelWidget();
 
@@ -1064,7 +1064,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
     }
 
     setWState( WState_MouseTracking );
-    setMouseTracking( FALSE );			// also sets event tqmask
+    setMouseTracking( FALSE );			// also sets event mask
     if ( desktop ) {
 	setWState( WState_Visible );
     } else if ( topLevel ) {			// set X cursor
@@ -1158,7 +1158,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows )
     }
 }
 
-void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool showIt )
+void TQWidget::reparentSys( TQWidget *parent, WFlags f, const TQPoint &p, bool showIt )
 {
     extern void qPRCreate( const TQWidget *, Window );
 
@@ -1179,7 +1179,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool
     clearWState(WState_MouseTracking);
 
     TQWidget* oldtlw = tqtopLevelWidget();
-    TQWidget *oldtqparent = parentWidget();
+    TQWidget *oldparent = parentWidget();
     WId old_winid = winid;
     if ( testWFlags(WType_Desktop) )
 	old_winid = 0;
@@ -1203,14 +1203,14 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool
     destroySyncCounter();
 #endif
 
-    if ( isTopLevel() || !tqparent ) // we are toplevel, or reparenting to toplevel
+    if ( isTopLevel() || !parent ) // we are toplevel, or reparenting to toplevel
         topData()->parentWinId = 0;
 
-    if ( tqparent != parentObj ) {
-	if ( parentObj )				// remove from tqparent
+    if ( parent != parentObj ) {
+	if ( parentObj )				// remove from parent
 	    parentObj->removeChild( this );
-	if ( tqparent )				// insert into new tqparent
-	    tqparent->insertChild( this );
+	if ( parent )				// insert into new parent
+	    parent->insertChild( this );
     }
     bool     enable = isEnabled();		// remember status
     FocusPolicy fp = focusPolicy();
@@ -1221,7 +1221,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool
     widget_flags = f;
     clearWState( WState_Created | WState_Visible | WState_ForceHide );
     create();
-    if ( isTopLevel() || (!tqparent || tqparent->isVisible() ) )
+    if ( isTopLevel() || (!parent || parent->isVisible() ) )
 	setWState( WState_ForceHide );	// new widgets do not show up in already visible parents
 
     const TQObjectList *chlist = childrenListObject();
@@ -1245,7 +1245,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool
 		      WM_TRANSIENT_FOR information... unfortunately, some window managers
 		      don't handle changing WM_TRANSIENT_FOR before the toplevel window is
 		      visible, so we unmap and remap all toplevel-transient tqchildren *after*
-		      the toplevel tqparent has been mapped.  thankfully, this is easy in TQt :)
+		      the toplevel parent has been mapped.  thankfully, this is easy in TQt :)
 		    */
 		    XUnmapWindow(w->x11Display(), w->winId());
 		    XSetTransientForHint(w->x11Display(), w->winId(), winId());
@@ -1288,8 +1288,8 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool
     reparentFocusWidgets( oldtlw );
 
     // re-register dnd
-    if (oldtqparent)
-	oldtqparent->checkChildrenDnd();
+    if (oldparent)
+	oldparent->checkChildrenDnd();
 
     if ( accept_drops )
 	setAcceptDrops( TRUE );
@@ -1358,9 +1358,9 @@ void TQWidget::x11SetWindowType( X11WindowType type )
         XDeleteProperty(x11Display(), winId(), qt_net_wm_window_type);
 }
 
-void TQWidget::x11SetWindowTransient( TQWidget* tqparent )
+void TQWidget::x11SetWindowTransient( TQWidget* parent )
 {
-    XSetTransientForHint( x11Display(), winId(), tqparent->winId());
+    XSetTransientForHint( x11Display(), winId(), parent->winId());
 }
 
 /*!
@@ -1621,11 +1621,11 @@ void TQWidget::setIcon( const TQPixmap &pixmap )
     if ( !pixmap.isNull() ) {
 	TQPixmap* pm = new TQPixmap( pixmap );
 	extra->topextra->icon = pm;
-	if ( !pm->tqmask() )
+	if ( !pm->mask() )
 	    pm->setMask( pm->createHeuristicMask() ); // may do detach()
 	icon_pixmap = pm->handle();
-	if ( pm->tqmask() )
-	    mask_pixmap = pm->tqmask()->handle();
+	if ( pm->mask() )
+	    mask_pixmap = pm->mask()->handle();
     }
     XWMHints *h = XGetWMHints( x11Display(), winId() );
     XWMHints  wm_hints;
@@ -2311,7 +2311,7 @@ void TQWidget::hideWindow()
 }
 
 /*!
-    Raises this widget to the top of the tqparent widget's stack.
+    Raises this widget to the top of the parent widget's stack.
 
     After this call the widget will be visually in front of any
     overlapping sibling widgets.
@@ -2328,7 +2328,7 @@ void TQWidget::raise()
 }
 
 /*!
-    Lowers the widget to the bottom of the tqparent widget's stack.
+    Lowers the widget to the bottom of the parent widget's stack.
 
     After this call the widget will be visually behind (and therefore
     obscured by) any overlapping sibling widgets.
@@ -2346,7 +2346,7 @@ void TQWidget::lower()
 
 
 /*!
-    Places the widget under \a w in the tqparent widget's stack.
+    Places the widget under \a w in the parent widget's stack.
 
     To make this work, the widget itself and \a w must be siblings.
 
@@ -2902,7 +2902,7 @@ void TQWidget::deleteTLSysExtra()
 }
 
 /*
-   examine the tqchildren of our tqparent up the tree and set the
+   examine the tqchildren of our parent up the tree and set the
    tqchildren_use_dnd extra data appropriately... this is used to keep DND enabled
    for widgets that are reparented and don't have DND enabled, BUT *DO* have
    tqchildren (or tqchildren of tqchildren ...) with DND enabled...
@@ -3040,7 +3040,7 @@ void TQWidget::setMask( const TQRegion& region )
 /*!
     Causes only the pixels of the widget for which \a bitmap has a
     corresponding 1 bit to be visible. Use TQt::color0 to draw
-    transtqparent regions and TQt::color1 to draw opaque regions of the
+    transparent regions and TQt::color1 to draw opaque regions of the
     bitmap.
 
     If the region includes pixels outside the rect() of the widget,
@@ -3065,7 +3065,7 @@ void TQWidget::setMask( const TQBitmap &bitmap )
 }
 
 /*!
-    Removes any tqmask set by setMask().
+    Removes any mask set by setMask().
 
     \sa setMask()
 */
@@ -3106,7 +3106,7 @@ void TQWidget::updateFrameStrut() const
     }
 
     Atom type_ret;
-    Window l = winId(), w = winId(), p, r; // target window, it's tqparent, root
+    Window l = winId(), w = winId(), p, r; // target window, it's parent, root
     Window *c;
     int i_unused;
     unsigned int nc;
@@ -3118,11 +3118,11 @@ void TQWidget::updateFrameStrut() const
 	    XFree(c);
 
 	if (! p) {
-	    qWarning("TQWidget::updateFrameStrut(): ERROR - no tqparent");
+	    qWarning("TQWidget::updateFrameStrut(): ERROR - no parent");
 	    return;
 	}
 
-	// if the tqparent window is the root window, an Enlightenment virtual root or
+	// if the parent window is the root window, an Enlightenment virtual root or
 	// a NET WM virtual root window, stop here
 	data_ret = 0;
 	if (p == r ||
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp
index 574374dcb..5bbb7c12f 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp
@@ -48,22 +48,22 @@
   custom versions.
 */
 
-Window qt_XCreateWindow( const TQWidget*, Display *display, Window tqparent,
+Window qt_XCreateWindow( const TQWidget*, Display *display, Window parent,
 			 int x, int y, uint w, uint h,
 			 int borderwidth, int depth,
 			 uint windowclass, Visual *visual,
-			 ulong valuetqmask, XSetWindowAttributes *attributes )
+			 ulong valuemask, XSetWindowAttributes *attributes )
 {
-    return XCreateWindow( display, tqparent, x, y, w, h, borderwidth, depth,
-			  windowclass, visual, valuetqmask, attributes );
+    return XCreateWindow( display, parent, x, y, w, h, borderwidth, depth,
+			  windowclass, visual, valuemask, attributes );
 }
 
 
-Window qt_XCreateSimpleWindow( const TQWidget*, Display *display, Window tqparent,
+Window qt_XCreateSimpleWindow( const TQWidget*, Display *display, Window parent,
 			       int x, int y, uint w, uint h, int borderwidth,
 			       ulong border, ulong background )
 {
-    return XCreateSimpleWindow( display, tqparent, x, y, w, h, borderwidth,
+    return XCreateSimpleWindow( display, parent, x, y, w, h, borderwidth,
 				border, background );
 }