Rename a number of old tq methods that are no longer tq specific

1 files changed, 35 insertions, 35 deletions

diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp
index e3513a5d..6f0743e9 100644
--- a/kpovmodeler/pmfinishedit.cpp
+++ b/kpovmodeler/pmfinishedit.cpp
@@ -22,7 +22,7 @@
 #include "pmcoloredit.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
@@ -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( ) ) );