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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

1 files changed, 29 insertions, 29 deletions

diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp
index 6655fd73..027152e6 100644
--- a/kpovmodeler/pmglobalsettingsedit.cpp
+++ b/kpovmodeler/pmglobalsettingsedit.cpp
@@ -21,7 +21,7 @@
 #include "pmlineedits.h"
 #include "pmcoloredit.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -74,26 +74,26 @@ void PMGlobalSettingsEdit::createTopWidgets( )
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* layout = new TQGridLayout( hl, 4, 2 );
+   TQGridLayout* tqlayout = new TQGridLayout( hl, 4, 2 );
    lbl = new TQLabel( i18n( "Maximum intersections:" ), this );
    m_pMaxIntersectionsEdit = new PMIntEdit( this );
-   layout->addWidget( lbl, 0, 0 );
-   layout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
+   tqlayout->addWidget( lbl, 0, 0 );
+   tqlayout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
    lbl = new TQLabel( i18n( "Maximum trace level:" ), this );
    m_pMaxTraceLevelEdit = new PMIntEdit( this );
-   layout->addWidget( lbl, 1, 0 );
-   layout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
+   tqlayout->addWidget( lbl, 1, 0 );
+   tqlayout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
    lbl = new TQLabel( i18n( "Number of waves:" ), this );
    m_pNumberWavesEdit = new PMIntEdit( this );
-   layout->addWidget( lbl, 2, 0 );
-   layout->addWidget( m_pNumberWavesEdit, 2, 1 );
+   tqlayout->addWidget( lbl, 2, 0 );
+   tqlayout->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" ) );
-   layout->addWidget( lbl, 3, 0 );
-   layout->addWidget( m_pNoiseGeneratorEdit, 3, 1 );
+   tqlayout->addWidget( lbl, 3, 0 );
+   tqlayout->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( ) );
-   layout = new TQGridLayout( hl, 7, 2 );
+   tqlayout = new TQGridLayout( hl, 7, 2 );
    lbl = new TQLabel( i18n( "Brightness:" ), m_pRadiosityWidget );
    m_pBrightnessEdit = new PMFloatEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 0, 0 );
-   layout->addWidget( m_pBrightnessEdit, 0, 1 );
+   tqlayout->addWidget( lbl, 0, 0 );
+   tqlayout->addWidget( m_pBrightnessEdit, 0, 1 );
    lbl = new TQLabel( i18n( "Count:" ), m_pRadiosityWidget );
    m_pCountEdit = new PMIntEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 1, 0 );
-   layout->addWidget( m_pCountEdit, 1, 1 );
+   tqlayout->addWidget( lbl, 1, 0 );
+   tqlayout->addWidget( m_pCountEdit, 1, 1 );
    lbl = new TQLabel( i18n( "Maximum distance:" ), m_pRadiosityWidget );
    m_pDistanceMaximumEdit = new PMFloatEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 2, 0 );
-   layout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
+   tqlayout->addWidget( lbl, 2, 0 );
+   tqlayout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
    lbl = new TQLabel( i18n( "Error boundary:" ), m_pRadiosityWidget );
    m_pErrorBoundEdit = new PMFloatEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 3, 0 );
-   layout->addWidget( m_pErrorBoundEdit, 3, 1 );
+   tqlayout->addWidget( lbl, 3, 0 );
+   tqlayout->addWidget( m_pErrorBoundEdit, 3, 1 );
    lbl = new TQLabel( i18n( "Gray threshold:" ), m_pRadiosityWidget );
    m_pGrayThresholdEdit = new PMFloatEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 4, 0 );
-   layout->addWidget( m_pGrayThresholdEdit, 4, 1 );
+   tqlayout->addWidget( lbl, 4, 0 );
+   tqlayout->addWidget( m_pGrayThresholdEdit, 4, 1 );
    lbl = new TQLabel( i18n( "Low error factor:" ), m_pRadiosityWidget );
    m_pLowErrorFactorEdit = new PMFloatEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 5, 0 );
-   layout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
+   tqlayout->addWidget( lbl, 5, 0 );
+   tqlayout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
    lbl = new TQLabel( i18n( "Minimum reuse:" ), m_pRadiosityWidget );
    m_pMinimumReuseEdit = new PMFloatEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 6, 0 );
-   layout->addWidget( m_pMinimumReuseEdit, 6, 1 );
+   tqlayout->addWidget( lbl, 6, 0 );
+   tqlayout->addWidget( m_pMinimumReuseEdit, 6, 1 );
    lbl = new TQLabel( i18n( "Nearest count:" ), m_pRadiosityWidget );
    m_pNearestCountEdit = new PMIntEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 7, 0 );
-   layout->addWidget( m_pNearestCountEdit, 7, 1 );
+   tqlayout->addWidget( lbl, 7, 0 );
+   tqlayout->addWidget( m_pNearestCountEdit, 7, 1 );
    lbl = new TQLabel( i18n( "Recursion limit:" ), m_pRadiosityWidget );
    m_pRecursionLimitEdit = new PMIntEdit( m_pRadiosityWidget );
-   layout->addWidget( lbl, 8, 0 );
-   layout->addWidget( m_pRecursionLimitEdit, 8, 1 );
+   tqlayout->addWidget( lbl, 8, 0 );
+   tqlayout->addWidget( m_pRecursionLimitEdit, 8, 1 );
    hl->addStretch( 1 );
 
    topLayout( )->addWidget( m_pRadiosityWidget );