rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

53 files changed, 335 insertions, 335 deletions

diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
index 0e63ed8a..b233202f 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
@@ -99,8 +99,8 @@ static const char* const not_close_xpm[]={
  *
  * @author Max Judin.
 */
-KDockMainWindow::KDockMainWindow( TQWidget* tqparent, const char *name, WFlags f)
-:KMainWindow( tqparent, name, f )
+KDockMainWindow::KDockMainWindow( TQWidget* parent, const char *name, WFlags f)
+:KMainWindow( parent, name, f )
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new KDockManager( this, new_name.latin1() );
@@ -122,7 +122,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw )
 void KDockMainWindow::setView( TQWidget *view )
 {
   if ( view->isA("KDockWidget") ){
-    if ( TQT_BASE_OBJECT(view->tqparent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this );
+    if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this );
   }
 
 #ifndef NO_KDE2
@@ -132,9 +132,9 @@ void KDockMainWindow::setView( TQWidget *view )
 #endif
 }
 
-KDockWidget* KDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
+KDockWidget* KDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
 {
-  return new KDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
+  return new KDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
 }
 
 void KDockMainWindow::makeDockVisible( KDockWidget* dock )
@@ -185,15 +185,15 @@ void KDockMainWindow::slotDockWidgetUndocked()
 }
 
 /*************************************************************************/
-KDockWidgetAbstractHeaderDrag::KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name )
-:TQFrame( tqparent, name )
+KDockWidgetAbstractHeaderDrag::KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
+:TQFrame( parent, name )
 {
   dw = dock;
   installEventFilter( dock->dockManager() );
 }
 /*************************************************************************/
-KDockWidgetHeaderDrag::KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name )
-:KDockWidgetAbstractHeaderDrag( tqparent, dock, name )
+KDockWidgetHeaderDrag::KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
+:KDockWidgetAbstractHeaderDrag( parent, dock, name )
 {
 }
 
@@ -208,13 +208,13 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
   paint.end();
 }
 /*************************************************************************/
-KDockWidgetAbstractHeader::KDockWidgetAbstractHeader( KDockWidget* tqparent, const char* name )
-:TQFrame( tqparent, name )
+KDockWidgetAbstractHeader::KDockWidgetAbstractHeader( KDockWidget* parent, const char* name )
+:TQFrame( parent, name )
 {
 }
 /*************************************************************************/
-KDockWidgetHeader::KDockWidgetHeader( KDockWidget* tqparent, const char* name )
-:KDockWidgetAbstractHeader( tqparent, name )
+KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
+:KDockWidgetAbstractHeader( parent, name )
 {
 #ifdef BORDERLESS_WINDOWS
   setCursor(TQCursor(ArrowCursor));
@@ -224,14 +224,14 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* tqparent, const char* name )
   tqlayout = new TQHBoxLayout( this );
   tqlayout->setResizeMode( TQLayout::Minimum );
 
-  drag = new KDockWidgetHeaderDrag( this, tqparent );
+  drag = new KDockWidgetHeaderDrag( this, parent );
 
   closeButton = new KDockButton_Private( this, "DockCloseButton" );
   TQToolTip::add( closeButton, i18n("Close") );
   closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
   closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerCloseButtonClicked()));
-  connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(undock()));
+  connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
+  connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
 
   stayButton = new KDockButton_Private( this, "DockStayButton" );
   TQToolTip::add( stayButton, i18n("Freeze the window tqgeometry", "Freeze") );
@@ -244,14 +244,14 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* tqparent, const char* name )
   TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") );
   dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm));
   dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerDockbackButtonClicked()));
-  connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(dockBack()));
+  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked()));
+  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack()));
 
   d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" );
   TQToolTip::add( d->toDesktopButton, i18n("Detach") );
   d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm));
   d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( d->toDesktopButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(toDesktop()));
+  connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
   stayButton->hide();
 
   d->dummy = new TQWidget( this );
@@ -273,7 +273,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel )
 {
   d->topLevel = isTopLevel;
   if ( isTopLevel ){
-    KDockWidget* par = (KDockWidget*)tqparent();
+    KDockWidget* par = (KDockWidget*)parent();
     if( par) {
       if( par->isDockBackPossible())
         dockbackButton->show();
@@ -425,12 +425,12 @@ void KDockWidgetHeader::setDragEnabled(bool b)
 #ifndef NO_KDE2
 void KDockWidgetHeader::saveConfig( KConfig* c )
 {
-  c->writeEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), stayButton->isOn() );
+  c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() );
 }
 
 void KDockWidgetHeader::loadConfig( KConfig* c )
 {
-  setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), false ) );
+  setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) );
 }
 #endif
 
@@ -479,11 +479,11 @@ public:
 
 
 /*************************************************************************/
-KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
+KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
 #ifdef BORDERLESS_WINDOWS
-: TQWidget( tqparent, name, f )//| WType_Dialog | WStyle_Customize | WStyle_NoBorder )
+: TQWidget( parent, name, f )//| WType_Dialog | WStyle_Customize | WStyle_NoBorder )
 #else
-: TQWidget( tqparent, name, f )
+: TQWidget( parent, name, f )
 #endif
   ,formerBrotherDockWidget(0L)
   ,currentDockPos(DockNone)
@@ -495,7 +495,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
 {
   d = new KDockWidgetPrivate();  // create private data
 
-  d->_parent = tqparent;
+  d->_parent = parent;
 
   tqlayout = new TQVBoxLayout( this );
   tqlayout->setResizeMode( TQLayout::Minimum );
@@ -526,7 +526,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
   widget = 0L;
 
   TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) );
-  applyToWidget( tqparent, TQPoint(0,0) );
+  applyToWidget( parent, TQPoint(0,0) );
 }
 
 void KDockWidget::setPixmap(const TQPixmap& pixmap) {
@@ -585,7 +585,7 @@ void KDockWidget::leaveEvent(TQEvent *e)
 {
 	TQWidget::leaveEvent(e);
 #ifdef BORDERLESS_WINDOWS
-	if (tqparent()) return;
+	if (parent()) return;
 //	setCursor(TQCursor(ArrowCursor));
 #endif
 }
@@ -593,7 +593,7 @@ void KDockWidget::leaveEvent(TQEvent *e)
 void KDockWidget::mousePressEvent(TQMouseEvent* mme)
 {
 #ifdef BORDERLESS_WINDOWS
-	if (!tqparent())
+	if (!parent())
 	{
 		kdDebug(282)<<"KDockWidget::mousePressEvent"<<endl;
 
@@ -663,7 +663,7 @@ void  KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
 {
 	TQWidget::mouseMoveEvent(mme);
 #ifdef BORDERLESS_WINDOWS
-	if (tqparent()) return;
+	if (parent()) return;
 
 	if (d->resizing)
 	{
@@ -772,14 +772,14 @@ void KDockWidget::setEnableDocking( int pos )
 
 void KDockWidget::updateHeader()
 {
-  if ( tqparent() ){
+  if ( parent() ){
 #ifdef BORDERLESS_WINDOWS
       tqlayout->setMargin(0);
       setMouseTracking(false);
       setCursor(TQCursor(ArrowCursor));
 #endif
 
-    if ( (TQT_BASE_OBJECT(tqparent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){
+    if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){
       header->hide();
     } else {
       header->setTopLevel( false );
@@ -800,7 +800,7 @@ void KDockWidget::updateHeader()
 
 void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 {
-  if ( TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(s) )
+  if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) )
   {
     hide();
     reparent(s, 0, TQPoint(0,0), false);
@@ -840,11 +840,11 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 
 void KDockWidget::show()
 {
-  if ( tqparent() || manager->main->isVisible() )
-    if ( !tqparent() ){
+  if ( parent() || manager->main->isVisible() )
+    if ( !parent() ){
      emit manager->setDockDefaultPos( this );
      emit setDockDefaultPos();
-     if ( tqparent() ){
+     if ( parent() ){
         makeDockVisible();
       } else {
         TQWidget::show();
@@ -864,9 +864,9 @@ void KDockWidget::setDockWindowType (NET::WindowType windowType)
 
 #endif
 
-void KDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnabled)
+void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnabled)
 {
-  d->_parent = tqparent;
+  d->_parent = parent;
   d->transient = transientEnabled;
   applyToWidget( parentWidget(), TQPoint(0,0) );
 }
@@ -900,8 +900,8 @@ bool KDockWidget::event( TQEvent *event )
       break;
     case TQEvent::CaptionChange:
       if ( parentWidget() ){
-        if ( tqparent()->inherits("KDockSplitter") ){
-          ((KDockSplitter*)(tqparent()))->updateName();
+        if ( parent()->inherits("KDockSplitter") ){
+          ((KDockSplitter*)(parent()))->updateName();
         }
         if ( parentDockTabGroup() ){
           setDockTabName( parentDockTabGroup() );
@@ -920,18 +920,18 @@ bool KDockWidget::event( TQEvent *event )
 
 KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
 {
-	if (!tqparent()) return 0;
-	if (!tqparent()->inherits("KDockSplitter")) return 0;
+	if (!parent()) return 0;
+	if (!parent()->inherits("KDockSplitter")) return 0;
 	Qt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?Qt::Vertical:Qt::Horizontal;
-		if (((KDockSplitter*)(tqparent()))->orientation()==orientation)
+		if (((KDockSplitter*)(parent()))->orientation()==orientation)
 		{
 			KDockWidget *neighbor=
 				((pos==DockLeft)||(pos==DockTop))?
-				static_cast<KDockWidget*>(((KDockSplitter*)(tqparent()))->getFirst()):
-				static_cast<KDockWidget*>(((KDockSplitter*)(tqparent()))->getLast());
+				static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getFirst()):
+				static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast());
 
 			if (neighbor==this)
-			return (static_cast<KDockWidget*>(TQT_TQWIDGET(tqparent()->tqparent()))->findNearestDockWidget(pos));
+			return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos));
 			else
 			if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup")))
 				return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
@@ -939,7 +939,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
 			return neighbor;
 		}
 		else
-		return (static_cast<KDockWidget*>(TQT_TQWIDGET(tqparent()->tqparent()))->findNearestDockWidget(pos));
+		return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos));
 
 	return 0;
 }
@@ -983,10 +983,10 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 //  kdDebug(282)<<"KDockWidget::manualDock(): success = false (2)"<<endl;
   }
 
-  if ( tqparent() && !tqparent()->inherits("KDockSplitter") && !parentDockTabGroup() &&
-  	!(dynamic_cast<KDockContainer*>(tqparent())) && !parentDockContainer()){
+  if ( parent() && !parent()->inherits("KDockSplitter") && !parentDockTabGroup() &&
+  	!(dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){
 //  kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl;
-//  kdDebug(282)<<tqparent()->name()<<endl;
+//  kdDebug(282)<<parent()->name()<<endl;
     succes = false;
   }
 
@@ -1037,7 +1037,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 
     currentDockPos = KDockWidget::DockCenter;
     emit manager->change();
-    return (KDockWidget*)parentTab->tqparent();
+    return (KDockWidget*)parentTab->parent();
   }
   else
   {
@@ -1199,7 +1199,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 
 KDockTabGroup* KDockWidget::parentDockTabGroup() const
 {
-  if ( !tqparent() ) return 0L;
+  if ( !parent() ) return 0L;
   TQWidget* candidate = parentWidget()->parentWidget();
   if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate;
   return 0L;
@@ -1207,7 +1207,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const
 
 TQWidget *KDockWidget::parentDockContainer() const
 {
-  if (!tqparent()) return 0L;
+  if (!parent()) return 0L;
   TQWidget* candidate = parentWidget()->parentWidget();
   if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate;
   return 0L;
@@ -1218,18 +1218,18 @@ void KDockWidget::setForcedFixedWidth(int w)
 {
 	d->forcedWidth=w;
 	setFixedWidth(w);
-	if (!tqparent()) return;
-	if (tqparent()->inherits("KDockSplitter"))
-		static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w);
+	if (!parent()) return;
+	if (parent()->inherits("KDockSplitter"))
+		static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w);
 }
 
 void KDockWidget::setForcedFixedHeight(int h)
 {
 	d->forcedHeight=h;
 	setFixedHeight(h);
-	if (!tqparent()) return;
-	if (tqparent()->inherits("KDockSplitter"))
-		static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h);
+	if (!parent()) return;
+	if (parent()->inherits("KDockSplitter"))
+		static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h);
 }
 
 int KDockWidget::forcedFixedWidth()
@@ -1249,9 +1249,9 @@ void KDockWidget::restoreFromForcedFixedSize()
 	setMaximumWidth(32000);
 	setMinimumHeight(0);
 	setMaximumHeight(32000);
-	if (!tqparent()) return;
-	if (tqparent()->inherits("KDockSplitter"))
-		static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this);
+	if (!parent()) return;
+	if (parent()->inherits("KDockSplitter"))
+		static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this);
 }
 
 void KDockWidget::toDesktop()
@@ -1314,8 +1314,8 @@ void KDockWidget::undock()
       lastTab->applyToWidget( 0L );
       lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) );
 
-      // KDockTabGroup always have a tqparent that is a KDockWidget
-      KDockWidget* parentOfTab = (KDockWidget*)parentTab->tqparent();
+      // KDockTabGroup always have a parent that is a KDockWidget
+      KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent();
       delete parentTab; // KDockTabGroup
 
       TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
@@ -1328,13 +1328,13 @@ void KDockWidget::undock()
           split->deactivate();
           if ( split->getFirst() == parentOfTab ){
             split->activate( lastTab );
-            if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+            if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft );
             else
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop );
           } else {
             split->activate( 0L, lastTab );
-            if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+            if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight );
             else
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom );
@@ -1357,7 +1357,7 @@ void KDockWidget::undock()
     }
   } else {
  /*********************************************************************************************/
-  //TQWidget* containerWidget = (TQWidget*)tqparent();
+  //TQWidget* containerWidget = (TQWidget*)parent();
   bool undockedFromContainer=false;
   if (d->container)
   {
@@ -1430,7 +1430,7 @@ void KDockWidget::setWidget( TQWidget* mw )
 {
   if ( !mw ) return;
 
-  if ( TQT_BASE_OBJECT(mw->tqparent()) != TQT_BASE_OBJECT(this) ){
+  if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){
     mw->reparent(this, 0, TQPoint(0,0), false);
   }
 
@@ -1479,20 +1479,20 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
   tab->parentWidget()->setCaption( listOfCaption );
 
   tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
-  if ( tab->parentWidget()->tqparent() )
-    if ( tab->parentWidget()->tqparent()->inherits("KDockSplitter") )
-      ((KDockSplitter*)(tab->parentWidget()->tqparent()))->updateName();
+  if ( tab->parentWidget()->parent() )
+    if ( tab->parentWidget()->parent()->inherits("KDockSplitter") )
+      ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName();
 }
 
 bool KDockWidget::mayBeHide() const
 {
-  bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
   return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) );
 }
 
 bool KDockWidget::mayBeShow() const
 {
-  bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
   return ( !isGroup && !isTabGroup && f && !isVisible() );
 }
 
@@ -1532,7 +1532,7 @@ void KDockWidget::makeDockVisible()
       p->show();
     p = p->parentWidget();
   }
-  if( !tqparent() ) // is undocked
+  if( !parent() ) // is undocked
     dockBack();
   show();
 }
@@ -1582,7 +1582,7 @@ void KDockWidget::dockBack()
   // else dockback to the dockmainwindow (default behavior)
   manualDock( ((KDockMainWindow*)manager->main)->getMainDockWidget(), formerDockPos, d->splitPosInPercent, TQPoint(0,0), false, d->index);
   formerBrotherDockWidget = 0L;
-  if (tqparent())
+  if (parent())
     makeDockVisible();
 }
 
@@ -1753,7 +1753,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
 #ifdef BORDERLESS_WINDOWS
 //BEGIN TEST
 	  KDockWidget *oldMoveWidget;
-	  if (!curdw->tqparent())
+	  if (!curdw->parent())
 	  {
 	  	curdw->move(TQCursor::pos()-d->dragOffset);
    	        pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos()-TQPoint(0,d->dragOffset.y()+3) );
@@ -2019,7 +2019,7 @@ void KDockManager::drop()
     drawDragRectangle();    // only the old rect will be deleted
     return;
   }
-  if ( !currentMoveWidget && !currentDragWidget->tqparent() ) {
+  if ( !currentMoveWidget && !currentDragWidget->parent() ) {
     currentDragWidget->move( TQCursor::pos() - d->dragOffset );
   }
   else {
@@ -2159,7 +2159,7 @@ void KDockManager::writeConfig(TQDomElement &base)
     TQObjectListIt it(*childDock);
     KDockWidget *obj1;
     while ( (obj1=(KDockWidget*)it.current()) ) {
-        if ( TQT_BASE_OBJECT(obj1->tqparent()) == TQT_BASE_OBJECT(main) )
+        if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
             mainWidgetStr = TQString::tqfromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
@@ -2210,7 +2210,7 @@ void KDockManager::writeConfig(TQDomElement &base)
                 list.append( ((KDockTabGroup*)obj->widget)->page( i )->name() );
             groupEl.appendChild(createListEntry(doc, "tabs", "tab", list));
             groupEl.appendChild(createNumberEntry(doc, "currentTab", ((KDockTabGroup*)obj->widget)->currentPageIndex()));
-            if (!obj->tqparent()) {
+            if (!obj->parent()) {
                 groupEl.appendChild(createStringEntry(doc, "dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""));
                 groupEl.appendChild(createNumberEntry(doc, "dockBackToPos", obj->formerDockPos));
             }
@@ -2219,15 +2219,15 @@ void KDockManager::writeConfig(TQDomElement &base)
             groupEl = doc.createElement("dock");
             groupEl.appendChild(createStringEntry(doc, "tabCaption", obj->tabPageLabel()));
             groupEl.appendChild(createStringEntry(doc, "tabToolTip", obj->toolTipString()));
-            if (!obj->tqparent()) {
+            if (!obj->parent()) {
                 groupEl.appendChild(createStringEntry(doc, "dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""));
                 groupEl.appendChild(createNumberEntry(doc, "dockBackToPos", obj->formerDockPos));
             }
         }
 
         groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
-        groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->tqparent()));
-        if ( !obj->tqparent() ) {
+        groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
+        if ( !obj->parent() ) {
             groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
             groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible()));
         }
@@ -2276,7 +2276,7 @@ void KDockManager::readConfig(TQDomElement &base)
     KDockWidget *obj1;
     while ( (obj1=(KDockWidget*)it.current()) ) {
         if ( !obj1->isGroup && !obj1->isTabGroup ) {
-            if ( obj1->tqparent() )
+            if ( obj1->parent() )
                 obj1->undock();
             else
                 obj1->hide();
@@ -2494,7 +2494,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
     ++it;
     //debug("  +Add subdock %s", obj->name());
     nList.append( obj->name() );
-    if ( TQT_BASE_OBJECT(obj->tqparent()) == TQT_BASE_OBJECT(main) )
+    if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) )
       c->writeEntry( "Main:view", obj->name() );
   }
 
@@ -2527,12 +2527,12 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
       if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){
 
         c->writeEntry( cname+":type", "GROUP");
-        if ( !obj->tqparent() ){
-          c->writeEntry( cname+":tqparent", "___null___");
+        if ( !obj->parent() ){
+          c->writeEntry( cname+":parent", "___null___");
           c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
-          c->writeEntry( cname+":tqparent", "yes");
+          c->writeEntry( cname+":parent", "yes");
         }
         c->writeEntry( cname+":first_name", obj->firstName );
         c->writeEntry( cname+":last_name", obj->lastName );
@@ -2559,14 +2559,14 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
 /*************************************************************************************************/
       if ( obj->isTabGroup){
         c->writeEntry( cname+":type", "TAB_GROUP");
-        if ( !obj->tqparent() ){
-          c->writeEntry( cname+":tqparent", "___null___");
+        if ( !obj->parent() ){
+          c->writeEntry( cname+":parent", "___null___");
           c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
           c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : "");
           c->writeEntry( cname+":dockBackToPos", obj->formerDockPos);
         } else {
-          c->writeEntry( cname+":tqparent", "yes");
+          c->writeEntry( cname+":parent", "yes");
         }
         TQStrList list;
         for ( int i = 0; i < ((KDockTabGroup*)obj->widget)->count(); ++i )
@@ -2583,7 +2583,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
 /*************************************************************************************************/
         c->writeEntry( cname+":tabCaption", obj->tabPageLabel());
         c->writeEntry( cname+":tabToolTip", obj->toolTipString());
-        if ( !obj->tqparent() ){
+        if ( !obj->parent() ){
           c->writeEntry( cname+":type", "NULL_DOCK");
           c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
@@ -2646,7 +2646,7 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     ++it;
     if ( !obj->isGroup && !obj->isTabGroup )
     {
-      if ( obj->tqparent() ) obj->undock(); else obj->hide();
+      if ( obj->parent() ) obj->undock(); else obj->hide();
     }
   }
 
@@ -2659,7 +2659,7 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     TQString type = c->readEntry( oname + ":type" );
     obj = 0L;
 
-    if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){
+    if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
       TQRect r = c->readRectEntry( oname + ":tqgeometry" );
       obj = getDockWidgetFromName( oname );
       obj->applyToWidget( 0L );
@@ -2753,7 +2753,7 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     TQString type = c->readEntry( oname + ":type" );
     obj = 0L;
 
-    if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){
+    if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
       obj = getDockWidgetFromName( oname );
       c->setGroup( group );
       TQString name = c->readEntry( oname + ":dockBackTo" );
@@ -2986,8 +2986,8 @@ void KDockManager::setSpecialBottomDockContainer(KDockWidget* container) {
 }
 
 
-KDockArea::KDockArea( TQWidget* tqparent, const char *name)
-:TQWidget( tqparent, name)
+KDockArea::KDockArea( TQWidget* parent, const char *name)
+:TQWidget( parent, name)
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new KDockManager( this, new_name.latin1() );
@@ -2999,9 +2999,9 @@ KDockArea::~KDockArea()
 	delete dockManager;
 }
 
-KDockWidget* KDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
+KDockWidget* KDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
 {
-  return new KDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
+  return new KDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
 }
 
 void KDockArea::makeDockVisible( KDockWidget* dock )
@@ -3119,10 +3119,10 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) {
 	m_nonOverlapSize=nonOverlapSize;
 	m_overlapMode=true;
 	if (parentDockWidget()) {
-		if (parentDockWidget()->tqparent()) {
+		if (parentDockWidget()->parent()) {
 			kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl;
 			KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-				tqparent()->qt_cast("KDockSplitter"));
+				parent()->qt_cast("KDockSplitter"));
 			if (sp) sp->resizeEvent(0);
 		}
 	}
@@ -3132,10 +3132,10 @@ void KDockContainer::deactivateOverlapMode() {
 	if (!m_overlapMode) return;
 	m_overlapMode=false;
 	if (parentDockWidget()) {
-		if (parentDockWidget()->tqparent()) {
+		if (parentDockWidget()->parent()) {
 			kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl;
 			KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-				tqparent()->qt_cast("KDockSplitter"));
+				parent()->qt_cast("KDockSplitter"));
 			if (sp) sp->resizeEvent(0);
 		}
 	}
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
index 5d0bbe86..9e0e43d5 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
@@ -111,10 +111,10 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget)
+   * @param parent the parent widget (usually a dockwidget)
    * @param name   the object instance name
    */
-  KDockWidgetAbstractHeader( KDockWidget* tqparent, const char* name = 0L );
+  KDockWidgetAbstractHeader( KDockWidget* parent, const char* name = 0L );
 
   /**
    * Destructs this.
@@ -161,11 +161,11 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget header)
+   * @param parent the parent widget (usually a dockwidget header)
    * @param dock   the dockwidget where it belongs to
    * @param name   the object instance name
    */
-  KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* tqparent,
+  KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* parent,
                                  KDockWidget* dock, const char* name = 0L );
 
   /**
@@ -207,11 +207,11 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget header)
+   * @param parent the parent widget (usually a dockwidget header)
    * @param dock   the dockwidget where it belongs to
    * @param name   the object instance name
    */
-  KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock,
+  KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock,
                          const char* name = 0L );
 
   /**
@@ -249,10 +249,10 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget)
+   * @param parent the parent widget (usually a dockwidget)
    * @param name   the object instance name
    */
-  KDockWidgetHeader( KDockWidget* tqparent, const char* name = 0L );
+  KDockWidgetHeader( KDockWidget* parent, const char* name = 0L );
 
   /**
    * Destructs this.
@@ -374,8 +374,8 @@ public:
   /**
    * Constructs this. It just calls the method of the base class.
    */
-  KDockTabGroup( TQWidget *tqparent = 0, const char *name = 0 )
-  :TQTabWidget( tqparent, name ){};
+  KDockTabGroup( TQWidget *parent = 0, const char *name = 0 )
+  :TQTabWidget( parent, name ){};
 
   /**
    * Destructs a KDockTabGroup.
@@ -396,7 +396,7 @@ private:
  * encapsulate the actual widgets (and member of the dockwidget class
  * set).
  *
- * You just grip the double-lined panel, tear it off its tqparent
+ * You just grip the double-lined panel, tear it off its parent
  * widget, drag it somewhere and let it loose. Depending on the
  * position where you leave it, the dockwidget becomes a toplevel
  * window on the desktop (floating mode) or docks to a new widget
@@ -415,7 +415,7 @@ private:
  * KDockMainWindow* mainWidget;
  * ...
  * KDockWidget* dock = 0L;
- * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no tqparent
+ * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no parent
  * TQWidget* actualWidget = new TQWidget( dock);
  * dock->setWidget( actualWidget); // embed it
  * dock->setToolTipString(i18n("That's me")); // available when appearing as tab page
@@ -447,13 +447,13 @@ public:
    * @param dockManager The responsible manager (dock helper)
    * @param name        Object instance name
    * @param pixmap      An icon (for instance shown when docked centered)
-   * @param tqparent      Parent widget
+   * @param parent      Parent widget
    * @param strCaption  Title of the dockwidget window (shown when toplevel)
    * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption
    * @param f TQt::WidgetFlags widget flags
    */
   KDockWidget( KDockManager* dockManager, const char* name,
-               const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = TQString(),
+               const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString(),
                const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0);
 
   /**
@@ -487,8 +487,8 @@ public:
    *
    * If the target is null, it will become a toplevel dockwidget at position pos;
    * Note: Docking to another dockwidget means exactly:
-   * A new tqparent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
-   * which contains both dockwidgets, this and the target dockwidget. So consider tqparent<->child relationships change completely during such actions.
+   * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
+   * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions.
    *
    * @param  target The dockwidget to dock to
    * @param  dockPos One of the DockPositions this is going to dock to
@@ -496,7 +496,7 @@ public:
    * @param  pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget)
    * @param  check Only for internal use;
    * @param  tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append
-   * @return result The group dockwidget that replaces the target dockwidget and will be grandtqparent of target and @p this.
+   * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this.
    */
   KDockWidget* manualDock( KDockWidget* target, DockPosition dockPos, int spliPos = 50, TQPoint pos = TQPoint(0,0), bool check = false, int tabIndex = -1);
 
@@ -568,7 +568,7 @@ public:
    * There are reasons that it's impossible:
    * @li It is a (tab) group.
    * @li It is already invisible ;-)
-   * @li The tqparent of this is the KDockMainWindow.
+   * @li The parent of this is the KDockMainWindow.
    * @li It isn't able to dock to another widget.
    */
   bool mayBeHide() const;
@@ -578,7 +578,7 @@ public:
    * There are reasons that it's impossible:
    * @li It is a (tab) group.
    * @li It is already visible ;-)
-   * @li The tqparent of this is the @p KDockMainWindow.
+   * @li The parent of this is the @p KDockMainWindow.
    */
   bool mayBeShow() const;
 
@@ -630,7 +630,7 @@ public:
    */
   virtual void show();
   /**
-   * @return the tqparent widget of this if it inherits class KDockTabGroup
+   * @return the parent widget of this if it inherits class KDockTabGroup
    */
   KDockTabGroup* parentDockTabGroup() const;
 
@@ -648,7 +648,7 @@ public:
 
 #endif
 
-  void setDockWindowTransient (TQWidget *tqparent, bool transientEnabled);
+  void setDockWindowTransient (TQWidget *parent, bool transientEnabled);
 
   /**
    * Returns the widget this dockwidget is set transient to, otherwise 0
@@ -738,7 +738,7 @@ protected:
   /**
    * Checks some conditions and shows or hides the dockwidget header (drag panel).
    * The header is hidden if:
-   * @li the tqparent widget is the KDockMainWindow
+   * @li the parent widget is the KDockMainWindow
    * @li this is a (tab) group dockwidget
    * @li it is not able to dock to another dockwidget
    */
@@ -837,7 +837,7 @@ private:
   void setDockTabName( KDockTabGroup* g);
 
   /**
-   * Retqparent to s or set this to the KDockMainWindow's view if s is that dockmainwindow.
+   * Reparent to s or set this to the KDockMainWindow's view if s is that dockmainwindow.
    * If s is O, simply move the widget.
    *
    * @param s the target widget to reparent to
@@ -988,7 +988,7 @@ public:
 
   /**
    * Shows all encapsulated widgets of all controlled dockwidgets and shows all dockwidgets which are
-   * tqparent of a dockwidget tab group.
+   * parent of a dockwidget tab group.
    */
   void activate();
 
@@ -1090,7 +1090,7 @@ signals:
   void replaceDock( KDockWidget* oldDock, KDockWidget* newDock );
 
   /**
-   * Signals a dockwidget without tqparent (toplevel) is shown.
+   * Signals a dockwidget without parent (toplevel) is shown.
    */
   void setDockDefaultPos( KDockWidget* );
 
@@ -1144,7 +1144,7 @@ private:
    * Finds the TQWidget recursively at the position given as parameter
    *
    * @param w a variable where the method puts the TQWidget at that position (instead of a return value)
-   * @param p the tqparent widget where the recursive search should start from
+   * @param p the parent widget where the recursive search should start from
    * @param pos global (desktop) position of the wanted dockwidget
    */
   void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos );
@@ -1152,7 +1152,7 @@ private:
   /**
    * Finds all dockwidgets which are child, grandchild and so on of p.
    *
-   * @param p the tqparent widget where the recursive search starts from
+   * @param p the parent widget where the recursive search starts from
    * @param l the widget list that contains the search result after the return of this method
    */
   void findChildDockWidget( const TQWidget* p, TQWidgetList*& l);
@@ -1323,11 +1323,11 @@ public:
    * @li ...and gets initialized
    * @li the main dockwidget is set to 0
    *
-   * @param tqparent Parent widget for the dock main widget
+   * @param parent Parent widget for the dock main widget
    * @param name internal object name
    * @param f TQt::WidgetFlags widget flags
    */
-  KDockMainWindow( TQWidget* tqparent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
+  KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
 
   /**
    * Destructs a dockmainwindow.
@@ -1362,12 +1362,12 @@ public:
    *
    * @param name   TQObject name (default dockwidget caption)
    * @param pixmap window icon (for instance shown when docked as tabwidget entry)
-   * @param tqparent tqparent widget for the new dockwidget
+   * @param parent parent widget for the new dockwidget
    * @param strCaption  window title (shown when toplevel)
    * @param strTabPageLabel title of the tab page (visible when in tab page mode), if it is "", only the icon will be shown; if it is 0L, the label is set to strCaption
    * @return    a pointer to the new created dockwidget
    */
-  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L,
+  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
     const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
 
   /**
@@ -1483,7 +1483,7 @@ friend class KDockManager;
 public:
 
 
-  KDockArea( TQWidget* tqparent = 0L, const char *name = 0L);
+  KDockArea( TQWidget* parent = 0L, const char *name = 0L);
 
   virtual ~KDockArea();
 
@@ -1493,7 +1493,7 @@ public:
   void setMainDockWidget( KDockWidget* );
   KDockWidget* getMainDockWidget(){ return mainDockWidget; }
 
-  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L,
+  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
     const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
 
   void writeDockConfig(TQDomElement &base);
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
index 19a88368..331b9082 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
@@ -26,8 +26,8 @@
 #include <tqtimer.h>
 #include <tqapplication.h>
 
-KDockSplitter::KDockSplitter(TQWidget *tqparent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
-: TQWidget(tqparent, name)
+KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
+: TQWidget(parent, name)
 {
   m_dontRecalc=false;
   divider = 0L;
@@ -540,8 +540,8 @@ bool KDockSplitter::highResolution() const
 
 
 /*************************************************************************/
-KDockButton_Private::KDockButton_Private( TQWidget *tqparent, const char * name )
-:TQPushButton( tqparent, name )
+KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name )
+:TQPushButton( parent, name )
 {
   moveMouse = false;
   setFocusPolicy( TQ_NoFocus );
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
index 4f9c119f..7d131111 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
@@ -45,7 +45,7 @@ class KDEUI_EXPORT KDockSplitter : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);
+  KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);
   virtual ~KDockSplitter(){};
 
   void activate(TQWidget *c0, TQWidget *c1 = 0L);
@@ -120,7 +120,7 @@ class KDEUI_EXPORT KDockButton_Private : public TQPushButton
   Q_OBJECT
   TQ_OBJECT
 public:
-  KDockButton_Private( TQWidget *tqparent=0, const char *name=0 );
+  KDockButton_Private( TQWidget *parent=0, const char *name=0 );
   ~KDockButton_Private();
 
 protected:
@@ -186,8 +186,8 @@ class KDEUI_EXPORT KDockWidgetHeaderPrivate
    : public TQObject
 {
 public:
-  KDockWidgetHeaderPrivate( TQObject* tqparent )
-        : TQObject( tqparent )
+  KDockWidgetHeaderPrivate( TQObject* parent )
+        : TQObject( parent )
   {
     forceCloseButtonHidden=false;
     toDesktopButton = 0;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
index 63a860e7..1951118f 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
@@ -45,8 +45,8 @@
 
 //============ KMdiChildArea ============//
 
-KMdiChildArea::KMdiChildArea( TQWidget *tqparent )
-		: TQFrame( tqparent, "kmdi_childarea" )
+KMdiChildArea::KMdiChildArea( TQWidget *parent )
+		: TQFrame( parent, "kmdi_childarea" )
 {
 	setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	m_captionFont = TQFont();
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
index 45df1eff..2ab456b7 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
@@ -102,7 +102,7 @@ public:
 	/**
 	 * Consruction. Note: This class needn't to know about KMdiMainFrm .
 	 */
-	KMdiChildArea( TQWidget *tqparent );
+	KMdiChildArea( TQWidget *parent );
 	
 	/**
 	 * Destructor : THERE should be no child windows anymore...
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
index b57b93a8..9667518a 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
@@ -85,8 +85,8 @@
 #include "kde2laptop_undockbutton.xpm"
 
 
-KMdiWin32IconButton::KMdiWin32IconButton( TQWidget* tqparent, const char* name )
-		: TQLabel( tqparent, name )
+KMdiWin32IconButton::KMdiWin32IconButton( TQWidget* parent, const char* name )
+		: TQLabel( parent, name )
 {}
 
 //============ mousePressEvent ============//
@@ -98,8 +98,8 @@ void KMdiWin32IconButton::mousePressEvent( TQMouseEvent* )
 
 //============ KMdiChildFrm ============//
 
-KMdiChildFrm::KMdiChildFrm( KMdiChildArea *tqparent )
-	: TQFrame( tqparent, "kmdi_childfrm" )
+KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
+	: TQFrame( parent, "kmdi_childfrm" )
 	, m_pClient( 0L )
 	, m_pManager( 0L )
 	, m_pCaption( 0L )
@@ -129,7 +129,7 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *tqparent )
 {
 	m_pCaption = new KMdiChildFrmCaption( this );
 
-	m_pManager = tqparent;
+	m_pManager = parent;
 
 	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "kmdi_iconbutton_icon" );
 	m_pUnixIcon = new TQToolButton( m_pCaption, "kmdi_toolbutton_icon" );
@@ -774,8 +774,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 	}
 	delete list;                        // delete the list, not the objects
 
-	//Retqparent if needed
-	if ( TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(this) )
+	//Reparent if needed
+	if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) )
 	{
 		//reparent to this widget , no flags , point , show it
 		TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
@@ -1068,7 +1068,7 @@ void KMdiChildFrm::doResize( bool captionOnly )
 static bool hasParent( TQObject* par, TQObject* o )
 {
 	while ( o && o != par )
-		o = o->tqparent();
+		o = o->parent();
 	return o == par;
 }
 
@@ -1086,7 +1086,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 			while ( ( pObj != 0L ) && !bIsChild )
 			{
 				bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) );
-				pObj = pObj->tqparent();
+				pObj = pObj->parent();
 			}
 			// unset the resize cursor if the cursor moved from the frame into a inner widget
 			if ( bIsChild )
@@ -1112,7 +1112,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 						m_pClient->activate();
 					}
 					
-					if ( ( TQT_BASE_OBJECT(obj->tqparent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
+					if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
 					{
 						TQWidget* w = ( TQWidget* ) obj;
 						if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) )
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
index c808e088..9569094a 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
@@ -54,7 +54,7 @@ class KMDI_EXPORT KMdiWin32IconButton : public TQLabel
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMdiWin32IconButton( TQWidget* tqparent, const char* name = 0 );
+	KMdiWin32IconButton( TQWidget* parent, const char* name = 0 );
 	virtual void mousePressEvent( TQMouseEvent* );
 
 signals:
@@ -185,7 +185,7 @@ public:
 	/**
 	 * Creates a new KMdiChildFrm class.
 	 */
-	KMdiChildFrm( KMdiChildArea *tqparent );
+	KMdiChildFrm( KMdiChildArea *parent );
 	
 	/**
 	 * Destroys this KMdiChildFrm
@@ -242,7 +242,7 @@ public:
 	inline MdiWindowState state() const { return m_state; }
 	
 	/**
-	 * Returns the inner client area of the tqparent of this (which is KMdiChildArea).
+	 * Returns the inner client area of the parent of this (which is KMdiChildArea).
 	 */
 	TQRect mdiAreaContentsRect() const;
 	
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
index 3bebc235..396d6d9d 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
@@ -65,12 +65,12 @@
 
 //============== KMdiChildFrmCaption =============//
 
-KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *tqparent )
-		: TQWidget( tqparent, "kmdi_childfrmcaption" )
+KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
+		: TQWidget( parent, "kmdi_childfrmcaption" )
 {
 	m_szCaption = i18n( "Unnamed" );
 	m_bActive = false;
-	m_pParent = tqparent;
+	m_pParent = parent;
 	setBackgroundMode( NoBackground );
 	setFocusPolicy( TQ_NoFocus );
 	m_bChildInDrag = false;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h
index fde6d3b7..4a6bb0a4 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h
@@ -49,7 +49,7 @@ public:
 	/**
 	 * Constructor
 	 */
-	KMdiChildFrmCaption( KMdiChildFrm *tqparent );
+	KMdiChildFrmCaption( KMdiChildFrm *parent );
 	
 	/**
 	 * Destructor
@@ -89,7 +89,7 @@ protected:
 	virtual void mousePressEvent( TQMouseEvent * );
 	
 	/**
-	 * Calls maximizePressed of the tqparent widget ( KMdiChildFrm )
+	 * Calls maximizePressed of the parent widget ( KMdiChildFrm )
 	 */
 	virtual void mouseDoubleClickEvent( TQMouseEvent * );
 	
@@ -118,7 +118,7 @@ public:
 
 protected:  // Protected attributes
 	/**
-	 * tqparent widget
+	 * parent widget
 	 */
 	KMdiChildFrm *m_pParent;
 	
@@ -128,7 +128,7 @@ protected:  // Protected attributes
 	bool m_bActive;
 	
 	/**
-	 * the position offset related to its tqparent widget (internally used for translating mouse move positions
+	 * the position offset related to its parent widget (internally used for translating mouse move positions
 	 */
 	TQPoint m_offset;
 	
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
index 94670ce8..7189b571 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
@@ -115,7 +115,7 @@ TQRect KMdiChildView::internalGeometry() const
 	{ // is attached
 		// get the client area coordinates inside the MDI child frame
 		TQRect posInFrame = tqgeometry();
-		// map these values to the tqparent of the MDI child frame
+		// map these values to the parent of the MDI child frame
 		// (this usually is the MDI child area) and return
 		TQPoint ptTopLeft = mdiParent() ->mapToParent( posInFrame.topLeft() );
 		TQSize sz = size();
@@ -375,7 +375,7 @@ void KMdiChildView::setCaption( const TQString& szCaption )
 	m_szCaption = szCaption;
 	if ( mdiParent() )
 		mdiParent() ->setCaption( m_szCaption );
-	else //have to call the tqparent one
+	else //have to call the parent one
 		TQWidget::setCaption( m_szCaption );
 
 	emit windowCaptionChanged( m_szCaption );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
index 1530a155..e735e445 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
@@ -49,7 +49,7 @@ class KMdiChildViewPrivate;
   *
   * All such windows 'lives' attached to a KMdiChildFrm widget
   * managed by KMdiChildArea, or detached (managed by the window manager.)
-  * So remember that the KMdiChildView::tqparent pointer may change, and may be 0L, too.
+  * So remember that the KMdiChildView::parent pointer may change, and may be 0L, too.
   *
   * There are 2 possibilities for you to put your widgets under MDI control:
   *
@@ -254,7 +254,7 @@ public:
 	virtual void setMDICaption( const TQString &caption );
 	
 	/**
-	 * Returns the KMdiChildFrm tqparent widget (or 0 if the window is not attached)
+	 * Returns the KMdiChildFrm parent widget (or 0 if the window is not attached)
 	 */
 	KMdiChildFrm *mdiParent() const;
 	
@@ -278,21 +278,21 @@ public:
 	/**
 	 * Sets the tqgeometry of the client area of this MDI child window. The
 	 * top left position of the argument is the position of the top left point
-	 * of the client area in its tqparent coordinates and the arguments width
+	 * of the client area in its parent coordinates and the arguments width
 	 * and height is the width and height of the client area. Please note: This
 	 * differs from the behavior of TQWidget::setGeometry()!
 	 */
 	void setInternalGeometry( const TQRect& newGeomety );
 	
 	/**
-	 * Returns the frame tqgeometry of this window or of the tqparent if there is any...
+	 * Returns the frame tqgeometry of this window or of the parent if there is any...
 	 */
 	TQRect externalGeometry() const;
 	
 	/**
 	 * Sets the tqgeometry of the frame of this MDI child window. The top left
 	 * position of the argument is the position of the top left point of the
-	 * frame in its tqparent coordinates and the arguments width and height is
+	 * frame in its parent coordinates and the arguments width and height is
 	 * the width and height of the widget frame. Please note: This differs
 	 * from the behavior of TQWidget::setGeometry()!
 	 */
@@ -425,17 +425,17 @@ public slots:
 	virtual void slot_clickedInDockMenu();
 	
 	/**
-	 * Calls TQWidget::show but also for it's tqparent widget if attached
+	 * Calls TQWidget::show but also for it's parent widget if attached
 	 */
 	virtual void show();
 	
 	/**
-	 * Calls TQWidget::hide() or it's tqparent widget hide() if attached
+	 * Calls TQWidget::hide() or it's parent widget hide() if attached
 	 */
 	virtual void hide();
 	
 	/**
-	 * Calls TQWidget::raise() or it's tqparent widget raise() if attached
+	 * Calls TQWidget::raise() or it's parent widget raise() if attached
 	 */
 	virtual void raise();
 	
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
index 3041834e..f196d1a0 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -49,8 +49,8 @@ static const char* const kmdi_not_close_xpm[] =
         "#####"
     };
 
-KMdiDockContainer::KMdiDockContainer( TQWidget *tqparent, TQWidget *win, int position, int flags )
-		: TQWidget( tqparent ), KDockContainer()
+KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags )
+		: TQWidget( parent ), KDockContainer()
 {
 	m_tabSwitching = false;
 	m_block = false;
@@ -167,9 +167,9 @@ void KMdiDockContainer::init()
 	}
 
 	// try to restore splitter size
-	if ( parentDockWidget() && parentDockWidget()->tqparent() )
+	if ( parentDockWidget() && parentDockWidget()->parent() )
 	{
-		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
+		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) );
 		if ( sp )
 			sp->setSeparatorPosX( m_separatorPos );
 	}
@@ -177,7 +177,7 @@ void KMdiDockContainer::init()
 
 KDockWidget* KMdiDockContainer::parentDockWidget()
 {
-	return ( ( KDockWidget* ) tqparent() );
+	return ( ( KDockWidget* ) parent() );
 }
 
 void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const TQString &text, int & )
@@ -462,9 +462,9 @@ void KMdiDockContainer::tabClicked( int t )
 	{
 		kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl;
 		// try save splitter position
-		if ( parentDockWidget() && parentDockWidget()->tqparent() )
+		if ( parentDockWidget() && parentDockWidget()->parent() )
 		{
-			KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
+			KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) );
 			if ( sp )
 				m_separatorPos = sp->separatorPos();
 		}
@@ -514,7 +514,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl )
 	TQDomDocument doc = dockEl.ownerDocument();
 	TQDomElement el;
 	el = doc.createElement( "name" );
-	el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( tqparent() ->name() ) ) );
+	el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( parent() ->name() ) ) );
 	dockEl.appendChild( el );
 	el = doc.createElement( "overlapMode" );
 	el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) );
@@ -569,7 +569,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 		}
 		else if ( el.tagName() == "child" )
 		{
-			KDockWidget * dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( el.text() );
+			KDockWidget * dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( el.text() );
 			if ( dw )
 			{
 				if ( el.hasAttribute( "tabCaption" ) )
@@ -580,7 +580,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 				{
 					dw->setToolTipString( el.attribute( "tabTooltip" ) );
 				}
-				dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter );
+				dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter );
 			}
 		}
 	}
@@ -624,8 +624,8 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
+	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) );
 
 	if ( isOverlapMode() )
 		cfg->writeEntry( "overlapMode", "true" );
@@ -633,10 +633,10 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 		cfg->writeEntry( "overlapMode", "false" );
 
 	// try to save the splitter position
-	if ( parentDockWidget() && parentDockWidget() ->tqparent() )
+	if ( parentDockWidget() && parentDockWidget() ->parent() )
 	{
 		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
-		                     tqparent() ->qt_cast( "KDockSplitter" ) );
+		                     parent() ->qt_cast( "KDockSplitter" ) );
 		if ( sp )
 			cfg->writeEntry( "separatorPos", m_separatorPos );
 	}
@@ -672,7 +672,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) );
 
 	if ( cfg->readEntry( "overlapMode" ) != "false" )
 		activateOverlapMode( m_tb->width() );
@@ -689,7 +689,7 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 		if ( dwn.isEmpty() )
 			break;
 		kdDebug( 760 ) << k_funcinfo << "configuring dockwidget :" << dwn << endl;
-		KDockWidget *dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( dwn );
+		KDockWidget *dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( dwn );
 		if ( dw )
 		{
 			TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).tqarg( i ) );
@@ -702,7 +702,7 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 			{
 				dw->setToolTipString( s );
 			}
-			dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter );
+			dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter );
 		}
 		if ( cfg->readBoolEntry( dwn, false ) )
 			raise = dwn;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
index 1767922c..22c58732 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
@@ -40,10 +40,10 @@ class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer
   TQ_OBJECT
 
 public:
-	KMdiDockContainer( TQWidget *tqparent, TQWidget *win, int position, int flags );
+	KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags );
 	virtual ~KMdiDockContainer();
 
-	/** Get the KDockWidget that is our tqparent */
+	/** Get the KDockWidget that is our parent */
 	KDockWidget *parentDockWidget();
 
 	/**
@@ -91,18 +91,18 @@ public:
 	/**
 	 * Save the config using a KConfig object
 	 *
-	 * The combination of the group_or_prefix variable and the tqparent
+	 * The combination of the group_or_prefix variable and the parent
 	 * dockwidget's name will be the group the configuration is saved in
-	 * \param group_or_prefix the prefix to append to the tqparent dockwidget's name
+	 * \param group_or_prefix the prefix to append to the parent dockwidget's name
 	 */
 	virtual void save( KConfig *, const TQString& group_or_prefix );
 
 	/**
 	 * Load the config using a KConfig object
 	 * 
-	 * The combination of the group_or_prefix variable and the tqparent
+	 * The combination of the group_or_prefix variable and the parent
 	 * dockwidget's name will be the group the configuration is loaded from
-	 * \param group_or_prefix the prefix to append to the tqparent dockwidget's name
+	 * \param group_or_prefix the prefix to append to the parent dockwidget's name
 	 */
 	virtual void load( KConfig *, const TQString& group_or_prefix );
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
index 9259a34b..fb5ed357 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
@@ -11,7 +11,7 @@
 #include <kpopupmenu.h>
 #include "kmdidocumentviewtabwidget.h"
 
-KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* tqparent, const char* name ) : KTabWidget( tqparent, name )
+KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
 {
 	m_visibility = KMdi::ShowWhenMoreThanOneTab;
 	tabBar() ->hide();
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h
index 10a9a182..0bde5891 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h
@@ -25,7 +25,7 @@ class KMDI_EXPORT KMdiDocumentViewTabWidget:
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMdiDocumentViewTabWidget( TQWidget* tqparent, const char* name = 0 );
+	KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 );
 	~KMdiDocumentViewTabWidget();
 
 	/**
diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp
index cc6b8535..e8f71ff2 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp
@@ -21,7 +21,7 @@
 #include <tqobjectlist.h>
 #include <kdebug.h>
 
-KMdiFocusList::KMdiFocusList( TQObject *tqparent ) : TQObject( tqparent )
+KMdiFocusList::KMdiFocusList( TQObject *parent ) : TQObject( parent )
 {}
 
 KMdiFocusList::~KMdiFocusList()
diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h
index 68db1656..5b5c24f4 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h
@@ -28,7 +28,7 @@ class KMDI_EXPORT KMdiFocusList: public TQObject
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMdiFocusList( TQObject *tqparent );
+	KMdiFocusList( TQObject *parent );
 	~KMdiFocusList();
 	void addWidgetTree( TQWidget* );
 	void restore();
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
index 54b885d5..cb40a909 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
@@ -58,8 +58,8 @@ using namespace KMDIPrivate;
 
 
 ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const KShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
-        TQObject* tqparent, const char* name )
-		: KToggleAction( text, cut, tqparent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
+        TQObject* parent, const char* name )
+		: KToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
 {
 	if ( m_dw )
 	{
@@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged()
 		setChecked( true );
 	else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
 	                           ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
-	                                                          tqparent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
+	                                                          parent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
 		setChecked( false );
 }
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h
index 6f784992..db3c84f6 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h
@@ -126,7 +126,7 @@ class KMDI_EXPORT ToggleToolViewAction: public KToggleAction
 public:
 
 	ToggleToolViewAction( const TQString& text, const KShortcut& cut = KShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
-	                      TQObject* tqparent = 0, const char* name = 0 );
+	                      TQObject* parent = 0, const char* name = 0 );
 
 	virtual ~ToggleToolViewAction();
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
index 92624120..89bdb44e 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
@@ -345,7 +345,7 @@ void KMdiMainFrm::applyOptions()
 		TQWidget* childFrame = 0L;
 		if ( ( *it )->mdiParent() )
 		{
-			kdDebug(760) << k_funcinfo << "using child view's mdi tqparent for resize hack" << endl;
+			kdDebug(760) << k_funcinfo << "using child view's mdi parent for resize hack" << endl;
 			childFrame = ( *it )->mdiParent();
 		}
 		else
@@ -421,7 +421,7 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name,
 {
 	Q_ASSERT( view ); // if this assert fails, then some part didn't return a widget. Fix the part ;)
 
-	KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*tqparent*/,
+	KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/,
 	                                              name.latin1() );
 	TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" );
 	view->reparent( pMDICover, TQPoint( 0, 0 ) );
@@ -670,7 +670,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 		pWnd->removeEventFilter( this );
 		pWnd->youAreDetached();
 		// this is only if it was attached and you want to detach it
-		if ( pWnd->tqparent() )
+		if ( pWnd->parent() )
 		{
 			KMdiChildFrm * lpC = pWnd->mdiParent();
 			if ( lpC )
@@ -1401,7 +1401,7 @@ void KMdiMainFrm::switchToToplevelMode()
 	//	TQApplication::sendPostedEvents(); //why do we need to empty the event queue?
 	if ( !parentWidget() )
 	{
-		//if we don't have a tqparent widget ( which i expect we wouldn't )
+		//if we don't have a parent widget ( which i expect we wouldn't )
 		//make sure we take into account the size of the docks provided by
 		//TQMainWindow
 		int topDockHeight = topDock() ? topDock()->height() : 0;
@@ -1875,9 +1875,9 @@ void KMdiMainFrm::switchToIDEAlMode()
 }
 
 
-void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToRetqparent, KDockWidget *container )
+void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container )
 {
-	TQPtrListIterator<KDockWidget> it( widgetsToRetqparent );
+	TQPtrListIterator<KDockWidget> it( widgetsToReparent );
 	for ( ; ( *it ); ++it )
 	{
 		( *it )->manualDock( container, KDockWidget::DockCenter, 20 );
@@ -1890,7 +1890,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 	KDockWidget* mainDock = getMainDockWidget();
 	if ( mainDock->parentDockTabGroup() )
 	{
-		mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->tqparent() );
+		mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
 		// FIXME: will likely crash below due to unchecked cast
 	}
 
@@ -1903,7 +1903,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 	KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
 	if ( widget && widget->parentDockTabGroup() )
 	{
-		widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->tqparent()) );
+		widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) );
 
 		if ( widget )
 		{
@@ -1935,7 +1935,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	KDockWidget *mainDock = getMainDockWidget();
 	KDockWidget *w = mainDock;
 	if ( mainDock->parentDockTabGroup() )
-		w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->tqparent()) );
+		w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) );
 
 	TQPtrList<KDockWidget> leftReparentWidgets;
 	TQPtrList<KDockWidget> rightReparentWidgets;
@@ -1943,7 +1943,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	TQPtrList<KDockWidget> topReparentWidgets;
 
 	if ( mainDock->parentDockTabGroup() )
-		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) );
+		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
 
 	findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
 	findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
@@ -2141,7 +2141,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
 	KDockWidget * mainDock = getMainDockWidget();
 	if ( mainDock->parentDockTabGroup() )
 	{
-		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) );
+		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
 	}
 
 	if ( widgetNames.count() > 0 )
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
index 1d4842d7..4e0403aa 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
@@ -549,7 +549,7 @@ public slots:
 	
 	/**
 	 * Using this method you have to use the setWidget method of the access object, and it is very recommendet, that you use
-	 * the widgetContainer() method for the tqparent of your newly created widget
+	 * the widgetContainer() method for the parent of your newly created widget
 	 */
 	KMdiToolViewAccessor *createToolWindow();
 	
@@ -758,7 +758,7 @@ protected:
 	void blockClearingOfWindowMenu( bool bBlocked ) { m_bClearingOfWindowMenuBlocked = bBlocked; }
 
 	void findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw );
-	void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToRetqparent, KDockWidget *container );
+	void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container );
 	TQStringList prepareIdealToTabs( KDockWidget* container );
 	void idealToolViewsToStandardTabs( TQStringList widgetNames, KDockWidget::DockPosition pos, int sizee );
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
index eaf15892..bbf6ccb6 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
@@ -140,20 +140,20 @@ TQString KMdiTaskBarButton::actualText() const
 //
 //####################################################################
 
-KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *tqparent, TQMainWindow::ToolBarDock dock )
-		: KToolBar( tqparent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
+KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
+		: KToolBar( parent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
 		, m_pCurrentFocusedWindow( 0 )
 		, m_pStretchSpace( 0 )
 		, m_layoutIsPending( false )
 		, m_bSwitchedOn( false )
 {
-	m_pFrm = tqparent;
+	m_pFrm = parent;
 	m_pButtonList = new TQPtrList<KMdiTaskBarButton>;
 	m_pButtonList->setAutoDelete( true );
 	//QT30   setFontPropagation(TQWidget::SameFont);
 	setMinimumWidth( 1 );
 	setFocusPolicy( TQ_NoFocus );
-	tqparent->moveToolBar( this, dock ); //XXX obsolete!
+	parent->moveToolBar( this, dock ); //XXX obsolete!
 }
 
 KMdiTaskBar::~KMdiTaskBar()
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h
index 7c7891a0..3bf827a3 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h
@@ -135,7 +135,7 @@ public:
 	/**
 	* Constructor (NoFocus, minimum width = 1, an internal TQPtrList of taskbar buttons (autodelete))
 	*/
-	KMdiTaskBar( KMdiMainFrm *tqparent, TQMainWindow::ToolBarDock dock );
+	KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock );
 	/**
 	* Destructor (deletes the taskbar button list)
 	*/
@@ -198,7 +198,7 @@ protected:
 	*/
 	TQPtrList<KMdiTaskBarButton>* m_pButtonList;
 	/**
-	* The belonging MDI mainframe (tqparent widget of this)
+	* The belonging MDI mainframe (parent widget of this)
 	*/
 	KMdiMainFrm* m_pFrm;
 	/**
diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
index c43fdf53..02f3f5d8 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
@@ -29,10 +29,10 @@
 #include "kmditoolviewaccessor.h"
 #include "kmditoolviewaccessor_p.h"
 
-KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption )
-		: TQObject( tqparent )
+KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption )
+		: TQObject( parent )
 {
-	mdiMainFrm = tqparent;
+	mdiMainFrm = parent;
 	d = new KMdiToolViewAccessorPrivate();
 	if ( widgetToWrap->inherits( "KDockWidget" ) )
 	{
@@ -55,9 +55,9 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent, TQWidget *wid
 		{
 			finalTabCaption = tabCaption;
 		}
-		d->widgetContainer = tqparent->createDockWidget( widgetToWrap->name(),
+		d->widgetContainer = parent->createDockWidget( widgetToWrap->name(),
 		                     ( widgetToWrap->icon() ? ( *( widgetToWrap->icon() ) ) : TQPixmap() ),
-		                     0L,   // tqparent
+		                     0L,   // parent
 		                     widgetToWrap->caption(),
 		                     finalTabCaption );
 		d->widgetContainer->setWidget( widgetToWrap );
@@ -75,9 +75,9 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent, TQWidget *wid
 	d->widget->installEventFilter( this );
 }
 
-KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent )
+KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent )
 {
-	mdiMainFrm = tqparent;
+	mdiMainFrm = parent;
 	d = new KMdiToolViewAccessorPrivate();
 }
 
@@ -133,7 +133,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri
 	{
 		tmp = mdiMainFrm->createDockWidget( widgetToWrap->name(),
 		                                    widgetToWrap->icon() ? ( *( widgetToWrap->icon() ) ) : TQPixmap(),
-		                                    0L,   // tqparent
+		                                    0L,   // parent
 		                                    widgetToWrap->caption(),
 		                                    finalTabCaption );
 		d->widgetContainer = tmp;
diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h
index f4dd40d9..34812b0e 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h
+++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h
@@ -61,8 +61,8 @@ private:
 	bool m_bFocusInEventIsPending;
 
 private:
-	KMdiToolViewAccessor( class KMdiMainFrm *tqparent , TQWidget *widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0 );
-	KMdiToolViewAccessor( class KMdiMainFrm *tqparent );
+	KMdiToolViewAccessor( class KMdiMainFrm *parent , TQWidget *widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0 );
+	KMdiToolViewAccessor( class KMdiMainFrm *parent );
 public:
 	~KMdiToolViewAccessor();
 	TQWidget *wrapperWidget();
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
index dcff6236..3e69c674 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
@@ -47,7 +47,7 @@ public:
 };
 
 
-KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *tqparent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(tqparent)
+KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(parent)
 {
 	m_expandedTabSize=-1;
 	m_showActiveTabTexts=false;
@@ -383,8 +383,8 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
 
 
 KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup,
-		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
-	:TQPushButton(TQIconSet(),text,tqparent),m_style(style)
+		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
+	:TQPushButton(TQIconSet(),text,parent),m_style(style)
 {
 	setIconSet(pic);
 	setText(text);
@@ -399,8 +399,8 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text,
 }
 
 KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
-		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
-	:TQPushButton(TQIconSet(),text,tqparent),m_style(style)
+		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
+	:TQPushButton(TQIconSet(),text,parent),m_style(style)
 {
 	setText(text);
 	m_position=pos;
@@ -498,9 +498,9 @@ TQSize KMultiTabBarButton::tqsizeHint() const
 
 
 KMultiTabBarTab::KMultiTabBarTab(const TQPixmap& pic, const TQString& text,
-		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,
+		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,
 		KMultiTabBar::KMultiTabBarStyle style)
-	:KMultiTabBarButton(text,0,id,tqparent,pos,style),
+	:KMultiTabBarButton(text,0,id,parent,pos,style),
  	m_showActiveTabText(false)
 {
 	d=new KMultiTabBarTabPrivate();
@@ -833,7 +833,7 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 
 
 
-KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *tqparent,const char *name):TQWidget(tqparent,name)
+KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *name):TQWidget(parent,name)
 {
 	m_buttons.setAutoDelete(false);
 	if (bm==Vertical)
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
index 39f701af..0b48bc8b 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
@@ -67,7 +67,7 @@ public:
 	 */
 	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
 
-	KMultiTabBar(KMultiTabBarMode bm,TQWidget *tqparent=0,const char *name=0);
+	KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0);
 	virtual ~KMultiTabBar();
 
 	/**
@@ -158,9 +158,9 @@ class KUTILS_EXPORT KMultiTabBarButton: public TQPushButton
   TQ_OBJECT
 public:
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	KMultiTabBarButton(const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	virtual  ~KMultiTabBarButton();
 	int id() const;
 
@@ -210,7 +210,7 @@ class KUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *tqparent,
+	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
 		KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style);
 	virtual ~KMultiTabBarTab();
 	/**
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h
index 28ae5171..90f0d922 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h
@@ -32,7 +32,7 @@ class KMultiTabBarInternal: public TQScrollView
         Q_OBJECT
   TQ_OBJECT
 public:
-        KMultiTabBarInternal(TQWidget *tqparent,KMultiTabBar::KMultiTabBarMode bm);
+        KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
         int appendTab(const TQPixmap &,int=-1,const TQString& =TQString());
         KMultiTabBarTab *tab(int) const;
         void removeTab(int);
@@ -58,7 +58,7 @@ protected:
         /**
          * [contentsM|m]ousePressEvent are reimplemented from TQScrollView
          * in order to ignore all mouseEvents on the viewport, so that the
-         * tqparent can handle them.
+         * parent can handle them.
          */
         virtual void contentsMousePressEvent(TQMouseEvent *);
         virtual void mousePressEvent(TQMouseEvent *);
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
index 87701e9c..26a1c5e4 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
@@ -33,8 +33,8 @@
 #include "ktabbar.h"
 #include "ktabwidget.h"
 
-KTabBar::KTabBar( TQWidget *tqparent, const char *name )
-    : TQTabBar( tqparent, name ), mReorderStartTab( -1 ), mReorderPreviousTab( -1 ),
+KTabBar::KTabBar( TQWidget *parent, const char *name )
+    : TQTabBar( parent, name ), mReorderStartTab( -1 ), mReorderPreviousTab( -1 ),
       mHoverCloseButtonTab( 0 ), mDragSwitchTab( 0 ), mHoverCloseButton( 0 ),
       mHoverCloseButtonEnabled( false ), mHoverCloseButtonDelayed( true ),
       mTabReorderingEnabled( false ), mTabCloseActivatePrevious( false )
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.h b/lib/compatibility/kmdi/qextmdi/ktabbar.h
index 44deca5e..c2167a86 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.h
@@ -38,7 +38,7 @@ class KDEUI_EXPORT KTabBar: public TQTabBar
   TQ_OBJECT
 
 public:
-    KTabBar( TQWidget* tqparent=0, const char* name=0 );
+    KTabBar( TQWidget* parent=0, const char* name=0 );
     virtual ~KTabBar();
 
     virtual void setTabEnabled( int, bool );
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
index b12152b4..55fdcaf8 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
@@ -48,8 +48,8 @@ public:
     }
 };
 
-KTabWidget::KTabWidget( TQWidget *tqparent, const char *name, WFlags f )
-    : TQTabWidget( tqparent, name, f )
+KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f )
+    : TQTabWidget( parent, name, f )
 {
     d = new KTabWidgetPrivate;
     setTabBar( new KTabBar(this, "tabbar") );
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.h b/lib/compatibility/kmdi/qextmdi/ktabwidget.h
index 4db91b1e..cd3c5c86 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.h
@@ -44,7 +44,7 @@ class KDEUI_EXPORT KTabWidget : public TQTabWidget
     TQ_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE setAutomaticResizeTabs )
 
 public:
-    KTabWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
+    KTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     /**
      * Destructor.
      */
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index 581263e2..ec008059 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -49,8 +49,8 @@ using namespace KNS;
 class NumSortListViewItem : public KListViewItem
 {
   public:
-  NumSortListViewItem( TQListView * tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() )  :
-  KListViewItem( tqparent, label1, label2, label3, label4, label5, label6, label7, label8 )  
+  NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() )  :
+  KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )  
   {
   }
 
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index eea67f6e..b5c1de0a 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -64,19 +64,19 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
 
       @param engine a pre-built engine object, or NULL if the download
                     dialog should create an engine on its own
-      @param tqparent the tqparent window
+      @param parent the parent window
       @param caption the dialog caption
     */
-    DownloadDialog(Engine *engine, TQWidget *tqparent, const TQString& caption);
+    DownloadDialog(Engine *engine, TQWidget *parent, const TQString& caption);
 
     /**
       Alternative constructor.
       Always uses an internal engine.
 
-      @param tqparent the tqparent window
+      @param parent the parent window
       @param caption the dialog caption
     */
-    DownloadDialog(TQWidget *tqparent, const TQString& caption);
+    DownloadDialog(TQWidget *parent, const TQString& caption);
 
     /**
       Destructor.
@@ -155,19 +155,19 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
 
       @param engine a pre-built engine object, or NULL if the download
                     dialog should create an engine on its own
-      @param tqparent the tqparent window
+      @param parent the parent window
     */
-    DownloadDialog(Engine *engine, TQWidget *tqparent = 0);
-    // ### KDE 4.0: remove and make caption/tqparent argument optional
+    DownloadDialog(Engine *engine, TQWidget *parent = 0);
+    // ### KDE 4.0: remove and make caption/parent argument optional
 
     /**
       Alternative constructor.
       Always uses an internal engine.
 
-      @param tqparent the tqparent window
+      @param parent the parent window
     */
-    DownloadDialog(TQWidget *tqparent = 0);
-    // ### KDE 4.0: remove and make caption/tqparent argument optional
+    DownloadDialog(TQWidget *parent = 0);
+    // ### KDE 4.0: remove and make caption/parent argument optional
 
     /**
       Opens the download dialog.
@@ -178,7 +178,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
       @param type a data type such as "korganizer/calendar"
     */
     static void open(TQString type);
-    // ### KDE 4.0: remove and make caption/tqparent argument optional
+    // ### KDE 4.0: remove and make caption/parent argument optional
 
   public slots:
     /**
diff --git a/lib/compatibility/knewstuff/engine.h b/lib/compatibility/knewstuff/engine.h
index 4f77daa5..31be3f9f 100644
--- a/lib/compatibility/knewstuff/engine.h
+++ b/lib/compatibility/knewstuff/engine.h
@@ -58,7 +58,7 @@ class Engine : public TQObject
 
       @param newStuff a KNewStuff object
       @param type the Hotstuff data type such as "korganizer/calendar"
-      @param parentWidget the tqparent window
+      @param parentWidget the parent window
     */
     Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 );
     /**
@@ -67,7 +67,7 @@ class Engine : public TQObject
       @param newStuff a KNewStuff object
       @param type the Hotstuff data type such as "korganizer/calendar"
       @param providerList the URL of the provider list
-      @param parentWidget the tqparent window
+      @param parentWidget the parent window
     */
     Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
 
@@ -84,9 +84,9 @@ class Engine : public TQObject
     TQString type() const { return mType; }
 
     /**
-      Returns the previously set tqparent widget.
+      Returns the previously set parent widget.
 
-      @return tqparent widget
+      @return parent widget
     */
     TQWidget *parentWidget() const { return mParentWidget; }
 
diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp
index ba08f345..0f3b98b4 100644
--- a/lib/compatibility/knewstuff/entry.cpp
+++ b/lib/compatibility/knewstuff/entry.cpp
@@ -252,11 +252,11 @@ void Entry::parseDomElement( const TQDomElement &element )
 }
 
 TQDomElement Entry::createDomElement( TQDomDocument &doc,
-                                              TQDomElement &tqparent )
+                                              TQDomElement &parent )
 {
   TQDomElement entry = doc.createElement( "stuff" );
   entry.setAttribute("type", mType);
-  tqparent.appendChild( entry );
+  parent.appendChild( entry );
 
   addElement( doc, entry, "name", name() );
   addElement( doc, entry, "author", author() );
@@ -283,12 +283,12 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc,
   return entry;
 }
 
-TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &tqparent,
+TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &parent,
                                const TQString &tag, const TQString &value )
 {
   TQDomElement n = doc.createElement( tag );
   n.appendChild( doc.createTextNode( value ) );
-  tqparent.appendChild( n );
+  parent.appendChild( n );
 
   return n;
 }
diff --git a/lib/compatibility/knewstuff/entry.h b/lib/compatibility/knewstuff/entry.h
index 3de9982c..8f583ecc 100644
--- a/lib/compatibility/knewstuff/entry.h
+++ b/lib/compatibility/knewstuff/entry.h
@@ -229,10 +229,10 @@ class KDE_EXPORT Entry
     /**
      * @internal
      */
-    TQDomElement createDomElement( TQDomDocument &, TQDomElement &tqparent );
+    TQDomElement createDomElement( TQDomDocument &, TQDomElement &parent );
 
   protected:
-    TQDomElement addElement( TQDomDocument &doc, TQDomElement &tqparent,
+    TQDomElement addElement( TQDomDocument &doc, TQDomElement &parent,
                             const TQString &tag, const TQString &value );
 
   private:
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 0dfad89e..7fa15372 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -32,11 +32,11 @@ using namespace KNS;
 
 KAction* KNS::standardAction(const TQString& what,
                              const TQObject *recvr,
-                             const char *slot, KActionCollection* tqparent,
+                             const char *slot, KActionCollection* parent,
                              const char *name)
 {
     return new KAction(i18n("Download New %1").tqarg(what), "knewstuff",
-                       0, recvr, slot, tqparent, name);
+                       0, recvr, slot, parent, name);
 }
 
 KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget )
diff --git a/lib/compatibility/knewstuff/knewstuff.h b/lib/compatibility/knewstuff/knewstuff.h
index 392f90f0..455063a3 100644
--- a/lib/compatibility/knewstuff/knewstuff.h
+++ b/lib/compatibility/knewstuff/knewstuff.h
@@ -36,7 +36,7 @@ class Entry;
 KAction* standardAction(const TQString& what,
                         const TQObject *recvr,
                         const char *slot,
-                        KActionCollection* tqparent,
+                        KActionCollection* parent,
                         const char *name = 0);
 }
 
@@ -74,7 +74,7 @@ class KDE_EXPORT KNewStuff
 
       @param type type of data to be handled, should be something like
                   korganizer/calendar, kword/template, kdesktop/wallpaper
-      @param parentWidget tqparent widget of dialogs opened by the KNewStuff
+      @param parentWidget parent widget of dialogs opened by the KNewStuff
                           engine
     */
     KNewStuff( const TQString &type, TQWidget *parentWidget = 0 );
@@ -85,7 +85,7 @@ class KDE_EXPORT KNewStuff
       @param type type of data to be handled, should be something like
                   korganizer/calendar, kword/template, kdesktop/wallpaper
       @param providerList the URL of the provider list
-      @param parentWidget tqparent widget of dialogs opened by the KNewStuff
+      @param parentWidget parent widget of dialogs opened by the KNewStuff
                           engine
     */
     KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
@@ -97,7 +97,7 @@ class KDE_EXPORT KNewStuff
     TQString type() const;
 
     /**
-      Return tqparent widget.
+      Return parent widget.
     */
     TQWidget *parentWidget() const;
 
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index 66878137..c7b4b855 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
@@ -37,8 +37,8 @@
 
 using namespace std;
 
-KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *tqparent )
-  : KNewStuff( type, tqparent )
+KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent )
+  : KNewStuff( type, parent )
 {
   mConfig = KGlobal::config();
 }
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.h b/lib/compatibility/knewstuff/knewstuffgeneric.h
index fb75323f..6347bf53 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.h
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.h
@@ -46,9 +46,9 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff
       Constructor.
 
       @param type a Hotstuff data type such as "korganizer/calendar"
-      @param tqparent the tqparent window.
+      @param parent the parent window.
     */
-    KNewStuffGeneric( const TQString &type, TQWidget *tqparent = 0 );
+    KNewStuffGeneric( const TQString &type, TQWidget *parent = 0 );
     ~KNewStuffGeneric();
 
     /**
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.h b/lib/compatibility/knewstuff/knewstuffsecure.h
index 9e725e0b..4195139c 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.h
+++ b/lib/compatibility/knewstuff/knewstuffsecure.h
@@ -47,7 +47,7 @@ public:
 
       @param type type of data to be handled, should be something like
              korganizer/calendar, kword/template, kdesktop/wallpaper
-      @param parentWidget tqparent widget of dialogs opened by the KNewStuff
+      @param parentWidget parent widget of dialogs opened by the KNewStuff
               engine
      */
     KNewStuffSecure(const TQString &type,  TQWidget *parentWidget=0);
@@ -79,7 +79,7 @@ private slots:
     /** Called when the upload has finished. 
         @param result the result of the upload
         Be careful if you reimplement it, as it deletes the temporary directory
-        m_tempDir used for upload. You must also delete it (call the tqparent's method)
+        m_tempDir used for upload. You must also delete it (call the parent's method)
         if you reimplement it.
     */
     void slotUploadFinished(bool result);  
diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp
index 65660cc4..ca7767e0 100644
--- a/lib/compatibility/knewstuff/provider.cpp
+++ b/lib/compatibility/knewstuff/provider.cpp
@@ -128,10 +128,10 @@ void Provider::parseDomElement( const TQDomElement &element )
   }
 }
 
-TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &tqparent )
+TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &parent )
 {
   TQDomElement entry = doc.createElement( "stuff" );
-  tqparent.appendChild( entry );
+  parent.appendChild( entry );
 
   TQDomElement n = doc.createElement( "name" );
   n.appendChild( doc.createTextNode( name() ) );
diff --git a/lib/compatibility/knewstuff/provider.h b/lib/compatibility/knewstuff/provider.h
index c41a9afb..680cec4e 100644
--- a/lib/compatibility/knewstuff/provider.h
+++ b/lib/compatibility/knewstuff/provider.h
@@ -144,7 +144,7 @@ class Provider
   protected:
     void parseDomElement( const TQDomElement & );
 
-    TQDomElement createDomElement( TQDomDocument &, TQDomElement &tqparent );
+    TQDomElement createDomElement( TQDomDocument &, TQDomElement &parent );
 
   private:
     TQString mName;
@@ -169,7 +169,7 @@ class ProviderLoader : public TQObject
     /**
      * Constructor.
      *
-     * @param parentWidget the tqparent widget
+     * @param parentWidget the parent widget
      */
     ProviderLoader( TQWidget *parentWidget );
 
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index 97694a34..a6625870 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -37,8 +37,8 @@ using namespace KNS;
 class ProviderItem : public KListViewItem
 {
   public:
-    ProviderItem( KListView *tqparent, Provider *provider ) :
-      KListViewItem( tqparent ), mProvider( provider )
+    ProviderItem( KListView *parent, Provider *provider ) :
+      KListViewItem( parent ), mProvider( provider )
     {
       setText( 0, provider->name() );
     }
@@ -49,9 +49,9 @@ class ProviderItem : public KListViewItem
     Provider *mProvider;
 };
 
-ProviderDialog::ProviderDialog( Engine *engine, TQWidget *tqparent ) :
+ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) :
   KDialogBase( Plain, i18n("Hot New Stuff Providers"), Ok | Cancel, Cancel,
-               tqparent, 0, false, true ),
+               parent, 0, false, true ),
   mEngine( engine )
 {
   TQFrame *topPage = plainPage();
diff --git a/lib/compatibility/knewstuff/providerdialog.h b/lib/compatibility/knewstuff/providerdialog.h
index 7a9f8884..6ab903bd 100644
--- a/lib/compatibility/knewstuff/providerdialog.h
+++ b/lib/compatibility/knewstuff/providerdialog.h
@@ -49,9 +49,9 @@ class ProviderDialog : public KDialogBase
       Constructor.
 
       @param engine a KNewStuff engine object
-      @param tqparent the tqparent window
+      @param parent the parent window
     */
-    ProviderDialog( Engine *engine, TQWidget *tqparent );
+    ProviderDialog( Engine *engine, TQWidget *parent );
 
     /**
       Clears the list of providers.
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 9e63386b..4eaed4aa 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -42,9 +42,9 @@
 
 using namespace KNS;
 
-UploadDialog::UploadDialog( Engine *engine, TQWidget *tqparent ) :
+UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) :
   KDialogBase( Plain, i18n("Share Hot New Stuff"), Ok | Cancel, Cancel,
-               tqparent, 0, false, true ),
+               parent, 0, false, true ),
   mEngine( engine )
 {
   mEntryList.setAutoDelete( true );
diff --git a/lib/compatibility/knewstuff/uploaddialog.h b/lib/compatibility/knewstuff/uploaddialog.h
index 5d7f0e68..623f689c 100644
--- a/lib/compatibility/knewstuff/uploaddialog.h
+++ b/lib/compatibility/knewstuff/uploaddialog.h
@@ -53,9 +53,9 @@ class UploadDialog : public KDialogBase
       Constructor.
 
       @param engine a KNewStuff engine object to be used for uploads
-      @param tqparent the tqparent window
+      @param parent the parent window
     */
-    UploadDialog( Engine *engine, TQWidget *tqparent );
+    UploadDialog( Engine *engine, TQWidget *parent );
 
     /**
       Destructor.
diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp
index d0c072ba..4a3aad3c 100644
--- a/lib/ksavealldialog.cpp
+++ b/lib/ksavealldialog.cpp
@@ -49,8 +49,8 @@ private:
 }
 
 
-KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ) :
-  KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"),
+KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) :
+  KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"),
 	       Ok | User1 | Close )
 {
   TQVBox *top = makeVBoxMainWidget();
@@ -140,8 +140,8 @@ KURL::List KSaveSelectDialog::filesNotToSave( )
 }
 
 
-KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ) :
-  KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"),
+KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) :
+  KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"),
 	       Ok | User1 | Close )
 {
   m_result = Cancel;
diff --git a/lib/ksavealldialog.h b/lib/ksavealldialog.h
index 091a3ae0..8aee6870 100644
--- a/lib/ksavealldialog.h
+++ b/lib/ksavealldialog.h
@@ -39,7 +39,7 @@ class KSaveSelectDialog : public KDialogBase
   TQ_OBJECT
 	
 public:
-	KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent );
+	KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent );
 	virtual ~KSaveSelectDialog();
 	
 	KURL::List filesToSave();
@@ -67,7 +67,7 @@ class KSaveAllDialog : public KDialogBase
 public:
   enum SaveAllResult{ SaveAll, Cancel, Revert };
 
-  KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent );
+  KSaveAllDialog( const TQStringList& filenames, TQWidget* parent );
   virtual ~KSaveAllDialog();
 
   SaveAllResult result() const { return m_result; }
diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp
index a50455f4..3f002ada 100644
--- a/lib/qextfileinfo.cpp
+++ b/lib/qextfileinfo.cpp
@@ -161,16 +161,16 @@ KURL QExtFileInfo::toAbsolute(const KURL& _urlToConvert,const KURL& _baseURL)
   This is needed for empty directory adding/handling. (Andras)
   Currently works only for local directories
 */
-KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& tqmask, TQWidget *window)
+KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& mask, TQWidget *window)
 {
   QExtFileInfo internalFileInfo;
-  return internalFileInfo.allFilesInternal(path, tqmask, window);
+  return internalFileInfo.allFilesInternal(path, mask, window);
 }
 
-KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask, TQWidget *window, bool resolveSymlinks)
+KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& mask, TQWidget *window, bool resolveSymlinks)
 {
   QExtFileInfo internalFileInfo;
-  KURL::List r = internalFileInfo.allFilesInternal(path, tqmask, window);
+  KURL::List r = internalFileInfo.allFilesInternal(path, mask, window);
 
   KURL::List::Iterator it;
   for ( it = r.begin(); it != r.end(); ++it )
@@ -181,10 +181,10 @@ KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqm
   return r;
 }
 
-TQDict<KFileItem> QExtFileInfo::allFilesDetailed(const KURL& path, const TQString& tqmask, TQWidget *window)
+TQDict<KFileItem> QExtFileInfo::allFilesDetailed(const KURL& path, const TQString& mask, TQWidget *window)
 {
   QExtFileInfo internalFileInfo;
-  return internalFileInfo.allFilesDetailedInternal(path, tqmask, window);
+  return internalFileInfo.allFilesDetailedInternal(path, mask, window);
 }
 
 
@@ -281,10 +281,10 @@ bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
 }
 
 /** No descriptions */
-KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window)
+KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& mask, TQWidget *window)
 {
   if (startURL.isLocalFile())
-    return allLocalFiles(startURL.path(-1), tqmask);
+    return allLocalFiles(startURL.path(-1), mask);
 
   dirListItems.clear();
   if (internalExists(startURL, true, window))
@@ -292,7 +292,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
     lstFilters.setAutoDelete(true);
     lstFilters.clear();
     // Split on white space
-    TQStringList list = TQStringList::split( ' ', tqmask );
+    TQStringList list = TQStringList::split( ' ', mask );
     for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
        lstFilters.append( new TQRegExp(*it, false, true ) );
 
@@ -320,7 +320,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
 }
 
 /** No descriptions */
-TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window)
+TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, const TQString& mask, TQWidget *window)
 {
   detailedDirListItems.setAutoDelete(true);
   detailedDirListItems.clear();
@@ -330,7 +330,7 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c
     lstFilters.setAutoDelete(true);
     lstFilters.clear();
     // Split on white space
-    TQStringList list = TQStringList::split( ' ', tqmask );
+    TQStringList list = TQStringList::split( ' ', mask );
     for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
        lstFilters.append( new TQRegExp(*it, false, true ) );
 
@@ -356,10 +356,10 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c
   return detailedDirListItems;
 }
 
-KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString& tqmask)
+KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString& mask)
 {
   KURL::List list;
-  TQDir d(startPath, tqmask);
+  TQDir d(startPath, mask);
   TQStringList l = d.entryList();
   TQStringList::ConstIterator end = l.constEnd();
   TQString path;
@@ -379,7 +379,7 @@ KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString
   for (TQStringList::ConstIterator it = l.constBegin(); it != end; ++it)
   {
     if ((*it) != "." && (*it) != "..")
-      list += allLocalFiles(startPath + "/" + (*it), tqmask);
+      list += allLocalFiles(startPath + "/" + (*it), mask);
   }
   return list;
 }
diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h
index 6a9e52c7..a223438e 100644
--- a/lib/qextfileinfo.h
+++ b/lib/qextfileinfo.h
@@ -55,21 +55,21 @@ public:
   static KURL toRelative(const KURL& urlToConvert, const KURL& baseURL, bool resolveSymlinks = true);
   /** Convert relative url to absolute, based on baseURL. */
   static KURL toAbsolute(const KURL& urlToConvert, const KURL& baseURL);
-  /** Returns a recursive list of files under path, matching the specified file tqmask. */
-  static KURL::List allFiles( const KURL& path, const TQString &tqmask, TQWidget *window);
-  /** Returns a recursive list of files under path, matching the specified file tqmask.
+  /** Returns a recursive list of files under path, matching the specified file mask. */
+  static KURL::List allFiles( const KURL& path, const TQString &mask, TQWidget *window);
+  /** Returns a recursive list of files under path, matching the specified file mask.
       The returned urls are relative to path.
   */
-  static KURL::List allFilesRelative( const KURL& path, const TQString &tqmask, TQWidget *window, bool resolveSymlinks = true);
-  /** Returns a recursive list of files under path, matching the specified file tqmask.
+  static KURL::List allFilesRelative( const KURL& path, const TQString &mask, TQWidget *window, bool resolveSymlinks = true);
+  /** Returns a recursive list of files under path, matching the specified file mask.
       The returned list contains detailed information about each url.
       The user should delete the KFileItems and clear the dict
       after they are not needed.
   */
-  static TQDict<KFileItem> allFilesDetailed(const KURL& path, const TQString &tqmask, TQWidget *window);
+  static TQDict<KFileItem> allFilesDetailed(const KURL& path, const TQString &mask, TQWidget *window);
   /** Creates a dir if don't exists. */
   static bool createDir(const KURL & path, TQWidget *window);
-  /** Returns the tqparent directory of dir. */
+  /** Returns the parent directory of dir. */
   static KURL cdUp(const KURL &dir);
   /** Returns the filename from a path string. */
   static TQString shortName(const TQString &fname );
@@ -93,9 +93,9 @@ private:
   bool internalExists(const KURL& url, bool readingOnly, TQWidget *window);
   bool internalCopy(const KURL& src, const KURL& target, int permissions,
                     bool overwrite, bool resume, TQWidget* window);
-  KURL::List allFilesInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window);
-  TQDict<KFileItem> allFilesDetailedInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window);
-  KURL::List allLocalFiles(const TQString& startPath, const TQString& tqmask);
+  KURL::List allFilesInternal(const KURL& startURL, const TQString& mask, TQWidget *window);
+  TQDict<KFileItem> allFilesDetailedInternal(const KURL& startURL, const TQString& mask, TQWidget *window);
+  KURL::List allLocalFiles(const TQString& startPath, const TQString& mask);
 
   bool bJobOK;
   static TQString lastErrorMsg;