1 files changed, 13 insertions, 13 deletions
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 4a370246a..8f61c5d8b 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -28,7 +28,7 @@
 #include "kspread_sheet.h"
 #include "kspread_view.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <knumvalidator.h>
 #include <kdebug.h>
@@ -38,7 +38,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 
 using namespace KSpread;
@@ -54,9 +54,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
 
   TQGroupBox* tmpTQButtonGroup;
   tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" );
-  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2);
+  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2);
 
   TQLabel *tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_1" );
   tmpTQLabel->setText(i18n("Allow:" ));
@@ -148,9 +148,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" );
-  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
+  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
 
   displayMessage = new TQCheckBox(i18n( "Show error message when invalid values are entered" ),tmpTQButtonGroup );
   displayMessage->setChecked( true );
@@ -188,10 +188,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" );
-  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
+  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
 
   displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup );
   displayMessage->setChecked( false );
@@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index)
         }
         break;
     }
-    if ( width() < sizeHint().width() )
-        resize( sizeHint() );
+    if ( width() < tqsizeHint().width() )
+        resize( tqsizeHint() );
 }
 
 void DlgValidity::changeIndexCond(int _index)