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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

1 files changed, 13 insertions, 13 deletions

diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index 590cbdda..df3c13d3 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -21,7 +21,7 @@
 #include "pmviewfactory.h"
 #include "pmdebug.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
@@ -34,8 +34,8 @@
 PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* hlayout;
-   TQVBoxLayout* vlayout;
+   TQHBoxLayout* htqlayout;
+   TQVBoxLayout* vtqlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
@@ -43,16 +43,16 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
    TQHBoxLayout* ghe;
    TQVBoxLayout* gvle;
 
-   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
-   hlayout = new TQHBoxLayout( vlayout );
-   hlayout->addWidget( new TQLabel( i18n( "Default view layout:" ), this ) );
+   htqlayout = new TQHBoxLayout( vtqlayout );
+   htqlayout->addWidget( new TQLabel( i18n( "Default view tqlayout:" ), this ) );
    m_pDefaultLayout = new TQComboBox( this );
-   hlayout->addWidget( m_pDefaultLayout, 1 );
-   hlayout->addStretch( 1 );
+   htqlayout->addWidget( m_pDefaultLayout, 1 );
+   htqlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Available View Layouts" ), this );
-   vlayout->addWidget( gb );
+   vtqlayout->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 );
 
-   vlayout->addStretch( 1 );
+   vtqlayout->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 layout entry has to be 'New Column'." ),
+            KMessageBox::error( this, i18n( "The docking position of the first view tqlayout 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->layout( ) )
-      delete m_pCustomOptionsHolder->layout( );
+   if( m_pCustomOptionsHolder->tqlayout( ) )
+      delete m_pCustomOptionsHolder->tqlayout( );
    if( m_pCustomOptionsWidget )
    {
       delete m_pCustomOptionsWidget;