Rename old tq methods that no longer need a unique name

43 files changed, 204 insertions, 204 deletions

diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html
index 31059876..11184218 100644
--- a/kspread/DESIGN.html
+++ b/kspread/DESIGN.html
@@ -22,7 +22,7 @@ and the source code itself.</p>
 
 <h2>Document/View Architecture</h2>
 
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>MVC (Model/View/Controller) means that the application consists of three
 big parts, the <i>Model</i> which holds the data structure and objects,
@@ -49,7 +49,7 @@ to some extent he can take most part of the KSpread back-end and glue a new
 user interface around the code.</p>
 
 <h2>Dependency Handling</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>When a cell holds a formula, then it is likely that it depends on other
 cell(s) for calculating the result. For example, if cell A11 has the formula
@@ -181,7 +181,7 @@ and the dependency manager will do the rest. In addition, this gives us
 recursive dependency calculation at almost no cost.</p>
 
 <h2>Manipulators</h2>
-<p>tqStatus: PLANNED.</p>
+<p>Status: PLANNED.</p>
 
 <p>Currently, every operation on a cell or on a range of cells is quite complex.
 You need to ensure correct repainting, recalculation, iterate on a range and so on.</p>
@@ -218,7 +218,7 @@ below.</p>
 accomplish this.</p>
 
 <h2>Selection handling</h2>
-<p>tqStatus: PLANNED</p>
+<p>Status: PLANNED</p>
 
 <p>The selection shall be an instance of some RangeList class,
 or however we want to call it - this will contain a list of
@@ -227,7 +227,7 @@ more entries. This will allow easy implementation of CTRL-selections and so,
 because thanks to manipulators, each operation will automatically support these.</p>
 
 <h2>Repaint Triggering</h2>
-<p>tqStatus: PLANNED</p>
+<p>Status: PLANNED</p>
 
 <p>As mentioned above, the interface between the core and the GUI needs to be kept
 at minimum. Also, the number of repaints needs to be as low as possible, and repaints
@@ -255,7 +255,7 @@ the manipulators that derive from it, so that it knows whether it changed
 cell's content or formatting.</p>
 
 <h2>Formula Engine</h2>
-<p>tqStatus: FINISHED.</p>
+<p>Status: FINISHED.</p>
 
 <p>This formula engine is just an expression evaluator. To offer better
 performance, the expression is first compiled into byte codes which will
@@ -472,7 +472,7 @@ token right before the percent. If yes, then the following code is generated:
 
 <h2>Value</h2>
 
-<p>tqStatus: FINISHED.<br>
+<p>Status: FINISHED.<br>
 </p>
 
 <p>to be written.</p>
@@ -480,7 +480,7 @@ token right before the percent. If yes, then the following code is generated:
 <h2>Commands Based on KCommand<br>
 </h2>
 
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>Until lately, to implement undo and redo, KSpread creates corresponding
 KSpreadUndo classes for each action and runs them when the user undoes
@@ -492,12 +492,12 @@ hence we should be able to undo/redo every operation (provided that the
 corresponding manipulator provides methods to store/recall the undo information).</p>
 
 <h2>Cell Storage</h2>
-<p>tqStatus: PLANNED.</p>
+<p>Status: PLANNED.</p>
 
 <p>Cells are grouped together, and then hashed.</p>
 
 <h2>Format Storage</h2>
-<p>tqStatus: PLANNED.</p>
+<p>Status: PLANNED.</p>
 
 <p>Formatting specifies how a cell should look like. It involves font
 attributes like bold or italics, vertical and horizontal tqalignment,
@@ -589,7 +589,7 @@ be in more than one leaf in the quad-tree. <i>Details on the possible use of
 quad-tree or other methods should be explored further more</i>.</p>
 
 <h2>Default Toolbars</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>Relevant mailing-list threads:</p>
 
@@ -652,7 +652,7 @@ Borders, Background, Foreground</li>
 </ul>
 
 <h2>Test Framework</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>Relevant mailing-list threads:</p>
 
@@ -704,7 +704,7 @@ test cases.</p>
 </p>
 
 <h2>Coding Style</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>(to be written in details).</p>
 
diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index 6e7f7403..b7ae7fb9 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -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>
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc
index 7c97f6c2..e326dd53 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cc
@@ -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..e4e130e8 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cc
@@ -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_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index 531f2ee3..d03b72d7 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -57,7 +57,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
   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_3Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" );
   groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 );
@@ -93,7 +93,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
   groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() );
 
   TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() );
-  groupBox1_2Layout->tqsetAlignment( TQt::AlignTop );
+  groupBox1_2Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" );
   groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 );
@@ -129,7 +129,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
   groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() );
 
   TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() );
-  groupBox1_1Layout->tqsetAlignment( TQt::AlignTop );
+  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_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index c8ce2671..dcc53a77 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -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_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_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 );
@@ -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..ca1ed59c 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -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..0a222654 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -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_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index 62e637f5..0f0a356c 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -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..a52d4df9 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -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 );
 
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index 53942457..27e27868 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -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;
 }
@@ -160,7 +160,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
   groupBox->tqlayout()->setMargin( KDialog::marginHint() );
 
   TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
-  groupBoxLayout->tqsetAlignment( TQt::AlignTop );
+  groupBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * label1 = new TQLabel( groupBox, "label1" );
   label1->setText( i18n( "Name:" ) );
@@ -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()
@@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y)
 
 void CellFormatDialog::init()
 {
-  TQColorGroup tqcolorGroup = TQApplication::tqpalette().active();
+  TQColorGroup colorGroup = TQApplication::tqpalette().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 );
@@ -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();
 
@@ -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 );
 
@@ -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 );
@@ -2682,14 +2682,14 @@ void CellFormatPageBorder::InitializeGrids()
   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();
@@ -3240,7 +3240,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p)
   {
     _p->setPenWidth(1);
     _p->setPenStyle(Qt::NoPen);
-    _p->setColor( tqcolorGroup().text() );
+    _p->setColor( colorGroup().text() );
   }
 
  area->tqrepaint();
@@ -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_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 51ca3cdc..9d223e19 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -194,8 +194,8 @@ 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_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::currentDate() )));
+  m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ,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) ));
 }
@@ -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..1587e866 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -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_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 1e58ccf5..e903fcd5 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -111,7 +111,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() );
   sort1Box->tqlayout()->setMargin( KDialog::marginHint() );
   TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() );
-  sort1BoxLayout->tqsetAlignment( TQt::AlignTop );
+  sort1BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" );
   sort1BoxLayout->addWidget( m_sortKey1 );
@@ -130,7 +130,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() );
   sort2Box->tqlayout()->setMargin( KDialog::marginHint() );
   TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() );
-  sort2BoxLayout->tqsetAlignment( TQt::AlignTop );
+  sort2BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" );
   m_sortKey2->insertItem( i18n( "None" ) );
@@ -150,7 +150,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() );
   sort3Box->tqlayout()->setMargin( KDialog::marginHint() );
   TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() );
-  sort3BoxLayout->tqsetAlignment( TQt::AlignTop );
+  sort3BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" );
   m_sortKey3->insertItem( i18n( "None" ) );
@@ -171,7 +171,7 @@ 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" ) );
@@ -179,7 +179,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() );
   firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() );
   TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() );
-  firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop );
+  firstKeyBoxLayout->setAlignment( TQt::AlignTop );
 
   m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" );
   m_useCustomLists->setText( i18n( "&Use custom list" ) );
@@ -206,7 +206,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   
   
   TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() );
-  resultToBoxLayout->tqsetAlignment( TQt::AlignTop );
+  resultToBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet");
   destinationSheet->setText("Destination Sheet:");
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 32a5474a..787aac7c 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -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()
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 8f61c5d8..79445e54 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -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..23cf3317 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -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..ced66251 100644
--- a/kspread/dialogs/position_cell_format.ui
+++ b/kspread/dialogs/position_cell_format.ui
@@ -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>
@@ -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..cb66f102 100644
--- a/kspread/dialogs/protection_cell_format.ui
+++ b/kspread/dialogs/protection_cell_format.ui
@@ -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>
@@ -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..89f314a7 100644
--- a/kspread/dialogs/sheet_properties_base.ui
+++ b/kspread/dialogs/sheet_properties_base.ui
@@ -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>
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 3f482e27..6b7e191f 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -547,7 +547,7 @@ void Canvas::validateSelection()
                 ypos = sheet->dblRowPos( moveY );
             }
             //d->validationInfo->setGeometry( 3, y + 3, len + 2, hei + 2 );
-            d->validationInfo->tqsetAlignment( TQt::AlignVCenter );
+            d->validationInfo->setAlignment( TQt::AlignVCenter );
             TQPainter painter;
             painter.begin( this );
             int len = 0;
@@ -1816,7 +1816,7 @@ void Canvas::dropEvent( TQDropEvent * _ev )
     }
 
 
-    b = _ev->tqencodedData( TextDrag::selectionMimeType() );
+    b = _ev->encodedData( TextDrag::selectionMimeType() );
     sheet->paste( b, TQRect( col, row, 1, 1 ), makeUndo );
 
     if ( _ev->source() == this )
@@ -3440,22 +3440,22 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
     if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU )
     {
         top = true;
-//         snaptqStatus |= KoGuides::SNAP_HORIZ;
+//         snapStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD )
     {
         bottom = true;
-//         snaptqStatus |= KoGuides::SNAP_HORIZ;
+//         snapStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD )
     {
         left = true;
-//         snaptqStatus |= KoGuides::SNAP_VERT;
+//         snapStatus |= KoGuides::SNAP_VERT;
     }
     if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD )
     {
         right = true;
-//         snaptqStatus |= KoGuides::SNAP_VERT;
+//         snapStatus |= KoGuides::SNAP_VERT;
     }
 
     double newLeft = objRect.left();
@@ -3572,7 +3572,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 //       {
 //         sp.setY( rect.bottom() );
 //       }
-//       m_gl.repaintSnapping( sp, snaptqStatus );
+//       m_gl.repaintSnapping( sp, snapStatus );
 //     }
 
     tqrepaint( oldBoundingRect );
@@ -4064,7 +4064,7 @@ void Canvas::paintUpdates()
   }
   else
   {
-    matrix = painter.tqworldMatrix();
+    matrix = painter.worldMatrix();
   }
 
 
@@ -4656,7 +4656,7 @@ VBorder::~VBorder()
     delete m_scrollTimer;
 }
 
-TQSize VBorder::tqsizeHint() const
+TQSize VBorder::sizeHint() const
 {
   return TQSize( 40, 10 );
 }
@@ -5057,7 +5057,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
           else
             m_lSize->setGeometry( 3, y + 3, len + 2,hei + 2 );
 
-          m_lSize->tqsetAlignment( TQt::AlignVCenter );
+          m_lSize->setAlignment( TQt::AlignVCenter );
           m_lSize->setText( tmpSize );
           m_lSize->setPalette( TQToolTip::palette() );
           m_lSize->show();
@@ -5095,7 +5095,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
   TQColor highlightColor = View::highlightColor();
   TQPen pen( TQt::black, 1 );
   painter.setPen( pen );
-  // painter.setBackgroundColor( tqcolorGroup().base() );
+  // painter.setBackgroundColor( colorGroup().base() );
 
   // painter.eraseRect( _ev->rect() );
 
@@ -5146,7 +5146,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
     }
     else
     {
-      TQColor c = tqcolorGroup().background();
+      TQColor c = colorGroup().background();
       TQBrush fill( c );
       qDrawPlainRect ( &painter, 0, zoomedYPos, width, height+1, c.dark(150),
            1, &fill );
@@ -5156,10 +5156,10 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
 
     // Reset painter
     painter.setFont( normalFont );
-    painter.setPen( tqcolorGroup().text() );
+    painter.setPen( colorGroup().text() );
 
     if ( selected )
-      painter.setPen( tqcolorGroup().highlightedText() );
+      painter.setPen( colorGroup().highlightedText() );
     else if ( highlighted )
       painter.setFont( boldFont );
 
@@ -5212,7 +5212,7 @@ HBorder::~HBorder()
     delete m_scrollTimer;
 }
 
-TQSize HBorder::tqsizeHint() const
+TQSize HBorder::sizeHint() const
 {
   return TQSize( 40, 10 );
 }
@@ -5758,7 +5758,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
         else
           m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 );
 
-        m_lSize->tqsetAlignment( TQt::AlignVCenter );
+        m_lSize->setAlignment( TQt::AlignVCenter );
         m_lSize->setText( tmpSize );
         m_lSize->setPalette( TQToolTip::palette() );
         m_lSize->show();
@@ -5866,7 +5866,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
       }
       else
       {
-        TQColor c = tqcolorGroup().background();
+        TQColor c = colorGroup().background();
         TQBrush fill( c );
         qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150),
            1, &fill );
@@ -5874,10 +5874,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
 
       // Reset painter
       painter.setFont( normalFont );
-      painter.setPen( tqcolorGroup().text() );
+      painter.setPen( colorGroup().text() );
 
       if ( selected )
-        painter.setPen( tqcolorGroup().highlightedText() );
+        painter.setPen( colorGroup().highlightedText() );
       else if ( highlighted )
         painter.setFont( boldFont );
       if ( !m_pView->activeSheet()->getShowColumnNumber() )
@@ -5929,7 +5929,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
       }
       else
       {
-        TQColor c = tqcolorGroup().background();
+        TQColor c = colorGroup().background();
         TQBrush fill( c );
         qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150),
            1, &fill );
@@ -5937,10 +5937,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
 
       // Reset painter
       painter.setFont( normalFont );
-      painter.setPen( tqcolorGroup().text() );
+      painter.setPen( colorGroup().text() );
 
       if ( selected )
-        painter.setPen( tqcolorGroup().highlightedText() );
+        painter.setPen( colorGroup().highlightedText() );
       else if ( highlighted )
         painter.setFont( boldFont );
       if ( !m_pView->activeSheet()->getShowColumnNumber() )
@@ -5991,7 +5991,7 @@ ToolTip::ToolTip( Canvas* canvas )
 // this is a hack of course, because it's not available from TQToolTip
 TQLabel *tip_findLabel()
 {
-    TQWidgetList  *list = TQApplication::tqallWidgets();
+    TQWidgetList  *list = TQApplication::allWidgets();
     TQWidgetListIt it( *list );
     TQWidget * w;
     while ( (w=it.current()) != 0 )
diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h
index f5aa6746..ce6c3feb 100644
--- a/kspread/kspread_canvas.h
+++ b/kspread/kspread_canvas.h
@@ -586,7 +586,7 @@ public:
 
     void updateColumns( int from, int to );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 private slots:
     void doAutoScroll();
@@ -672,7 +672,7 @@ public:
     void equalizeRow( double resize );
     void updateRows( int from, int to );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 private slots:
     void doAutoScroll();
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index fdcf38be..705f77b4 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -2498,7 +2498,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
      */
   if ( d->style == Cell::ST_Button ) {
     TQBrush fill( TQt::lightGray );
-    TQApplication::style().tqdrawControl( TQStyle::CE_PushButton, &_painter, this,
+    TQApplication::style().drawControl( TQStyle::CE_PushButton, &_painter, this,
                TQRect( _tx + 1, _ty + 1, w2 - 1, h2 - 1 ),
                defaultColorGroup ); //, selected, &fill );
   }
@@ -6744,8 +6744,8 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op )
           if( inside_tag )
           {
             inside_tag = false;
-            if( tag.tqstartsWith( "a href=\"", true ) )
-            if( tag.tqendsWith( "\"" ) )
+            if( tag.startsWith( "a href=\"", true ) )
+            if( tag.endsWith( "\"" ) )
               qml_link = tag.mid( 8, tag.length()-9 );
             tag = TQString();
           }
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 188dbe2e..c277e991 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -1656,12 +1656,12 @@ void Doc::paintContent( TQPainter& painter, const TQRect& rect,
     if ( m_zoomedResolutionX != zoomX )
         d_zoom *= ( zoomX / m_zoomedResolutionX );
 
-    // KSpread support zoom, therefore no need to scale with tqworldMatrix
-    TQWMatrix matrix = painter.tqworldMatrix();
+    // KSpread support zoom, therefore no need to scale with worldMatrix
+    TQWMatrix matrix = painter.worldMatrix();
     matrix.setMatrix( 1, 0, 0, 1, matrix.dx(), matrix.dy() );
     TQRect prect = rect;
-    prect.setWidth( (int) (prect.width() * painter.tqworldMatrix().m11()) );
-    prect.setHeight( (int) (prect.height() * painter.tqworldMatrix().m22()) );
+    prect.setWidth( (int) (prect.width() * painter.worldMatrix().m11()) );
+    prect.setHeight( (int) (prect.height() * painter.worldMatrix().m22()) );
     setZoomAndResolution( (int) ( d_zoom * 100 ), KoGlobal::dpiX(), KoGlobal::dpiY() );
     // paint the content, now zoom is correctly set
     kdDebug(36001)<<"paintContent-------------------------------------\n";
@@ -1746,7 +1746,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect,
                       - view->canvasWidget()->yOffset() );
   }
   else {
-    matrix = painter.tqworldMatrix();
+    matrix = painter.worldMatrix();
   }
 
 //   TQPtrListIterator<KoDocumentChild> it( tqchildren() );
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index ddf41d31..721412ca 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -315,11 +315,11 @@ TQObject( editor )
   d->editor = editor;
   d->hintLabel = 0;
 
-  d->completionPopup = new TQVBox( editor->tqtopLevelWidget(), 0, WType_Popup );
+  d->completionPopup = new TQVBox( editor->topLevelWidget(), 0, WType_Popup );
   d->completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
   d->completionPopup->setLineWidth( 1 );
   d->completionPopup->installEventFilter( this );
-  d->completionPopup->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
+  d->completionPopup->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
 
   d->completionListBox = new KListBox( d->completionPopup );
   d->completionPopup->setFocusProxy( d->completionListBox );
@@ -430,7 +430,7 @@ void FunctionCompletion::showCompletion( const TQStringList &choices )
 
   // size of the pop-up
   d->completionPopup->setMaximumHeight( 100 );
-  d->completionPopup->resize( d->completionListBox->tqsizeHint() +
+  d->completionPopup->resize( d->completionListBox->sizeHint() +
     TQSize( d->completionListBox->verticalScrollBar()->width() + 4,
         d->completionListBox->horizontalScrollBar()->height() + 4 ) );
   int h = d->completionListBox->height();
@@ -612,7 +612,7 @@ void CellEditor::triggerFunctionAutoComplete()
   TQStringList fnames = KSpread::FunctionRepository::self()->functionNames();
   TQStringList choices;
   for( unsigned i=0; i<fnames.count(); i++ )
-    if( fnames[i].tqstartsWith( id, false ) )
+    if( fnames[i].startsWith( id, false ) )
       choices.append( fnames[i] );
   choices.sort();
 
diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cc
index 42246838..dc15cddc 100644
--- a/kspread/kspread_functions_conversion.cc
+++ b/kspread/kspread_functions_conversion.cc
@@ -168,7 +168,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *)
   if ((value < 0) || (value > 3999))
     return Value::errorNA();
   TQString result;
-  result = TQString::tqfromLatin1 (RNThousands[(value / 1000)] +
+  result = TQString::fromLatin1 (RNThousands[(value / 1000)] +
                                 RNHundreds[(value / 100) % 10] +
                                 RNTens[(value / 10 ) % 10] +
                                 RNUnits[(value) % 10]);
diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc
index b139057d..0136d298 100644
--- a/kspread/kspread_functions_datetime.cc
+++ b/kspread/kspread_functions_datetime.cc
@@ -32,8 +32,8 @@
 using namespace KSpread;
 
 // prototypes, sorted
-Value func_tqcurrentDate (valVector args, ValueCalc *calc, FuncExtra *);
-Value func_tqcurrentDateTime (valVector args, ValueCalc *calc, FuncExtra *);
+Value func_currentDate (valVector args, ValueCalc *calc, FuncExtra *);
+Value func_currentDateTime (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_currentTime (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_date (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_datevalue (valVector args, ValueCalc *calc, FuncExtra *);
@@ -77,10 +77,10 @@ void RegisterDateTimeFunctions()
   FunctionRepository* repo = FunctionRepository::self();
   Function *f;
   
-  f = new Function ("CURRENTDATE",  func_tqcurrentDate);
+  f = new Function ("CURRENTDATE",  func_currentDate);
   f->setParamCount (0);
   repo->add (f);
-  f = new Function ("CURRENTDATETIME",  func_tqcurrentDateTime);
+  f = new Function ("CURRENTDATETIME",  func_currentDateTime);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("CURRENTTIME",  func_currentTime);
@@ -140,7 +140,7 @@ void RegisterDateTimeFunctions()
   f = new Function ("MONTHS",  func_months);
   f->setParamCount (3);
   repo->add (f);
-  f = new Function ("NOW",  func_tqcurrentDateTime);
+  f = new Function ("NOW",  func_currentDateTime);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("SECOND",  func_second);
@@ -154,7 +154,7 @@ void RegisterDateTimeFunctions()
   repo->add (f);
   f = new Function ("TIMEVALUE",  func_timevalue);
   repo->add (f);
-  f = new Function ("TODAY",  func_tqcurrentDate);
+  f = new Function ("TODAY",  func_currentDate);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("WEEKDAY",  func_weekday);
@@ -519,7 +519,7 @@ Value func_monthname (valVector args, ValueCalc *calc, FuncExtra *)
   int number = calc->conv()->asInteger (args[0]).asInteger();
 
   TQString monthName = calc->conv()->locale()->calendar()->monthName (number,
-      TQDate::tqcurrentDate().year());
+      TQDate::currentDate().year());
   if (monthName.isNull())
     return Value::errorVALUE();
   return Value (monthName);
@@ -555,10 +555,10 @@ Value func_time (valVector args, ValueCalc *calc, FuncExtra *)
   return Value (TQTime (h, m, s));
 }
 
-// Function: tqcurrentDate
-Value func_tqcurrentDate (valVector, ValueCalc *, FuncExtra *)
+// Function: currentDate
+Value func_currentDate (valVector, ValueCalc *, FuncExtra *)
 {
-  return Value (TQDate::tqcurrentDate ());
+  return Value (TQDate::currentDate ());
 }
 
 // Function: currentTime
@@ -567,10 +567,10 @@ Value func_currentTime (valVector, ValueCalc *, FuncExtra *)
   return Value (TQTime::currentTime ());
 }
 
-// Function: tqcurrentDateTime
-Value func_tqcurrentDateTime (valVector, ValueCalc *, FuncExtra *)
+// Function: currentDateTime
+Value func_currentDateTime (valVector, ValueCalc *, FuncExtra *)
 {
-  return Value (TQDateTime::tqcurrentDateTime ());
+  return Value (TQDateTime::currentDateTime ());
 }
 
 // Function: dayOfYear
diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc
index 7d55a8ff..73370e03 100644
--- a/kspread/kspread_map.cc
+++ b/kspread/kspread_map.cc
@@ -159,7 +159,7 @@ void Map::loadOasisSettings( KoOasisSettings &settings )
 
 void Map::saveOasisSettings( KoXmlWriter &settingsWriter )
 {
-    settingsWriter.addConfigItem( "ViewId", TQString::tqfromLatin1( "View1" ) );
+    settingsWriter.addConfigItem( "ViewId", TQString::fromLatin1( "View1" ) );
     // Save visual info for the first view, such as active sheet and active cell
     // It looks like a hack, but reopening a document creates only one view anyway (David)
     View * view = m_doc->views().isEmpty() ? 0 : dynamic_cast<View*>(m_doc->views().getFirst());
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc
index 9257a3f5..82ee585f 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cc
@@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href/*.mid(1)*/);
-        const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
+        const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
         image.setKey(key);
 
         KoStore* store = context.store();
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 09abcf8a..0e7f7bcc 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -222,12 +222,12 @@ TextDrag::~TextDrag()
 }
 
 
-TQByteArray TextDrag::tqencodedData( const char * mime ) const
+TQByteArray TextDrag::encodedData( const char * mime ) const
 {
   if ( strcmp( selectionMimeType(), mime ) == 0)
     return m_kspread;
   else
-    return TQTextDrag::tqencodedData( mime );
+    return TQTextDrag::encodedData( mime );
 }
 
 bool TextDrag::canDecode( TQMimeSource* e )
@@ -5125,11 +5125,11 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
 
     if ( mime->provides( TextDrag::selectionMimeType() ) )
     {
-        b = mime->tqencodedData( TextDrag::selectionMimeType() );
+        b = mime->encodedData( TextDrag::selectionMimeType() );
     }
     else if( mime->provides( "text/plain" ) )
     {
-        // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" )
+        // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" )
         // In particular it handles charsets (in the mimetype). Copied from KPresenter ;-)
         TQString _text = TQApplication::tqclipboard()->text( clipboardMode );
         doc()->emitBeginOperation();
@@ -5152,7 +5152,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
 void Sheet::pasteTextPlain( TQString &_text, TQRect pasteArea)
 {
 //  TQString tmp;
-//  tmp= TQString::fromLocal8Bit(_mime->tqencodedData( "text/plain" ));
+//  tmp= TQString::fromLocal8Bit(_mime->encodedData( "text/plain" ));
   if( _text.isEmpty() )
     return;
 
@@ -5530,7 +5530,7 @@ bool Sheet::testAreaPasteInsert()const
     TQByteArray b;
 
     if ( mime->provides( "application/x-kspread-snippet" ) )
-        b = mime->tqencodedData( "application/x-kspread-snippet" );
+        b = mime->encodedData( "application/x-kspread-snippet" );
     else
         return false;
 
@@ -7171,7 +7171,7 @@ void Sheet::convertPart( const TQString & part, KoXmlWriter & xmlWriter ) const
                     TQDomElement t = dd.createElement( "text:date" );
                     t.setAttribute( "text:date-value", "0-00-00" );
                     // todo: "style:data-style-name", "N2"
-                    t.appendChild( dd.createTextNode( TQDate::tqcurrentDate().toString() ) );
+                    t.appendChild( dd.createTextNode( TQDate::currentDate().toString() ) );
                     parent.appendChild( t );
 #endif
                 }
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index 5d907810..2947728c 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -160,7 +160,7 @@ public:
     void setPlain( TQString const & _plain ) { setText( _plain ); }
     void setKSpread( TQByteArray const & _kspread ) { m_kspread = _kspread; }
 
-    virtual TQByteArray tqencodedData( const char * mime ) const;
+    virtual TQByteArray encodedData( const char * mime ) const;
     virtual const char* format( int i ) const;
 
     static bool canDecode( TQMimeSource * e );
@@ -1018,7 +1018,7 @@ public:
 
     void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _tqgeometry );
 
-    const TQColorGroup& tqcolorGroup() { return widget()->tqcolorGroup(); }
+    const TQColorGroup& colorGroup() { return widget()->colorGroup(); }
 
     int id() const;
 
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index c3c12117..6f9a4f8b 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -1273,7 +1273,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ
         fileName="";
 
     TQString t(TQTime::currentTime().toString());
-    TQString d(TQDate::tqcurrentDate().toString());
+    TQString d(TQDate::currentDate().toString());
     TQString ta;
     if ( !_sheet.isEmpty() )
         ta = _sheet;
diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc
index 06e7a689..8a483154 100644
--- a/kspread/kspread_toolbox.cc
+++ b/kspread/kspread_toolbox.cc
@@ -59,7 +59,7 @@ void ToolBox::setEnabled( bool enable )
     }
     else
     {
-	if ( tqfocusWidget() == this )
+	if ( focusWidget() == this )
 	    focusNextPrevChild( TRUE );
 	TQObjectList clo = childrenListObject();
 	if ( !clo.isEmpty() )
@@ -97,7 +97,7 @@ void ToolBox::childEvent( TQChildEvent* ev )
 {
     if ( ev->inserted() && ev->child()->isWidgetType() )
 	m_layout->addWidget( (TQWidget*)ev->child() );
-    resize( tqsizeHint() );
+    resize( sizeHint() );
 }
 
 void ToolBox::mousePressEvent( TQMouseEvent* ev )
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index cb947f34..89c5ff35 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -1968,8 +1968,8 @@ void View::initView()
 
     d->hBorderWidget = new HBorder( this, d->canvas,this );
     d->vBorderWidget = new VBorder( this, d->canvas ,this );
-    d->hBorderWidget->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    d->vBorderWidget->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+    d->hBorderWidget->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    d->vBorderWidget->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
     d->canvas->setFocusPolicy( TQ_StrongFocus );
     TQWidget::setFocusPolicy( TQ_StrongFocus );
@@ -4143,7 +4143,7 @@ void View::paste()
   {
     canvasWidget()->deselectAllObjects();
     TQCString returnedTypeMime = "application/vnd.oasis.opendocument.spreadsheet";
-    const TQByteArray arr = data->tqencodedData( returnedTypeMime );
+    const TQByteArray arr = data->encodedData( returnedTypeMime );
     if( arr.isEmpty() )
       return;
     TQBuffer buffer( arr );
@@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( )
 
   if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
   {
-    p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 );
+    p2.setX( p2.x() - d->popupListChoose->sizeHint().width() + 1 );
   }
 
   d->popupListChoose->popup( p2 );
@@ -7209,7 +7209,7 @@ void View::transformPart()
 
     if ( d->transformToolBox.isNull() )
     {
-        d->transformToolBox = new KoTransformToolBox( selectedChild(), tqtopLevelWidget() );
+        d->transformToolBox = new KoTransformToolBox( selectedChild(), topLevelWidget() );
         d->transformToolBox->show();
 
         d->transformToolBox->setDocumentChild( selectedChild() );
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index 4c80e7b4..730cd404 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -80,7 +80,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     // Create the display
     calc_display = new DLabel( this, "display" );
     calc_display->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken );
-    calc_display->tqsetAlignment( AlignRight|AlignVCenter );
+    calc_display->setAlignment( AlignRight|AlignVCenter );
     calc_display->setFocus();
     calc_display->setFocusPolicy( TQ_StrongFocus );
 
@@ -89,18 +89,18 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     statusINVLabel = new TQLabel( this, "INV" );
     Q_CHECK_PTR( statusINVLabel );
     statusINVLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusINVLabel->tqsetAlignment( AlignCenter );
+    statusINVLabel->setAlignment( AlignCenter );
     statusINVLabel->setText("NORM");
 
     statusHYPLabel = new TQLabel( this, "HYP" );
     Q_CHECK_PTR( statusHYPLabel );
     statusHYPLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusHYPLabel->tqsetAlignment( AlignCenter );
+    statusHYPLabel->setAlignment( AlignCenter );
 
     statusERRORLabel = new TQLabel( this, "ERROR" );
     Q_CHECK_PTR( statusERRORLabel );
     statusERRORLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusERRORLabel->tqsetAlignment( AlignLeft|AlignVCenter );
+    statusERRORLabel->setAlignment( AlignLeft|AlignVCenter );
 
     // create angle button group
 
@@ -586,7 +586,7 @@ void TQtCalculator::updateGeometry()
         if( o->isWidgetType() )
         {
             margin = TQApplication::style().
-                tqpixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
+                pixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
             ((TQWidget*)o)->setMinimumSize(s.width()+margin, s.height()+margin);
             ((TQWidget*)o)->installEventFilter( this );
             ((TQWidget*)o)->setAcceptDrops(true);
@@ -595,11 +595,11 @@ void TQtCalculator::updateGeometry()
 
     l = (TQObjectList*)mLargePage->tqchildren(); // silence please
 
-    int h1 = pbF->tqminimumSize().height();
+    int h1 = pbF->minimumSize().height();
     int h2 = (int)((((float)h1 + 4.0) / 5.0));
     s.setWidth(mLargePage->fontMetrics().width("MMM") +
                TQApplication::style().
-               tqpixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
+               pixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
     s.setHeight(h1 + h2);
 
     for(uint i = 0; i < l->count(); i++)
@@ -621,7 +621,7 @@ void TQtCalculator::updateGeometry()
     statusINVLabel->setMinimumWidth(s.width());
     statusHYPLabel->setMinimumWidth(s.width());
 
-    //setFixedSize(tqminimumSize());
+    //setFixedSize(minimumSize());
 }
 
 void TQtCalculator::exit()
@@ -1494,10 +1494,10 @@ void TQtCalculator::configclicked(){
                       "enabled. See the README for details.");
 #endif
 
-  label->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
+  label->setAlignment(AlignLeft|WordBreak|ExpandTabs);
   label->setText(labelstring);
 
-  label2->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
+  label2->setAlignment(AlignLeft|WordBreak|ExpandTabs);
   label2->setText(labelstring2);
 
   // HACK
@@ -1540,7 +1540,7 @@ void TQtCalculator::configclicked(){
     set_precision();
     set_style();
     updateGeometry();
-    resize(tqminimumSize());
+    resize(minimumSize());
   }
   delete configdlg;
 }
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
index d55c332b..0311c913 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
@@ -40,7 +40,7 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name)
   
   //we start with a default calendar for the current month;
 
-  TQDate first_day_in_month = TQDate::tqcurrentDate();
+  TQDate first_day_in_month = TQDate::currentDate();
   first_day_in_month.setYMD(first_day_in_month.year(),first_day_in_month.month(),1);
   
   TQDate last_day_in_month(first_day_in_month.year(),first_day_in_month.month(),first_day_in_month.daysInMonth());
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
index 712b11b4..d2c8fc08 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>400</width>
                     <height>19</height>
diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc
index 44f8fa01..a919b31d 100644
--- a/kspread/plugins/scripting/scripting.cc
+++ b/kspread/plugins/scripting/scripting.cc
@@ -43,9 +43,9 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
     setInstance(KSpreadScriptingFactory::instance());
 
     kdDebug() << "Scripting plugin. Class: "
-          << tqmetaObject()->className()
+          << metaObject()->className()
           << ", Parent: "
-          << parent->tqmetaObject()->className()
+          << parent->metaObject()->className()
           << "\n";
 
     if ( parent->inherits("KSpread::View") )
diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc
index 53fe60b3..0c9e9e97 100644
--- a/kspread/tests/testrunner.cc
+++ b/kspread/tests/testrunner.cc
@@ -67,8 +67,8 @@ TestRunner::TestRunner():
   d->testType = new KComboBox( mainWidget );
   tqlayout->addWidget( d->testType, 0, 1 );
 
-  TQSpacerItem* tqspacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  tqlayout->addItem( tqspacerItem, 0, 2 );
+  TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+  tqlayout->addItem( spacerItem, 0, 2 );
 
   d->runButton = new KPushButton( "Run", mainWidget );
   tqlayout->addWidget( d->runButton, 0, 3 );
diff --git a/kspread/valueconverter.cc b/kspread/valueconverter.cc
index 8dda86d1..cd649c36 100644
--- a/kspread/valueconverter.cc
+++ b/kspread/valueconverter.cc
@@ -228,11 +228,11 @@ Value ValueConverter::asDateTime (const Value &value) const
   
   switch (value.type()) {
     case Value::Empty:
-      val.setValue (TQDateTime::tqcurrentDateTime());
+      val.setValue (TQDateTime::currentDateTime());
     break;
     case Value::Boolean:
       //ignore the bool value... any better idea? ;)
-      val.setValue (TQDateTime::tqcurrentDateTime());
+      val.setValue (TQDateTime::currentDateTime());
     break;
     case Value::Integer:
       val.setValue (value.asFloat());
@@ -269,11 +269,11 @@ Value ValueConverter::asDate (const Value &value) const
   
   switch (value.type()) {
     case Value::Empty:
-      val.setValue (TQDate::tqcurrentDate());
+      val.setValue (TQDate::currentDate());
     break;
     case Value::Boolean:
       //ignore the bool value... any better idea? ;)
-      val.setValue (TQDate::tqcurrentDate());
+      val.setValue (TQDate::currentDate());
     break;
     case Value::Integer:
       val.setValue (value.asFloat());