Rename obsolete tq methods to standard names

(cherry picked from commit ebbee358abafa1b5166404c6fe5cc44ae2837a57)

52 files changed, 597 insertions, 597 deletions

diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index 0229c518..d44715e6 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -135,10 +135,10 @@ protected:
    void drawButton( TQPainter* p )
    {
       // Draw the background
-      tqstyle( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
+      style( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
                                    TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
       // Draw the label
-      tqstyle( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
+      style( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
                             TQStyle::Style_Enabled );
    }
 };
diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp
index fe91f1e0..8dff49b0 100644
--- a/kpovmodeler/pmbicubicpatchedit.cpp
+++ b/kpovmodeler/pmbicubicpatchedit.cpp
@@ -39,32 +39,32 @@ void PMBicubicPatchEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pType = new TQComboBox( false, this );
    m_pType->insertItem( i18n( "Normal (type 0)" ) );
    m_pType->insertItem( i18n( "Preprocessed (type 1)" ) );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
-   tqlayout->addWidget( m_pType );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+   layout->addWidget( m_pType );
+   layout->addStretch( 1 );
 
    m_pUSteps = new PMIntEdit( this );
    m_pUSteps->setValidation( true, 0, false, 0 );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
-   tqlayout->addWidget( m_pUSteps );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
+   layout->addWidget( m_pUSteps );
    m_pVSteps = new PMIntEdit( this );
    m_pVSteps->setValidation( true, 0, false, 0 );
-   tqlayout->addWidget( new TQLabel( "v", this ) );
-   tqlayout->addWidget( m_pVSteps );
+   layout->addWidget( new TQLabel( "v", this ) );
+   layout->addWidget( m_pVSteps );
 
    m_pFlatness = new PMFloatEdit( this );
    m_pFlatness->setValidation( true, 0.0, false, 0.0 );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
-   tqlayout->addWidget( m_pFlatness );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
+   layout->addWidget( m_pFlatness );
+   layout->addStretch( 1 );
 
    topLayout( )->addWidget( new TQLabel( i18n( "Points:" ), this ) );
 
diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp
index 836d7d72..34910df0 100644
--- a/kpovmodeler/pmblobcylinderedit.cpp
+++ b/kpovmodeler/pmblobcylinderedit.cpp
@@ -36,7 +36,7 @@ void PMBlobCylinderEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMBlobCylinderEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
    gl->addWidget( m_pEnd2, 1, 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
    gl->addWidget( m_pStrength, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp
index 6bf37b26..ba4e226b 100644
--- a/kpovmodeler/pmblobsphereedit.cpp
+++ b/kpovmodeler/pmblobsphereedit.cpp
@@ -34,23 +34,23 @@ void PMBlobSphereEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pCentre = new PMVectorEdit( "x", "y", "z", this );
    m_pRadius = new PMFloatEdit( this );
    m_pStrength = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
-   tqlayout->addWidget( m_pCentre );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
+   layout->addWidget( m_pCentre );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   TQGridLayout* gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
    gl->addWidget( m_pStrength, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp
index 23db4104..253d38b5 100644
--- a/kpovmodeler/pmcameraedit.cpp
+++ b/kpovmodeler/pmcameraedit.cpp
@@ -40,7 +40,7 @@ void PMCameraEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQGridLayout* tqlayout;
+   TQGridLayout* layout;
    TQLabel* label;
 
    m_pCameraType = new TQComboBox( false, this );
@@ -75,28 +75,28 @@ void PMCameraEdit::createTopWidgets( )
    hl->addWidget( m_pCylinderTypeLabel );
    hl->addWidget( m_pCylinderType );
 
-   tqlayout = new TQGridLayout( topLayout( ), 7, 2 );
-   tqlayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
-   tqlayout->addWidget( m_pLocation, 0, 1 );
+   layout = new TQGridLayout( topLayout( ), 7, 2 );
+   layout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
+   layout->addWidget( m_pLocation, 0, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
-   tqlayout->addWidget( m_pSky, 1, 1 );
+   layout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
+   layout->addWidget( m_pSky, 1, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
-   tqlayout->addWidget( m_pDirection, 2, 1 );
+   layout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
+   layout->addWidget( m_pDirection, 2, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
-   tqlayout->addWidget( m_pRight, 3, 1 );
+   layout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
+   layout->addWidget( m_pRight, 3, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
-   tqlayout->addWidget( m_pUp, 4, 1 );
+   layout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
+   layout->addWidget( m_pUp, 4, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
-   tqlayout->addWidget( m_pLookAt, 5, 1 );
+   layout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
+   layout->addWidget( m_pLookAt, 5, 1 );
 
    m_pEnableAngle = new TQCheckBox( i18n( "Angle:" ), this );
-   tqlayout->addWidget( m_pEnableAngle, 6, 0 );
-   tqlayout->addWidget( m_pAngle, 6, 1, AlignLeft );
+   layout->addWidget( m_pEnableAngle, 6, 0 );
+   layout->addWidget( m_pAngle, 6, 1, AlignLeft );
 
    m_pFocalBlur = new TQCheckBox( i18n( "Focal blur" ), this );
    topLayout( )->addWidget( m_pFocalBlur );
@@ -116,27 +116,27 @@ void PMCameraEdit::createTopWidgets( )
    m_pVariance->setValidation( true, 0, false, 0 );
    m_focalWidgets.append( m_pVariance );
 
-   tqlayout = new TQGridLayout( topLayout( ), 5, 2 );
+   layout = new TQGridLayout( topLayout( ), 5, 2 );
    label = new TQLabel( i18n( "Aperture:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 0, 0 );
-   tqlayout->addWidget( m_pAperture, 0, 1 );
+   layout->addWidget( label, 0, 0 );
+   layout->addWidget( m_pAperture, 0, 1 );
    label = new TQLabel( i18n( "Blur samples:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 1, 0 );
-   tqlayout->addWidget( m_pBlurSamples, 1, 1 );
+   layout->addWidget( label, 1, 0 );
+   layout->addWidget( m_pBlurSamples, 1, 1 );
    label = new TQLabel( i18n( "Focal point:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 2, 0 );
-   tqlayout->addWidget( m_pFocalPoint, 2, 1 );
+   layout->addWidget( label, 2, 0 );
+   layout->addWidget( m_pFocalPoint, 2, 1 );
    label = new TQLabel( i18n( "Confidence:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 3, 0 );
-   tqlayout->addWidget( m_pConfidence, 3, 1 );
+   layout->addWidget( label, 3, 0 );
+   layout->addWidget( m_pConfidence, 3, 1 );
    label = new TQLabel( i18n( "Variance:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 4, 0 );
-   tqlayout->addWidget( m_pVariance, 4, 1 );
+   layout->addWidget( label, 4, 0 );
+   layout->addWidget( m_pVariance, 4, 1 );
 
    m_pExport = new TQCheckBox( i18n( "Export to renderer" ), this );
    topLayout( )->addWidget( m_pExport );
diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp
index 4be987ac..c0dafa37 100644
--- a/kpovmodeler/pmcolorsettings.cpp
+++ b/kpovmodeler/pmcolorsettings.cpp
@@ -28,60 +28,60 @@
 PMColorSettings::PMColorSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQGridLayout* grid;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
-   grid = new TQGridLayout( vtqlayout, 6, 3 );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   grid = new TQGridLayout( vlayout, 6, 3 );
    
    grid->addWidget( new TQLabel( i18n( "Background:" ), this ), 0, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 0, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 0, 2 );
    m_pBackgroundColor = new KColorButton( this );
-   htqlayout->addWidget( m_pBackgroundColor );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pBackgroundColor );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Wire frame:" ), this ), 1, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 1, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 1, 2 );
    m_pGraphicalObjectsColor[0] = new KColorButton( this );
-   htqlayout->addWidget( m_pGraphicalObjectsColor[0] );
-   htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+   hlayout->addWidget( m_pGraphicalObjectsColor[0] );
+   hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
    m_pGraphicalObjectsColor[1] = new KColorButton( this );
-   htqlayout->addWidget( m_pGraphicalObjectsColor[1] );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pGraphicalObjectsColor[1] );
+   hlayout->addStretch( 1 );
    
    grid->addWidget( new TQLabel( i18n( "Control points:" ), this ), 2, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 2, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 2, 2 );
    m_pControlPointsColor[0] = new KColorButton( this );
-   htqlayout->addWidget( m_pControlPointsColor[0] );
-   htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+   hlayout->addWidget( m_pControlPointsColor[0] );
+   hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
    m_pControlPointsColor[1] = new KColorButton( this );
-   htqlayout->addWidget( m_pControlPointsColor[1] );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pControlPointsColor[1] );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Axes:" ), this ), 3, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 3, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 3, 2 );
    grid->addWidget( new TQLabel( "x", this ), 3, 1 );
    m_pAxesColor[0] = new KColorButton( this );
-   htqlayout->addWidget( m_pAxesColor[0] );
-   htqlayout->addWidget( new TQLabel( "y", this ) );
+   hlayout->addWidget( m_pAxesColor[0] );
+   hlayout->addWidget( new TQLabel( "y", this ) );
    m_pAxesColor[1] = new KColorButton( this );
-   htqlayout->addWidget( m_pAxesColor[1] );
-   htqlayout->addWidget( new TQLabel( "z", this ) );
+   hlayout->addWidget( m_pAxesColor[1] );
+   hlayout->addWidget( new TQLabel( "z", this ) );
    m_pAxesColor[2] = new KColorButton( this );
-   htqlayout->addWidget( m_pAxesColor[2] );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pAxesColor[2] );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Field of view:" ), this ), 4, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 4, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 4, 2 );
    m_pFieldOfViewColor = new KColorButton( this );
-   htqlayout->addWidget( m_pFieldOfViewColor );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pFieldOfViewColor );
+   hlayout->addStretch( 1 );
 }
 
 void PMColorSettings::displaySettings( )
diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp
index 75a07855..9969e4d7 100644
--- a/kpovmodeler/pmconeedit.cpp
+++ b/kpovmodeler/pmconeedit.cpp
@@ -36,7 +36,7 @@ void PMConeEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -51,13 +51,13 @@ void PMConeEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
    gl->addWidget( m_pEnd2, 1, 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius 1:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius1, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Radius 2:" ), this ), 1, 0 );
    gl->addWidget( m_pRadius2, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    topLayout( )->addWidget( m_pOpen );
 
diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp
index 014eb09b..114e22f6 100644
--- a/kpovmodeler/pmcsgedit.cpp
+++ b/kpovmodeler/pmcsgedit.cpp
@@ -34,17 +34,17 @@ void PMCSGEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    m_pTypeCombo = new TQComboBox( false, this );
    m_pTypeCombo->insertItem( i18n( "Union" ) );
    m_pTypeCombo->insertItem( i18n( "Intersection" ) );
    m_pTypeCombo->insertItem( i18n( "Difference" ) );
    m_pTypeCombo->insertItem( i18n( "Merge" ) );
    
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
-   tqlayout->addWidget( m_pTypeCombo );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+   layout->addWidget( m_pTypeCombo );
+   layout->addStretch( 1 );
 
    connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeSelected( int ) ) );
 }
diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp
index b8741ae7..b15a0d16 100644
--- a/kpovmodeler/pmcylinderedit.cpp
+++ b/kpovmodeler/pmcylinderedit.cpp
@@ -36,7 +36,7 @@ void PMCylinderEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMCylinderEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
    gl->addWidget( m_pEnd2, 1, 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
-   tqlayout->addWidget( m_pRadius );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
+   layout->addWidget( m_pRadius );
+   layout->addStretch( 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pOpen );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pOpen );
   
    connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index 60446a53..a5086c15 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -44,13 +44,13 @@ void PMDeclareEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pNameEdit = new TQLineEdit( this );
    m_pNameEdit->setMaxLength( 40 );
    TQLabel* label = new TQLabel( i18n( "Identifier:" ), this );
 
-   tqlayout->addWidget( label );
-   tqlayout->addWidget( m_pNameEdit );
+   layout->addWidget( label );
+   layout->addWidget( m_pNameEdit );
 
    connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
             TQT_SLOT( slotNameChanged( const TQString& ) ) );
@@ -67,13 +67,13 @@ void PMDeclareEdit::createBottomWidgets( )
             TQT_SLOT( slotItemSelected( TQListBoxItem* ) ) );
    topLayout( )->addWidget( m_pLinkedObjects, 1 );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pSelectButton = new TQPushButton( i18n( "Select..." ), this );
    m_pSelectButton->setEnabled( false );
 
    connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelect( ) ) );
-   tqlayout->addStretch( );
-   tqlayout->addWidget( m_pSelectButton );
+   layout->addStretch( );
+   layout->addWidget( m_pSelectButton );
 
    Base::createBottomWidgets( );
 }
diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp
index 09b53cbd..661cd892 100644
--- a/kpovmodeler/pmdetailobjectedit.cpp
+++ b/kpovmodeler/pmdetailobjectedit.cpp
@@ -33,7 +33,7 @@ void PMDetailObjectEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pGlobalDetail = new TQCheckBox( i18n( "Global detail" ), this );
    m_pLocalDetailLevelLabel = new TQLabel( i18n( "Detail level:" ), this );
    m_pLocalDetailLevel = new TQComboBox( this );
@@ -43,10 +43,10 @@ void PMDetailObjectEdit::createTopWidgets( )
    m_pLocalDetailLevel->insertItem( i18n( "High" ) );
    m_pLocalDetailLevel->insertItem( i18n( "Very High" ) );
 
-   tqlayout->addWidget( m_pGlobalDetail );
-   tqlayout->addWidget( m_pLocalDetailLevelLabel );
-   tqlayout->addWidget( m_pLocalDetailLevel );
-   tqlayout->addStretch( );
+   layout->addWidget( m_pGlobalDetail );
+   layout->addWidget( m_pLocalDetailLevelLabel );
+   layout->addWidget( m_pLocalDetailLevel );
+   layout->addStretch( );
 
    connect( m_pGlobalDetail, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotGlobalDetailClicked( ) ) );
    connect( m_pLocalDetailLevel, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index bd444718..33f3b813 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -519,7 +519,7 @@ void PMDialogEditBase::slotTexturePreview( )
       m_pRenderFrame->setFixedSize( s_previewSize + m_pRenderFrame->frameWidth( ) * 2,
                                     s_previewSize + m_pRenderFrame->frameWidth( ) * 2 );
       m_pRenderFrame->updateGeometry( );
-      m_pTexturePreviewWidget->tqlayout( )->activate( );
+      m_pTexturePreviewWidget->layout( )->activate( );
       emit sizeChanged( );
       m_pOutputWidget->slotClear( );
       m_pRenderWidget->render( scene, mode, m_pPart->url( ) );
diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h
index 77c37409..e2ae701a 100644
--- a/kpovmodeler/pmdialogeditbase.h
+++ b/kpovmodeler/pmdialogeditbase.h
@@ -42,7 +42,7 @@ class PMPovrayOutputWidget;
 /**
  * Base class for all widgets for editing object attributes.
  *
- * Ensures a consistent tqlayout for all widgets. Widgets should not
+ * Ensures a consistent layout for all widgets. Widgets should not
  * created within the constructor, but with the functions @ref createTopWidgets
  * and @ref createBottomWidgets.
  * 
@@ -276,7 +276,7 @@ protected:
     * of the sub class.
     *
     * First call the function of the base class, then create and append
-    * the widgets to the top tqlayout.
+    * the widgets to the top layout.
     */
    virtual void createTopWidgets( ) { };
 
@@ -284,7 +284,7 @@ protected:
     * Create widgets here, that should be placed under the widgets
     * of the sub class.
     *
-    * First create and append the widgets to the top tqlayout, then
+    * First create and append the widgets to the top layout, then
     * call the function of the base class
     */
    virtual void createBottomWidgets( );
@@ -296,7 +296,7 @@ protected:
    virtual void saveContents( );
 
    /**
-    * Returns a pointer to the top tqlayout
+    * Returns a pointer to the top layout
     */
    TQBoxLayout* topLayout( ) const { return m_pTopLayout; }
 
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index be91b48e..fce0e170 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -314,10 +314,10 @@ void PMDialogView::slotDataChanged( )
 
 void PMDialogView::slotSizeChanged( )
 {
-   // force recalculating of the tqlayout
+   // force recalculating of the layout
    if( m_pDisplayedWidget )
-      if( m_pDisplayedWidget->tqlayout( ) )
-         m_pDisplayedWidget->tqlayout( )->activate( );
+      if( m_pDisplayedWidget->layout( ) )
+         m_pDisplayedWidget->layout( )->activate( );
    m_pHelper->calculateSize( );
 }
 
diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp
index e960f869..0197a806 100644
--- a/kpovmodeler/pmdiscedit.cpp
+++ b/kpovmodeler/pmdiscedit.cpp
@@ -37,7 +37,7 @@ void PMDiscEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pCenter = new PMVectorEdit( "x", "y", "z", this );
@@ -53,18 +53,18 @@ void PMDiscEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "Normal:" ), this ), 1, 0 );
    gl->addWidget( m_pNormal, 1, 1 );
    
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Hole radius:" ), this ), 1, 0 );
    gl->addWidget( m_pHRadius, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( nb );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( nb );
+   layout->addStretch( 1 );
 
    connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 438d76e5..7d5ecf2d 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+  style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -350,8 +350,8 @@ PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, co
 PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
 :PMDockWidgetAbstractHeader( parent, name )
 {
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   drag = new PMDockWidgetHeaderDrag( this, parent );
 
@@ -386,12 +386,12 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
   toDesktopButton->setFixedSize(buttonWidth,buttonHeight);
   connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( toDesktopButton );
-  tqlayout->addWidget( stayButton );
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( toDesktopButton );
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
   drag->setFixedHeight( tqlayout->minimumSize().height() );
 }
 
@@ -415,7 +415,7 @@ void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
     closeButton->show();
     toDesktopButton->show();
   }
-  tqlayout->activate();
+  layout->activate();
   updateGeometry();
 }
 
@@ -423,19 +423,19 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd )
 {
   if ( !nd ) return;
 
-  delete tqlayout;
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  delete layout;
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   delete drag;
   drag = nd;
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( toDesktopButton );
-  tqlayout->addWidget( stayButton );
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( toDesktopButton );
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
   drag->setFixedHeight( tqlayout->minimumSize().height() );
 }
 
@@ -481,8 +481,8 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
 
   d->_parent = parent;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   manager = dockManager;
   manager->childDock->append( TQT_TQOBJECT(this) );
@@ -538,15 +538,15 @@ void PMDockWidget::setHeader( PMDockWidgetAbstractHeader* h )
 
   if ( header ){
     delete header;
-    delete tqlayout;
+    delete layout;
     header = h;
-    tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
-    tqlayout->addWidget( header );
+    layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
+    layout->addWidget( header );
      setWidget( widget );
   } else {
     header = h;
-    tqlayout->addWidget( header );
+    layout->addWidget( header );
   }
 }
 
@@ -777,7 +777,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   // MODIFICATION (Zehender):
   // If DockPosition is DockLeft or DockRight, add the widget
   // left or right of the target, so that a new vertical splitter
-  // (a splitter with horizontal widget tqlayout :-) is created
+  // (a splitter with horizontal widget layout :-) is created
   // that spawns the full height of the main view
 
   if( ( dockPos == PMDockWidget::DockLeft ) ||
@@ -1086,13 +1086,13 @@ void PMDockWidget::setWidget( TQWidget* mw )
   }
 
   widget = mw;
-  delete tqlayout;
+  delete layout;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
-  tqlayout->addWidget( header );
-  tqlayout->addWidget( widget,1 );
+  layout->addWidget( header );
+  layout->addWidget( widget,1 );
 }
 
 void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
@@ -1316,10 +1316,10 @@ void PMDockManager::activate()
 bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
 {
 /* This doesn't seem to fullfill any sense, other than breaking
-   TQMainWindow's tqlayout all over the place
+   TQMainWindow's layout all over the place
    The first child of the mainwindow is not necessarily a meaningful
    content widget but in TQt3's TQMainWindow it can easily be a TQToolBar.
-   In short: TQMainWindow knows how to tqlayout its children, no need to
+   In short: TQMainWindow knows how to layout its children, no need to
    mess that up.
 
    >>>>>I need this in the PMDockArea at the moment (JoWenn)
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 26b2bb2c..4bd3bb50 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -305,9 +305,9 @@ protected slots:
 protected:
 
   /**
-   * A tqlayout manager for placing the embedded buttons (close and stay)
+   * A layout manager for placing the embedded buttons (close and stay)
    */
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
 
   /**
    * a little button for closing (undocking and hiding) the dockwidget
@@ -773,9 +773,9 @@ private:
   TQWidget* widget;
 
   /**
-   * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header
+   * the layout manager that takes care about proper resizing and moving the embedded widget and the header
    */
-  TQVBoxLayout* tqlayout;
+  TQVBoxLayout* layout;
 
   /**
    * the responsible dockmanager
@@ -872,7 +872,7 @@ public:
    * (TQObject::name) in the childDock variable of
    * PMDockManager. This list in turn contains all
    * PMDockWidgets (according to the PMDockWidget constructor).
-   * So in principle, in order to restore a window tqlayout,
+   * So in principle, in order to restore a window layout,
    * one must first construct all widgets, put each of them in a
    * PMDockWidget and then call readConfig(). And for all that
    * to work, each widget must have a unique name.
@@ -884,11 +884,11 @@ public:
 #endif
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readConfig(TQDomElement &base);
 
@@ -1274,11 +1274,11 @@ public:
   PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeDockConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readDockConfig(TQDomElement &base);
 
diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp
index e3513a5d..38766f94 100644
--- a/kpovmodeler/pmfinishedit.cpp
+++ b/kpovmodeler/pmfinishedit.cpp
@@ -42,80 +42,80 @@ void PMFinishEdit::createTopWidgets( )
    Base::createTopWidgets( );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* tqlayout = new TQGridLayout( hl, 2, 2 );
+   TQGridLayout* layout = new TQGridLayout( hl, 2, 2 );
    m_pEnableAmbientEdit = new TQCheckBox( i18n( "Ambient color" ), this );
    m_pAmbientColorLabel = new TQLabel( i18n( "Color:" ), this );
    m_pAmbientColorEdit = new PMColorEdit( true, this );
-   tqlayout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 );
-   tqlayout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop );
-   tqlayout->addWidget( m_pAmbientColorEdit, 1, 1 );
+   layout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 );
+   layout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop );
+   layout->addWidget( m_pAmbientColorEdit, 1, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 4, 2 );
+   layout = new TQGridLayout( hl, 4, 2 );
    m_pEnableDiffuseEdit = new TQCheckBox( i18n( "Diffuse:" ), this );
    m_pDiffuseEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableDiffuseEdit, 0, 0 );
-   tqlayout->addWidget( m_pDiffuseEdit, 0, 1 );
+   layout->addWidget( m_pEnableDiffuseEdit, 0, 0 );
+   layout->addWidget( m_pDiffuseEdit, 0, 1 );
    m_pEnableBrillianceEdit = new TQCheckBox( i18n( "Brilliance:" ), this );
    m_pBrillianceEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableBrillianceEdit, 1, 0 );
-   tqlayout->addWidget( m_pBrillianceEdit, 1, 1 );
+   layout->addWidget( m_pEnableBrillianceEdit, 1, 0 );
+   layout->addWidget( m_pBrillianceEdit, 1, 1 );
    m_pEnableCrandEdit = new TQCheckBox( i18n( "Crand:" ), this );
    m_pCrandEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableCrandEdit, 2, 0 );
-   tqlayout->addWidget( m_pCrandEdit, 2, 1 );
+   layout->addWidget( m_pEnableCrandEdit, 2, 0 );
+   layout->addWidget( m_pCrandEdit, 2, 1 );
    m_pConserveEnergyEdit = new TQCheckBox(
       i18n( "Conserve energy for reflection" ), this );
-   tqlayout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 );
+   layout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 2, 2 );
+   layout = new TQGridLayout( hl, 2, 2 );
    m_pEnablePhongEdit = new TQCheckBox( i18n( "Phong:" ), this );
    m_pPhongEdit = new PMFloatEdit( this );
    m_pEnablePhongSizeEdit = new TQCheckBox( i18n( "Phong size:" ), this );
    m_pPhongSizeEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnablePhongEdit, 0, 0 );
-   tqlayout->addWidget( m_pPhongEdit, 0, 1 );
-   tqlayout->addWidget( m_pEnablePhongSizeEdit, 1, 0 );
-   tqlayout->addWidget( m_pPhongSizeEdit, 1, 1 );
+   layout->addWidget( m_pEnablePhongEdit, 0, 0 );
+   layout->addWidget( m_pPhongEdit, 0, 1 );
+   layout->addWidget( m_pEnablePhongSizeEdit, 1, 0 );
+   layout->addWidget( m_pPhongSizeEdit, 1, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 3, 2 );
+   layout = new TQGridLayout( hl, 3, 2 );
    m_pEnableSpecularEdit = new TQCheckBox( i18n( "Specular:" ), this );
    m_pSpecularEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableSpecularEdit, 0, 0 );
-   tqlayout->addWidget( m_pSpecularEdit, 0, 1 );
+   layout->addWidget( m_pEnableSpecularEdit, 0, 0 );
+   layout->addWidget( m_pSpecularEdit, 0, 1 );
    m_pEnableRoughnessEdit = new TQCheckBox( i18n( "Roughness:" ), this );
    m_pRoughnessEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableRoughnessEdit, 1, 0 );
-   tqlayout->addWidget( m_pRoughnessEdit, 1, 1 );
+   layout->addWidget( m_pEnableRoughnessEdit, 1, 0 );
+   layout->addWidget( m_pRoughnessEdit, 1, 1 );
    m_pEnableMetallicEdit = new TQCheckBox( i18n( "Metallic:" ), this );
    m_pMetallicEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableMetallicEdit, 2, 0 );
-   tqlayout->addWidget( m_pMetallicEdit, 2, 1 );
+   layout->addWidget( m_pEnableMetallicEdit, 2, 0 );
+   layout->addWidget( m_pMetallicEdit, 2, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 6, 2 );
+   layout = new TQGridLayout( hl, 6, 2 );
    m_pIridEdit = new TQCheckBox( i18n( "Iridiscence" ), this );
-   tqlayout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 );
+   layout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 );
    m_pIridAmountLabel = new TQLabel( i18n( "Amount:" ), this );
    m_pIridAmountEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pIridAmountLabel, 1, 0 );
-   tqlayout->addWidget( m_pIridAmountEdit, 1, 1 );
+   layout->addWidget( m_pIridAmountLabel, 1, 0 );
+   layout->addWidget( m_pIridAmountEdit, 1, 1 );
    m_pIridThicknessLabel = new TQLabel( i18n( "Thickness:" ), this );
    m_pIridThicknessEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pIridThicknessLabel, 2, 0 );
-   tqlayout->addWidget( m_pIridThicknessEdit, 2, 1 );
+   layout->addWidget( m_pIridThicknessLabel, 2, 0 );
+   layout->addWidget( m_pIridThicknessEdit, 2, 1 );
    m_pIridTurbulenceEdit = new PMFloatEdit( this );
    m_pIridTurbulenceLabel = new TQLabel( i18n( "Turbulence:" ), this );
-   tqlayout->addWidget( m_pIridTurbulenceLabel, 3, 0 );
-   tqlayout->addWidget( m_pIridTurbulenceEdit, 3, 1 );
+   layout->addWidget( m_pIridTurbulenceLabel, 3, 0 );
+   layout->addWidget( m_pIridTurbulenceEdit, 3, 1 );
    m_pEnableReflectionEdit = new TQCheckBox( i18n( "Reflection" ), this );
-   tqlayout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 );
+   layout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 );
    hl->addStretch( 1 );
 
    m_pReflectionWidget = new TQWidget( this );
@@ -151,7 +151,7 @@ void PMFinishEdit::createTopWidgets( )
    gl->addWidget( m_pEnableRefMetallicEdit, 3, 0 );
    gl->addWidget( m_pReflectionMetallicEdit, 3, 1 );
    vl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 );
+   layout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 );
 
 
    connect( m_pAmbientColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp
index 027152e6..7c8eddad 100644
--- a/kpovmodeler/pmglobalsettingsedit.cpp
+++ b/kpovmodeler/pmglobalsettingsedit.cpp
@@ -74,26 +74,26 @@ void PMGlobalSettingsEdit::createTopWidgets( )
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* tqlayout = new TQGridLayout( hl, 4, 2 );
+   TQGridLayout* layout = new TQGridLayout( hl, 4, 2 );
    lbl = new TQLabel( i18n( "Maximum intersections:" ), this );
    m_pMaxIntersectionsEdit = new PMIntEdit( this );
-   tqlayout->addWidget( lbl, 0, 0 );
-   tqlayout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
+   layout->addWidget( lbl, 0, 0 );
+   layout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
    lbl = new TQLabel( i18n( "Maximum trace level:" ), this );
    m_pMaxTraceLevelEdit = new PMIntEdit( this );
-   tqlayout->addWidget( lbl, 1, 0 );
-   tqlayout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
+   layout->addWidget( lbl, 1, 0 );
+   layout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
    lbl = new TQLabel( i18n( "Number of waves:" ), this );
    m_pNumberWavesEdit = new PMIntEdit( this );
-   tqlayout->addWidget( lbl, 2, 0 );
-   tqlayout->addWidget( m_pNumberWavesEdit, 2, 1 );
+   layout->addWidget( lbl, 2, 0 );
+   layout->addWidget( m_pNumberWavesEdit, 2, 1 );
    lbl = new TQLabel( i18n( "Noise generator:" ), this );
    m_pNoiseGeneratorEdit = new TQComboBox( false, this );
    m_pNoiseGeneratorEdit->insertItem( i18n( "Original" ) );
    m_pNoiseGeneratorEdit->insertItem( i18n( "Range Corrected" ) );
    m_pNoiseGeneratorEdit->insertItem( i18n( "Perlin" ) );
-   tqlayout->addWidget( lbl, 3, 0 );
-   tqlayout->addWidget( m_pNoiseGeneratorEdit, 3, 1 );
+   layout->addWidget( lbl, 3, 0 );
+   layout->addWidget( m_pNoiseGeneratorEdit, 3, 1 );
    hl->addStretch( 1 );
 
    m_pRadiosityEdit = new TQCheckBox( i18n( "Radiosity (Povray 3.1)" ), this );
@@ -101,43 +101,43 @@ void PMGlobalSettingsEdit::createTopWidgets( )
 
    m_pRadiosityWidget = new TQWidget( this );
    hl = new TQHBoxLayout( m_pRadiosityWidget, 0, KDialog::spacingHint( ) );
-   tqlayout = new TQGridLayout( hl, 7, 2 );
+   layout = new TQGridLayout( hl, 7, 2 );
    lbl = new TQLabel( i18n( "Brightness:" ), m_pRadiosityWidget );
    m_pBrightnessEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 0, 0 );
-   tqlayout->addWidget( m_pBrightnessEdit, 0, 1 );
+   layout->addWidget( lbl, 0, 0 );
+   layout->addWidget( m_pBrightnessEdit, 0, 1 );
    lbl = new TQLabel( i18n( "Count:" ), m_pRadiosityWidget );
    m_pCountEdit = new PMIntEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 1, 0 );
-   tqlayout->addWidget( m_pCountEdit, 1, 1 );
+   layout->addWidget( lbl, 1, 0 );
+   layout->addWidget( m_pCountEdit, 1, 1 );
    lbl = new TQLabel( i18n( "Maximum distance:" ), m_pRadiosityWidget );
    m_pDistanceMaximumEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 2, 0 );
-   tqlayout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
+   layout->addWidget( lbl, 2, 0 );
+   layout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
    lbl = new TQLabel( i18n( "Error boundary:" ), m_pRadiosityWidget );
    m_pErrorBoundEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 3, 0 );
-   tqlayout->addWidget( m_pErrorBoundEdit, 3, 1 );
+   layout->addWidget( lbl, 3, 0 );
+   layout->addWidget( m_pErrorBoundEdit, 3, 1 );
    lbl = new TQLabel( i18n( "Gray threshold:" ), m_pRadiosityWidget );
    m_pGrayThresholdEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 4, 0 );
-   tqlayout->addWidget( m_pGrayThresholdEdit, 4, 1 );
+   layout->addWidget( lbl, 4, 0 );
+   layout->addWidget( m_pGrayThresholdEdit, 4, 1 );
    lbl = new TQLabel( i18n( "Low error factor:" ), m_pRadiosityWidget );
    m_pLowErrorFactorEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 5, 0 );
-   tqlayout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
+   layout->addWidget( lbl, 5, 0 );
+   layout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
    lbl = new TQLabel( i18n( "Minimum reuse:" ), m_pRadiosityWidget );
    m_pMinimumReuseEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 6, 0 );
-   tqlayout->addWidget( m_pMinimumReuseEdit, 6, 1 );
+   layout->addWidget( lbl, 6, 0 );
+   layout->addWidget( m_pMinimumReuseEdit, 6, 1 );
    lbl = new TQLabel( i18n( "Nearest count:" ), m_pRadiosityWidget );
    m_pNearestCountEdit = new PMIntEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 7, 0 );
-   tqlayout->addWidget( m_pNearestCountEdit, 7, 1 );
+   layout->addWidget( lbl, 7, 0 );
+   layout->addWidget( m_pNearestCountEdit, 7, 1 );
    lbl = new TQLabel( i18n( "Recursion limit:" ), m_pRadiosityWidget );
    m_pRecursionLimitEdit = new PMIntEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 8, 0 );
-   tqlayout->addWidget( m_pRecursionLimitEdit, 8, 1 );
+   layout->addWidget( lbl, 8, 0 );
+   layout->addWidget( m_pRecursionLimitEdit, 8, 1 );
    hl->addStretch( 1 );
 
    topLayout( )->addWidget( m_pRadiosityWidget );
diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h
index 30ee5d16..a330afba 100644
--- a/kpovmodeler/pmglview.h
+++ b/kpovmodeler/pmglview.h
@@ -568,7 +568,7 @@ public:
 };
 
 /**
- * Configuration widget for the view tqlayout settings dialog
+ * Configuration widget for the view layout settings dialog
  */
 class PMGLViewOptionsWidget : public PMViewOptionsWidget
 {
diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp
index 644b2ab3..04bdbdd3 100644
--- a/kpovmodeler/pmgridsettings.cpp
+++ b/kpovmodeler/pmgridsettings.cpp
@@ -31,38 +31,38 @@
 PMGridSettings::PMGridSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
    gb = new TQGroupBox( i18n( "Displayed Grid" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) );
    m_pGridColor = new KColorButton( gb );
-   htqlayout->addWidget( m_pGridColor );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pGridColor );
+   hlayout->addStretch( 1 );
 
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) );
    m_pGridDistance = new PMIntEdit( gb );
    m_pGridDistance->setValidation( true, 20, false, 0 );
-   htqlayout->addWidget( m_pGridDistance );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pGridDistance );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Control Point Grid" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
-   htqlayout = new TQHBoxLayout( gvl );
-   grid = new TQGridLayout( htqlayout, 3, 2 );
+   hlayout = new TQHBoxLayout( gvl );
+   grid = new TQGridLayout( hlayout, 3, 2 );
    grid->addWidget( new TQLabel( i18n( "2D/3D movement:" ), gb ), 0, 0 );
    m_pMoveGrid = new PMFloatEdit( gb );
    m_pMoveGrid->setValidation( true, 0.001, true, 100 );
@@ -78,9 +78,9 @@ PMGridSettings::PMGridSettings( TQWidget* parent, const char* name )
    m_pRotateGrid->setValidation( true, 0.001, true, 180 );
    grid->addWidget( m_pRotateGrid, 2, 1 );
 
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMGridSettings::displaySettings( )
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 7f52442e..206d39a7 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -247,8 +247,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
    TQPixmap removeButtonPixmap = SmallIcon( "pmremovepoint" );
 
    // First let's deal with the filter entries...
-   if( m_pFiltersWidget->tqlayout( ) )
-      delete m_pFiltersWidget->tqlayout( );
+   if( m_pFiltersWidget->layout( ) )
+      delete m_pFiltersWidget->layout( );
 
    m_filterEntries.setAutoDelete( true );
    m_filterAddButtons.setAutoDelete( true );
@@ -313,8 +313,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
    m_transmitRemoveButtons.setAutoDelete( false );
 
    // recreate the entry edits
-   if( m_pTransmitsWidget->tqlayout( ) )
-      delete m_pTransmitsWidget->tqlayout( );
+   if( m_pTransmitsWidget->layout( ) )
+      delete m_pTransmitsWidget->layout( );
 
    gl = new TQGridLayout( m_pTransmitsWidget, ntransmits + 1, 3, 0, KDialog::spacingHint( ) );
 
diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp
index d9b427e7..4b8b2381 100644
--- a/kpovmodeler/pminterioredit.cpp
+++ b/kpovmodeler/pminterioredit.cpp
@@ -38,33 +38,33 @@ void PMInteriorEdit::createTopWidgets( )
    Base::createTopWidgets( );
 
    TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* tqlayout = new TQGridLayout( hl ,17 ,6);
+   TQGridLayout* layout = new TQGridLayout( hl ,17 ,6);
    m_pEnableIorEdit = new TQCheckBox( i18n( "Refraction:" ), this );
    m_pIorEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableIorEdit, 0, 0 );
-   tqlayout->addWidget( m_pIorEdit, 0, 1 );
+   layout->addWidget( m_pEnableIorEdit, 0, 0 );
+   layout->addWidget( m_pIorEdit, 0, 1 );
    m_pEnableCausticsEdit = new TQCheckBox( i18n( "Caustics:" ), this );
    m_pCausticsEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableCausticsEdit, 1, 0 );
-   tqlayout->addWidget( m_pCausticsEdit, 1, 1 );
+   layout->addWidget( m_pEnableCausticsEdit, 1, 0 );
+   layout->addWidget( m_pCausticsEdit, 1, 1 );
    m_pEnableDispersionEdit = new TQCheckBox( i18n( "Dispersion:" ), this );
    m_pDispersionEdit = new PMFloatEdit( this );
    m_pDispersionEdit->setValidation( true, 0, false, 0 );
-   tqlayout->addWidget( m_pEnableDispersionEdit, 2, 0 );
-   tqlayout->addWidget( m_pDispersionEdit, 2, 1 );
+   layout->addWidget( m_pEnableDispersionEdit, 2, 0 );
+   layout->addWidget( m_pDispersionEdit, 2, 1 );
    m_pEnableDispSamplesEdit = new TQCheckBox( i18n( "Dispersion samples:" ), this );
    m_pDispSamplesEdit = new PMIntEdit( this );
    m_pDispSamplesEdit->setValidation( true, 2, false, 0 );
-   tqlayout->addWidget( m_pEnableDispSamplesEdit, 3, 0 );
-   tqlayout->addWidget( m_pDispSamplesEdit, 3, 1 );
+   layout->addWidget( m_pEnableDispSamplesEdit, 3, 0 );
+   layout->addWidget( m_pDispSamplesEdit, 3, 1 );
    m_pEnableFadeDistanceEdit = new TQCheckBox( i18n( "Fade distance:" ), this );
    m_pFadeDistanceEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 );
-   tqlayout->addWidget( m_pFadeDistanceEdit, 4, 1 );
+   layout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 );
+   layout->addWidget( m_pFadeDistanceEdit, 4, 1 );
    m_pEnableFadePowerEdit = new TQCheckBox( i18n( "Fade power:" ), this );
    m_pFadePowerEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableFadePowerEdit, 5, 0 );
-   tqlayout->addWidget( m_pFadePowerEdit, 5, 1 );
+   layout->addWidget( m_pEnableFadePowerEdit, 5, 0 );
+   layout->addWidget( m_pFadePowerEdit, 5, 1 );
    hl->addStretch( 1 );
 
    connect( m_pIorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index df3c13d3..c379e0b3 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -34,8 +34,8 @@
 PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
@@ -43,16 +43,16 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
    TQHBoxLayout* ghe;
    TQVBoxLayout* gvle;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
-   htqlayout = new TQHBoxLayout( vtqlayout );
-   htqlayout->addWidget( new TQLabel( i18n( "Default view tqlayout:" ), this ) );
+   hlayout = new TQHBoxLayout( vlayout );
+   hlayout->addWidget( new TQLabel( i18n( "Default view layout:" ), this ) );
    m_pDefaultLayout = new TQComboBox( this );
-   htqlayout->addWidget( m_pDefaultLayout, 1 );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pDefaultLayout, 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Available View Layouts" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    
@@ -180,7 +180,7 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
    
    ghl->addStretch( 1 );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMLayoutSettings::displaySettings( )
@@ -220,7 +220,7 @@ bool PMLayoutSettings::validateData( )
          if( ( *eit ).dockPosition( ) != PMDockWidget::DockRight )
          {
             emit showMe( );
-            KMessageBox::error( this, i18n( "The docking position of the first view tqlayout entry has to be 'New Column'." ),
+            KMessageBox::error( this, i18n( "The docking position of the first view layout entry has to be 'New Column'." ),
                                 i18n( "Error" ) );
             return false;
          }
@@ -720,8 +720,8 @@ void PMLayoutSettings::slotMoveDownViewEntryClicked( )
 void PMLayoutSettings::displayCustomOptions( )
 {
    // delete an old widget
-   if( m_pCustomOptionsHolder->tqlayout( ) )
-      delete m_pCustomOptionsHolder->tqlayout( );
+   if( m_pCustomOptionsHolder->layout( ) )
+      delete m_pCustomOptionsHolder->layout( );
    if( m_pCustomOptionsWidget )
    {
       delete m_pCustomOptionsWidget;
diff --git a/kpovmodeler/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h
index 856b423d..250758f7 100644
--- a/kpovmodeler/pmlayoutsettings.h
+++ b/kpovmodeler/pmlayoutsettings.h
@@ -35,7 +35,7 @@ class TQPushButton;
 class TQLabel;
 
 /**
- * View tqlayout configuration dialog page
+ * View layout configuration dialog page
  */
 class PMLayoutSettings : public PMSettingsDialogPage
 {
@@ -57,19 +57,19 @@ public:
    
 protected slots:
    /**
-    * Called when the browse add tqlayout button is clicked
+    * Called when the browse add layout button is clicked
     */
    void slotAddLayout( );
    /**
-    * Called when the remove tqlayout button is clicked
+    * Called when the remove layout button is clicked
     */
    void slotRemoveLayout( );
    /**
-    * Called when the selected tqlayout changes
+    * Called when the selected layout changes
     */
    void slotLayoutSelected( int i );
    /**
-    * Called when the tqlayout name changes
+    * Called when the layout name changes
     */
    void slotLayoutNameChanged( const TQString& text );
    /**
diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp
index 73a75c6d..c1e21024 100644
--- a/kpovmodeler/pmlightgroupedit.cpp
+++ b/kpovmodeler/pmlightgroupedit.cpp
@@ -34,12 +34,12 @@ void PMLightGroupEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    m_pGlobalLights = new TQCheckBox( i18n( "Global lights" ), this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pGlobalLights );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pGlobalLights );
+   layout->addStretch( 1 );
 
    connect( m_pGlobalLights, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
 }
diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp
index 87f6203c..8ebca5c6 100644
--- a/kpovmodeler/pmlinkedit.cpp
+++ b/kpovmodeler/pmlinkedit.cpp
@@ -64,12 +64,12 @@ void PMLinkEdit::init( )
    m_pIDEdit->setReadOnly( true );
    grid->addWidget( m_pIDEdit, 0, 1 );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( );
-   grid->addLayout( tqlayout, 1, 1 );
+   TQHBoxLayout* layout = new TQHBoxLayout( );
+   grid->addLayout( layout, 1, 1 );
    m_pSelectButton = new TQPushButton( i18n( "Select..." ), this );
-   tqlayout->addWidget( m_pSelectButton );
+   layout->addWidget( m_pSelectButton );
    m_pClearButton = new KPushButton( KStdGuiItem::clear(), this );
-   tqlayout->addWidget( m_pClearButton );
+   layout->addWidget( m_pClearButton );
 
    connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelectClicked( ) ) );
    connect( m_pClearButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClearClicked( ) ) );
diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp
index 1c8c6f34..dec87cb7 100644
--- a/kpovmodeler/pmlistpatternedit.cpp
+++ b/kpovmodeler/pmlistpatternedit.cpp
@@ -41,39 +41,39 @@ void PMListPatternEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( topLayout( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( topLayout( ) );
 
    /* Field for Pattern List type */
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( vtqlayout );
+   TQHBoxLayout* layout = new TQHBoxLayout( vlayout );
    TQLabel* label = new TQLabel( i18n( "Type:" ), this );
    m_pTypeCombo = new TQComboBox( false, this );
    m_pTypeCombo->insertItem( i18n( "Checkers" ) );
    m_pTypeCombo->insertItem( i18n( "Brick" ) );
    m_pTypeCombo->insertItem( i18n( "Hexagon" ) );
-   tqlayout->addWidget( label, 0, AlignTop );
-   tqlayout->addWidget( m_pTypeCombo );
-   tqlayout->addStretch( 1 );
+   layout->addWidget( label, 0, AlignTop );
+   layout->addWidget( m_pTypeCombo );
+   layout->addStretch( 1 );
 
    /* The depth field */
-   tqlayout = new TQHBoxLayout( vtqlayout );
+   layout = new TQHBoxLayout( vlayout );
    m_pDepthLabel = new TQLabel( i18n( "Depth:" ), this );
    m_pDepth = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pDepthLabel );
-   tqlayout->addWidget( m_pDepth );
-   tqlayout->addStretch( 1 );
+   layout->addWidget( m_pDepthLabel );
+   layout->addWidget( m_pDepth );
+   layout->addStretch( 1 );
 
    /* The brick information */
-   TQHBoxLayout* bricklayout = new TQHBoxLayout( vtqlayout );
+   TQHBoxLayout* bricklayout = new TQHBoxLayout( vlayout );
    m_pBrickSizeLabel = new TQLabel( i18n( "Brick size:" ), this );
    m_pBrickSize = new PMVectorEdit( "x", "y", "z", this );
    bricklayout->addWidget( m_pBrickSizeLabel );
    bricklayout->addWidget( m_pBrickSize );
-   tqlayout = new TQHBoxLayout( vtqlayout );
+   layout = new TQHBoxLayout( vlayout );
    m_pMortarLabel = new TQLabel( i18n( "Mortar:" ), this );
    m_pMortar = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pMortarLabel );
-   tqlayout->addWidget( m_pMortar );
-   tqlayout->addStretch( 1 );
+   layout->addWidget( m_pMortarLabel );
+   layout->addWidget( m_pMortar );
+   layout->addStretch( 1 );
 
    /* connect all signals to slots/signals */
    connect( m_pBrickSize, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp
index 61bea7a1..6ddf9679 100644
--- a/kpovmodeler/pmmeshedit.cpp
+++ b/kpovmodeler/pmmeshedit.cpp
@@ -35,17 +35,17 @@ void PMMeshEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    m_pHierarchy = new TQCheckBox( i18n( "Hierarchy" ), this );
    m_pEnableInsideVector = new TQCheckBox( i18n( "Inside vector:" ), this );
    m_pInsideVector = new PMVectorEdit( "x", "y", "z", this );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pHierarchy );
-   tqlayout->addStretch( 1 );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pEnableInsideVector );
-   tqlayout->addWidget( m_pInsideVector );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pHierarchy );
+   layout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pEnableInsideVector );
+   layout->addWidget( m_pInsideVector );
+   layout->addStretch( 1 );
 
    connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pEnableInsideVector, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInsideVectorClicked( ) ) );
diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp
index f9179f74..8f590982 100644
--- a/kpovmodeler/pmnamedobjectedit.cpp
+++ b/kpovmodeler/pmnamedobjectedit.cpp
@@ -34,12 +34,12 @@ void PMNamedObjectEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pNameEdit = new TQLineEdit( this );
    TQLabel* label = new TQLabel( i18n( "Name:" ), this );
 
-   tqlayout->addWidget( label );
-   tqlayout->addWidget( m_pNameEdit );
+   layout->addWidget( label );
+   layout->addWidget( m_pNameEdit );
 
    connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
             TQT_SLOT( slotNameChanged( const TQString& ) ) );
diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp
index 93f9f419..47a38435 100644
--- a/kpovmodeler/pmobjectlibrarysettings.cpp
+++ b/kpovmodeler/pmobjectlibrarysettings.cpp
@@ -36,16 +36,16 @@
 PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    TQGroupBox* gb = new TQGroupBox( i18n( "Libraries" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
-   TQHBoxLayout* htqlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) );
+   TQHBoxLayout* hlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) );
    m_pObjectLibraries = new TQListBox( gb );
    connect( m_pObjectLibraries, TQT_SIGNAL( selectionChanged( ) ), TQT_SLOT( slotObjectLibraryChanged( ) ) );
-   htqlayout->addWidget( m_pObjectLibraries );
-   TQVBoxLayout* gvl = new TQVBoxLayout( htqlayout );
+   hlayout->addWidget( m_pObjectLibraries );
+   TQVBoxLayout* gvl = new TQVBoxLayout( hlayout );
    m_pCreateObjectLibrary = new TQPushButton( i18n( "Create..." ), gb );
    connect( m_pCreateObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCreateObjectLibrary( ) ) );
    gvl->addWidget( m_pCreateObjectLibrary );
@@ -77,9 +77,9 @@ PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char*
    grid->addWidget( m_pLibraryDescription, 2, 1 );
    grid->addMultiCellWidget( m_pReadOnlyText, 3, 3, 0, 1 );
    grid->setColStretch( 1, 1 );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMObjectLibrarySettings::displaySettings( )
diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp
index e9cd33b4..411b0a49 100644
--- a/kpovmodeler/pmobjectsettings.cpp
+++ b/kpovmodeler/pmobjectsettings.cpp
@@ -47,188 +47,188 @@
 PMObjectSettings::PMObjectSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    gb = new TQGroupBox( i18n( "Subdivisions" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    grid = new TQGridLayout( gvl, 13, 3 );
 
    grid->addWidget( new TQLabel( i18n( "Sphere:" ), gb ), 0, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 0, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 0, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 0, 1 );
    m_pSphereUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereUSteps );
+   hlayout->addWidget( m_pSphereUSteps );
    m_pSphereUSteps->setValidation( true, 2, true, 32 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pSphereVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereVSteps );
+   hlayout->addWidget( m_pSphereVSteps );
    m_pSphereVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Cylinder:" ), gb ), 1, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 1, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 1, 2 );
    m_pCylinderSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pCylinderSteps );
+   hlayout->addWidget( m_pCylinderSteps );
    m_pCylinderSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Cone:" ), gb ), 2, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 2, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 2, 2 );
    m_pConeSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pConeSteps );
+   hlayout->addWidget( m_pConeSteps );
    m_pConeSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Torus:" ), gb ), 3, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 3, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 3, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 3, 1 );
    m_pTorusUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pTorusUSteps );
+   hlayout->addWidget( m_pTorusUSteps );
    m_pTorusUSteps->setValidation( true, 2, true, 16 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pTorusVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pTorusVSteps );
+   hlayout->addWidget( m_pTorusVSteps );
    m_pTorusVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Disc:" ), gb ), 4, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 4, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 4, 2 );
    m_pDiscSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pDiscSteps );
+   hlayout->addWidget( m_pDiscSteps );
    m_pDiscSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Blob sphere:" ), gb ), 5, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 5, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 5, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 5, 1 );
    m_pBlobSphereUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobSphereUSteps );
+   hlayout->addWidget( m_pBlobSphereUSteps );
    m_pBlobSphereUSteps->setValidation( true, 2, true, 32 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pBlobSphereVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobSphereVSteps );
+   hlayout->addWidget( m_pBlobSphereVSteps );
    m_pBlobSphereVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Blob cylinder:" ), gb ), 6, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 6, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 6, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 6, 1 );
    m_pBlobCylinderUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobCylinderUSteps );
+   hlayout->addWidget( m_pBlobCylinderUSteps );
    m_pBlobCylinderUSteps->setValidation( true, 2, true, 32 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pBlobCylinderVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobCylinderVSteps );
+   hlayout->addWidget( m_pBlobCylinderVSteps );
    m_pBlobCylinderVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Lathe:" ), gb ), 7, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 7, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 7, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 7, 1 );
    m_pLatheUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pLatheUSteps );
+   hlayout->addWidget( m_pLatheUSteps );
    m_pLatheUSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pLatheRSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pLatheRSteps );
+   hlayout->addWidget( m_pLatheRSteps );
    m_pLatheRSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Surface of revolution:" ), gb ), 8, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 8, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 8, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 8, 1 );
    m_pSorUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSorUSteps );
+   hlayout->addWidget( m_pSorUSteps );
    m_pSorUSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pSorRSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSorRSteps );
+   hlayout->addWidget( m_pSorRSteps );
    m_pSorRSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Prism:" ), gb ), 9, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 9, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 9, 2 );
    m_pPrismSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pPrismSteps );
+   hlayout->addWidget( m_pPrismSteps );
    m_pPrismSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Superquadric ellipsoid:" ), gb ), 10, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 10, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 10, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 10, 1 );
    m_pSqeUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSqeUSteps );
+   hlayout->addWidget( m_pSqeUSteps );
    m_pSqeUSteps->setValidation( true, 2, true, 8 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pSqeVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSqeVSteps );
+   hlayout->addWidget( m_pSqeVSteps );
    m_pSqeVSteps->setValidation( true, 2, true, 8 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Sphere sweep:" ), gb ), 11, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 11, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 11, 2 );
    grid->addWidget( new TQLabel( "r", gb ), 11, 1 );
    m_pSphereSweepRSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereSweepRSteps );
+   hlayout->addWidget( m_pSphereSweepRSteps );
    m_pSphereSweepRSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addWidget( new TQLabel( "s", gb ) );
+   hlayout->addWidget( new TQLabel( "s", gb ) );
    m_pSphereSweepSSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereSweepSSteps );
+   hlayout->addWidget( m_pSphereSweepSSteps );
    m_pSphereSweepSSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Heightfield:" ), gb ), 12, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 12, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 12, 2 );
    m_pHeightFieldVariance = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pHeightFieldVariance );
+   hlayout->addWidget( m_pHeightFieldVariance );
    m_pHeightFieldVariance->setValidation( true, 1, true, 16 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Sizes" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
    grid = new TQGridLayout( gvl, 1, 2 );
 
    grid->addWidget( new TQLabel( i18n( "Plane:" ), gb ), 0, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 0, 1 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 0, 1 );
    m_pPlaneSize = new PMFloatEdit( gb );
-   htqlayout->addWidget( m_pPlaneSize );
+   hlayout->addWidget( m_pPlaneSize );
    m_pPlaneSize->setValidation( true, 0.1, false, 0.0 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Camera Views" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
    m_pHighDetailCameraViews = new TQCheckBox( i18n( "High detail for enhanced projections" ), gb );
    gvl->addWidget( m_pHighDetailCameraViews );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMObjectSettings::displaySettings( )
diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp
index 07376933..9c125c32 100644
--- a/kpovmodeler/pmopenglsettings.cpp
+++ b/kpovmodeler/pmopenglsettings.cpp
@@ -28,12 +28,12 @@
 PMOpenGLSettings::PMOpenGLSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    m_pDirect = new TQCheckBox( i18n( "Direct rendering" ), this );
-   vtqlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) );
-   vtqlayout->addWidget( m_pDirect );
-   vtqlayout->addStretch( 1 );
+   vlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) );
+   vlayout->addWidget( m_pDirect );
+   vlayout->addStretch( 1 );
 }
 
 void PMOpenGLSettings::displaySettings( )
diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp
index 25e1ac64..ca029887 100644
--- a/kpovmodeler/pmpalettevalueedit.cpp
+++ b/kpovmodeler/pmpalettevalueedit.cpp
@@ -39,21 +39,21 @@ PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name )
       : TQWidget( parent, name )
 {
    TQLabel* lbl;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pIndexEdit = new PMIntEdit( this );
    m_pValueEdit = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
    lbl = new TQLabel( i18n( "Index" ), this );
-   tqlayout->addWidget( lbl );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
-   tqlayout->addWidget( m_pIndexEdit );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( lbl );
+   layout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_pIndexEdit );
+   layout->addSpacing( KDialog::spacingHint( ) );
    lbl = new TQLabel( i18n( "Value" ), this );
-   tqlayout->addWidget( lbl );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
-   tqlayout->addWidget( m_pValueEdit );
+   layout->addWidget( lbl );
+   layout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_pValueEdit );
 
    connect( m_pIndexEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pValueEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index e8d1a984..b791a9aa 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -145,7 +145,7 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
 
    restoreConfig( instance( )->config( ) );
 
-   connect( tqApp->tqclipboard( ), TQT_SIGNAL( dataChanged( ) ),
+   connect( tqApp->clipboard( ), TQT_SIGNAL( dataChanged( ) ),
             TQT_SLOT( slotClipboardDataChanged( ) ) );
    slotClipboardDataChanged( );
    connect( &m_commandManager, TQT_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ),
@@ -730,7 +730,7 @@ void PMPart::initView( TQWidget* parent, const char* name )
    if( !m_pShell )
    {
       // a part inside konqueror
-      // simple tqlayout
+      // simple layout
       m_pView = new PMView( this, parent, name );
       m_pView->show( );
       setWidget( m_pView );
@@ -1450,7 +1450,7 @@ void PMPart::slotEditCut( )
 
    if( sortedList.count( ) > 0 )
    {
-      TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) );
+      TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) );
       removeSelection( i18n( "Cut" ) );
    }
 
@@ -1472,7 +1472,7 @@ void PMPart::slotEditCopy( )
    const PMObjectList& sortedList = selectedObjects( );
 
    if( sortedList.count( ) > 0 )
-      TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) );
+      TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) );
 
    emit setStatusBarText( "" );
 }
@@ -1549,7 +1549,7 @@ void PMPart::slotEditPaste( )
 {
    emit setStatusBarText( i18n( "Inserting clipboard contents..." ) );
 
-   pasteOrDrop( i18n( "Paste" ), tqApp->tqclipboard( )->data( ),
+   pasteOrDrop( i18n( "Paste" ), tqApp->clipboard( )->data( ),
                 m_pActiveObject );
 
    emit setStatusBarText( "" );
@@ -2508,7 +2508,7 @@ void PMPart::slotClipboardDataChanged( )
 {
    if( isReadWrite( ) )
    {
-      m_canDecode = PMObjectDrag::canDecode( tqApp->tqclipboard( )->data( ), this );
+      m_canDecode = PMObjectDrag::canDecode( tqApp->clipboard( )->data( ), this );
       m_pPasteAction->setEnabled( m_canDecode && m_pActiveObject );
    }
    else
diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp
index c8d815a8..eb65727f 100644
--- a/kpovmodeler/pmpatternedit.cpp
+++ b/kpovmodeler/pmpatternedit.cpp
@@ -48,12 +48,12 @@ void PMPatternEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQGridLayout* tqlayout;
+   TQGridLayout* layout;
    TQHBoxLayout* hl;
    TQVBoxLayout* vl;
    TQGridLayout* gl;
 
-   tqlayout = new TQGridLayout( topLayout( ), 12, 2 );
+   layout = new TQGridLayout( topLayout( ), 12, 2 );
    hl = new TQHBoxLayout( KDialog::spacingHint( ) );
    hl->addWidget( new TQLabel( i18n( "Type:" ), this ) );
    m_pTypeCombo = new TQComboBox( false, this );
@@ -88,12 +88,12 @@ void PMPatternEdit::createTopWidgets( )
    m_pTypeCombo->insertItem( i18n( "Wrinkles" ) );
    hl->addWidget( m_pTypeCombo );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellLayout( hl, 0, 0, 0, 1 );
+   layout->addMultiCellLayout( hl, 0, 0, 0, 1 );
 
    m_pAgateTurbulenceLabel = new TQLabel( i18n( "Turbulence:" ), this );
-   tqlayout->addWidget( m_pAgateTurbulenceLabel, 1, 0 );
+   layout->addWidget( m_pAgateTurbulenceLabel, 1, 0 );
    m_pAgateTurbulenceEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pAgateTurbulenceEdit, 1, 1, AlignLeft );
+   layout->addWidget( m_pAgateTurbulenceEdit, 1, 1, AlignLeft );
 
    m_pCrackleWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pCrackleWidget, 0, KDialog::spacingHint( ) );
@@ -114,7 +114,7 @@ void PMPatternEdit::createTopWidgets( )
    m_pCrackleSolid = new TQCheckBox( i18n( "Solid:" ), m_pCrackleWidget );
    gl->addMultiCellWidget( m_pCrackleSolid, 2, 2, 0, 1 );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pCrackleWidget, 2, 2, 0, 1 );
+   layout->addMultiCellWidget( m_pCrackleWidget, 2, 2, 0, 1 );
 
    m_pDensityWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pDensityWidget, 0, KDialog::spacingHint( ) );
@@ -132,17 +132,17 @@ void PMPatternEdit::createTopWidgets( )
    m_pDensityInterpolate->insertItem( i18n( "Trilinear" ) );
    hl->addWidget( m_pDensityInterpolate );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pDensityWidget, 3, 3, 0, 1 );
+   layout->addMultiCellWidget( m_pDensityWidget, 3, 3, 0, 1 );
 
    m_pGradientLabel = new TQLabel( i18n( "Gradient:" ), this );
-   tqlayout->addWidget( m_pGradientLabel, 4, 0 );
+   layout->addWidget( m_pGradientLabel, 4, 0 );
    m_pGradientEdit = new PMVectorEdit( "x", "y", "z", this );
-   tqlayout->addWidget( m_pGradientEdit, 4, 1 );
+   layout->addWidget( m_pGradientEdit, 4, 1 );
 
    m_pJuliaComplexLabel = new TQLabel( i18n( "Complex number:" ), this );
-   tqlayout->addWidget( m_pJuliaComplexLabel, 5, 0 );
+   layout->addWidget( m_pJuliaComplexLabel, 5, 0 );
    m_pJuliaComplex = new PMVectorEdit( "Real", "Imaginary", this );
-   tqlayout->addWidget( m_pJuliaComplex, 5, 1 );
+   layout->addWidget( m_pJuliaComplex, 5, 1 );
 
    m_pFractalWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pFractalWidget, 0, KDialog::spacingHint( ) );
@@ -195,7 +195,7 @@ void PMPatternEdit::createTopWidgets( )
    m_pFractalIntFactor = new PMFloatEdit( m_pFractalWidget );
    gl->addWidget( m_pFractalIntFactor, 1, 3 );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pFractalWidget, 6, 6, 0, 1 );
+   layout->addMultiCellWidget( m_pFractalWidget, 6, 6, 0, 1 );
 
    m_pQuiltControlsLabel = new TQLabel( i18n( "Quilt controls:" ), this );
    m_pQuiltControl0Edit = new PMFloatEdit( this );
@@ -204,8 +204,8 @@ void PMPatternEdit::createTopWidgets( )
    hl->addWidget( m_pQuiltControl0Edit );
    hl->addWidget( m_pQuiltControl1Edit );
    hl->addStretch( 1 );
-   tqlayout->addWidget( m_pQuiltControlsLabel, 7, 0 );
-   tqlayout->addLayout( hl, 7, 1 );
+   layout->addWidget( m_pQuiltControlsLabel, 7, 0 );
+   layout->addLayout( hl, 7, 1 );
 
    m_pSlopeWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pSlopeWidget, 0, KDialog::spacingHint( ) );
@@ -240,17 +240,17 @@ void PMPatternEdit::createTopWidgets( )
    m_pSlopeHiAlt = new PMFloatEdit( m_pSlopeWidget );
    gl->addWidget( m_pSlopeHiAlt, 1, 1 );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pSlopeWidget, 8, 8, 0, 1 );
+   layout->addMultiCellWidget( m_pSlopeWidget, 8, 8, 0, 1 );
 
    m_pSpiralNumberLabel = new TQLabel( i18n( "Spiral number:" ), this );
    m_pSpiralNumberEdit = new PMIntEdit( this );
-   tqlayout->addWidget( m_pSpiralNumberLabel, 9, 0 );
-   tqlayout->addWidget( m_pSpiralNumberEdit, 9, 1, AlignLeft );
+   layout->addWidget( m_pSpiralNumberLabel, 9, 0 );
+   layout->addWidget( m_pSpiralNumberEdit, 9, 1, AlignLeft );
 
    m_pDepthLabel = new TQLabel( i18n( "Depth:" ), this );
    m_pDepthEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pDepthLabel, 10, 0 );
-   tqlayout->addWidget( m_pDepthEdit, 10, 1, AlignLeft );
+   layout->addWidget( m_pDepthLabel, 10, 0 );
+   layout->addWidget( m_pDepthEdit, 10, 1, AlignLeft );
 
    m_pNoiseGeneratorLabel = new TQLabel( i18n( "Noise generator:" ), this );
    m_pNoiseGenerator = new TQComboBox( false, this );
@@ -258,8 +258,8 @@ void PMPatternEdit::createTopWidgets( )
    m_pNoiseGenerator->insertItem( i18n( "Original" ) );
    m_pNoiseGenerator->insertItem( i18n( "Range Corrected" ) );
    m_pNoiseGenerator->insertItem( i18n( "Perlin" ) );
-   tqlayout->addWidget( m_pNoiseGeneratorLabel, 11, 0 );
-   tqlayout->addWidget( m_pNoiseGenerator, 11, 1 );
+   layout->addWidget( m_pNoiseGeneratorLabel, 11, 0 );
+   layout->addWidget( m_pNoiseGenerator, 11, 1 );
 
    m_pEnableTurbulenceEdit = new TQCheckBox( i18n( "Turbulence" ), this );
    topLayout( )->addWidget( m_pEnableTurbulenceEdit );
diff --git a/kpovmodeler/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp
index 5f90b008..13e28aab 100644
--- a/kpovmodeler/pmplaneedit.cpp
+++ b/kpovmodeler/pmplaneedit.cpp
@@ -38,24 +38,24 @@ void PMPlaneEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pNormal = new PMVectorEdit( "x", "y", "z", this );
    m_pDistance = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Normal:" ), this ) );
-   tqlayout->addWidget( m_pNormal );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Normal:" ), this ) );
+   layout->addWidget( m_pNormal );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ) );
-   tqlayout->addWidget( m_pDistance );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Distance:" ), this ) );
+   layout->addWidget( m_pDistance );
+   layout->addStretch( 1 );
 
    TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( nb );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( nb );
+   layout->addStretch( 1 );
 
    connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp
index c89d1e7e..901bac94 100644
--- a/kpovmodeler/pmpluginsettings.cpp
+++ b/kpovmodeler/pmpluginsettings.cpp
@@ -54,10 +54,10 @@ public:
 PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    TQGroupBox* gb = new TQGroupBox( i18n( "Installed Plugins" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
    TQVBoxLayout* gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
@@ -77,7 +77,7 @@ PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name )
    hl->addWidget( m_pToggle );
    hl->addStretch( 1 );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMPluginSettings::displaySettings( )
diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp
index ec3176d0..e0e3bebc 100644
--- a/kpovmodeler/pmpolynomedit.cpp
+++ b/kpovmodeler/pmpolynomedit.cpp
@@ -96,8 +96,8 @@ void PMPolynomEdit::displayCoefficients( const PMVector& co, int cOrder,
    {
       if( m_currentOrder > 0 )
       {
-         if( m_pPolyWidget->tqlayout( ) )
-            delete m_pPolyWidget->tqlayout( );
+         if( m_pPolyWidget->layout( ) )
+            delete m_pPolyWidget->layout( );
          
          m_labels.setAutoDelete( true );
          m_labels.clear( );
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index eac93134..3ceaa83b 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -40,60 +40,60 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
 {
    m_selectionIndex = 0;
 
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    gb = new TQGroupBox( i18n( "Povray Command" ), this );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Command:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Command:" ), gb ) );
    m_pPovrayCommand = new TQLineEdit( gb );
-   htqlayout->addWidget( m_pPovrayCommand );
+   hlayout->addWidget( m_pPovrayCommand );
    m_pBrowsePovrayCommand = new TQPushButton( gb );
    m_pBrowsePovrayCommand->setPixmap( SmallIcon( "fileopen" ) );
    connect( m_pBrowsePovrayCommand, TQT_SIGNAL( clicked( ) ),
             TQT_SLOT( slotBrowsePovrayCommand( ) ) );
-   htqlayout->addWidget( m_pBrowsePovrayCommand );
-   vtqlayout->addWidget( gb );
+   hlayout->addWidget( m_pBrowsePovrayCommand );
+   vlayout->addWidget( gb );
 
    gb = new TQGroupBox( i18n( "Povray User Documentation" ), this );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Path:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Path:" ), gb ) );
    m_pDocumentationPath = new TQLineEdit( gb );
-   htqlayout->addWidget( m_pDocumentationPath );
+   hlayout->addWidget( m_pDocumentationPath );
    m_pBrowseDocumentationPath = new TQPushButton( gb );
    m_pBrowseDocumentationPath->setPixmap( SmallIcon( "fileopen" ) );
    connect( m_pBrowseDocumentationPath, TQT_SIGNAL( clicked( ) ),
             TQT_SLOT( slotBrowsePovrayDocumentation( ) ) );
-   htqlayout->addWidget( m_pBrowseDocumentationPath );
-   vtqlayout->addWidget( gb );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Version:" ), gb ) );
+   hlayout->addWidget( m_pBrowseDocumentationPath );
+   vlayout->addWidget( gb );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Version:" ), gb ) );
    m_pDocumentationVersion = new TQComboBox( false, gb );
    TQValueList<TQString> versions = PMDocumentationMap::theMap( )->availableVersions( );
    TQValueListIterator<TQString> it;
    for( it = versions.begin( ); it != versions.end( ); ++it )
       m_pDocumentationVersion->insertItem( *it );
-   htqlayout->addWidget( m_pDocumentationVersion );
-   htqlayout->addStretch( );
+   hlayout->addWidget( m_pDocumentationVersion );
+   hlayout->addStretch( );
 
    gb = new TQGroupBox( i18n( "Library Paths" ), this );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
-   htqlayout = new TQHBoxLayout( gvl );
+   hlayout = new TQHBoxLayout( gvl );
    m_pLibraryPaths = new TQListBox( gb );
    connect( m_pLibraryPaths, TQT_SIGNAL( highlighted( int ) ),
             TQT_SLOT( slotPathSelected( int ) ) );
-   htqlayout->addWidget( m_pLibraryPaths );
+   hlayout->addWidget( m_pLibraryPaths );
 
-   TQVBoxLayout* bl = new TQVBoxLayout( htqlayout );
+   TQVBoxLayout* bl = new TQVBoxLayout( hlayout );
    m_pAddLibraryPath = new TQPushButton( i18n( "Add..." ), gb );
    connect( m_pAddLibraryPath, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPath( ) ) );
    bl->addWidget( m_pAddLibraryPath );
@@ -113,9 +113,9 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
             TQT_SLOT( slotPathDown( ) ) );
    bl->addWidget( m_pLibraryPathDown );
    bl->addStretch( 1 );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMPovraySettings::displaySettings( )
diff --git a/kpovmodeler/pmpreviewsettings.cpp b/kpovmodeler/pmpreviewsettings.cpp
index a08ff1fe..700c19ee 100644
--- a/kpovmodeler/pmpreviewsettings.cpp
+++ b/kpovmodeler/pmpreviewsettings.cpp
@@ -32,16 +32,16 @@
 PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
    
-   htqlayout = new TQHBoxLayout( vtqlayout );
-   grid = new TQGridLayout( htqlayout, 2, 2 );
+   hlayout = new TQHBoxLayout( vlayout );
+   grid = new TQGridLayout( hlayout, 2, 2 );
    grid->addWidget( new TQLabel( i18n( "Size:" ), this ), 0, 0 );
    m_pPreviewSize = new PMIntEdit( this );
    m_pPreviewSize->setValidation( true, 10, true, 400 );
@@ -50,10 +50,10 @@ PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name )
    grid->addWidget( new TQLabel( i18n( "Gamma:" ), this ), 1, 0 );
    m_pPreviewGamma = new PMFloatEdit( this );
    grid->addWidget( m_pPreviewGamma, 1, 1 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Rendered Objects" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewSphere = new TQCheckBox( i18n( "Sphere" ), gb );
@@ -64,52 +64,52 @@ PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name )
    gvl->addWidget( m_pPreviewBox );
 
    gb = new TQGroupBox( i18n( "Wall" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewWall = new TQCheckBox( i18n( "Enable wall" ), gb );
    gvl->addWidget( m_pPreviewWall );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
    m_pWallColor1 = new KColorButton( gb );
-   htqlayout->addWidget( m_pWallColor1 );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
+   hlayout->addWidget( m_pWallColor1 );
+   hlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
    m_pWallColor2 = new KColorButton( gb );
-   htqlayout->addWidget( m_pWallColor2 );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pWallColor2 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Floor" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewFloor = new TQCheckBox( i18n( "Enable floor" ), gb );
    gvl->addWidget( m_pPreviewFloor );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
    m_pFloorColor1 = new KColorButton( gb );
-   htqlayout->addWidget( m_pFloorColor1 );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
+   hlayout->addWidget( m_pFloorColor1 );
+   hlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
    m_pFloorColor2 = new KColorButton( gb );
-   htqlayout->addWidget( m_pFloorColor2 );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pFloorColor2 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Antialiasing" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewAA = new TQCheckBox( i18n( "Enable antialiasing" ), gb );
    gvl->addWidget( m_pPreviewAA );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Depth:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Depth:" ), gb ) );
    m_pPreviewAALevel = new PMIntEdit( gb );
    m_pPreviewAALevel->setValidation( true, 1, true, 9 );
-   htqlayout->addWidget( m_pPreviewAALevel );
-   htqlayout->addWidget( new TQLabel( i18n( "Threshold:" ), gb ) );
+   hlayout->addWidget( m_pPreviewAALevel );
+   hlayout->addWidget( new TQLabel( i18n( "Threshold:" ), gb ) );
    m_pPreviewAAThreshold = new PMFloatEdit( gb );
-   htqlayout->addWidget( m_pPreviewAAThreshold );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pPreviewAAThreshold );
+   hlayout->addStretch( 1 );
    
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMPreviewSettings::displaySettings( )
diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp
index 09039d7e..e5cf8615 100644
--- a/kpovmodeler/pmprismedit.cpp
+++ b/kpovmodeler/pmprismedit.cpp
@@ -332,8 +332,8 @@ void PMPrismEdit::deleteEdits( )
    m_points.clear( );
    m_points.setAutoDelete( false );
    
-   if( m_pEditWidget->tqlayout( ) )
-      delete m_pEditWidget->tqlayout( );
+   if( m_pEditWidget->layout( ) )
+      delete m_pEditWidget->layout( );
 }
 
 TQValueList< TQValueList<PMVector> > PMPrismEdit::splinePoints( )
diff --git a/kpovmodeler/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp
index 9e0a2d29..cb86c0c0 100644
--- a/kpovmodeler/pmquickcoloredit.cpp
+++ b/kpovmodeler/pmquickcoloredit.cpp
@@ -36,10 +36,10 @@ void PMQuickColorEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pColorEdit = new PMColorEdit( false, this );
-   tqlayout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop );
-   tqlayout->addWidget( m_pColorEdit );
+   layout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop );
+   layout->addWidget( m_pColorEdit );
 
    connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
 }
diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp
index f8c73a80..fa200ba6 100644
--- a/kpovmodeler/pmsettingsdialog.cpp
+++ b/kpovmodeler/pmsettingsdialog.cpp
@@ -111,7 +111,7 @@ PMSettingsDialog::PMSettingsDialog( PMPart* part, TQWidget* parent, const char*
    sl.clear( );
    sl.append( i18n( "View Layout" ) );
    w = addVBoxPage( sl, i18n( "Display Settings for View Layouts" ),
-                    SmallIcon( "pmconfigureviewtqlayout", 22 ) );
+                    SmallIcon( "pmconfigureviewlayout", 22 ) );
    p = new PMLayoutSettings( w );
    registerPage( w, p );
 
diff --git a/kpovmodeler/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp
index 62ce6c9e..3eb326c4 100644
--- a/kpovmodeler/pmsolidcoloredit.cpp
+++ b/kpovmodeler/pmsolidcoloredit.cpp
@@ -35,12 +35,12 @@ void PMSolidColorEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pColorEdit = new PMColorEdit( true, this );
    TQLabel* label = new TQLabel( i18n( "Color:" ), this );
 
-   tqlayout->addWidget( label, 0, AlignTop );
-   tqlayout->addWidget( m_pColorEdit );
+   layout->addWidget( label, 0, AlignTop );
+   layout->addWidget( m_pColorEdit );
 
    connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
 }
diff --git a/kpovmodeler/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp
index 99bac3ea..c12f95bd 100644
--- a/kpovmodeler/pmsphereedit.cpp
+++ b/kpovmodeler/pmsphereedit.cpp
@@ -36,19 +36,19 @@ void PMSphereEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pCentre = new PMVectorEdit( "x", "y", "z", this );
    m_pRadius = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
-   tqlayout->addWidget( m_pCentre );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
+   layout->addWidget( m_pCentre );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
-   tqlayout->addWidget( m_pRadius );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
+   layout->addWidget( m_pRadius );
+   layout->addStretch( 1 );
 
    connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmtruetypecache.cpp b/kpovmodeler/pmtruetypecache.cpp
index 41e4296a..f685001a 100644
--- a/kpovmodeler/pmtruetypecache.cpp
+++ b/kpovmodeler/pmtruetypecache.cpp
@@ -217,7 +217,7 @@ FT_UInt PMTrueTypeFont::findGlyphIndex( TQChar c )
 
    if( m_face )
    {
-      // glyphIndex = FT_Get_Char_Index( m_face, c.tqunicode( ) );
+      // glyphIndex = FT_Get_Char_Index( m_face, c.unicode( ) );
       // if( !glyphIndex )
       char ch = c.latin1( );
       if( !ch )
diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp
index 79075dc3..7b9b6568 100644
--- a/kpovmodeler/pmvectoredit.cpp
+++ b/kpovmodeler/pmvectoredit.cpp
@@ -32,7 +32,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
       : TQWidget( parent, name )
 {
    unsigned int i;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQLabel* label;
 
    m_edits.resize( 2 );
@@ -43,24 +43,24 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
                TQT_SLOT( slotTextChanged( const TQString& ) ) );
    }
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
 
    if( !descriptionX.isEmpty( ) )
    {
       label = new TQLabel( descriptionX, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[0] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[0] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionY.isEmpty( ) )
    {
       label = new TQLabel( descriptionY, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[1] );
+   layout->addWidget( m_edits[1] );
 }
 
 PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
@@ -70,7 +70,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
       : TQWidget( parent, name )
 {
    unsigned int i;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQLabel* label;
 
    m_edits.resize( 3 );
@@ -81,33 +81,33 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
                TQT_SLOT( slotTextChanged( const TQString& ) ) );
    }
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
 
    if( !descriptionX.isEmpty( ) )
    {
       label = new TQLabel( descriptionX, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[0] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[0] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionY.isEmpty( ) )
    {
       label = new TQLabel( descriptionY, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[1] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[1] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionZ.isEmpty( ) )
    {
       label = new TQLabel( descriptionZ, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[2] );
+   layout->addWidget( m_edits[2] );
 }
 
 PMVectorEdit::PMVectorEdit( const TQString& descriptionA,
@@ -118,7 +118,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA,
       : TQWidget( parent, name )
 {
    unsigned int i;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQLabel* label;
 
    m_edits.resize( 4 );
@@ -129,42 +129,42 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA,
                TQT_SLOT( slotTextChanged( const TQString& ) ) );
    }
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
 
    if( !descriptionA.isEmpty( ) )
    {
       label = new TQLabel( descriptionA, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[0] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[0] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionB.isEmpty( ) )
    {
       label = new TQLabel( descriptionB, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[1] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[1] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionC.isEmpty( ) )
    {
       label = new TQLabel( descriptionC, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[2] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[2] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionD.isEmpty( ) )
    {
       label = new TQLabel( descriptionD, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[3] );
+   layout->addWidget( m_edits[3] );
 }
 
 void PMVectorEdit::setVector( const PMVector& v, int precision )
diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp
index 98fb2f61..2fcd7eb2 100644
--- a/kpovmodeler/pmview.cpp
+++ b/kpovmodeler/pmview.cpp
@@ -39,7 +39,7 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name )
 {
    setBackgroundMode( PaletteBase );
 
-   TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+   TQVBoxLayout* layout = new TQVBoxLayout( this );
    m_pMainSplitter = new TQSplitter( Qt::Horizontal, this, "MainSplitter" );
    m_pTreeEditSplitter = new TQSplitter( Qt::Vertical, m_pMainSplitter,
                                         "TreeEditSplitter" );
@@ -68,8 +68,8 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name )
    
    m_pMainSplitter->show( );
 
-   tqlayout->addWidget( m_pMainSplitter );
-   tqlayout->activate( );
+   layout->addWidget( m_pMainSplitter );
+   layout->activate( );
 
    m_pPart = part;
 }
diff --git a/kpovmodeler/pmviewbase.h b/kpovmodeler/pmviewbase.h
index 68febcf4..66426987 100644
--- a/kpovmodeler/pmviewbase.h
+++ b/kpovmodeler/pmviewbase.h
@@ -60,7 +60,7 @@ public:
 
 /**
  * Base class for configuration widgets for view types
- * for the tqlayout settings dialog page
+ * for the layout settings dialog page
  */
 class PMViewOptionsWidget : public TQWidget
 {
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index e6f9148c..fe3a031d 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -443,7 +443,7 @@ void PMViewLayout::normalize( )
 
 PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell )
 {
-   PMViewLayout tqlayout;
+   PMViewLayout layout;
 
    TQValueList< TQValueList< PMViewLayoutEntry > > cols;
    cols.append( TQValueList< PMViewLayoutEntry >( ) );
@@ -457,7 +457,7 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell )
 
    for( cit = cols.begin( ); cit != cols.end( ); ++cit )
       for( eit = ( *cit ).begin( ); eit != ( *cit ).end( ); ++eit )
-         tqlayout.addEntry( *eit );
+         layout.addEntry( *eit );
 
    // find floating widgets
    TQPtrList<PMDockWidget> list;
@@ -495,11 +495,11 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell )
             invalid = true;
 
          if( !invalid )
-            tqlayout.addEntry( e );
+            layout.addEntry( e );
       }
    }
 
-   return tqlayout;
+   return layout;
 }
 
 void PMViewLayout::recursiveExtractColumns(
@@ -666,7 +666,7 @@ void PMViewLayoutManager::loadData( )
    TQString fileName = locate( "data", "kpovmodeler/viewlayouts.xml" );
    if( fileName.isEmpty( ) )
    {
-      // Generate a default tqlayout
+      // Generate a default layout
       // I have a feeling this shouldn't be here but hey, it works for now
       // TODO Must find a way to move this cleanly to PMShell
       PMViewLayout a;
@@ -763,7 +763,7 @@ void PMViewLayoutManager::saveData( )
    {
       TQDomElement l;
 
-      l = doc.createElement( "viewtqlayout" );
+      l = doc.createElement( "viewlayout" );
       ( *it ).saveData( l, doc );
       e.appendChild( l );
    }
@@ -810,7 +810,7 @@ void PMViewLayoutManager::displayLayout( const TQString& name, PMShell* shell )
             flist.remove( );
          }
       }
-      // Create the new tqlayout
+      // Create the new layout
       v_layout->displayLayout( shell );
       m_layoutDisplayed = true;
    }
@@ -879,7 +879,7 @@ PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent,
    TQWidget* w = new TQWidget( this );
    TQVBoxLayout* vl = new TQVBoxLayout( w, 0, KDialog::spacingHint( ) );
 
-   TQLabel* l = new TQLabel( i18n( "Enter view tqlayout name:" ), w );
+   TQLabel* l = new TQLabel( i18n( "Enter view layout name:" ), w );
    vl->addWidget( l );
 
    m_pLayoutName = new TQLineEdit( w );
@@ -907,13 +907,13 @@ void PMSaveViewLayoutDialog::slotOk( )
    TQString name = m_pLayoutName->text( );
 
    PMViewLayoutManager* m = PMViewLayoutManager::theManager( );
-   PMViewLayout* tqlayout = m->findLayout( name );
+   PMViewLayout* layout = m->findLayout( name );
 
    PMViewLayout newLayout = PMViewLayout::extractViewLayout( m_pShell );
    newLayout.setName( name );
 
-   if( tqlayout )
-      *tqlayout = newLayout;
+   if( layout )
+      *layout = newLayout;
    else
       m->addLayout( newLayout );
 
diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h
index c84147fb..a1129406 100644
--- a/kpovmodeler/pmviewlayoutmanager.h
+++ b/kpovmodeler/pmviewlayoutmanager.h
@@ -108,8 +108,8 @@ private:
 /**
  * Class used internally by @ref PMViewLayoutManager
  *
- * This class maintains a named tqlayout. It basically stores all views
- * associated with that tqlayout.
+ * This class maintains a named layout. It basically stores all views
+ * associated with that layout.
  */
 class PMViewLayout
 {
@@ -143,12 +143,12 @@ public:
     */
    void displayLayout( PMShell* shell );
    /**
-    * Sets the name of the tqlayout
+    * Sets the name of the layout
     */
    void setName( const TQString& n );
    /**
     *
-    * Add a new entry to the tqlayout. By default it adds the entry at the end
+    * Add a new entry to the layout. By default it adds the entry at the end
     * of the list. If a position is given it adds the entry at the indicated
     * position
     */
@@ -179,7 +179,7 @@ public:
    void normalize( );
 
    /**
-    * Extracts the view tqlayout from the current window
+    * Extracts the view layout from the current window
     */
    static PMViewLayout extractViewLayout( PMShell* shell );
 private:
@@ -202,7 +202,7 @@ private:
  *
  * 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.
+ * layout. The layouts are stored in a XML file caled viewlayouts.xml.
  */
 class PMViewLayoutManager
 {
@@ -221,11 +221,11 @@ public:
     */
    TQStringList availableLayouts( );
    /**
-    * Sets the default tqlayout
+    * Sets the default layout
     */
    void setDefaultLayout( const TQString& name );
    /**
-    * Returns the default tqlayout
+    * Returns the default layout
     */
    TQString defaultLayout( ) const { return m_defaultLayout; }
    /**
@@ -233,7 +233,7 @@ public:
     */
    void displayLayout( const TQString& name, PMShell* shell );
    /**
-    * Displays the tqlayout indicated as default
+    * Displays the layout indicated as default
     */
    void displayDefaultLayout( PMShell* shell );
    /**
@@ -241,23 +241,23 @@ public:
     */
    void loadData( );
    /**
-    * Saves the current tqlayout collection to the configuration file
+    * Saves the current layout collection to the configuration file
     */
    void saveData( );
    /**
-    * Add a new empty tqlayout
+    * Add a new empty layout
     */
    void addLayout( const TQString& name );
    /**
-    * Add a new tqlayout
+    * Add a new layout
     */
    void addLayout( const PMViewLayout& l ) { m_layouts.append( l ); }
    /**
-    * Remove a tqlayout
+    * Remove a layout
     */
    void removeLayout( const TQString& name );
    /**
-    * Get a known tqlayout
+    * Get a known layout
     */
    PMViewLayout* findLayout( const TQString& name );
    /**