22 files changed, 173 insertions, 173 deletions
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 1d13712f..a9e10a2d 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -627,7 +627,7 @@ void PMDockWidget::show()
 void PMDockWidget::setDockWindowType (NET::WindowType windowType)
 {
   d->windowType = windowType;
-  applyToWidget( tqparentWidget(), TQPoint(0,0) );
+  applyToWidget( parentWidget(), TQPoint(0,0) );
 }
 
 #endif
@@ -636,7 +636,7 @@ void PMDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEna
 {
   d->_parent = tqparent;
   d->transient = transientEnabled;
-  applyToWidget( tqparentWidget(), TQPoint(0,0) );
+  applyToWidget( parentWidget(), TQPoint(0,0) );
 }
 
 bool PMDockWidget::event( TQEvent* pevent )
@@ -663,13 +663,13 @@ bool PMDockWidget::event( TQEvent* pevent )
       emit manager->change();
       break;
     case TQEvent::CaptionChange:
-      if ( tqparentWidget() ){
+      if ( parentWidget() ){
         if ( tqparent()->inherits("PMDockSplitter") ){
           ((PMDockSplitter*)(tqparent()))->updateName();
         }
-        if ( tqparentDockTabGroup() ){
-          setDockTabName( tqparentDockTabGroup() );
-          tqparentDockTabGroup()->setTabLabel( this, tabPageLabel() );
+        if ( parentDockTabGroup() ){
+          setDockTabName( parentDockTabGroup() );
+          parentDockTabGroup()->setTabLabel( this, tabPageLabel() );
         }
       }
       break;
@@ -715,7 +715,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
     succes = false;
   }
 
-  if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !tqparentDockTabGroup() ){
+  if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){
     succes = false;
   }
 
@@ -724,7 +724,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   if( target && ( dockPos != PMDockWidget::DockCenter )
       && ( dockPos != PMDockWidget::DockNone ) )
   {
-     TQWidget* pdt = target->tqparentDockTabGroup( );
+     TQWidget* pdt = target->parentDockTabGroup( );
      if( pdt )
         return manualDock( ( PMDockWidget* ) ( pdt->tqparent( ) ),
                            dockPos, spliPos, pos, check, tabIndex );
@@ -759,19 +759,19 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
     return this;
   }
 
-  PMDockTabGroup* tqparentTab = target->tqparentDockTabGroup();
-  if ( tqparentTab ){
+  PMDockTabGroup* parentTab = target->parentDockTabGroup();
+  if ( parentTab ){
     // add to existing TabGroup
-    applyToWidget( tqparentTab );
-    tqparentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
+    applyToWidget( parentTab );
+    parentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
                           tabPageLabel(), tabIndex );
-    setDockTabName( tqparentTab );
+    setDockTabName( parentTab );
     if( !toolTipStr.isEmpty())
-      tqparentTab->setTabToolTip( this, toolTipStr);
+      parentTab->setTabToolTip( this, toolTipStr);
 
     currentDockPos = PMDockWidget::DockCenter;
     emit manager->change();
-    return (PMDockWidget*)tqparentTab->tqparent();
+    return (PMDockWidget*)parentTab->tqparent();
   }
 
   // MODIFICATION (Zehender):
@@ -792,7 +792,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
         {
            PMDockWidget* dw = ( PMDockWidget* ) wtarget;
            newTarget = dw;
-           TQWidget* pw = wtarget->tqparentWidget( );
+           TQWidget* pw = wtarget->parentWidget( );
            if( pw )
            {
               if( pw->inherits( "PMDockSplitter" ) )
@@ -803,7 +803,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
               }
            }
         }
-        wtarget = wtarget->tqparentWidget( );
+        wtarget = wtarget->parentWidget( );
      }
 
      if( newTarget != target )
@@ -813,8 +813,8 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   // END MODIFICATION
 
   // create a new dockwidget that will contain the target and this
-  TQWidget* tqparentDock = target->tqparentWidget();
-  PMDockWidget* newDock = new PMDockWidget( manager, "tempName", TQPixmap(TQString("")), tqparentDock );
+  TQWidget* parentDock = target->parentWidget();
+  PMDockWidget* newDock = new PMDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock );
   newDock->currentDockPos = target->currentDockPos;
 
   if ( dockPos == PMDockWidget::DockCenter ){
@@ -824,9 +824,9 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   }
   newDock->eDocking = (target->eDocking & eDocking) & (~(int)PMDockWidget::DockCenter);
 
-  newDock->applyToWidget( tqparentDock );
+  newDock->applyToWidget( parentDock );
 
-  if ( !tqparentDock ){
+  if ( !parentDock ){
     // dock to a toplevel dockwidget means newDock is toplevel now
     newDock->move( target->frameGeometry().topLeft() );
     newDock->resize( target->tqgeometry().size() );
@@ -909,9 +909,9 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
     panner->show();
   }
 
-  if ( tqparentDock ){
-    if ( tqparentDock->inherits("PMDockSplitter") ){
-      PMDockSplitter* sp = (PMDockSplitter*)tqparentDock;
+  if ( parentDock ){
+    if ( parentDock->inherits("PMDockSplitter") ){
+      PMDockSplitter* sp = (PMDockSplitter*)parentDock;
       sp->deactivate();
       if ( sp->getFirst() == target )
         sp->activate( newDock, 0L );
@@ -928,10 +928,10 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   return newDock;
 }
 
-PMDockTabGroup* PMDockWidget::tqparentDockTabGroup() const
+PMDockTabGroup* PMDockWidget::parentDockTabGroup() const
 {
   if ( !tqparent() ) return 0L;
-  TQWidget* candidate = tqparentWidget()->tqparentWidget();
+  TQWidget* candidate = parentWidget()->parentWidget();
   if ( candidate && candidate->inherits("PMDockTabGroup") ) return (PMDockTabGroup*)candidate;
   return 0L;
 }
@@ -948,8 +948,8 @@ void PMDockWidget::toDesktop()
 
 void PMDockWidget::undock()
 {
-  TQWidget* tqparentW = tqparentWidget();
-  if ( !tqparentW ){
+  TQWidget* parentW = parentWidget();
+  if ( !parentW ){
     hide();
     if (!d->blockHasUndockedSignal)
       emit hasUndocked();
@@ -962,73 +962,73 @@ void PMDockWidget::undock()
   manager->blockSignals(true);
   manager->undockProcess = true;
 
-  bool isV = tqparentW->isVisibleToTLW();
+  bool isV = parentW->isVisibleToTLW();
 
-  PMDockTabGroup* tqparentTab = tqparentDockTabGroup();
-  if ( tqparentTab ){
-    d->index = tqparentTab->indexOf( this); // memorize the page position in the tab widget
-    tqparentTab->removePage( this );
-    formerBrotherDockWidget = (PMDockWidget*)tqparentTab->page(0);
+  PMDockTabGroup* parentTab = parentDockTabGroup();
+  if ( parentTab ){
+    d->index = parentTab->indexOf( this); // memorize the page position in the tab widget
+    parentTab->removePage( this );
+    formerBrotherDockWidget = (PMDockWidget*)parentTab->page(0);
     TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                       this, TQT_SLOT(loseFormerBrotherDockWidget()) );
     applyToWidget( 0L );
-    if ( tqparentTab->count() == 1 ){
+    if ( parentTab->count() == 1 ){
 
       // last subdock widget in the tab control
-      PMDockWidget* lastTab = (PMDockWidget*)tqparentTab->page(0);
-      tqparentTab->removePage( lastTab );
+      PMDockWidget* lastTab = (PMDockWidget*)parentTab->page(0);
+      parentTab->removePage( lastTab );
       lastTab->applyToWidget( 0L );
-      lastTab->move( tqparentTab->mapToGlobal(tqparentTab->frameGeometry().topLeft()) );
+      lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) );
 
       // PMDockTabGroup always have a tqparent that is a PMDockWidget
-      PMDockWidget* tqparentOfTab = (PMDockWidget*)tqparentTab->tqparent();
-      delete tqparentTab; // PMDockTabGroup
+      PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->tqparent();
+      delete parentTab; // PMDockTabGroup
 
-      TQWidget* tqparentOfDockWidget = tqparentOfTab->tqparentWidget();
-      if ( tqparentOfDockWidget == 0L ){
+      TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
+      if ( parentOfDockWidget == 0L ){
           if ( isV ) lastTab->show();
       } else {
-        if ( tqparentOfDockWidget->inherits("PMDockSplitter") ){
-          PMDockSplitter* split = (PMDockSplitter*)tqparentOfDockWidget;
+        if ( parentOfDockWidget->inherits("PMDockSplitter") ){
+          PMDockSplitter* split = (PMDockSplitter*)parentOfDockWidget;
           lastTab->applyToWidget( split );
           split->deactivate();
-          if ( split->getFirst() == tqparentOfTab ){
+          if ( split->getFirst() == parentOfTab ){
             split->activate( lastTab );
             if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockLeft );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft );
             else
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockTop );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop );
           } else {
             split->activate( 0L, lastTab );
             if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockRight );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight );
             else
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockBottom );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom );
           }
           split->show();
         } else {
-          lastTab->applyToWidget( tqparentOfDockWidget );
+          lastTab->applyToWidget( parentOfDockWidget );
         }
         lastTab->show();
       }
       manager->blockSignals(false);
-      emit manager->replaceDock( tqparentOfTab, lastTab );
-      lastTab->currentDockPos = tqparentOfTab->currentDockPos;
-      emit tqparentOfTab->iMBeingClosed();
+      emit manager->replaceDock( parentOfTab, lastTab );
+      lastTab->currentDockPos = parentOfTab->currentDockPos;
+      emit parentOfTab->iMBeingClosed();
       manager->blockSignals(true);
-      delete tqparentOfTab;
+      delete parentOfTab;
 
     } else {
-      setDockTabName( tqparentTab );
+      setDockTabName( parentTab );
     }
   } else {
 /*********************************************************************************************/
-    if ( tqparentW->inherits("PMDockSplitter") ){
-      PMDockSplitter* tqparentSplitterOfDockWidget = (PMDockSplitter*)tqparentW;
-      d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
+    if ( parentW->inherits("PMDockSplitter") ){
+      PMDockSplitter* parentSplitterOfDockWidget = (PMDockSplitter*)parentW;
+      d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
 
-      PMDockWidget* secondWidget = (PMDockWidget*)tqparentSplitterOfDockWidget->getAnother( this );
-      PMDockWidget* group        = (PMDockWidget*)tqparentSplitterOfDockWidget->tqparentWidget();
+      PMDockWidget* secondWidget = (PMDockWidget*)parentSplitterOfDockWidget->getAnother( this );
+      PMDockWidget* group        = (PMDockWidget*)parentSplitterOfDockWidget->parentWidget();
       formerBrotherDockWidget = secondWidget;
       applyToWidget( 0L );
       group->hide();
@@ -1037,25 +1037,25 @@ void PMDockWidget::undock()
         TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                           this, TQT_SLOT(loseFormerBrotherDockWidget()) );
 
-      if ( !group->tqparentWidget() ){
+      if ( !group->parentWidget() ){
         secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
         secondWidget->resize( group->width(), group->height() );
       } else {
-        TQWidget* obj = group->tqparentWidget();
+        TQWidget* obj = group->parentWidget();
         secondWidget->applyToWidget( obj );
         if ( obj->inherits("PMDockSplitter") ){
-          PMDockSplitter* tqparentOfGroup = (PMDockSplitter*)obj;
-          tqparentOfGroup->deactivate();
+          PMDockSplitter* parentOfGroup = (PMDockSplitter*)obj;
+          parentOfGroup->deactivate();
 
-          if ( tqparentOfGroup->getFirst() == group )
-            tqparentOfGroup->activate( secondWidget );
+          if ( parentOfGroup->getFirst() == group )
+            parentOfGroup->activate( secondWidget );
           else
-            tqparentOfGroup->activate( 0L, secondWidget );
+            parentOfGroup->activate( 0L, secondWidget );
         }
       }
       secondWidget->currentDockPos = group->currentDockPos;
       secondWidget->formerDockPos  = group->formerDockPos;
-      delete tqparentSplitterOfDockWidget;
+      delete parentSplitterOfDockWidget;
       manager->blockSignals(false);
       emit manager->replaceDock( group, secondWidget );
       emit group->iMBeingClosed();
@@ -1107,13 +1107,13 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
   listOfCaption.remove( listOfCaption.length()-1, 1 );
   listOfName.remove( listOfName.length()-1, 1 );
 
-  tab->tqparentWidget()->setName( listOfName.utf8() );
-  tab->tqparentWidget()->setCaption( listOfCaption );
+  tab->parentWidget()->setName( listOfName.utf8() );
+  tab->parentWidget()->setCaption( listOfCaption );
 
-  tab->tqparentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
-  if ( tab->tqparentWidget()->tqparent() )
-    if ( tab->tqparentWidget()->tqparent()->inherits("PMDockSplitter") )
-      ((PMDockSplitter*)(tab->tqparentWidget()->tqparent()))->updateName();
+  tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
+  if ( tab->parentWidget()->tqparent() )
+    if ( tab->parentWidget()->tqparent()->inherits("PMDockSplitter") )
+      ((PMDockSplitter*)(tab->parentWidget()->tqparent()))->updateName();
 }
 
 bool PMDockWidget::mayBeHide() const
@@ -1146,16 +1146,16 @@ void PMDockWidget::changeHideShowState()
 
 void PMDockWidget::makeDockVisible()
 {
-  if ( tqparentDockTabGroup() ){
-    tqparentDockTabGroup()->showPage( this );
+  if ( parentDockTabGroup() ){
+    parentDockTabGroup()->showPage( this );
   }
   if ( isVisible() ) return;
 
-  TQWidget* p = tqparentWidget();
+  TQWidget* p = parentWidget();
   while ( p ){
     if ( !p->isVisible() )
       p->show();
-    p = p->tqparentWidget();
+    p = p->parentWidget();
   }
   if( tqparent() == 0L) // is undocked
     dockBack();
@@ -1306,7 +1306,7 @@ void PMDockManager::activate()
   while ( (obj=(PMDockWidget*)it.current()) ) {
     ++it;
     if ( obj->widget ) obj->widget->show();
-    if ( !obj->tqparentDockTabGroup() ){
+    if ( !obj->parentDockTabGroup() ){
         obj->show();
     }
   }
@@ -1468,7 +1468,7 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
   if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
   if (!childDockWidgetList) return 0L;
   if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
-  if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->tqparentDockTabGroup() ) return 0L;
+  if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L;
 
   PMDockWidget* www = (PMDockWidget*)w;
   if ( www->dockSite( ) == (int)PMDockWidget::DockNone ) return 0L;
@@ -1559,9 +1559,9 @@ void PMDockManager::startDrag( PMDockWidget* w )
    || ( w->currentDockPos == PMDockWidget::DockTop) || ( w->currentDockPos == PMDockWidget::DockBottom)) {
     w->prevSideDockPosBeforeDrag = w->currentDockPos;
 
-    if ( w->tqparentWidget()->inherits("PMDockSplitter") ){
-      PMDockSplitter* tqparentSplitterOfDockWidget = (PMDockSplitter*)(w->tqparentWidget());
-      w->d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
+    if ( w->parentWidget()->inherits("PMDockSplitter") ){
+      PMDockSplitter* parentSplitterOfDockWidget = (PMDockSplitter*)(w->parentWidget());
+      w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
     }
   }
 
@@ -1577,7 +1577,7 @@ void PMDockManager::dragMove( PMDockWidget* dw, TQPoint pos )
   PMDockWidget::DockPosition oldPos = curPos;
 
   TQSize r = dw->widget->size();
-  if ( dw->tqparentDockTabGroup() ){
+  if ( dw->parentDockTabGroup() ){
     curPos = PMDockWidget::DockCenter;
     if ( oldPos != curPos ) {
       d->dragRect.setRect( p.x()+2, p.y()+2, r.width()-4, r.height()-4 );
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 28e85963..8639e6b0 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -614,7 +614,7 @@ public:
   /**
    * @return the tqparent widget of this if it inherits class PMDockTabGroup
    */
-  PMDockTabGroup* tqparentDockTabGroup() const;
+  PMDockTabGroup* parentDockTabGroup() const;
 
 #ifndef NO_KDE2
 
@@ -855,7 +855,7 @@ public:
 #ifndef NO_KDE2
   /**
    * Saves the current state of the dockmanager and of all controlled widgets.
-   * State means here to save the tqgeometry, visibility, tqparents, internal object names, orientation,
+   * State means here to save the tqgeometry, visibility, parents, internal object names, orientation,
    * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
    * last but not least some necessary things for recovering the dockmainwindow state.
    *
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index 5a86e25a..3dd59456 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -238,15 +238,15 @@ void PMDockSplitter::updateName()
   if ( !initialised ) return;
 
   TQString new_name = TQString( child0->name() ) + "," + child1->name();
-  tqparentWidget()->setName( new_name.latin1() );
-  tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() );
-  tqparentWidget()->tqrepaint( false );
+  parentWidget()->setName( new_name.latin1() );
+  parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
+  parentWidget()->tqrepaint( false );
 
-  ((PMDockWidget*)tqparentWidget())->firstName = child0->name();
-  ((PMDockWidget*)tqparentWidget())->lastName = child1->name();
-  ((PMDockWidget*)tqparentWidget())->splitterOrientation = orientation;
+  ((PMDockWidget*)parentWidget())->firstName = child0->name();
+  ((PMDockWidget*)parentWidget())->lastName = child1->name();
+  ((PMDockWidget*)parentWidget())->splitterOrientation = orientation;
 
-  TQWidget* p = tqparentWidget()->tqparentWidget();
+  TQWidget* p = parentWidget()->parentWidget();
   if ( p != 0L && p->inherits("PMDockSplitter" ) )
     ((PMDockSplitter*)p)->updateName();
 }
diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp
index a9bdaee8..57881593 100644
--- a/kpovmodeler/pmfactory.cpp
+++ b/kpovmodeler/pmfactory.cpp
@@ -54,7 +54,7 @@ PMFactory::~PMFactory( )
    s_aboutData = 0L;
 }
 
-KParts::Part* PMFactory::createPartObject( TQWidget* tqparentWidget,
+KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget,
                                      const char* widgetName,
                                      TQObject* tqparent, const char* name,
                                      const char* classname,
@@ -65,7 +65,7 @@ KParts::Part* PMFactory::createPartObject( TQWidget* tqparentWidget,
    bool readwrite = !( ( strcmp( classname, "Browser/View" ) == 0 )
           || ( strcmp( classname, "KParts::ReadOnlyPart" ) == 0 ) );
 
-   KParts::ReadWritePart *part = new PMPart( tqparentWidget, widgetName,
+   KParts::ReadWritePart *part = new PMPart( parentWidget, widgetName,
                                              tqparent, name, readwrite );
 
    return part;
diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h
index ee649d84..dac51e7b 100644
--- a/kpovmodeler/pmfactory.h
+++ b/kpovmodeler/pmfactory.h
@@ -33,7 +33,7 @@ public:
    PMFactory( );
    virtual ~PMFactory( );
 
-   virtual KParts::Part* createPartObject( TQWidget* tqparentWidget,
+   virtual KParts::Part* createPartObject( TQWidget* parentWidget,
                                      const char* widgetName,
                                      TQObject* tqparent, const char* name,
                                      const char* classname,
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 823e3c19..91e6d797 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -312,7 +312,7 @@ void PMGLView::initializeGL( )
 
       Window p;
       p = RootWindow( display, vi->screen );
-      TQWidget* pw = tqparentWidget( );
+      TQWidget* pw = parentWidget( );
       if( pw )
          p = pw->winId( );
 
@@ -406,7 +406,7 @@ void PMGLView::setScale( double scale )
    if( m_dScale > 0 )
    {
       m_dScale = scale;
-      tqinvalidateProjection( );
+      invalidateProjection( );
    }
    else
       kdError( PMArea ) << "Scale <= 0 in PMGLView::setScale\n";
@@ -415,18 +415,18 @@ void PMGLView::setScale( double scale )
 void PMGLView::setTranslationX( double d )
 {
    m_dTransX = d;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::setTranslationY( double d )
 {
    m_dTransY = d;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::resizeEvent( TQResizeEvent* )
 {
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::paintEvent( TQPaintEvent* )
@@ -434,7 +434,7 @@ void PMGLView::paintEvent( TQPaintEvent* )
    tqrepaint( );
 }
 
-void PMGLView::tqinvalidateProjection( bool graphicalChange /*= true*/ )
+void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ )
 {
    m_viewTransformation = PMMatrix::identity( );
 
@@ -698,14 +698,14 @@ void PMGLView::mouseMoveEvent( TQMouseEvent* e )
             m_dTransX += m_scaleIntX * c;
             m_dTransY += m_scaleIntY * c;
             m_dScale *= s;
-            tqinvalidateProjection( );
+            invalidateProjection( );
          }
       }
       else if( m_bTranslateMode )
       {
          m_dTransX += ( e->x( ) - m_mousePos.x( ) ) / m_dScale;
          m_dTransY -= ( e->y( ) - m_mousePos.y( ) ) / m_dScale;
-         tqinvalidateProjection( );
+         invalidateProjection( );
       }
       m_mousePos = e->pos( );
    }
@@ -713,7 +713,7 @@ void PMGLView::mouseMoveEvent( TQMouseEvent* e )
    {
       m_dTransX += ( e->x( ) - m_mousePos.x( ) ) / m_dScale;
       m_dTransY -= ( e->y( ) - m_mousePos.y( ) ) / m_dScale;
-      tqinvalidateProjection( );
+      invalidateProjection( );
 
       m_mousePos = e->pos( );
    }
@@ -799,7 +799,7 @@ void PMGLView::wheelEvent( TQWheelEvent* e )
       m_dTransX += deltaX * c;
       m_dTransY += deltaY * c;
       m_dScale *= s;
-      tqinvalidateProjection( );
+      invalidateProjection( );
    }
 }
 
@@ -858,7 +858,7 @@ void PMGLView::keyPressEvent( TQKeyEvent* e )
       accept = false;
 
    if( accept )
-      tqinvalidateProjection( );
+      invalidateProjection( );
    else
       e->ignore( );
 }
@@ -885,7 +885,7 @@ void PMGLView::slotAutoScroll( )
 
       m_dTransX += pixels * m_autoScrollDirectionX / m_dScale;
       m_dTransY -= pixels * m_autoScrollDirectionY / m_dScale;
-      tqinvalidateProjection( );
+      invalidateProjection( );
 
    if( m_bGraphicalChangeMode )
       if( m_bMultipleSelectionMode )
@@ -1101,7 +1101,7 @@ void PMGLView::setType( PMViewType t )
    if( m_type != t )
       m_viewTransformation = PMMatrix::identity( );
    m_type = t;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 
    emit viewTypeChanged( viewTypeAsString( t ) );
 }
@@ -1109,7 +1109,7 @@ void PMGLView::setType( PMViewType t )
 void PMGLView::setCamera( PMCamera* c )
 {
    m_pCamera = c;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::slotRefresh( )
@@ -1135,7 +1135,7 @@ void PMGLView::slotClear( )
 void PMGLView::slotActiveRenderModeChanged( )
 {
    if( ( m_type == PMViewCamera ) && m_pCamera )
-      tqinvalidateProjection( );
+      invalidateProjection( );
 }
 
 void PMGLView::slotStopRendering( )
@@ -1176,13 +1176,13 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
       {
          if( obj->type( ) == "Camera" )
             if( m_pCamera == ( PMCamera* ) obj )
-               tqinvalidateProjection( );
+               invalidateProjection( );
 
          if( obj->tqparent( ) )
             if( obj->tqparent( )->type( ) == "Camera" )
                if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
                   if( obj->hasTransformationMatrix( ) )
-                     tqinvalidateProjection( );
+                     invalidateProjection( );
       }
 
       redraw = true;
@@ -1213,7 +1213,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
             if( obj->tqparent( )->type( ) == "Camera" )
                if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
                   if( obj->hasTransformationMatrix( ) )
-                     tqinvalidateProjection( );
+                     invalidateProjection( );
       }
       redraw = true;
    }
@@ -1229,7 +1229,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
             if( obj->tqparent( )->type( ) == "Camera" )
                if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
                   if( obj->hasTransformationMatrix( ) )
-                     tqinvalidateProjection( );
+                     invalidateProjection( );
 
       redraw = true;
    }
diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h
index 036ce5f5..e6954370 100644
--- a/kpovmodeler/pmglview.h
+++ b/kpovmodeler/pmglview.h
@@ -353,7 +353,7 @@ private:
    /**
     * Invalidates the projection and repaints the view
     */
-   void tqinvalidateProjection( bool graphicaChange = false );
+   void invalidateProjection( bool graphicaChange = false );
 
    /**
     * Starts multiple selection mode
diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp
index 4e2b79c3..1090837f 100644
--- a/kpovmodeler/pminsertrulesystem.cpp
+++ b/kpovmodeler/pminsertrulesystem.cpp
@@ -897,7 +897,7 @@ void PMInsertRuleSystem::loadRules( const TQString& fileName )
    PMRuleClass::s_pPrototypeManager = 0;
 }
 
-bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                     const TQString& className,
                                     const PMObject* after,
                                     const PMObjectList* objectsBetween )
@@ -905,7 +905,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
    bool possible = false;
 
    // find rules for target class
-   PMMetaObject* meta = tqparentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->tqmetaObject( );
    for( ; meta && !possible; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
@@ -917,7 +917,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
          TQStringList::ConstIterator it;
          for( it = exceptions.begin( );
               it != exceptions.end( ) && !exceptionFound; ++it )
-            if( tqparentObject->isA( *it ) )
+            if( parentObject->isA( *it ) )
                exceptionFound = true;
 
          if( !exceptionFound )
@@ -935,7 +935,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
 
                   // count already inserted child objects
                   bool afterInsertPoint = false;
-                  PMObject* o = tqparentObject->firstChild( );
+                  PMObject* o = parentObject->firstChild( );
                   if( !after )
                      afterInsertPoint = true;
                   for( ; o; o = o->nextSibling( ) )
@@ -952,7 +952,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
                   }
 
                   // evaluate condition value
-                  possible = rule->evaluate( tqparentObject );
+                  possible = rule->evaluate( parentObject );
                }
             }
          }
@@ -962,15 +962,15 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
    return possible;
 }
 
-bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                     const PMObject* object,
                                     const PMObject* after,
                                     const PMObjectList* objectsBetween )
 {
-   return canInsert( tqparentObject, object->type( ), after, objectsBetween );
+   return canInsert( parentObject, object->type( ), after, objectsBetween );
 }
 
-int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                    const PMObjectList& list,
                                    const PMObject* after )
 {
@@ -978,17 +978,17 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
    TQStringList classes;
    for( ; it.current( ); ++it )
       classes.append( it.current( )->type( ) );
-   return canInsert( tqparentObject, classes, after );
+   return canInsert( parentObject, classes, after );
 }
 
-int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                    const TQStringList& list,
                                    const PMObject* after )
 {
    if( list.size( ) == 1 )
    {
       // more efficient
-      if( canInsert( tqparentObject, list.first( ), after ) )
+      if( canInsert( parentObject, list.first( ), after ) )
          return 1;
       else
          return 0;
@@ -996,7 +996,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
 
    // find rules for target class
    TQPtrList<PMRuleTargetClass> targetClassList;
-   PMMetaObject* meta = tqparentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->tqmetaObject( );
    for( ; meta; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
@@ -1015,7 +1015,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
       {
          rit.current( )->reset( );
          bool afterInsertPoint = false;
-         PMObject* o = tqparentObject->firstChild( );
+         PMObject* o = parentObject->firstChild( );
          if( !after )
             afterInsertPoint = true;
          for( ; o; o = o->nextSibling( ) )
@@ -1041,7 +1041,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
          {
             PMRule* rule = rit.current( );
             if( rule->matches( *oit ) )
-               possible = rule->evaluate( tqparentObject );
+               possible = rule->evaluate( parentObject );
          }
       }
       if( possible )
diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h
index c280bcc2..0f13a099 100644
--- a/kpovmodeler/pminsertrulesystem.h
+++ b/kpovmodeler/pminsertrulesystem.h
@@ -624,7 +624,7 @@ public:
     * The parser uses the third parameter for top level objects. These objects
     * have to be treated as if they are inserted after the object after.
     */
-   bool canInsert( const PMObject* tqparentObject, const TQString& className,
+   bool canInsert( const PMObject* parentObject, const TQString& className,
                    const PMObject* after, const PMObjectList* objectsBetween = 0 );
 
    /**
@@ -634,20 +634,20 @@ public:
     * The parser uses the third parameter for top level objects. These objects
     * have to be treated as if they are inserted after the object after.
     *
-    * Same as canInsert( tqparentObject, object->class( ), after, objectsBetween )
+    * Same as canInsert( parentObject, object->class( ), after, objectsBetween )
     */
-   bool canInsert( const PMObject* tqparentObject, const PMObject* object,
+   bool canInsert( const PMObject* parentObject, const PMObject* object,
                    const PMObject* after, const PMObjectList* objectsBetween = 0 );
 
    /**
     * Returns the number of objects that can be inserted at that position
     */
-   int canInsert( const PMObject* tqparentObject, const PMObjectList& list,
+   int canInsert( const PMObject* parentObject, const PMObjectList& list,
                   const PMObject* after );
    /**
     * Returns the number of objects that can be inserted at that position
     */
-   int canInsert( const PMObject* tqparentObject, const TQStringList& listOfClasses,
+   int canInsert( const PMObject* parentObject, const TQStringList& listOfClasses,
                   const PMObject* after );
    /**
     * Returns a pointer to the part
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index acafe593..a1be809b 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -186,7 +186,7 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* tqparent, const char* name )
 void PMLayoutSettings::displaySettings( )
 {
    PMViewLayoutManager* m = PMViewLayoutManager::theManager( );
-   m_viewLayouts = m->tqlayouts( );
+   m_viewLayouts = m->layouts( );
    m_currentViewLayout = m_viewLayouts.begin( );
    m_defaultViewLayout = m_viewLayouts.begin( );
    for( ; ( m_defaultViewLayout != m_viewLayouts.end( ) ) &&
@@ -210,7 +210,7 @@ bool PMLayoutSettings::validateData( )
       if( ( *lit ).name( ).isEmpty( ) )
       {
          emit showMe( );
-         KMessageBox::error( this, i18n( "View tqlayouts may not have empty names." ),
+         KMessageBox::error( this, i18n( "View layouts may not have empty names." ),
                              i18n( "Error" ) );
          return false;
       }
diff --git a/kpovmodeler/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp
index e22a37f2..36ed2d2a 100644
--- a/kpovmodeler/pmlibraryhandle.cpp
+++ b/kpovmodeler/pmlibraryhandle.cpp
@@ -353,12 +353,12 @@ PMLibraryHandle::PMResult PMLibraryHandle::deleteSubLibrary( const TQString& sub
    return PMLibraryHandle::NotInLib;
 }
 
-PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString& tqparentPath )
+PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString& parentPath )
 {
    if( m_readOnly )
       return PMLibraryHandle::ReadOnlyLib;
 
-   TQString newPath = tqparentPath + "/" + m_path.section( '/', -1 );
+   TQString newPath = parentPath + "/" + m_path.section( '/', -1 );
    PMLibraryHandle::EntryIterator itr( m_libraries );
    for( ; itr.current( ); ++itr )
    {
diff --git a/kpovmodeler/pmlibraryhandle.h b/kpovmodeler/pmlibraryhandle.h
index 2263407e..e20d6368 100644
--- a/kpovmodeler/pmlibraryhandle.h
+++ b/kpovmodeler/pmlibraryhandle.h
@@ -181,10 +181,10 @@ public:
 
    /**
     * Changes the tqparent library if this is a sub library
-    * @param tqparentPath The new tqparent path for this library
+    * @param parentPath The new tqparent path for this library
     * @return PMLibraryHandle::Ok if successful or the reason for failure
     */
-   PMLibraryHandle::PMResult changeParentLibrary( const TQString& tqparentPath );
+   PMLibraryHandle::PMResult changeParentLibrary( const TQString& parentPath );
 
 private:
 
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 03fd15c5..16778e76 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -220,10 +220,10 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
    TQValueList<bool> subLibList;
    if( m_isSubLibrary && PMLibraryIconDrag::decode( e, pathList, subLibList ) )
    {
-      PMLibraryIconView* source = static_cast<PMLibraryIconView*>( e->source( )->tqparentWidget( ) );
-      PMLibraryHandle* tqparentLib = source->library( );
+      PMLibraryIconView* source = static_cast<PMLibraryIconView*>( e->source( )->parentWidget( ) );
+      PMLibraryHandle* parentLib = source->library( );
       PMLibraryHandle newParentLib = PMLibraryHandle( m_path );
-      if ( tqparentLib->isReadOnly() || newParentLib.isReadOnly() )
+      if ( parentLib->isReadOnly() || newParentLib.isReadOnly() )
       {
          e->ignore();
          return;
@@ -238,7 +238,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
             if( subLibList[i] )
             {
                TQString newpath = newPath( path, true );
-               if( tqparentLib->deleteSubLibrary( path ) == PMLibraryHandle::Ok )
+               if( parentLib->deleteSubLibrary( path ) == PMLibraryHandle::Ok )
                {
                   PMLibraryHandle lib = PMLibraryHandle( path );
                   if( newParentLib.addSubLibrary( newpath, lib.name() ) == PMLibraryHandle::Ok )
@@ -249,7 +249,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
                   else
                   {
                      success = false;
-                     tqparentLib->addSubLibrary( path, lib.name( ) );
+                     parentLib->addSubLibrary( path, lib.name( ) );
                   }
                }
                else
@@ -258,7 +258,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
             else
             {
                TQString newpath = newPath( path, false );
-               if( tqparentLib->deleteObject( path ) == PMLibraryHandle::Ok )
+               if( parentLib->deleteObject( path ) == PMLibraryHandle::Ok )
                {
                   PMLibraryObject obj = PMLibraryObject( path );
                   if( newParentLib.addObject( newpath, obj.name() ) == PMLibraryHandle::Ok )
@@ -268,7 +268,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
                   else
                   {
                      success = false;
-                     tqparentLib->addObject( path, obj.name( ) );
+                     parentLib->addObject( path, obj.name( ) );
                   }
                }
                else
diff --git a/kpovmodeler/pmlibrarymanager.h b/kpovmodeler/pmlibrarymanager.h
index 698f3f49..1ced4d0b 100644
--- a/kpovmodeler/pmlibrarymanager.h
+++ b/kpovmodeler/pmlibrarymanager.h
@@ -72,7 +72,7 @@ public:
 
    /**
     * Refreshes the list of libraries.
-    * WARNING: This function tqinvalidates all previously given PMLibraryHandle pointers
+    * WARNING: This function invalidates all previously given PMLibraryHandle pointers
     */
    void refresh( );
    
diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp
index 2c027314..e2801943 100644
--- a/kpovmodeler/pmparser.cpp
+++ b/kpovmodeler/pmparser.cpp
@@ -200,7 +200,7 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent,
          PMObject* obj = tqparent;
          bool stop = false;
          
-         // go to tqparents, until the tqparent is the scene
+         // go to parents, until the tqparent is the scene
          // (declares can only be inserted as top level objects)
          do
          {
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index db94f33e..7dec1524 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -99,7 +99,7 @@ TQTime PMDebugTime;
 
 //#define KPM_WITH_OBJECT_LIBRARY
 
-PMPart::PMPart( TQWidget* tqparentWidget, const char* widgetName,
+PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
                 TQObject* tqparent, const char* name, bool readwrite,
                 PMShell* shell )
       : DCOPObject( "PMPartIface" ),
@@ -141,7 +141,7 @@ PMPart::PMPart( TQWidget* tqparentWidget, const char* widgetName,
 
    initActions( );
    initDocument( );
-   initView( tqparentWidget, widgetName );
+   initView( parentWidget, widgetName );
 
    restoreConfig( instance( )->config( ) );
 
@@ -161,7 +161,7 @@ PMPart::PMPart( TQWidget* tqparentWidget, const char* widgetName,
    slotObjectChanged( m_pScene, PMCNewSelection, this );
 }
 
-PMPart::PMPart( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/,
+PMPart::PMPart( TQWidget* /*parentWidget*/, const char* /*widgetName*/,
                 TQObject* tqparent, const char* name, bool readwrite,
                 bool /*onlyCutPaste*/, PMShell* shell )
       : DCOPObject( "LibraryBrowserIface" ),
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index 0fe3bd22..30a60d41 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -76,7 +76,7 @@ public:
     * construtor of PMPart, calls all init functions to create the
     * application.
     */
-   PMPart( TQWidget* tqparentWidget, const char* widgetName,
+   PMPart( TQWidget* parentWidget, const char* widgetName,
            TQObject* tqparent, const char* name, bool readWrite,
            PMShell* shell = 0 );
 
@@ -84,7 +84,7 @@ public:
     * construtor of PMPart, calls all init functions to create the
     * application. It does not create the main widget.
     */
-   PMPart( TQWidget* tqparentWidget, const char* widgetName,
+   PMPart( TQWidget* parentWidget, const char* widgetName,
            TQObject* tqparent, const char* name, bool readWrite,
            bool onlyCutPaste, PMShell* shell = 0 );
 
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 4eee45a9..27249472 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -159,7 +159,7 @@ void PMShell::setupActions( )
                                     "view_new_librarybrowser" );
 #endif
 
-   // Creating the view tqlayouts menu
+   // Creating the view layouts menu
    m_pViewLayoutsAction = new KActionMenu( i18n( "View Layouts" ),
                                            actionCollection( ), "view_layouts_menu" );
    KPopupMenu* menu = m_pViewLayoutsAction->popupMenu( );
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 07fa308a..03eb8f7b 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -804,7 +804,7 @@ bool PMTreeView::targetDisplaysPart( TQWidget* target )
       // find the tree view
       TQWidget* t = target;
       while( t && !t->isA( "PMTreeView" ) )
-         t = t->tqparentWidget( );
+         t = t->parentWidget( );
       if( t )
          if( ( ( PMTreeView* ) t )->part( ) == m_pPart )
             result = true;
diff --git a/kpovmodeler/pmtreeviewitem.h b/kpovmodeler/pmtreeviewitem.h
index 234506bf..81fdeb96 100644
--- a/kpovmodeler/pmtreeviewitem.h
+++ b/kpovmodeler/pmtreeviewitem.h
@@ -61,7 +61,7 @@ public:
    PMObject* object( ) const { return m_pObject; }
    /**
     * Returns a key that can be used for sorting, here the index in the
-    * tqparents list of tqchildren
+    * parents list of tqchildren
     */
    virtual TQString key( int column, bool ascending ) const;
    /**
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index 1314ec85..4b57d728 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -663,7 +663,7 @@ void PMViewLayoutManager::loadData( )
 
    m_layoutsLoaded = true;
 
-   TQString fileName = locate( "data", "kpovmodeler/viewtqlayouts.xml" );
+   TQString fileName = locate( "data", "kpovmodeler/viewlayouts.xml" );
    if( fileName.isEmpty( ) )
    {
       // Generate a default tqlayout
@@ -710,7 +710,7 @@ void PMViewLayoutManager::loadData( )
    TQFile file( fileName );
    if( !file.open( IO_ReadOnly ) )
    {
-      kdError( PMArea ) << i18n( "Could not open the view tqlayouts file." )
+      kdError( PMArea ) << i18n( "Could not open the view layouts file." )
                         << endl;
       return;
    }
@@ -740,16 +740,16 @@ void PMViewLayoutManager::loadData( )
 
 void PMViewLayoutManager::saveData( )
 {
-   TQString fileName = locateLocal( "data", "kpovmodeler/viewtqlayouts.xml" );
+   TQString fileName = locateLocal( "data", "kpovmodeler/viewlayouts.xml" );
    if( fileName.isEmpty( ) )
    {
-      kdError( PMArea ) << i18n( "View tqlayouts not found." ) << endl;
+      kdError( PMArea ) << i18n( "View layouts not found." ) << endl;
       return;
    }
    TQFile file( fileName );
    if( !file.open( IO_WriteOnly ) )
    {
-      kdError( PMArea ) << i18n( "Could not open the view tqlayouts file." )
+      kdError( PMArea ) << i18n( "Could not open the view layouts file." )
                         << endl;
       return;
    }
diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h
index 686472c3..1ef04eba 100644
--- a/kpovmodeler/pmviewlayoutmanager.h
+++ b/kpovmodeler/pmviewlayoutmanager.h
@@ -198,11 +198,11 @@ private:
 };
 
 /**
- * Singleton that contains the view tqlayouts available.
+ * Singleton that contains the view layouts available.
  *
- * It interacts with @ref PMShell to create the view tqlayouts.
- * The class maintains a list of tqlayouts as well as the name of the default
- * tqlayout. The tqlayouts are stored in a XML file caled viewtqlayouts.xml.
+ * It interacts with @ref PMShell to create the view layouts.
+ * The class maintains a list of layouts as well as the name of the default
+ * tqlayout. The layouts are stored in a XML file caled viewlayouts.xml.
  */
 class PMViewLayoutManager
 {
@@ -217,7 +217,7 @@ public:
    static PMViewLayoutManager* theManager( );
 
    /**
-    * Returns the list of available view tqlayouts
+    * Returns the list of available view layouts
     */
    TQStringList availableLayouts( );
    /**
@@ -237,7 +237,7 @@ public:
     */
    void displayDefaultLayout( PMShell* shell );
    /**
-    * Loads all tqlayouts from the configuration file
+    * Loads all layouts from the configuration file
     */
    void loadData( );
    /**
@@ -261,15 +261,15 @@ public:
     */
    PMViewLayout* findLayout( const TQString& name );
    /**
-    * Returns the list of available tqlayouts
+    * Returns the list of available layouts
     */
-   TQValueList<PMViewLayout> tqlayouts( ) { return m_layouts; }
+   TQValueList<PMViewLayout> layouts( ) { return m_layouts; }
    /**
-    * Sets the list of available tqlayouts
+    * Sets the list of available layouts
     */
    void setLayouts( const TQValueList<PMViewLayout>& l ) { m_layouts = l; }
    /**
-    * Fill the available tqlayouts menu
+    * Fill the available layouts menu
     */
    void fillPopupMenu( KPopupMenu* pMenu );
 private: