Rename obsolete tq methods to standard names

18 files changed, 88 insertions, 88 deletions

diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index 0fe6fb41..095f1188 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -22,7 +22,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index d03b72d7..9e9d47de 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -54,9 +54,9 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" );
   groupBox1_3->setColumnLayout(0, Qt::Vertical );
-  groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() );
-  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() );
+  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 );
 
   TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" );
@@ -89,10 +89,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" );
   groupBox1_2->setColumnLayout(0, Qt::Vertical );
-  groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox1_2->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_2->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() );
+  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() );
   groupBox1_2Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" );
@@ -125,10 +125,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" );
   groupBox1_1->setColumnLayout(0, Qt::Vertical );
-  groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox1_1->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_1->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() );
+  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() );
   groupBox1_1Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" );
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index dcc53a77..09da5d58 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -89,9 +89,9 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
   m_delimiterBox->setTitle( i18n( "Delimiter" ) );
   m_delimiterBox->setColumnLayout(0, Qt::Vertical );
-  m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() );
-  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() );
+  m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() );
+  m_delimiterBox->layout()->setMargin( KDialog::marginHint() );
+  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() );
   m_delimiterBoxLayout->setAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 );
 
@@ -132,9 +132,9 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
   m_formatBox->setTitle( i18n( "Format" ) );
   m_formatBox->setColumnLayout(0, Qt::Vertical );
-  m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  m_formatBox->tqlayout()->setMargin( KDialog::marginHint() );
-  m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() );
+  m_formatBox->layout()->setSpacing( KDialog::spacingHint() );
+  m_formatBox->layout()->setMargin( KDialog::marginHint() );
+  m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() );
   m_formatBoxLayout->setAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 );
 
@@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   if ( m_mode == Clipboard )
   {
     setCaption( i18n( "Inserting From Clipboard" ) );
-    TQMimeSource * mime = TQApplication::tqclipboard()->data();
+    TQMimeSource * mime = TQApplication::clipboard()->data();
     if ( !mime )
     {
       KMessageBox::information( this, i18n("There is no data in the clipboard.") );
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index 0a222654..dceca6b1 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -30,17 +30,17 @@ using namespace KSpread;
 
 FindOption::FindOption( TQWidget *parent)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(parent);
+    TQVBoxLayout *layout = new TQVBoxLayout(parent);
     m_moreOptions = new TQPushButton( i18n( "More Options" ), parent );
-    tqlayout->addWidget(  m_moreOptions );
+    layout->addWidget(  m_moreOptions );
 
     connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) );
 
     m_findExtension = new TQWidget( parent );
-    tqlayout->addWidget( m_findExtension );
-    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension );
+    layout->addWidget( m_findExtension );
+    TQVBoxLayout *layout1 = new TQVBoxLayout( m_findExtension );
     m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension );
-    tqlayout1->addWidget( m_searchInAllSheet );
+    layout1->addWidget( m_searchInAllSheet );
 
     TQHBoxLayout *comboLayout = new TQHBoxLayout( m_findExtension );
     TQLabel *label = new TQLabel( i18n( "Search in:" ), m_findExtension );
@@ -48,7 +48,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchIn = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchIn );
-    tqlayout1->addLayout( comboLayout );
+    layout1->addLayout( comboLayout );
 
     TQStringList lst;
     lst << i18n( "Cell Values" );
@@ -61,7 +61,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchDirection = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchDirection );
-    tqlayout1->addLayout( comboLayout );
+    layout1->addLayout( comboLayout );
 
     lst.clear();
     lst << i18n( "Across then Down" );
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index 8cd3f89f..6e217f24 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -55,7 +55,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->tqlayout();
+  grp->layout();
   lay1->addWidget(grp);
   if( insRem==Insert)
   {
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index f7878266..ce97542d 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -151,15 +151,15 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
   : TQWidget( parent ),
     m_dlg( dlg )
 {
-  TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout");
+  TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout");
 
   TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->setTitle( i18n( "Style" ) );
-  groupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
+  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
   groupBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * label1 = new TQLabel( groupBox, "label1" );
@@ -198,8 +198,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
 
   TQSpacerItem * spacer = new TQSpacerItem( 20, 260, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
-  tqlayout->addWidget( groupBox, 0, 0 );
-  tqlayout->addItem( spacer, 1, 0 );
+  layout->addWidget( groupBox, 0, 0 );
+  layout->addItem( spacer, 1, 0 );
 
   if ( m_dlg->getStyle()->type() == Style::BUILTIN )
   {
@@ -886,7 +886,7 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y)
 
 void CellFormatDialog::init()
 {
-  TQColorGroup colorGroup = TQApplication::tqpalette().active();
+  TQColorGroup colorGroup = TQApplication::palette().active();
 
   // Did we initialize the bitmaps ?
   if ( formatOnlyNegSignedPixmap == 0L )
@@ -948,7 +948,7 @@ TQPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const TQC
 
   TQPainter painter;
   painter.begin( pixmap );
-  painter.fillRect( 0, 0, 150, 14, TQApplication::tqpalette().active().base() );
+  painter.fillRect( 0, 0, 150, 14, TQApplication::palette().active().base() );
   painter.setPen( _color1 );
   painter.drawText( 2, 11, TQString(_string1) );
   painter.setPen( _color2 );
@@ -1082,7 +1082,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
   : TQWidget ( parent ),
     dlg( _dlg )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6,10 );
 
     TQButtonGroup *grp = new TQButtonGroup( i18n("Format"),this);
     TQGridLayout *grid = new TQGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint());
@@ -1149,7 +1149,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
     listFormat=new TQListBox(grp);
     grid->addMultiCellWidget(listFormat,2,7,1,1);
     TQWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) );
-    tqlayout->addWidget(grp);
+    layout->addWidget(grp);
 
     /* *** */
 
@@ -1245,7 +1245,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
         format->setCurrentItem( 3 );
     else if ( dlg->floatFormat == Format::AlwaysSigned && dlg->floatColor == Format::NegRed )
         format->setCurrentItem( 4 );
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     cellFormatType=dlg->formatType;
     newFormatType = cellFormatType;
@@ -2678,7 +2678,7 @@ void CellFormatPageBorder::InitializeGrids()
     { {0,0}, {0,1},{0,2} };
   /***********************/
 
-  /* set up a tqlayout box for most of the border setting buttons */
+  /* set up a layout box for most of the border setting buttons */
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Border") );
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index 7150b017..b9e20054 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -48,11 +48,11 @@
 using namespace KSpread;
 
 PaperLayout::PaperLayout( TQWidget * parent, const char * name,
-                                        const KoPageLayout & tqlayout,
+                                        const KoPageLayout & layout,
                                         const KoHeadFoot & headfoot,
                                         int tabs, KoUnit::Unit unit,
                                         Sheet * sheet, View * view)
-  : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/),
+  : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/),
     m_pSheet( sheet ),
     m_pView( view )
 {
@@ -130,7 +130,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox )
     rangeGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( rangeGroup );
 
-    TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() );
+    TQGridLayout *grid = new TQGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() );
 
     TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup );
     grid->addWidget( pPrintRange, 0, 0 );
@@ -182,7 +182,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     zoomGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( zoomGroup );
 
-    TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6,
+    TQGridLayout *grid = new TQGridLayout( zoomGroup->layout(), 2, 6,
                                          KDialog::spacingHint() );
 
     m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup );
@@ -312,7 +312,7 @@ void PaperLayout::slotOk()
     {
       SheetPrint *print = sheet->print();
 
-      KoPageLayout pl = tqlayout();
+      KoPageLayout pl = layout();
       KoHeadFoot hf = headFoot();
       KoUnit::Unit unit = sheet->doc()->unit();
       print->setPrintGrid( pPrintGrid->isChecked() );
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h
index c9a9e6e5..0260c1c8 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.h
+++ b/kspread/dialogs/kspread_dlg_paperlayout.h
@@ -42,7 +42,7 @@ class PaperLayout: public KoPageLayoutDia
   TQ_OBJECT
 public:
   PaperLayout( TQWidget* parent, const char* name,
-                      const KoPageLayout& tqlayout,
+                      const KoPageLayout& layout,
                       const KoHeadFoot& headfoot,
                       int tabs, KoUnit::Unit unit,
                       Sheet * sheet, View *view);
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc
index 9b54644d..cc49afad 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -49,7 +49,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->tqlayout();
+  grp->layout();
   lay1->addWidget(grp);
   rb1 = new TQRadioButton( i18n("Move towards right"), grp );
   rb2 = new TQRadioButton( i18n("Move towards bottom"), grp );
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index c4777a7b..d17c27e1 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -790,10 +790,10 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name )
   m_pView = _view;
 
   TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" );
-  tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+  tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->tqlayout(),8,1);
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->layout(),8,1);
   grid1->addRowSpacing( 0, KDialog::marginHint()  );
   grid1->setRowStretch( 7, 10 );
 
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index 477cfd1c..c5ae14c7 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -75,7 +75,7 @@ reference::reference( View* parent, const char* name )
   m_pOk = bb->addButton( KStdGuiItem::ok() );
   m_pCancel = bb->addButton( KStdGuiItem::cancel() );
   m_pOk->setDefault( TRUE );
-  bb->tqlayout();
+  bb->layout();
   lay1->addWidget( bb );
 
   TQString text;
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 6a7b2abc..9a7c6e33 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -85,7 +85,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" );
   orientationGroup->setLineWidth(0);
   orientationGroup->setMargin(0);
-  orientationGroup->tqlayout()->setMargin(0);
+  orientationGroup->layout()->setMargin(0);
 
   m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" );
   m_sortColumn->setText( i18n( "Sort &Rows" ) );
@@ -108,9 +108,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort1Box->setTitle( i18n( "Sort By" ) );
   sort1Box->setFlat(true);
   sort1Box->setColumnLayout(0, Qt::Vertical );
-  sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort1Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() );
+  sort1Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort1Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() );
   sort1BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" );
@@ -127,9 +127,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort2Box->setTitle( i18n( "Then By" ) );
   sort2Box->setFlat(true);
   sort2Box->setColumnLayout(0, Qt::Vertical );
-  sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort2Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() );
+  sort2Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort2Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() );
   sort2BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" );
@@ -147,9 +147,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort3Box->setTitle( i18n( "Then By" ) );
   sort3Box->setFlat(true);
   sort3Box->setColumnLayout(0, Qt::Vertical );
-  sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort3Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() );
+  sort3Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort3Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() );
   sort3BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" );
@@ -176,9 +176,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" );
   firstKeyBox->setTitle( i18n( "First Key" ) );
   firstKeyBox->setColumnLayout(0, Qt::Vertical );
-  firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() );
-  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() );
+  firstKeyBox->layout()->setSpacing( KDialog::spacingHint() );
+  firstKeyBox->layout()->setMargin( KDialog::marginHint() );
+  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() );
   firstKeyBoxLayout->setAlignment( TQt::AlignTop );
 
   m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" );
@@ -201,11 +201,11 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" );
   resultToBox->setTitle( i18n( "Location to Store Sort Results" ) );
   resultToBox->setColumnLayout(0, Qt::Vertical );
-  resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  resultToBox->tqlayout()->setMargin( KDialog::marginHint() );
+  resultToBox->layout()->setSpacing( KDialog::spacingHint() );
+  resultToBox->layout()->setMargin( KDialog::marginHint() );
   
   
-  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() );
+  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() );
   resultToBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet");
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 3f0c27e0..510e0ad8 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -46,7 +46,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page );
     grp->setRadioButtonExclusive( TRUE );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
     rb1 = new TQRadioButton( i18n("Everything"), grp );
     rb2 = new TQRadioButton( i18n("Text"), grp );
@@ -59,7 +59,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page);
     grp->setRadioButtonExclusive( TRUE );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
 
 
@@ -71,7 +71,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
     rb5->setChecked(true);
 
     // cb = new TQCheckBox(i18n("Transpose"),this);
-    // cb->tqlayout();
+    // cb->layout();
     // lay1->addWidget(cb);
 
     connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) );
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index dd0857e3..26ec4580 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -42,15 +42,15 @@ using namespace KSpread;
 StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
   : TQWidget( parent, name, fl )
 {
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout");
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "layout");
 
   m_styleList = new KListView( this, "m_styleList" );
   m_styleList->addColumn( i18n( "Styles" ) );
   m_styleList->setResizeMode( KListView::AllColumns );
-  tqlayout->addWidget( m_styleList );
+  layout->addWidget( m_styleList );
 
   m_displayBox = new KComboBox( FALSE, this, "m_displayBox" );
-  tqlayout->addWidget( m_displayBox );
+  layout->addWidget( m_displayBox );
 
   m_styleList->header()->setLabel( 0, i18n( "Styles" ) );
   m_displayBox->clear();
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 79445e54..2d0b5656 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -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->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2);
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),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->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),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->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
+  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
 
   displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup );
   displayMessage->setChecked( false );
diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui
index ced66251..5e4af84d 100644
--- a/kspread/dialogs/position_cell_format.ui
+++ b/kspread/dialogs/position_cell_format.ui
@@ -55,7 +55,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -271,7 +271,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -331,7 +331,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui
index cb66f102..c9c3eb7a 100644
--- a/kspread/dialogs/protection_cell_format.ui
+++ b/kspread/dialogs/protection_cell_format.ui
@@ -60,7 +60,7 @@ Note that you can print it even if the cell is protected</string>
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -79,7 +79,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -120,7 +120,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui
index 89f314a7..d2a24d6c 100644
--- a/kspread/dialogs/sheet_properties_base.ui
+++ b/kspread/dialogs/sheet_properties_base.ui
@@ -47,7 +47,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -127,7 +127,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">