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

38 files changed, 282 insertions, 282 deletions

diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index 6e7f7403..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">
@@ -168,7 +168,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -206,7 +206,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignHCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc
index 7c97f6c2..5dc3f83d 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cc
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kbuttonbox.h>
@@ -55,7 +55,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker)
   lay->addWidget( m_pAngle );
 
   TQWidget* spacer = new TQWidget( page );
-  spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) );
+  spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) );
   lay->addWidget( spacer );
 
   m_pAngle->setFocus();
diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc
index 9a78074b..71cb2ada 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cc
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 
@@ -51,7 +51,7 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke
   lay1->addWidget( label );
 
   m_areaName = new TQLineEdit(page);
-  m_areaName->setMinimumWidth( m_areaName->tqsizeHint().width() * 3 );
+  m_areaName->setMinimumWidth( m_areaName->sizeHint().width() * 3 );
 
   lay1->addWidget( m_areaName );
   m_areaName->setFocus();
diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc
index 9ed3c551..8705fc5a 100644
--- a/kspread/dialogs/kspread_dlg_comment.cc
+++ b/kspread/dialogs/kspread_dlg_comment.cc
@@ -23,7 +23,7 @@
 
 #include <tqmultilineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kbuttonbox.h>
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index 531f2ee3..83f37b2f 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 <tqlayout.h>
+#include <layout.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->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() );
-  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() );
-  groupBox1_3Layout->tqsetAlignment( TQt::AlignTop );
+  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" );
   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->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() );
-  groupBox1_2Layout->tqsetAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() );
+  groupBox1_2Layout->setAlignment( 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->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() );
-  groupBox1_1Layout->tqsetAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() );
+  groupBox1_1Layout->setAlignment( 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( tqminimumSizeHint() ) );
+  resize( TQSize(702, 380).expandedTo( minimumSizeHint() ) );
   clearWState( WState_Polished );
 
   TQStringList list;
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index 91589f9f..7d63a668 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
@@ -197,14 +197,14 @@ void ConsolidateDialog::slotOk()
        h <= ( ( desc == D_BOTH || desc == D_ROW ) ? 1 : 0 ) )
   {
     m_pView->slotUpdateView( m_pView->activeSheet() );
-    KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).tqarg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).arg( *( r.begin() ) ));
     return;
   }
 
   if( (*it).range().bottom()==KS_rowMax || (*it).range().right()== KS_colMax )
   {
     m_pView->slotUpdateView( m_pView->activeSheet() );
-    KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( *( r.begin() ) ));
     return;
   }
 
@@ -220,7 +220,7 @@ void ConsolidateDialog::slotOk()
     if(currentRange.bottom()==KS_rowMax || currentRange.right()== KS_colMax)
     {
       m_pView->slotUpdateView( m_pView->activeSheet() );
-      KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( r[i]));
+      KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( r[i]));
       return;
     }
     if ( ( desc == D_NONE && ( w != w2 || h != h2 ) ) ||
@@ -228,7 +228,7 @@ void ConsolidateDialog::slotOk()
 	 ( desc == D_COL && w != w2 ) )
     {
       m_pView->slotUpdateView( m_pView->activeSheet() );
-      TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").tqarg( *( r.begin() ) ).tqarg( r[i] );
+      TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").arg( *( r.begin() ) ).arg( r[i] );
       KMessageBox::error( this, tmp);
       return;
     }
@@ -652,7 +652,7 @@ void ConsolidateDialog::slotReturnPressed()
   Range r( txt, m_pView->doc()->map() );
   if ( !r.isValid() )
   {
-    KMessageBox::error( this, i18n("The range\n%1\n is malformed").tqarg( txt ));
+    KMessageBox::error( this, i18n("The range\n%1\n is malformed").arg( txt ));
     return;
   }
 
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index c8ce2671..7008de4e 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -22,7 +22,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -78,7 +78,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_targetRect.setBottom( lastCell->row() );
 
   m_sheet = new TQTable( page, "m_table" );
-  //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
+  //m_sheet->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
   m_sheet->setNumRows( 0 );
   m_sheet->setNumCols( 0 );
 
@@ -86,13 +86,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   // Delimiter: comma, semicolon, tab, space, other
   m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" );
-  m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
+  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_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop );
+  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 );
 
   m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" );
@@ -122,20 +122,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 );
 
   m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" );
-  m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
+  m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
   m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) );
   m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 );
 
 
   // Format: number, text, currency,
   m_formatBox = new TQButtonGroup( page, "m_formatBox" );
-  m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
+  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_formatBoxLayout->tqsetAlignment( TQt::AlignTop );
+  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 );
 
   m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" );
@@ -157,7 +157,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" );
   m_comboLine->insertItem( i18n( "1" ) );
-  m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
+  m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboLine, 1, 3 );
 
@@ -165,20 +165,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_comboQuote->insertItem( i18n( "\"" ) );
   m_comboQuote->insertItem( i18n( "'" ) );
   m_comboQuote->insertItem( i18n( "None" ) );
-  m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
+  m_comboQuote->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboQuote, 1, 2 );
   TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred );
   MyDialogLayout->addItem( spacer_2, 2, 3 );
 
   TextLabel3 = new TQLabel( page, "TextLabel3" );
-  TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
+  TextLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
   TextLabel3->setText( i18n( "Start at line:" ) );
 
   MyDialogLayout->addWidget( TextLabel3, 0, 3 );
 
   TextLabel2 = new TQLabel( page, "TextLabel2" );
-  TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
+  TextLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
   TextLabel2->setText( i18n( "Textquote:" ) );
 
   MyDialogLayout->addWidget( TextLabel2, 0, 2 );
@@ -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.") );
@@ -200,7 +200,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_cancelled = true;
       return;
     }
-    m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) );
+    m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) );
   }
   else if ( mode == File )
   {
@@ -249,7 +249,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   fillSheet();
   fillComboBox();
 
-  resize(tqsizeHint());
+  resize(sizeHint());
 
   m_sheet->setSelectionMode(TQTable::NoSelection);
 
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 7cf242a9..4c1a5bcf 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -39,7 +39,7 @@
 #include <tqframe.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -48,7 +48,7 @@
 #include <tqsqlfield.h>
 #include <tqsqlquery.h>
 #include <tqsqlrecord.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
 #include <tqwhatsthis.h>
@@ -139,16 +139,16 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   Frame16Layout->addWidget( TextLabel5, 5, 0 );
   Frame5Layout->addWidget( Frame16 );
 
-  m_databasetqStatus = new TQLabel( Frame5, "m_databaseStatus" );
-  m_databasetqStatus->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetqStatus->sizePolicy().hasHeightForWidth() ) );
-  m_databasetqStatus->setMaximumSize( TQSize( 32767, 30 ) );
-  m_databasetqStatus->setText( " " );
-  Frame5Layout->addWidget( m_databasetqStatus );
+  m_databaseStatus = new TQLabel( Frame5, "m_databaseStatus" );
+  m_databaseStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) );
+  m_databaseStatus->setMaximumSize( TQSize( 32767, 30 ) );
+  m_databaseStatus->setText( " " );
+  Frame5Layout->addWidget( m_databaseStatus );
 
   m_databaseLayout->addWidget( Frame5, 0, 1 );
 
   TQFrame * Frame17 = new TQFrame( m_database, "Frame17" );
-  Frame17->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) );
+  Frame17->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) );
   Frame17->setMinimumSize( TQSize( 111, 0 ) );
   Frame17->setFrameShape( TQFrame::NoFrame );
   Frame17->setFrameShadow( TQFrame::Plain );
@@ -181,9 +181,9 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
 
   Frame5_2Layout->addLayout( Layout21, 0, 0 );
 
-  m_sheettqStatus = new TQLabel( Frame5_2, "m_tableStatus" );
-  m_sheettqStatus->setText( " " );
-  Frame5_2Layout->addWidget( m_sheettqStatus, 3, 0 );
+  m_sheetStatus = new TQLabel( Frame5_2, "m_tableStatus" );
+  m_sheetStatus->setText( " " );
+  Frame5_2Layout->addWidget( m_sheetStatus, 3, 0 );
 
   m_SelectSheetLabel = new TQLabel( Frame5_2, "m_SelectSheetLabel" );
   m_SelectSheetLabel->setText( i18n( "Select tables:" ) );
@@ -198,7 +198,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_sheetLayout->addWidget( Frame5_2, 0, 1 );
 
   TQFrame * Frame17_2 = new TQFrame( m_sheet, "Frame17_2" );
-  Frame17_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) );
+  Frame17_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) );
   Frame17_2->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_2->setFrameShape( TQFrame::NoFrame );
   Frame17_2->setFrameShadow( TQFrame::Plain );
@@ -227,14 +227,14 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
 
   Frame5_2_2Layout->addWidget( m_columnView, 1, 0 );
 
-  m_columnstqStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" );
-  m_columnstqStatus->setText( " " );
-  Frame5_2_2Layout->addWidget( m_columnstqStatus, 2, 0 );
+  m_columnsStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" );
+  m_columnsStatus->setText( " " );
+  Frame5_2_2Layout->addWidget( m_columnsStatus, 2, 0 );
 
   m_columnsLayout->addWidget( Frame5_2_2, 0, 1 );
 
   TQFrame * Frame17_3 = new TQFrame( m_columns, "Frame17_3" );
-  Frame17_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) );
+  Frame17_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) );
   Frame17_3->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_3->setFrameShape( TQFrame::NoFrame );
   Frame17_3->setFrameShadow( TQFrame::Plain );
@@ -353,7 +353,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_optionsLayout->addWidget( optionsFrame, 0, 1 );
 
   TQFrame * Frame17_4 = new TQFrame( m_options, "Frame17_4" );
-  Frame17_4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) );
+  Frame17_4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) );
   Frame17_4->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_4->setFrameShape( TQFrame::NoFrame );
   Frame17_4->setFrameShadow( TQFrame::Plain );
@@ -402,7 +402,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_resultLayout->addWidget( Frame5_2_2_3, 0, 1 );
 
   TQFrame * Frame17_5 = new TQFrame( m_result, "Frame17_5" );
-  Frame17_5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) );
+  Frame17_5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) );
   Frame17_5->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_5->setFrameShape( TQFrame::NoFrame );
   Frame17_5->setFrameShadow( TQFrame::Plain );
@@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext()
       m_dbConnection->setPort( port );
     }
 
-    m_databasetqStatus->setText( i18n("Connecting to database...") );
+    m_databaseStatus->setText( i18n("Connecting to database...") );
     if ( m_dbConnection->open() )
     {
-      m_databasetqStatus->setText( i18n("Connected. Retrieving table information...") );
+      m_databaseStatus->setText( i18n("Connected. Retrieving table information...") );
       TQStringList sheetList( m_dbConnection->tables() );
 
       if ( sheetList.isEmpty() )
@@ -741,7 +741,7 @@ bool DatabaseDialog::databaseDoNext()
       }
 
       m_sheetView->setEnabled( true );
-      m_databasetqStatus->setText( " " );
+      m_databaseStatus->setText( " " );
     }
     else
     {
@@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext()
         errorMsg.append( error.databaseText() );
         errorMsg.append( "\n" );
       }
-      m_databasetqStatus->setText( " " );
+      m_databaseStatus->setText( " " );
 
       KMessageBox::error( this, errorMsg );
       return false;
@@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext()
   else
   {
     KMessageBox::error( this, i18n("Driver could not be loaded") );
-    m_databasetqStatus->setText( " " );
+    m_databaseStatus->setText( " " );
     return false;
   }
   setNextEnabled(m_sheet, true);
@@ -778,7 +778,7 @@ bool DatabaseDialog::databaseDoNext()
 
 bool DatabaseDialog::sheetsDoNext()
 {
-  m_databasetqStatus->setText( i18n("Retrieving meta data of tables...") );
+  m_databaseStatus->setText( i18n("Retrieving meta data of tables...") );
   TQStringList sheets;
 
   for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling())
diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h
index 6e82adc3..9334935c 100644
--- a/kspread/dialogs/kspread_dlg_database.h
+++ b/kspread/dialogs/kspread_dlg_database.h
@@ -88,7 +88,7 @@ class DatabaseDialog : public KWizard
   TQSqlDatabase * m_dbConnection;
 
   TQWidget      * m_database;
-  TQLabel       * m_databasetqStatus;
+  TQLabel       * m_databaseStatus;
   TQLineEdit    * m_username;
   TQLineEdit    * m_port;
   TQLineEdit    * m_databaseName;
@@ -99,12 +99,12 @@ class DatabaseDialog : public KWizard
   TQWidget      * m_sheet;
   TQComboBox    * m_databaseList;
   KPushButton  * m_connectButton;
-  TQLabel       * m_sheettqStatus;
+  TQLabel       * m_sheetStatus;
   TQLabel       * m_SelectSheetLabel;
   KListView    * m_sheetView;
   TQWidget      * m_columns;
   KListView    * m_columnView;
-  TQLabel       * m_columnstqStatus;
+  TQLabel       * m_columnsStatus;
   TQWidget      * m_options;
   TQComboBox    * m_columns_1;
   TQComboBox    * m_columns_2;
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index d63bfd69..75330563 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -20,7 +20,7 @@
 
 #include "kspread_dlg_find.h"
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
@@ -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" );
@@ -120,7 +120,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 }
 
 FindDlg::~FindDlg()
@@ -144,7 +144,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 }
 
 SearchDlg::~SearchDlg()
diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc
index 6374c102..efb00f63 100644
--- a/kspread/dialogs/kspread_dlg_format.cc
+++ b/kspread/dialogs/kspread_dlg_format.cc
@@ -25,7 +25,7 @@
 
 #include <tqcombobox.h>
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
@@ -106,7 +106,7 @@ void FormatDialog::slotActivated( int index )
     if ( img.isEmpty() )
     {
 	TQString str( i18n( "Could not find image %1." ) );
-	str = str.tqarg( m_entries[ index ].image );
+	str = str.arg( m_entries[ index ].image );
 	KMessageBox::error( this, str ); 
 	
 	enableButtonOK(false);
@@ -118,7 +118,7 @@ void FormatDialog::slotActivated( int index )
     if ( pix.isNull() )
     {
 	TQString str( i18n( "Could not load image %1." ) );
-	str = str.tqarg( img );
+	str = str.arg( img );
 	KMessageBox::error( this,str );
 	
 	enableButtonOK(false);
@@ -138,7 +138,7 @@ void FormatDialog::slotOk()
     if ( xml.isEmpty() )
     {
 	TQString str( i18n( "Could not find sheet-style XML file '%1'." ) );
-	str = str.tqarg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.arg( m_entries[ m_combo->currentItem() ].xml );
 	KMessageBox::error( this, str );
 	return;
     }
@@ -152,7 +152,7 @@ void FormatDialog::slotOk()
     if ( !parseXML( doc ) )
     {
 	TQString str( i18n( "Parsing error in sheet-style XML file %1." ) );
-	str = str.tqarg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.arg( m_entries[ m_combo->currentItem() ].xml );
 	KMessageBox::error( this, str );
 	return;
     }
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index 62e637f5..a63ff039 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqtabwidget.h>
 
 #include "kspread_dlg_formula.h"
@@ -49,7 +49,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KSpread;
 
@@ -87,7 +87,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     searchFunct = new KLineEdit(page);
     TQSizePolicy sp3( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
-    searchFunct->tqsetSizePolicy( sp3 );
+    searchFunct->setSizePolicy( sp3 );
 
     grid1->addWidget( searchFunct, 0, 0 );
 
@@ -99,7 +99,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     functions = new TQListBox(page);
     TQSizePolicy sp1( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-    functions->tqsetSizePolicy( sp1 );
+    functions->setSizePolicy( sp1 );
     grid1->addWidget( functions, 2, 0 );
 
     selectFunction = new TQPushButton( page );
@@ -112,7 +112,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     m_tabwidget = new TQTabWidget( page );
     TQSizePolicy sp2( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-    m_tabwidget->tqsetSizePolicy( sp2 );
+    m_tabwidget->setSizePolicy( sp2 );
     grid1->addMultiCellWidget( m_tabwidget, 0, 2, 1, 1 );
 
     m_browser = new TQTextBrowser( m_tabwidget );
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index 8902cf6c..44af6b68 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -44,7 +44,7 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
@@ -152,7 +152,7 @@ GoalSeekDialog::GoalSeekDialog( View * parent,  TQPoint const & marker,
 
   m_resultText = new TQLabel( m_resultFrame, "m_resultText" );
   m_resultText->setText( "Goal seeking with cell <cell> found <a | no> solution:" );
-  m_resultText->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+  m_resultText->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
   m_resultFrameLayout->addMultiCellWidget( m_resultText, 0, 0, 0, 1 );
 
@@ -459,7 +459,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal)
     //    m_targetCell->setCalcDirtyFlag();
     m_targetCell->calc( false );
 
-    m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).tqarg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).arg( m_sourceEdit->text() ) );
     m_newValue->setText( m_pView->doc()->locale()->formatNumber( startA ) );
     m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) );
     m_restored = false;
@@ -471,7 +471,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal)
     m_targetCell->setCalcDirtyFlag();
     m_sourceCell->sheet()->setRegionPaintDirty(m_sourceCell->cellRect());
     m_targetCell->calc( false );
-    m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).tqarg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).arg( m_sourceEdit->text() ) );
     m_newValue->setText( "" );
     m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) );
     m_restored = true;
diff --git a/kspread/dialogs/kspread_dlg_goto.cc b/kspread/dialogs/kspread_dlg_goto.cc
index 2d9935ac..83ae08bd 100644
--- a/kspread/dialogs/kspread_dlg_goto.cc
+++ b/kspread/dialogs/kspread_dlg_goto.cc
@@ -23,7 +23,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klineedit.h>
 
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index 8cd3f89f..f7b0ce44 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -27,7 +27,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kbuttonbox.h>
 #include <kdebug.h>
@@ -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 53942457..2bac0636 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqfontdatabase.h>
 #include <tqradiobutton.h>
@@ -78,7 +78,7 @@ PatternSelect::PatternSelect( TQWidget *parent, const char * )
 {
     penStyle = Qt::NoPen;
     penWidth = 1;
-    penColor = tqcolorGroup().text();
+    penColor = colorGroup().text();
     selected = false;
     undefined = false;
 }
@@ -88,7 +88,7 @@ void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle
     penStyle = _style;
     penColor = _color;
     penWidth = _width;
-    tqrepaint();
+    repaint();
 }
 
 void PatternSelect::setUndefined()
@@ -127,7 +127,7 @@ void PatternSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    tqrepaint();
+    repaint();
 }
 
 void PatternSelect::slotSelect()
@@ -136,7 +136,7 @@ void PatternSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    tqrepaint();
+    repaint();
 }
 
 
@@ -151,16 +151,16 @@ 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() );
-  groupBoxLayout->tqsetAlignment( TQt::AlignTop );
+  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
+  groupBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * label1 = new TQLabel( groupBox, "label1" );
   label1->setText( i18n( "Name:" ) );
@@ -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 )
   {
@@ -207,7 +207,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
     m_parentBox->setEnabled( false );
   }
 
-  resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize( 534, 447 ).expandedTo(minimumSizeHint()) );
 }
 
 GeneralTab::~GeneralTab()
@@ -262,7 +262,7 @@ bool GeneralTab::checkParent( const TQString & parentName )
     {
       KMessageBox::sorry( this,
                           i18n( "The style cannot inherit from '%1' because of recursive references." )
-                          .tqarg( m_parentBox->currentText() ) );
+                          .arg( m_parentBox->currentText() ) );
       return false;
     }
 
@@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y)
 
 void CellFormatDialog::init()
 {
-  TQColorGroup tqcolorGroup = TQApplication::tqpalette().active();
+  TQColorGroup colorGroup = TQApplication::palette().active();
 
   // Did we initialize the bitmaps ?
   if ( formatOnlyNegSignedPixmap == 0L )
   {
-    TQColor black = tqcolorGroup.text(); // not necessarily black :)
+    TQColor black = colorGroup.text(); // not necessarily black :)
     formatOnlyNegSignedPixmap    = paintFormatPixmap( "123.456", black, "-123.456", black );
     formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red );
     formatRedNeverSignedPixmap   = paintFormatPixmap( "123.456", black, "123.456", TQt::red );
@@ -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;
@@ -1465,8 +1465,8 @@ void CellFormatPageFloat::init()
     TQString tmp;
     TQString tmp2;
     TQDate tmpDate( 2000,2,18);
-    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true);
-    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false);
+    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), true);
+    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), false);
 
     ValueFormatter *fmt = dlg->getDoc()->formatter();
 
@@ -1965,7 +1965,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg
 
   TQStringList tmpListFont;
   TQFontDatabase *fontDataBase = new TQFontDatabase();
-  tmpListFont = fontDataBase->tqfamilies();
+  tmpListFont = fontDataBase->families();
   delete fontDataBase;
 
   family_combo->insertStringList( tmpListFont);
@@ -1996,7 +1996,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg
   TQStringList lst;
   lst.append("");
   for ( unsigned int i = 1; i < 100; ++i )
-        lst.append( TQString( "%1" ).tqarg( i ) );
+        lst.append( TQString( "%1" ).arg( i ) );
 
   size_combo->insertStringList( lst );
 
@@ -2151,7 +2151,7 @@ void CellFormatPageFont::display_example(const TQFont& font)
   TQString string;
   fontChanged=true;
   example_label->setFont(font);
-  example_label->tqrepaint();
+  example_label->repaint();
 }
 
 void CellFormatPageFont::setCombos()
@@ -2164,10 +2164,10 @@ void CellFormatPageFont::setCombos()
  if ( dlg->bTextColor )
    textColor = dlg->textColor;
  else
-   textColor = tqcolorGroup().text();
+   textColor = colorGroup().text();
 
  if ( !textColor.isValid() )
-   textColor =tqcolorGroup().text();
+   textColor =colorGroup().text();
 
  textColorButton->setColor( textColor );
 
@@ -2281,7 +2281,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial
     if ( dlg->isRowSelected )
         width->setEnabled(false);
 
-    defaultWidth->setText(i18n("Default width (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName()));
+    defaultWidth->setText(i18n("Default width (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName()));
     if ( dlg->isRowSelected )
         defaultWidth->setEnabled(false);
 
@@ -2296,7 +2296,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial
     if ( dlg->isColumnSelected )
         height->setEnabled(false);
 
-    defaultHeight->setText(i18n("Default height (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); //annma
+    defaultHeight->setText(i18n("Default height (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); //annma
     if ( dlg->isColumnSelected )
         defaultHeight->setEnabled(false);
 
@@ -2533,7 +2533,7 @@ BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton
 {
   penStyle = Qt::NoPen;
   penWidth = 1;
-  penColor = tqcolorGroup().text();
+  penColor = colorGroup().text();
   setToggleButton( true );
   setOn( false);
   setChanged(false);
@@ -2549,7 +2549,7 @@ void BorderButton::setUndefined()
 {
  setPenStyle(Qt::SolidLine );
  setPenWidth(1);
- setColor(tqcolorGroup().midlight());
+ setColor(colorGroup().midlight());
 }
 
 
@@ -2558,7 +2558,7 @@ void BorderButton::unselect()
   setOn(false);
   setPenWidth(1);
   setPenStyle(Qt::NoPen);
-  setColor( tqcolorGroup().text() );
+  setColor( colorGroup().text() );
   setChanged(true);
 }
 
@@ -2586,7 +2586,7 @@ void Border::paintEvent( TQPaintEvent *_ev )
   TQPen pen;
   TQPainter painter;
   painter.begin( this );
-  pen=TQPen( tqcolorGroup().midlight(),2,SolidLine);
+  pen=TQPen( colorGroup().midlight(),2,SolidLine);
   painter.setPen( pen );
 
   painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY );
@@ -2678,18 +2678,18 @@ 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") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
   grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint());
   int fHeight = tmpTQGroupBox->fontMetrics().height();
   grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title
 
   area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow);
   grid2->addMultiCellWidget(area,2,4,1,3);
-  area->setBackgroundColor( tqcolorGroup().base() );
+  area->setBackgroundColor( colorGroup().base() );
 
   /* initailize the buttons that are in this box */
   for (int i=BorderType_Top; i < BorderType_END; i++)
@@ -2709,7 +2709,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Preselect") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint());
 
@@ -2748,7 +2748,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Pattern") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint());
   fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -2804,7 +2804,7 @@ void CellFormatPageBorder::InitializeGrids()
   style->insertItem(paintFormatPixmap(DashDotLine),2 );
   style->insertItem(paintFormatPixmap(DashDotDotLine),3  );
   style->insertItem(paintFormatPixmap(SolidLine),4);
-  style->setBackgroundColor( tqcolorGroup().background() );
+  style->setBackgroundColor( colorGroup().background() );
 
   grid2->addMultiCell(grid3,6,6,0,1);
   grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1);
@@ -2813,7 +2813,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Preview") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint());
   fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -2970,9 +2970,9 @@ TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style)
   TQPixmap pixmap( style->width(), 14 );
   TQPainter painter;
   TQPen pen;
-  pen=TQPen( tqcolorGroup().text(),1,_style);
+  pen=TQPen( colorGroup().text(),1,_style);
   painter.begin( &pixmap );
-  painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() );
+  painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() );
   painter.setPen( pen );
   painter.drawLine( 0, 7, style->width(), 7 );
   painter.end();
@@ -3223,7 +3223,7 @@ void CellFormatPageBorder::preselect( BorderButton *_p )
       vertical->setChanged(true);
     }
   }
-  area->tqrepaint();
+  area->repaint();
 }
 
 void CellFormatPageBorder::changeState( BorderButton *_p)
@@ -3240,10 +3240,10 @@ void CellFormatPageBorder::changeState( BorderButton *_p)
   {
     _p->setPenWidth(1);
     _p->setPenStyle(Qt::NoPen);
-    _p->setColor( tqcolorGroup().text() );
+    _p->setColor( colorGroup().text() );
   }
 
- area->tqrepaint();
+ area->repaint();
 }
 
 void CellFormatPageBorder::draw()
@@ -3483,7 +3483,7 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y())))
     }
   }
 
-  area->tqrepaint();
+  area->repaint();
 }
 
 
@@ -3505,7 +3505,7 @@ void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style )
 {
     brushStyle = _style;
     brushColor = _color;
-    tqrepaint();
+    repaint();
 }
 
 
@@ -3535,7 +3535,7 @@ void BrushSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    tqrepaint();
+    repaint();
 }
 
 void BrushSelect::slotSelect()
@@ -3544,7 +3544,7 @@ void BrushSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    tqrepaint();
+    repaint();
 }
 
 
@@ -3567,7 +3567,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" );
     tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
     tmpTQGroupBox->setTitle( i18n("Pattern") );
-    tmpTQGroupBox->tqsetAlignment( AlignLeft );
+    tmpTQGroupBox->setAlignment( AlignLeft );
 
     TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint());
     int fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -3656,10 +3656,10 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     if ( dlg->bBgColor )
         bgColor = dlg->bgColor;
     else
-        bgColor = tqcolorGroup().base();
+        bgColor = colorGroup().base();
 
     if (!bgColor.isValid())
-        bgColor = tqcolorGroup().base();
+        bgColor = colorGroup().base();
 
     bgColorButton->setColor( bgColor );
     connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ),
@@ -3678,7 +3678,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" );
     tmpTQGroupBox->setTitle( i18n("Preview") );
     tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
-    tmpTQGroupBox->tqsetAlignment( AlignLeft );
+    tmpTQGroupBox->setAlignment( AlignLeft );
 
     grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint());
     fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -3753,8 +3753,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
 void CellFormatPagePattern::slotNotAnyColor()
 {
   b_notAnyColor = true;
-  bgColorButton->setColor( tqcolorGroup().base() );
-  current->setBackgroundColor( tqcolorGroup().base() );
+  bgColorButton->setColor( colorGroup().base() );
+  current->setBackgroundColor( colorGroup().base() );
 }
 
 void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color )
diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h
index b8ec0bba..8d38663a 100644
--- a/kspread/dialogs/kspread_dlg_layout.h
+++ b/kspread/dialogs/kspread_dlg_layout.h
@@ -101,16 +101,16 @@ class PatternSelect : public TQFrame
 public:
     PatternSelect( TQWidget *parent, const char *_name );
 
-    void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); }
+    void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; repaint(); }
     Qt::PenStyle getPenStyle() { return penStyle; }
-    void setColor( const TQColor &_col ) { penColor = _col; tqrepaint(); }
+    void setColor( const TQColor &_col ) { penColor = _col; repaint(); }
     const TQColor& getColor() { return penColor; }
-    void setPenWidth( int _w ) { penWidth = _w; tqrepaint(); }
+    void setPenWidth( int _w ) { penWidth = _w; repaint(); }
     int getPenWidth() { return penWidth; }
 
     void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style );
     void setUndefined();
-    void setDefined() { undefined = FALSE; tqrepaint(); }
+    void setDefined() { undefined = FALSE; repaint(); }
 
     bool isDefined() { return !undefined; }
 
@@ -389,7 +389,7 @@ class BrushSelect : public TQFrame
 public:
     BrushSelect( TQWidget *parent, const char *_name );
 
-    void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); }
+    void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; repaint(); }
     Qt::BrushStyle getBrushStyle() const { return brushStyle; }
     TQColor getBrushColor() const { return brushColor; }
     void setBrushColor(const TQColor &_c) { brushColor=_c;}
diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc
index f4e03269..cdff22f1 100644
--- a/kspread/dialogs/kspread_dlg_list.cc
+++ b/kspread/dialogs/kspread_dlg_list.cc
@@ -20,7 +20,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqmultilineedit.h>
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index f0e6f664..6e89e2cf 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -37,7 +37,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhgroupbox.h>
 
 #include <kapplication.h>
@@ -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 );
@@ -194,17 +194,17 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     TQStringList lst;
     for( int i = 5; i < 500; i += 5 )
     {
-        lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) );
+        lst.append( TQString( i18n( "%1%" ) ).arg( i ) );
         if( tqRound( print->zoom() * 100 ) > i &&
             tqRound( print->zoom() * 100 ) < i + 5 )
         {
-            lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) );
+            lst.append( TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ) );
         }
     }
     m_cZoom->insertStringList( lst );
 
     int number_of_entries = m_cZoom->count();
-    TQString string = TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) );
+    TQString string = TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) );
     for (int i = 0; i < number_of_entries ; i++)
     {
         if ( string == (TQString) m_cZoom->text(i) )
@@ -227,11 +227,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstX.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstX.append( TQString( "%1" ).tqarg( i ) );
+        lstX.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitX() > 20 )
     {
-      lstX.append( TQString( "%1" ).tqarg( print->pageLimitX() ) );
+      lstX.append( TQString( "%1" ).arg( print->pageLimitX() ) );
     }
     m_cLimitPagesX->insertStringList( lstX );
 
@@ -250,11 +250,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstY.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstY.append( TQString( "%1" ).tqarg( i ) );
+        lstY.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitY() > 20 )
     {
-      lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) );
+      lstY.append( TQString( "%1" ).arg( print->pageLimitY() ) );
     }
     m_cLimitPagesY->insertStringList( lstY );
 
@@ -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() );
@@ -407,7 +407,7 @@ void PaperLayout::slotOk()
       if ( m_rScalingZoom->isChecked() )
       {
         kdDebug() << "Zoom is selected" << endl;
-        if( TQString( "%1%" ).tqarg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
+        if( TQString( "%1%" ).arg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
         {
           kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl;
           TQString zoomtext = m_cZoom->currentText();
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..8dda529e 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kbuttonbox.h>
 #include <tqbuttongroup.h>
@@ -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 51ca3cdc..531e6260 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -26,7 +26,7 @@
 */
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqvgroupbox.h>
@@ -192,12 +192,12 @@ void parameterLocale::updateDefaultSystemConfig()
 
 void parameterLocale::updateToMatchLocale(KLocale* locale)
 {
-  m_language->setText( i18n("Language: %1").tqarg( locale->language() ));
-  m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) ));
-  m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() )));
-  m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ,true) ));
-  m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) ));
-  m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) ));
+  m_language->setText( i18n("Language: %1").arg( locale->language() ));
+  m_number->setText( i18n("Default number format: %1").arg( locale->formatNumber(12.55) ));
+  m_date->setText( i18n("Long date format: %1").arg( locale->formatDate( TQDate::currentDate() )));
+  m_shortDate->setText( i18n("Short date format: %1").arg( locale->formatDate( TQDate::currentDate() ,true) ));
+  m_time->setText( i18n("Time format: %1").arg( locale->formatTime( TQTime::currentTime() ) ));
+  m_money->setText( i18n("Currency format: %1").arg( locale->formatMoney(12.55) ));
 }
 
 configure::configure( View* _view, TQVBox *box , char *name )
@@ -488,7 +488,7 @@ miscParameters::miscParameters( View* _view,TQVBox *box, char *name )
 //   valIndent->setRange( 0.0, 100.0, 10.0 );
   valIndent->setValue ( KoUnit::toUserValue( _indent, indentUnit ) );
   TQWhatsThis::add(valIndent, i18n( "Lets you define the amount of indenting used by the Increase Indent and Decrease Indent option in the Format menu." ) );
-  valIndent->setLabel(i18n("&Indentation step (%1):").tqarg(KoUnit::unitName(indentUnit)));
+  valIndent->setLabel(i18n("&Indentation step (%1):").arg(KoUnit::unitName(indentUnit)));
 
   msgError= new TQCheckBox(i18n("&Show error message for invalid formulae"),tmpTQGroupBox);
   msgError->setChecked(m_bMsgError);
@@ -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 );
 
@@ -905,7 +905,7 @@ configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name )
   TQWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) );
 
   TQWidget* spacer = new TQWidget( box );
-  spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+  spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     if( config->hasGroup("KSpell kspread") )
     {
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index c456efb3..7c3007e8 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -40,7 +40,7 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kbuttonbox.h>
 #include <kmessagebox.h>
@@ -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;
@@ -110,7 +110,7 @@ reference::reference( View* parent, const char* name )
            TQT_SLOT(slotDoubleClicked(TQListBoxItem *)));
   connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this,
            TQT_SLOT(slotHighlighted(TQListBoxItem * )));
-  m_rangeName->setText(i18n("Area: %1").tqarg(""));
+  m_rangeName->setText(i18n("Area: %1").arg(""));
 
   resize( 250, 200 );
 }
@@ -134,7 +134,7 @@ void reference::displayAreaValues(TQString const & areaName)
     }
   }
 
-  tmpName = i18n("Area: %1").tqarg(tmpName);
+  tmpName = i18n("Area: %1").arg(tmpName);
   m_rangeName->setText(tmpName);
 }
 
@@ -206,7 +206,7 @@ void reference::slotEdit()
   EditAreaName editDlg( m_pView, "EditArea", name );
   editDlg.exec();
 
-  m_rangeName->setText(i18n("Area: %1").tqarg(""));
+  m_rangeName->setText(i18n("Area: %1").arg(""));
   TQString tmp = m_list->text(m_list->currentItem());
   if (!tmp.isEmpty())
     displayAreaValues( tmp );
@@ -254,7 +254,7 @@ EditAreaName::EditAreaName( View * parent,
   m_pView = parent;
 
   resize( 350, 142 );
-  tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
+  setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
                               (TQSizePolicy::SizeType)4, 0, 0,
                               sizePolicy().hasHeightForWidth() ) );
 
diff --git a/kspread/dialogs/kspread_dlg_resize2.cc b/kspread/dialogs/kspread_dlg_resize2.cc
index e6d74d26..4185847e 100644
--- a/kspread/dialogs/kspread_dlg_resize2.cc
+++ b/kspread/dialogs/kspread_dlg_resize2.cc
@@ -26,7 +26,7 @@
 #include <float.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <knuminput.h>
 
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc
index 0158dd2a..4ce74abd 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cc
@@ -30,7 +30,7 @@
 #include "kspread_sheet.h"
 #include "kspread_view.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqlabel.h>
 
diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc
index c73f71ec..e497a790 100644
--- a/kspread/dialogs/kspread_dlg_show.cc
+++ b/kspread/dialogs/kspread_dlg_show.cc
@@ -22,7 +22,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqlistbox.h>
 #include <tqlabel.h>
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc
index 75a50cc3..450737a1 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cc
@@ -21,7 +21,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 
@@ -78,9 +78,9 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type )
         for( it = listInt.begin(); it != listInt.end(); ++it )
 	  {
 	    if(!showColNumber)
-	      listCol+=i18n("Column: %1").tqarg(Cell::columnName(*it));
+	      listCol+=i18n("Column: %1").arg(Cell::columnName(*it));
 	    else
-	      listCol+=i18n("Column: %1").tqarg(text.setNum(*it));
+	      listCol+=i18n("Column: %1").arg(text.setNum(*it));
 	  }
         list->insertStringList(listCol);
         }
@@ -98,7 +98,7 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type )
         qHeapSort(listInt);
         TQValueList<int>::Iterator it;
         for( it = listInt.begin(); it != listInt.end(); ++it )
-	  listRow+=i18n("Row: %1").tqarg(text.setNum(*it));
+	  listRow+=i18n("Row: %1").arg(text.setNum(*it));
 
         list->insertStringList(listRow);
         }
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 1e58ccf5..4ce0d91e 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -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,10 +108,10 @@ 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() );
-  sort1BoxLayout->tqsetAlignment( TQt::AlignTop );
+  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" );
   sort1BoxLayout->addWidget( m_sortKey1 );
@@ -127,10 +127,10 @@ 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() );
-  sort2BoxLayout->tqsetAlignment( TQt::AlignTop );
+  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" );
   m_sortKey2->insertItem( i18n( "None" ) );
@@ -147,10 +147,10 @@ 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() );
-  sort3BoxLayout->tqsetAlignment( TQt::AlignTop );
+  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" );
   m_sortKey3->insertItem( i18n( "None" ) );
@@ -171,15 +171,15 @@ SortDialog::SortDialog( View * parent,  const char * name,
 
   m_page2 = new TQWidget( m_tabWidget, "m_page2" );
   TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout");
-  page2Layout->tqsetAlignment(TQt::AlignTop);
+  page2Layout->setAlignment(TQt::AlignTop);
 
   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() );
-  firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop );
+  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" );
   m_useCustomLists->setText( i18n( "&Use custom list" ) );
@@ -201,12 +201,12 @@ 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() );
-  resultToBoxLayout->tqsetAlignment( TQt::AlignTop );
+  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() );
+  resultToBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet");
   destinationSheet->setText("Destination Sheet:");
@@ -351,7 +351,7 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -359,13 +359,13 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+		m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
 		
 		if ( i == r.left() )
 		  selectionMayHaveHeader=false;
             }
     }
-     // m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+     // m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
   }
   // Entire rows selected ?
   else if ( util_isRowSelected(r) )
@@ -377,7 +377,7 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i)
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").tqarg(i);
+	    TQString rowName=i18n(" (Row %1)").arg(i);
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -385,7 +385,7 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listRow += i18n("Row %1").tqarg(i);
+		m_listRow += i18n("Row %1").arg(i);
 		
 		if ( i == r.top() )
 		  selectionMayHaveHeader=false;
@@ -419,13 +419,13 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 		    m_listColumn += guessName + colName;
 	    else
 	    {
-		    m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+		    m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
 		    
 		    if (i == r.left())
 		      selectionMayHaveHeader=false;
@@ -435,13 +435,13 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i) 
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").tqarg(i);
+	    TQString rowName=i18n(" (Row %1)").arg(i);
 	    
 	    if (!guessName.isEmpty())
 		    m_listRow += guessName + rowName;
 	    else
 	    {
-		    m_listRow += i18n("Row %1").tqarg(i);
+		    m_listRow += i18n("Row %1").arg(i);
 		    
 		    if (i == r.top())
 		      selectionMayHaveHeader=false;
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 3f0c27e0..5c9f44a3 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
@@ -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 32a5474a..071aae69 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 
 #include <kcombobox.h>
@@ -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();
@@ -59,7 +59,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
   m_displayBox->insertItem( i18n( "Custom Styles" ) );
   m_displayBox->insertItem( i18n( "Hierarchical" ) );
   connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle()));
-  resize( TQSize(446, 384).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(446, 384).expandedTo(minimumSizeHint()) );
 }
 
 StyleWidget::~StyleWidget()
@@ -232,11 +232,11 @@ void StyleDlg::slotUser1()
     s = m_styleManager->defaultStyle();
 
   int i = 1;
-  TQString newName( i18n( "style%1" ).tqarg( m_styleManager->count() + i ) );
+  TQString newName( i18n( "style%1" ).arg( m_styleManager->count() + i ) );
   while ( m_styleManager->style( newName ) != 0 )
   {
     ++i;
-    newName = i18n( "style%1" ).tqarg( m_styleManager->count() + i );
+    newName = i18n( "style%1" ).arg( m_styleManager->count() + i );
   }
 
   CustomStyle * style = new CustomStyle( newName, s );
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc
index 1b899ebf..f88f3a7f 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cc
@@ -243,7 +243,7 @@ void SubtotalDialog::fillColumnBoxes()
 
     if ( text.length() > 0 )
     {
-      text = col.tqarg( Cell::columnName( i ) );
+      text = col.arg( Cell::columnName( i ) );
     }
 
     m_dialog->m_columnBox->insertItem( text );
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 8f61c5d8..4a370246 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 <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <knumvalidator.h>
 #include <kdebug.h>
@@ -38,7 +38,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.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->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 );
@@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index)
         }
         break;
     }
-    if ( width() < tqsizeHint().width() )
-        resize( tqsizeHint() );
+    if ( width() < sizeHint().width() )
+        resize( sizeHint() );
 }
 
 void DlgValidity::changeIndexCond(int _index)
diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui
index cb73b12d..341d72a9 100644
--- a/kspread/dialogs/kspreadsubtotal.ui
+++ b/kspread/dialogs/kspreadsubtotal.ui
@@ -195,7 +195,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>152</height>
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index aba1a170..58b27528 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdesktopfile.h>
 #include <kdialogbase.h>
@@ -105,7 +105,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
     fLayout->add( d->fileLink );
     fLayout->add( new TQLabel( i18n("Recent file:" ), d->filePage ) );
     TQComboBox* recentFile = new TQComboBox( d->filePage );
-    recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+    recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
     fLayout->add( recentFile );
     fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) );
     connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this,
diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui
index df2ff211..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">
@@ -298,7 +298,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>10</width>
                                     <height>20</height>
@@ -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">
@@ -358,7 +358,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui
index 0768d4f7..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">
@@ -95,7 +95,7 @@ Note that you can print it even if the cell is protected</string>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>21</height>
@@ -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">
@@ -136,7 +136,7 @@ Note that you can print it even if the cell is protected</string>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>20</height>
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index 69397687..7cdd6449 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -39,7 +39,7 @@ SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* parent ):
   TQVBox* mainWidget = makeVBoxMainWidget();
   d = new SheetPropertiesBase( mainWidget );
   TQWidget* spacer = new TQWidget( mainWidget );
-  spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
+  spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
   enableButtonSeparator( true );
 }
 
diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui
index 0750b8a9..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">
@@ -99,7 +99,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -118,7 +118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -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">