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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 14 insertions, 14 deletions

diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index 83f37b2f..531f2ee3 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -43,7 +43,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 using namespace KSpread;
 
@@ -54,10 +54,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" );
   groupBox1_3->setColumnLayout(0, Qt::Vertical );
-  groupBox1_3->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_3->layout()->setMargin( KDialog::marginHint() );
-  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() );
-  groupBox1_3Layout->setAlignment( TQt::AlignTop );
+  groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() );
+  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() );
+  groupBox1_3Layout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" );
   groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 );
@@ -89,11 +89,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" );
   groupBox1_2->setColumnLayout(0, Qt::Vertical );
-  groupBox1_2->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_2->layout()->setMargin( KDialog::marginHint() );
+  groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() );
-  groupBox1_2Layout->setAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() );
+  groupBox1_2Layout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" );
   groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 );
@@ -125,11 +125,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" );
   groupBox1_1->setColumnLayout(0, Qt::Vertical );
-  groupBox1_1->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_1->layout()->setMargin( KDialog::marginHint() );
+  groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() );
-  groupBox1_1Layout->setAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() );
+  groupBox1_1Layout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" );
   groupBox1_1Layout->addWidget( textLabel1_1, 0, 0 );
@@ -158,7 +158,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
   groupBox1_1Layout->addItem( spacer_6, 1, 3 );
 
   Form1Layout->addWidget( groupBox1_1, 0, 0 );
-  resize( TQSize(702, 380).expandedTo( minimumSizeHint() ) );
+  resize( TQSize(702, 380).expandedTo( tqminimumSizeHint() ) );
   clearWState( WState_Polished );
 
   TQStringList list;