Rename obsolete tq methods to standard names

47 files changed, 408 insertions, 408 deletions

diff --git a/kspread/KSpreadLayoutIface.cc b/kspread/KSpreadLayoutIface.cc
index 1ca174cf..d3c5e1b7 100644
--- a/kspread/KSpreadLayoutIface.cc
+++ b/kspread/KSpreadLayoutIface.cc
@@ -28,47 +28,47 @@ using namespace KSpread;
 
 LayoutIface::LayoutIface(Format *_layout)
 {
-    tqlayout=_layout;
+    layout=_layout;
 }
 
 void LayoutIface::setBgColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setBgColor(c);
+    layout->setBgColor(c);
 }
 
 void LayoutIface::setBgColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setBgColor(c);
+    layout->setBgColor(c);
 }
 
 
 void LayoutIface::setTextColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setTextColor(c);
+    layout->setTextColor(c);
 }
 
 void LayoutIface::setTextColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setTextColor(c);
+    layout->setTextColor(c);
 }
 
 void LayoutIface::setAngle(int angle)
 {
-    tqlayout->setAngle(angle);
+    layout->setAngle(angle);
 }
 
 void LayoutIface::setVerticalText(bool _vertical)
 {
-    tqlayout->setVerticalText(_vertical);
+    layout->setVerticalText(_vertical);
 }
 
 void LayoutIface::setMultiRow(bool _multi)
 {
-    tqlayout->setMultiRow( _multi );
+    layout->setMultiRow( _multi );
 }
 
 void LayoutIface::setAlign( const TQString& _Align )
@@ -82,7 +82,7 @@ void LayoutIface::setAlign( const TQString& _Align )
         Align=Format::Center;
     else
         Align=Format::Undefined;
-    tqlayout->setAlign( Align);
+    layout->setAlign( Align);
 }
 
 void LayoutIface::setAlignY( const TQString& _AlignY )
@@ -96,23 +96,23 @@ void LayoutIface::setAlignY( const TQString& _AlignY )
         AlignY=Format::Bottom;
     else
         AlignY=Format::Middle;
-    tqlayout->setAlignY( AlignY);
+    layout->setAlignY( AlignY);
 }
 
 void LayoutIface::setPostfix(const TQString &_postfix)
 {
-    tqlayout->setPostfix( _postfix );
+    layout->setPostfix( _postfix );
 }
 
 void LayoutIface::setPrefix(const TQString &_prefix)
 {
-    tqlayout->setPrefix( _prefix );
+    layout->setPrefix( _prefix );
 }
 
 void LayoutIface::setFormatType(const TQString &_formatType)
 {
     FormatType format;
-    tqlayout->setPrecision(2);
+    layout->setPrecision(2);
     if (_formatType=="Generic")
         format = Generic_format;
     else if(_formatType=="Number")
@@ -151,43 +151,43 @@ void LayoutIface::setFormatType(const TQString &_formatType)
         format=fraction_three_digits;
     else
         format=Generic_format;
-    tqlayout->setFormatType( format);
+    layout->setFormatType( format);
 }
 
 
 void LayoutIface::setPrecision(int _p)
 {
-    tqlayout->setPrecision( _p );
+    layout->setPrecision( _p );
 }
 
 void LayoutIface::setTextFontBold(bool _b)
 {
-    tqlayout->setTextFontBold( _b );
+    layout->setTextFontBold( _b );
 }
 
 void LayoutIface::setTextFontItalic(bool _b)
 {
-    tqlayout->setTextFontItalic( _b );
+    layout->setTextFontItalic( _b );
 }
 
 void LayoutIface::setTextFontUnderline(bool _b)
 {
-    tqlayout->setTextFontUnderline( _b );
+    layout->setTextFontUnderline( _b );
 }
 
 void LayoutIface::setTextFontStrike(bool _b)
 {
-    tqlayout->setTextFontStrike( _b );
+    layout->setTextFontStrike( _b );
 }
 
 void LayoutIface::setTextFontSize( int _size )
 {
-    tqlayout->setTextFontSize( _size );
+    layout->setTextFontSize( _size );
 }
 
 void LayoutIface::setTextFontFamily( const TQString& _font )
 {
-    tqlayout->setTextFontFamily( _font );
+    layout->setTextFontFamily( _font );
 }
 
 
@@ -195,34 +195,34 @@ void LayoutIface::setTextFontFamily( const TQString& _font )
 void LayoutIface::setLeftBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setLeftBorderStyle(Qt::DotLine);
+        layout->setLeftBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setLeftBorderStyle(Qt::DashLine);
+        layout->setLeftBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setLeftBorderStyle(Qt::DashDotLine);
+        layout->setLeftBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setLeftBorderStyle(Qt::DashDotDotLine);
+        layout->setLeftBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setLeftBorderStyle(Qt::SolidLine);
+        layout->setLeftBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setLeftBorderStyle(Qt::SolidLine);
+        layout->setLeftBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setLeftBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setLeftBorderColor(c );
+    layout->setLeftBorderColor(c );
 }
 
 void LayoutIface::setLeftBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setLeftBorderColor(c );
+    layout->setLeftBorderColor(c );
 }
 
 void LayoutIface::setLeftBorderWidth( int _size )
 {
-    tqlayout->setLeftBorderWidth( _size );
+    layout->setLeftBorderWidth( _size );
 }
 
 
@@ -230,34 +230,34 @@ void LayoutIface::setLeftBorderWidth( int _size )
 void LayoutIface::setRightBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setRightBorderStyle(Qt::DotLine);
+        layout->setRightBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setRightBorderStyle(Qt::DashLine);
+        layout->setRightBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setRightBorderStyle(Qt::DashDotLine);
+        layout->setRightBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setRightBorderStyle(Qt::DashDotDotLine);
+        layout->setRightBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setRightBorderStyle(Qt::SolidLine);
+        layout->setRightBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setRightBorderStyle(Qt::SolidLine);
+        layout->setRightBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setRightBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setRightBorderColor(c );
+    layout->setRightBorderColor(c );
 }
 
 void LayoutIface::setRightBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setRightBorderColor(c );
+    layout->setRightBorderColor(c );
 }
 
 void LayoutIface::setRightBorderWidth( int _size )
 {
-    tqlayout->setRightBorderWidth( _size );
+    layout->setRightBorderWidth( _size );
 }
 
 
@@ -265,34 +265,34 @@ void LayoutIface::setRightBorderWidth( int _size )
 void LayoutIface::setTopBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setTopBorderStyle(Qt::DotLine);
+        layout->setTopBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setTopBorderStyle(Qt::DashLine);
+        layout->setTopBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setTopBorderStyle(Qt::DashDotLine);
+        layout->setTopBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setTopBorderStyle(Qt::DashDotDotLine);
+        layout->setTopBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setTopBorderStyle(Qt::SolidLine);
+        layout->setTopBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setTopBorderStyle(Qt::SolidLine);
+        layout->setTopBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setTopBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setTopBorderColor(c );
+    layout->setTopBorderColor(c );
 }
 
 void LayoutIface::setTopBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setTopBorderColor(c );
+    layout->setTopBorderColor(c );
 }
 
 void LayoutIface::setTopBorderWidth( int _size )
 {
-    tqlayout->setTopBorderWidth( _size );
+    layout->setTopBorderWidth( _size );
 }
 
 
@@ -300,33 +300,33 @@ void LayoutIface::setTopBorderWidth( int _size )
 void LayoutIface::setBottomBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setBottomBorderStyle(Qt::DotLine);
+        layout->setBottomBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setBottomBorderStyle(Qt::DashLine);
+        layout->setBottomBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setBottomBorderStyle(Qt::DashDotLine);
+        layout->setBottomBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setBottomBorderStyle(Qt::DashDotDotLine);
+        layout->setBottomBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setBottomBorderStyle(Qt::SolidLine);
+        layout->setBottomBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setBottomBorderStyle(Qt::SolidLine);
+        layout->setBottomBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setBottomBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setBottomBorderColor(c );
+    layout->setBottomBorderColor(c );
 }
 void LayoutIface::setBottomBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setBottomBorderColor(c );
+    layout->setBottomBorderColor(c );
 }
 
 void LayoutIface::setBottomBorderWidth( int _size )
 {
-    tqlayout->setBottomBorderWidth( _size );
+    layout->setBottomBorderWidth( _size );
 }
 
 
@@ -334,33 +334,33 @@ void LayoutIface::setBottomBorderWidth( int _size )
 void LayoutIface::setFallDiagonalStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setFallDiagonalStyle(Qt::DotLine);
+        layout->setFallDiagonalStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setFallDiagonalStyle(Qt::DashLine);
+        layout->setFallDiagonalStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setFallDiagonalStyle(Qt::DashDotLine);
+        layout->setFallDiagonalStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setFallDiagonalStyle(Qt::DashDotDotLine);
+        layout->setFallDiagonalStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setFallDiagonalStyle(Qt::SolidLine);
+        layout->setFallDiagonalStyle(Qt::SolidLine);
     else
-        tqlayout->setFallDiagonalStyle(Qt::SolidLine);
+        layout->setFallDiagonalStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setFallDiagonalColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setFallDiagonalColor(c );
+    layout->setFallDiagonalColor(c );
 }
 void LayoutIface::setFallDiagonalColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setFallDiagonalColor(c );
+    layout->setFallDiagonalColor(c );
 }
 
 void LayoutIface::setFallDiagonalWidth( int _size )
 {
-    tqlayout->setFallDiagonalWidth( _size );
+    layout->setFallDiagonalWidth( _size );
 }
 
 
@@ -369,47 +369,47 @@ void LayoutIface::setFallDiagonalWidth( int _size )
 void LayoutIface::setGoUpDiagonalStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DotLine);
+        layout->setGoUpDiagonalStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DashLine);
+        layout->setGoUpDiagonalStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DashDotLine);
+        layout->setGoUpDiagonalStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DashDotDotLine);
+        layout->setGoUpDiagonalStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::SolidLine);
+        layout->setGoUpDiagonalStyle(Qt::SolidLine);
     else
-        tqlayout->setGoUpDiagonalStyle(Qt::SolidLine);
+        layout->setGoUpDiagonalStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setGoUpDiagonalColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setGoUpDiagonalColor(c );
+    layout->setGoUpDiagonalColor(c );
 }
 void LayoutIface::setGoUpDiagonalColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setGoUpDiagonalColor(c );
+    layout->setGoUpDiagonalColor(c );
 }
 
 void LayoutIface::setGoUpDiagonalWidth( int _size )
 {
-    tqlayout->setGoUpDiagonalWidth( _size );
+    layout->setGoUpDiagonalWidth( _size );
 }
 
 
 void LayoutIface::setIndent( double indent )
 {
     if( indent >= 0.0 )
-        tqlayout->setIndent( indent );
+        layout->setIndent( indent );
     else
-        tqlayout->setIndent( 0.0 );
+        layout->setIndent( 0.0 );
 }
 
 
 void LayoutIface::setDontPrintText ( bool _print)
 {
-    tqlayout->setDontPrintText ( _print);
+    layout->setDontPrintText ( _print);
 }
 
diff --git a/kspread/KSpreadLayoutIface.h b/kspread/KSpreadLayoutIface.h
index c4231032..84de8ac4 100644
--- a/kspread/KSpreadLayoutIface.h
+++ b/kspread/KSpreadLayoutIface.h
@@ -95,7 +95,7 @@ k_dcop:
     //don't print text
     virtual void setDontPrintText ( bool _b);
 private:
-    Format *tqlayout;
+    Format *layout;
 };
 
 } //namespace KSpread
diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt
index 6aebbb9e..bf0feb94 100644
--- a/kspread/OASIS.txt
+++ b/kspread/OASIS.txt
@@ -51,7 +51,7 @@ Document/Workbook
    [x] Active sheet
    [x] Header
    [x] Footer
-   [x] Page tqlayout
+   [x] Page layout
    [x] Protection status
    [x] Print range
    [x] Print setup
diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index 0fe6fb41..095f1188 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -22,7 +22,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index d03b72d7..9e9d47de 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -54,9 +54,9 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" );
   groupBox1_3->setColumnLayout(0, Qt::Vertical );
-  groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() );
-  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() );
+  groupBox1_3->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_3->layout()->setMargin( KDialog::marginHint() );
+  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() );
   groupBox1_3Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" );
@@ -89,10 +89,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" );
   groupBox1_2->setColumnLayout(0, Qt::Vertical );
-  groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox1_2->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_2->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() );
+  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() );
   groupBox1_2Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" );
@@ -125,10 +125,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" );
   groupBox1_1->setColumnLayout(0, Qt::Vertical );
-  groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox1_1->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_1->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() );
+  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() );
   groupBox1_1Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" );
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index dcc53a77..09da5d58 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -89,9 +89,9 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
   m_delimiterBox->setTitle( i18n( "Delimiter" ) );
   m_delimiterBox->setColumnLayout(0, Qt::Vertical );
-  m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() );
-  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() );
+  m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() );
+  m_delimiterBox->layout()->setMargin( KDialog::marginHint() );
+  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() );
   m_delimiterBoxLayout->setAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 );
 
@@ -132,9 +132,9 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
   m_formatBox->setTitle( i18n( "Format" ) );
   m_formatBox->setColumnLayout(0, Qt::Vertical );
-  m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  m_formatBox->tqlayout()->setMargin( KDialog::marginHint() );
-  m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() );
+  m_formatBox->layout()->setSpacing( KDialog::spacingHint() );
+  m_formatBox->layout()->setMargin( KDialog::marginHint() );
+  m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() );
   m_formatBoxLayout->setAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 );
 
@@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   if ( m_mode == Clipboard )
   {
     setCaption( i18n( "Inserting From Clipboard" ) );
-    TQMimeSource * mime = TQApplication::tqclipboard()->data();
+    TQMimeSource * mime = TQApplication::clipboard()->data();
     if ( !mime )
     {
       KMessageBox::information( this, i18n("There is no data in the clipboard.") );
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index 0a222654..dceca6b1 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -30,17 +30,17 @@ using namespace KSpread;
 
 FindOption::FindOption( TQWidget *parent)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(parent);
+    TQVBoxLayout *layout = new TQVBoxLayout(parent);
     m_moreOptions = new TQPushButton( i18n( "More Options" ), parent );
-    tqlayout->addWidget(  m_moreOptions );
+    layout->addWidget(  m_moreOptions );
 
     connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) );
 
     m_findExtension = new TQWidget( parent );
-    tqlayout->addWidget( m_findExtension );
-    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension );
+    layout->addWidget( m_findExtension );
+    TQVBoxLayout *layout1 = new TQVBoxLayout( m_findExtension );
     m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension );
-    tqlayout1->addWidget( m_searchInAllSheet );
+    layout1->addWidget( m_searchInAllSheet );
 
     TQHBoxLayout *comboLayout = new TQHBoxLayout( m_findExtension );
     TQLabel *label = new TQLabel( i18n( "Search in:" ), m_findExtension );
@@ -48,7 +48,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchIn = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchIn );
-    tqlayout1->addLayout( comboLayout );
+    layout1->addLayout( comboLayout );
 
     TQStringList lst;
     lst << i18n( "Cell Values" );
@@ -61,7 +61,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchDirection = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchDirection );
-    tqlayout1->addLayout( comboLayout );
+    layout1->addLayout( comboLayout );
 
     lst.clear();
     lst << i18n( "Across then Down" );
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index 8cd3f89f..6e217f24 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -55,7 +55,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->tqlayout();
+  grp->layout();
   lay1->addWidget(grp);
   if( insRem==Insert)
   {
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index f7878266..ce97542d 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -151,15 +151,15 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
   : TQWidget( parent ),
     m_dlg( dlg )
 {
-  TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout");
+  TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout");
 
   TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->setTitle( i18n( "Style" ) );
-  groupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
+  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
   groupBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * label1 = new TQLabel( groupBox, "label1" );
@@ -198,8 +198,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
 
   TQSpacerItem * spacer = new TQSpacerItem( 20, 260, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
-  tqlayout->addWidget( groupBox, 0, 0 );
-  tqlayout->addItem( spacer, 1, 0 );
+  layout->addWidget( groupBox, 0, 0 );
+  layout->addItem( spacer, 1, 0 );
 
   if ( m_dlg->getStyle()->type() == Style::BUILTIN )
   {
@@ -886,7 +886,7 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y)
 
 void CellFormatDialog::init()
 {
-  TQColorGroup colorGroup = TQApplication::tqpalette().active();
+  TQColorGroup colorGroup = TQApplication::palette().active();
 
   // Did we initialize the bitmaps ?
   if ( formatOnlyNegSignedPixmap == 0L )
@@ -948,7 +948,7 @@ TQPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const TQC
 
   TQPainter painter;
   painter.begin( pixmap );
-  painter.fillRect( 0, 0, 150, 14, TQApplication::tqpalette().active().base() );
+  painter.fillRect( 0, 0, 150, 14, TQApplication::palette().active().base() );
   painter.setPen( _color1 );
   painter.drawText( 2, 11, TQString(_string1) );
   painter.setPen( _color2 );
@@ -1082,7 +1082,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
   : TQWidget ( parent ),
     dlg( _dlg )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6,10 );
 
     TQButtonGroup *grp = new TQButtonGroup( i18n("Format"),this);
     TQGridLayout *grid = new TQGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint());
@@ -1149,7 +1149,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
     listFormat=new TQListBox(grp);
     grid->addMultiCellWidget(listFormat,2,7,1,1);
     TQWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) );
-    tqlayout->addWidget(grp);
+    layout->addWidget(grp);
 
     /* *** */
 
@@ -1245,7 +1245,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
         format->setCurrentItem( 3 );
     else if ( dlg->floatFormat == Format::AlwaysSigned && dlg->floatColor == Format::NegRed )
         format->setCurrentItem( 4 );
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     cellFormatType=dlg->formatType;
     newFormatType = cellFormatType;
@@ -2678,7 +2678,7 @@ void CellFormatPageBorder::InitializeGrids()
     { {0,0}, {0,1},{0,2} };
   /***********************/
 
-  /* set up a tqlayout box for most of the border setting buttons */
+  /* set up a layout box for most of the border setting buttons */
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Border") );
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index 7150b017..b9e20054 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -48,11 +48,11 @@
 using namespace KSpread;
 
 PaperLayout::PaperLayout( TQWidget * parent, const char * name,
-                                        const KoPageLayout & tqlayout,
+                                        const KoPageLayout & layout,
                                         const KoHeadFoot & headfoot,
                                         int tabs, KoUnit::Unit unit,
                                         Sheet * sheet, View * view)
-  : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/),
+  : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/),
     m_pSheet( sheet ),
     m_pView( view )
 {
@@ -130,7 +130,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox )
     rangeGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( rangeGroup );
 
-    TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() );
+    TQGridLayout *grid = new TQGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() );
 
     TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup );
     grid->addWidget( pPrintRange, 0, 0 );
@@ -182,7 +182,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     zoomGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( zoomGroup );
 
-    TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6,
+    TQGridLayout *grid = new TQGridLayout( zoomGroup->layout(), 2, 6,
                                          KDialog::spacingHint() );
 
     m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup );
@@ -312,7 +312,7 @@ void PaperLayout::slotOk()
     {
       SheetPrint *print = sheet->print();
 
-      KoPageLayout pl = tqlayout();
+      KoPageLayout pl = layout();
       KoHeadFoot hf = headFoot();
       KoUnit::Unit unit = sheet->doc()->unit();
       print->setPrintGrid( pPrintGrid->isChecked() );
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h
index c9a9e6e5..0260c1c8 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.h
+++ b/kspread/dialogs/kspread_dlg_paperlayout.h
@@ -42,7 +42,7 @@ class PaperLayout: public KoPageLayoutDia
   TQ_OBJECT
 public:
   PaperLayout( TQWidget* parent, const char* name,
-                      const KoPageLayout& tqlayout,
+                      const KoPageLayout& layout,
                       const KoHeadFoot& headfoot,
                       int tabs, KoUnit::Unit unit,
                       Sheet * sheet, View *view);
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc
index 9b54644d..cc49afad 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -49,7 +49,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->tqlayout();
+  grp->layout();
   lay1->addWidget(grp);
   rb1 = new TQRadioButton( i18n("Move towards right"), grp );
   rb2 = new TQRadioButton( i18n("Move towards bottom"), grp );
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index c4777a7b..d17c27e1 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -790,10 +790,10 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name )
   m_pView = _view;
 
   TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" );
-  tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+  tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->tqlayout(),8,1);
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->layout(),8,1);
   grid1->addRowSpacing( 0, KDialog::marginHint()  );
   grid1->setRowStretch( 7, 10 );
 
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index 477cfd1c..c5ae14c7 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -75,7 +75,7 @@ reference::reference( View* parent, const char* name )
   m_pOk = bb->addButton( KStdGuiItem::ok() );
   m_pCancel = bb->addButton( KStdGuiItem::cancel() );
   m_pOk->setDefault( TRUE );
-  bb->tqlayout();
+  bb->layout();
   lay1->addWidget( bb );
 
   TQString text;
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 6a7b2abc..9a7c6e33 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -85,7 +85,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" );
   orientationGroup->setLineWidth(0);
   orientationGroup->setMargin(0);
-  orientationGroup->tqlayout()->setMargin(0);
+  orientationGroup->layout()->setMargin(0);
 
   m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" );
   m_sortColumn->setText( i18n( "Sort &Rows" ) );
@@ -108,9 +108,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort1Box->setTitle( i18n( "Sort By" ) );
   sort1Box->setFlat(true);
   sort1Box->setColumnLayout(0, Qt::Vertical );
-  sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort1Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() );
+  sort1Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort1Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() );
   sort1BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" );
@@ -127,9 +127,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort2Box->setTitle( i18n( "Then By" ) );
   sort2Box->setFlat(true);
   sort2Box->setColumnLayout(0, Qt::Vertical );
-  sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort2Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() );
+  sort2Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort2Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() );
   sort2BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" );
@@ -147,9 +147,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort3Box->setTitle( i18n( "Then By" ) );
   sort3Box->setFlat(true);
   sort3Box->setColumnLayout(0, Qt::Vertical );
-  sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort3Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() );
+  sort3Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort3Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() );
   sort3BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" );
@@ -176,9 +176,9 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" );
   firstKeyBox->setTitle( i18n( "First Key" ) );
   firstKeyBox->setColumnLayout(0, Qt::Vertical );
-  firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() );
-  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() );
+  firstKeyBox->layout()->setSpacing( KDialog::spacingHint() );
+  firstKeyBox->layout()->setMargin( KDialog::marginHint() );
+  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() );
   firstKeyBoxLayout->setAlignment( TQt::AlignTop );
 
   m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" );
@@ -201,11 +201,11 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" );
   resultToBox->setTitle( i18n( "Location to Store Sort Results" ) );
   resultToBox->setColumnLayout(0, Qt::Vertical );
-  resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  resultToBox->tqlayout()->setMargin( KDialog::marginHint() );
+  resultToBox->layout()->setSpacing( KDialog::spacingHint() );
+  resultToBox->layout()->setMargin( KDialog::marginHint() );
   
   
-  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() );
+  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() );
   resultToBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet");
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 3f0c27e0..510e0ad8 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -46,7 +46,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page );
     grp->setRadioButtonExclusive( TRUE );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
     rb1 = new TQRadioButton( i18n("Everything"), grp );
     rb2 = new TQRadioButton( i18n("Text"), grp );
@@ -59,7 +59,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page);
     grp->setRadioButtonExclusive( TRUE );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
 
 
@@ -71,7 +71,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
     rb5->setChecked(true);
 
     // cb = new TQCheckBox(i18n("Transpose"),this);
-    // cb->tqlayout();
+    // cb->layout();
     // lay1->addWidget(cb);
 
     connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) );
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index dd0857e3..26ec4580 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -42,15 +42,15 @@ using namespace KSpread;
 StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
   : TQWidget( parent, name, fl )
 {
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout");
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "layout");
 
   m_styleList = new KListView( this, "m_styleList" );
   m_styleList->addColumn( i18n( "Styles" ) );
   m_styleList->setResizeMode( KListView::AllColumns );
-  tqlayout->addWidget( m_styleList );
+  layout->addWidget( m_styleList );
 
   m_displayBox = new KComboBox( FALSE, this, "m_displayBox" );
-  tqlayout->addWidget( m_displayBox );
+  layout->addWidget( m_displayBox );
 
   m_styleList->header()->setLabel( 0, i18n( "Styles" ) );
   m_displayBox->clear();
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 79445e54..2d0b5656 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -54,9 +54,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
 
   TQGroupBox* tmpTQButtonGroup;
   tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" );
-  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2);
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2);
 
   TQLabel *tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_1" );
   tmpTQLabel->setText(i18n("Allow:" ));
@@ -148,9 +148,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" );
-  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
 
   displayMessage = new TQCheckBox(i18n( "Show error message when invalid values are entered" ),tmpTQButtonGroup );
   displayMessage->setChecked( true );
@@ -188,10 +188,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" );
-  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
+  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
 
   displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup );
   displayMessage->setChecked( false );
diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui
index ced66251..5e4af84d 100644
--- a/kspread/dialogs/position_cell_format.ui
+++ b/kspread/dialogs/position_cell_format.ui
@@ -55,7 +55,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -271,7 +271,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -331,7 +331,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui
index cb66f102..c9c3eb7a 100644
--- a/kspread/dialogs/protection_cell_format.ui
+++ b/kspread/dialogs/protection_cell_format.ui
@@ -60,7 +60,7 @@ Note that you can print it even if the cell is protected</string>
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -79,7 +79,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -120,7 +120,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui
index 89f314a7..d2a24d6c 100644
--- a/kspread/dialogs/sheet_properties_base.ui
+++ b/kspread/dialogs/sheet_properties_base.ui
@@ -47,7 +47,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -127,7 +127,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kspread/digest.cc b/kspread/digest.cc
index ca45c35d..0d27375b 100644
--- a/kspread/digest.cc
+++ b/kspread/digest.cc
@@ -831,7 +831,7 @@ void rtl_digest_destroySHA1 (rtlDigest Digest)
 bool SHA1::getHash( TQString const & text, TQCString & hash )
 {
   rtlDigest aDigest     = rtl_digest_createSHA1();
-  rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.tqunicode(), text.length() * sizeof(TQChar) );
+  rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.unicode(), text.length() * sizeof(TQChar) );
   
   if ( aError == rtl_Digest_E_None )
   {
diff --git a/kspread/doc/PAINTING.html b/kspread/doc/PAINTING.html
index 13a674db..1f2578f2 100644
--- a/kspread/doc/PAINTING.html
+++ b/kspread/doc/PAINTING.html
@@ -59,10 +59,10 @@ If it doesn't, two things can happen:</p>
       slightly buggy.)
 </ol>
 
-The tqlayout code also takes into account if the cell has vertical text,
+The layout code also takes into account if the cell has vertical text,
 if it is angled, indented text, and so on.</p>
 
-<p>The result of the tqlayout process is the setting of the following
+<p>The result of the layout process is the setting of the following
 variables in a cell:</p>
 
 <table cellspacing="0" cellpadding="3" border="1">
@@ -100,7 +100,7 @@ variables in a cell:</p>
 </pre>
 </table>
 
-<p>After the tqlayout process, paintCell() uses these
+<p>After the layout process, paintCell() uses these
 variables to position the text within the cell and also to paint "more
 text" markers, etc.</p>
 
diff --git a/kspread/formula.cc b/kspread/formula.cc
index 0f70feaf..fbcf8c0e 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cc
@@ -134,7 +134,7 @@ Token::Op KSpread::matchOperator( const TQString& text )
   if( text.length() == 1 )
   {
     TQChar p = text[0];
-    switch( p.tqunicode() )
+    switch( p.unicode() )
     {
         case '+': result = Token::Plus; break;
         case '-': result = Token::Minus; break;
@@ -355,7 +355,7 @@ void TokenStack::ensureSpace()
 // helper function: return true for valid identifier character
 bool KSpread::isIdentifier( TQChar ch )
 {
-  return ( ch.tqunicode() == '_' ) || (ch.tqunicode() == '$' ) || ( ch.isLetter() );
+  return ( ch.unicode() == '_' ) || (ch.unicode() == '$' ) || ( ch.isLetter() );
 }
 
 
@@ -527,7 +527,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const
        }
 
        // aposthrophe (') marks sheet name for 3-d cell, e.g 'Sales Q3'!A4, or a named range
-       else if ( ch.tqunicode() == '\'' )
+       else if ( ch.unicode() == '\'' )
        {
          i++;
          state = InSheetOrAreaName;
@@ -680,7 +680,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const
     case InSheetOrAreaName:
 
        // consume until '
-        if ( ch.tqunicode() != '\'' )
+        if ( ch.unicode() != '\'' )
           tokenText.append( ex[i++] );
 
        else
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 4d091a3d..4ebfffea 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -3582,7 +3582,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 }
 
 
-void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ )
+void Canvas::finishResizeObject( const TQString &/*name*/, bool /*layout*/ )
 {
   if ( d->m_resizeObject )
   {
@@ -3598,8 +3598,8 @@ void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ )
         doc()->addCommand( resizeCmd );
     }
 
-//     if ( tqlayout )
-//       doc()->tqlayout( m_resizeObject );
+//     if ( layout )
+//       doc()->layout( m_resizeObject );
 
     d->m_ratio = 0.0;
     d->m_isResizing = false;
@@ -3775,7 +3775,7 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys )
 
     TQColor color = cell->format()->textColor( markerColumn(), markerRow() );
     if ( !color.isValid() )
-        color = TQApplication::tqpalette().active().text();
+        color = TQApplication::palette().active().text();
     g.setColor( TQColorGroup::Text, color);
 
     color = cell->bgColor( markerColumn(), markerRow() );
@@ -3899,7 +3899,7 @@ void Canvas::copyOasisObjects()
     }
 
     TQDragObject *dragObject = multiDrag;
-    TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard );
+    TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard );
 }
 
 void Canvas::closeEditor()
@@ -4109,7 +4109,7 @@ void Canvas::paintUpdates()
       {
         cell = sheet->cellAt( x, y );
 
-        // recalc and retqlayout only for non default cells
+        // recalc and relayout only for non default cells
         if (!cell->isDefault())
         {
           if (cell->calcDirtyFlag()) cell->calc();
diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h
index d8411791..ea7e3dd1 100644
--- a/kspread/kspread_canvas.h
+++ b/kspread/kspread_canvas.h
@@ -284,7 +284,7 @@ public:
      */
     void closeEditor();
 
-    // Created by the view since it's tqlayout is managed there,
+    // Created by the view since it's layout is managed there,
     // but is in fact a sibling of the canvas, which needs to know about it.
     void setEditWidget( KSpread::EditWidget * ew );
 
@@ -326,7 +326,7 @@ public:
     /// resize the m_resizeObject
     void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio );
     /// create KPrResizeCmd
-    void finishResizeObject( const TQString &name, bool tqlayout = true );
+    void finishResizeObject( const TQString &name, bool layout = true );
 
     /**
      * @brief Display object above the other objects in editiong mode
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index 0cbda2b4..0c5de5e6 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -486,7 +486,7 @@ void Cell::setValue( const Value& v )
     clearAllErrors();
 
   //If the value has not changed then we don't need to do anything
-  //(ie. no need to retqlayout, update dependant cells etc.),
+  //(ie. no need to relayout, update dependant cells etc.),
   //unless this cell contains a formula, in which case its dependancies might have changed
   //even though the value has not.  For example, if this cell was previously empty (and its value is
   //therefore empty) and a new dependency upon an empty cell has been added.  The new value would still
@@ -697,7 +697,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y )
       d->extra()->mergedYCells = 0;
     }
 
-    // Refresh the tqlayout
+    // Refresh the layout
     setFlag( Flag_LayoutDirty );
     return;
   }
@@ -717,7 +717,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y )
     }
   }
 
-  // Refresh the tqlayout
+  // Refresh the layout
   setFlag( Flag_LayoutDirty );
 }
 
@@ -1204,7 +1204,7 @@ void Cell::freeAllObscuredCells()
 //                              Layout
 
 
-// Recalculate the entire tqlayout.  This includes the following members:
+// Recalculate the entire layout.  This includes the following members:
 //
 //   d->textX,     d->textY
 //   d->textWidth, d->textHeight
@@ -1222,11 +1222,11 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row )
 {
   // Are _col and _row really needed ?
   //
-  // Yes they are: they are useful if this is the default tqlayout, in
+  // Yes they are: they are useful if this is the default layout, in
   // which case d->row and d->column are 0 and 0, but _col and _row
   // are the real coordinates of the cell.
 
-  // There is no need to remake the tqlayout if it hasn't changed.
+  // There is no need to remake the layout if it hasn't changed.
   if ( !testFlag( Flag_LayoutDirty ) )
     return;
 
@@ -1244,7 +1244,7 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row )
          d->extra()->mergedXCells, d->extra()->mergedYCells );
 
   // If the column for this cell is hidden or the row is too low,
-  // there is no use in remaking the tqlayout.
+  // there is no use in remaking the layout.
   ColumnFormat  *cl1 = format()->sheet()->columnFormat( _col );
   RowFormat     *rl1 = format()->sheet()->rowFormat( _row );
   if ( cl1->isHide()
@@ -1597,11 +1597,11 @@ void Cell::setOutputText()
     return;
   }
 
-  // If nothing has changed, we don't need to remake the text tqlayout.
+  // If nothing has changed, we don't need to remake the text layout.
   if ( !testFlag(Flag_TextFormatDirty) )
     return;
 
-  // We don't want to remake the tqlayout unnecessarily.
+  // We don't want to remake the layout unnecessarily.
   clearFlag( Flag_TextFormatDirty );
 
   // Display a formula if warranted.  If not, display the value instead;
@@ -2193,7 +2193,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   double  width   = width0;
   double  height  = height0;
 
-  // Handle right-to-left tqlayout.
+  // Handle right-to-left layout.
   // In an RTL sheet the cells have to be painted at their opposite horizontal
   // location on the canvas, meaning that column A will be the rightmost column
   // on screen, column B will be to the left of it and so on. Here we change
@@ -2257,10 +2257,10 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
       selected = false;
   }
 
-  // Need to make a new tqlayout ?
+  // Need to make a new layout ?
   //
   // FIXME: We have already used (at least) extraWidth/Height above,
-  //        and now we are recalculating the tqlayout.  This has to be
+  //        and now we are recalculating the layout.  This has to be
   //        moved up above all uses.
   //
   // FIXME: This needs to be taken out eventually - it is done in
@@ -2686,7 +2686,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect,
           const TQPoint &cellRef, bool selected,
           TQColor &backgroundColor )
 {
-  TQColorGroup  defaultColorGroup = TQApplication::tqpalette().active();
+  TQColorGroup  defaultColorGroup = TQApplication::palette().active();
   TQRect        zoomedCellRect    = sheet()->doc()->zoomRect( cellRect );
 
   // If this is not the KS_rowMax and/or KS_colMax, then we reduce
@@ -3175,7 +3175,7 @@ void Cell::paintText( TQPainter& painter,
 
   ColumnFormat  *colFormat         = format()->sheet()->columnFormat( cellRef.x() );
 
-  TQColorGroup    defaultColorGroup = TQApplication::tqpalette().active();
+  TQColorGroup    defaultColorGroup = TQApplication::palette().active();
   TQColor         textColorPrint    = effTextColor( cellRef.x(), cellRef.y() );
 
   // Resolve the text color if invalid (=default).
@@ -3183,7 +3183,7 @@ void Cell::paintText( TQPainter& painter,
     if ( painter.device()->isExtDev() )
       textColorPrint = TQt::black;
     else
-      textColorPrint = TQApplication::tqpalette().active().text();
+      textColorPrint = TQApplication::palette().active().text();
   }
 
   TQPen tmpPen( textColorPrint );
@@ -3209,7 +3209,7 @@ void Cell::paintText( TQPainter& painter,
 
   // Check for blue color, for hyperlink.
   if ( !link().isEmpty() ) {
-    tmpPen.setColor( TQApplication::tqpalette().active().link() );
+    tmpPen.setColor( TQApplication::palette().active().link() );
     TQFont f = painter.font();
     f.setUnderline( true );
     painter.setFont( f );
@@ -4704,7 +4704,7 @@ TQString Cell::link() const
 
 void Cell::update()
 {
-  /* those obscuring us need to redo their tqlayout cause they can't obscure us
+  /* those obscuring us need to redo their layout cause they can't obscure us
      now that we've got text.
      This includes cells obscuring cells that we are obscuring
   */
diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h
index 500804f3..fd100c45 100644
--- a/kspread/kspread_cell.h
+++ b/kspread/kspread_cell.h
@@ -265,7 +265,7 @@ public:
 
     /**
      * Moves around the cell. It cares about obscured and obscuring cells and
-     * forces, retqlayout, calculation and redrawing of the cell.
+     * forces, relayout, calculation and redrawing of the cell.
      */
     void move( int column, int row );
 
@@ -807,7 +807,7 @@ public:
     void clearAllErrors();
 
     /**
-     * Calculates the tqlayout of the cell, i,e, determines what should be shown
+     * Calculates the layout of the cell, i,e, determines what should be shown
      * for this cell, m_strOutText.
      */
     void makeLayout( TQPainter &_painter, int _col, int _row );
@@ -900,9 +900,9 @@ public:
    * In that case the cell usually displays "#####"
    *
    * LayoutDirty
-   * Flag showing whether the current tqlayout is OK.
+   * Flag showing whether the current layout is OK.
    * If you change for example the fonts point size, set this flag. When the
-   * cell must draw itself on the screen it will first recalculate its tqlayout.
+   * cell must draw itself on the screen it will first recalculate its layout.
    *
    * CalcDirty
    * Shows whether recalculation is necessary.
@@ -925,7 +925,7 @@ public:
    * If this flag is set, then it is known that this cell has to be updated
    * on the display. This means that somewhere in the calling stack there is a
    * function which will call @ref Sheet::updateCell once it retains
-   * the control. If a function changes the contents/tqlayout of this cell and this
+   * the control. If a function changes the contents/layout of this cell and this
    * flag is not set, then the function must set it at once. After the changes
    * are done the function must call <tt>m_pSheet->updateCell(...).
    * The flag is cleared by the function format()->sheet()->updateCell.
diff --git a/kspread/kspread_cluster.cc b/kspread/kspread_cluster.cc
index 21fe0ef0..318ee758 100644
--- a/kspread/kspread_cluster.cc
+++ b/kspread/kspread_cluster.cc
@@ -1039,7 +1039,7 @@ bool ColumnCluster::insertColumn( int col )
     int cx = col / KSPREAD_CLUSTER_LEVEL2;
     int dx = col % KSPREAD_CLUSTER_LEVEL2;
 
-    // Is there a column tqlayout at the right most position ?
+    // Is there a column layout at the right most position ?
     // In this case the shift is impossible.
     ColumnFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ];
     if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] )
@@ -1356,7 +1356,7 @@ bool RowCluster::insertRow( int row )
     int cx = row / KSPREAD_CLUSTER_LEVEL2;
     int dx = row % KSPREAD_CLUSTER_LEVEL2;
 
-    // Is there a row tqlayout at the bottom most position ?
+    // Is there a row layout at the bottom most position ?
     // In this case the shift is impossible.
     RowFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ];
     if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] )
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 8a580ecb..ea698845 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -941,7 +941,7 @@ void Doc::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles ) con
     styles = mainStyles.styles( KoGenStyle::STYLE_PAGELAYOUT );
     it = styles.begin();
     for ( ; it != styles.end() ; ++it ) {
-        (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
+        (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
         stylesWriter->endElement();
     }
 
@@ -1179,7 +1179,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc )
       return false;
   }
 
-  //Backwards compatibility with older versions for paper tqlayout
+  //Backwards compatibility with older versions for paper layout
   if ( d->syntaxVersion < 1 )
   {
     TQDomElement paper = spread.namedItem( "paper" ).toElement();
@@ -1549,7 +1549,7 @@ void Doc::setZoomAndResolution( int zoom, int dpiX, int dpiY )
 
 void Doc::newZoomAndResolution( bool updateViews, bool /*forPrint*/ )
 {
-/*    tqlayout();
+/*    layout();
     updateAllFrames();*/
     if ( updateViews )
     {
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index 44a3d178..7f0fa282 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -1455,7 +1455,7 @@ EditWidget::EditWidget( TQWidget *_parent, Canvas *_canvas,
   m_pCanvas = _canvas;
   Q_ASSERT(m_pCanvas != NULL);
   // Those buttons are created by the caller, so that they are inserted
-  // properly in the tqlayout - but they are then managed here.
+  // properly in the layout - but they are then managed here.
   m_pCancelButton = cancelButton;
   m_pOkButton = okButton;
   isArray = false;
diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cc
index dc15cddc..23f2ca01 100644
--- a/kspread/kspread_functions_conversion.cc
+++ b/kspread/kspread_functions_conversion.cc
@@ -179,7 +179,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *)
 // return < 0 if invalid
 int func_arabic_helper (TQChar c)
 {
-  switch (c.upper().tqunicode())
+  switch (c.upper().unicode())
   {
     case 'M': return 1000;
     case 'D': return 500;
diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc
index 1f661d27..e61aff93 100644
--- a/kspread/kspread_functions_text.cc
+++ b/kspread/kspread_functions_text.cc
@@ -188,7 +188,7 @@ Value func_code (valVector args, ValueCalc *calc, FuncExtra *)
   if (str.length() <= 0)
      return Value::errorVALUE();
 
-  return Value (str[0].tqunicode());
+  return Value (str[0].unicode());
 }
 
 // Function: COMPARE
@@ -496,11 +496,11 @@ Value func_rot (valVector args, ValueCalc *calc, FuncExtra *)
 
   for( unsigned i=0; i<text.length(); i++ )
   {
-    unsigned c = text[i].upper().tqunicode();
+    unsigned c = text[i].upper().unicode();
     if( ( c >= 'A' ) && ( c <= 'M' ) )
-      text[i] = TQChar( text[i].tqunicode() + 13);
+      text[i] = TQChar( text[i].unicode() + 13);
     if( ( c >= 'N' ) && ( c <= 'Z' ) )
-      text[i] = TQChar( text[i].tqunicode() - 13);
+      text[i] = TQChar( text[i].unicode() - 13);
   }
 
   return Value (text);
diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp
index d2518494..d15c79c8 100644
--- a/kspread/kspread_generalProperty.cpp
+++ b/kspread/kspread_generalProperty.cpp
@@ -38,11 +38,11 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal
 , m_generalValue( generalValue )
 , m_unit( unit )
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-    tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
 
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    tqlayout->addItem( spacer );
+    layout->addItem( spacer );
 
     if ( m_generalValue.m_name.isNull() )
     {
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index a888a392..8d6cf77b 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -3940,7 +3940,7 @@ void Sheet::swapCells( int x1, int y1, int x2, int y2, bool cpFormat )
     }
 
   // Dummy cell used for swapping cells.
-  // In fact we copy only content and no tqlayout
+  // In fact we copy only content and no layout
   // information. Imagine sorting in a sheet. Swapping
   // the format while sorting is not what you would expect
   // as a user.
@@ -5088,7 +5088,7 @@ void Sheet::copySelection( Selection* selectionInfo )
     kd->setPlain( copyAsText(selectionInfo) );
     kd->setKSpread( buffer.buffer() );
 
-    TQApplication::tqclipboard()->setData( kd );
+    TQApplication::clipboard()->setData( kd );
 }
 
 void Sheet::cutSelection( Selection* selectionInfo )
@@ -5107,7 +5107,7 @@ void Sheet::cutSelection( Selection* selectionInfo )
     kd->setPlain( copyAsText(selectionInfo) );
     kd->setKSpread( buffer.buffer() );
 
-    TQApplication::tqclipboard()->setData( kd );
+    TQApplication::clipboard()->setData( kd );
 
     deleteSelection( selectionInfo, true );
 }
@@ -5117,7 +5117,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
                    bool insert, int insertTo, bool pasteFC,
                    TQClipboard::Mode clipboardMode )
 {
-    TQMimeSource * mime = TQApplication::tqclipboard()->data( clipboardMode );
+    TQMimeSource * mime = TQApplication::clipboard()->data( clipboardMode );
     if ( !mime )
         return;
 
@@ -5131,7 +5131,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
     {
         // 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 );
+        TQString _text = TQApplication::clipboard()->text( clipboardMode );
         doc()->emitBeginOperation();
         pasteTextPlain( _text, pasteArea );
         emit sig_updateView( this );
@@ -5523,7 +5523,7 @@ void Sheet::loadSelectionUndo(const TQDomDocument& d, const TQRect& loadArea,
 
 bool Sheet::testAreaPasteInsert()const
 {
-    TQMimeSource* mime = TQApplication::tqclipboard()->data( TQClipboard::Clipboard );
+    TQMimeSource* mime = TQApplication::clipboard()->data( TQClipboard::Clipboard );
     if ( !mime )
         return false;
 
@@ -6418,16 +6418,16 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext&
                 if ( masterStyle )
                 {
                     loadSheetStyleFormat( masterStyle );
-                    if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-tqlayout-name" ) )
+                    if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-layout-name" ) )
                     {
-                        TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() );
+                        TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-layout-name", TQString() );
                         //kdDebug()<<"masterPageLayoutStyleName :"<<masterPageLayoutStyleName<<endl;
                         const TQDomElement *masterLayoutStyle = oasisContext.oasisStyles().findStyle( masterPageLayoutStyleName );
                       if ( masterLayoutStyle )
                       {
                         //kdDebug()<<"masterLayoutStyle :"<<masterLayoutStyle<<endl;
                         KoStyleStack styleStack;
-                        styleStack.setTypeProperties( "page-tqlayout" );
+                        styleStack.setTypeProperties( "page-layout" );
                         styleStack.push( *masterLayoutStyle );
                         loadOasisMasterLayoutPage( styleStack );
                       }
@@ -6564,7 +6564,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
     TQString orientation = "Portrait";
     TQString format;
 
-    // Laurent : Why we stored tqlayout information as Millimeter ?!!!!!
+    // Laurent : Why we stored layout information as Millimeter ?!!!!!
     // kspread used point for all other attribute
     // I don't understand :(
     if ( styleStack.hasAttributeNS( KoXmlNS::fo, "page-width" ) )
@@ -6717,7 +6717,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
         kdDebug() << "Repeated: " << number << endl;
     }
 
-    Format tqlayout( this , doc()->styleManager()->defaultStyle() );
+    Format layout( this , doc()->styleManager()->defaultStyle() );
     if ( column.hasAttributeNS( KoXmlNS::table, "default-cell-style-name" ) )
     {
       const TQString styleName = column.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() );
@@ -6726,7 +6726,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
         Style* const style = styleMap[ styleName ];
         if ( style )
         {
-          tqlayout.setStyle( style );
+          layout.setStyle( style );
           isNonDefaultColumn = true;
         }
       }
@@ -6799,7 +6799,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
       {
         columnFormat = this->columnFormat( indexCol );
       }
-      columnFormat->copy( tqlayout );
+      columnFormat->copy( layout );
 
       ++indexCol;
     }
@@ -6828,7 +6828,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
     }
     styleStack.setTypeProperties( "table-row" );
 
-    Format tqlayout( this , doc()->styleManager()->defaultStyle() );
+    Format layout( this , doc()->styleManager()->defaultStyle() );
     if ( row.hasAttributeNS( KoXmlNS::table,"default-cell-style-name" ) )
     {
       const TQString styleName = row.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() );
@@ -6837,7 +6837,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
         Style* const style = styleMap[ styleName ];
         if ( style )
         {
-          tqlayout.setStyle( style );
+          layout.setStyle( style );
           isNonDefaultRow = true;
         }
       }
@@ -6908,7 +6908,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
       {
         rowFormat = this->rowFormat( rowIndex );
       }
-      rowFormat->copy( tqlayout );
+      rowFormat->copy( layout );
 
       ++rowIndex;
     }
@@ -7355,7 +7355,7 @@ TQString Sheet::saveOasisSheetStyleName( KoGenStyles &mainStyles )
     KoGenStyle pageStyle( Doc::STYLE_PAGE, "table"/*FIXME I don't know if name is sheet*/ );
 
     KoGenStyle pageMaster( Doc::STYLE_PAGEMASTER );
-    pageMaster.addAttribute( "style:page-tqlayout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) );
+    pageMaster.addAttribute( "style:page-layout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) );
 
     TQBuffer buffer;
     buffer.open( IO_WriteOnly );
@@ -7391,7 +7391,7 @@ void Sheet::saveOasisColRowCell( KoXmlWriter& xmlWriter, KoGenStyles &mainStyles
         currentColumnStyle.addPropertyPt( "style:column-width", column->dblWidth() );
         currentColumnStyle.addProperty( "fo:break-before", "auto" );/*FIXME auto or not ?*/
 
-        //style default tqlayout for column
+        //style default layout for column
         KoGenStyle currentDefaultCellStyle; // the type is determined in saveOasisCellStyle
         TQString currentDefaultCellStyleName = column->saveOasisCellStyle( currentDefaultCellStyle, mainStyles );
 
@@ -7774,7 +7774,7 @@ bool Sheet::loadXML( const TQDomElement& sheet )
         // we just ignore 'ok' - if it didn't work, go on
     }
 
-    // Load the paper tqlayout
+    // Load the paper layout
     TQDomElement paper = sheet.namedItem( "paper" ).toElement();
     if ( !paper.isNull() )
     {
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index ff6272ac..6ac0fcb9 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -305,13 +305,13 @@ public:
     void unifyObjectName( EmbeddedObject *object );
 
     /**
-     * Returns the tqlayout direction of the sheet.
+     * Returns the layout direction of the sheet.
      */
     LayoutDirection layoutDirection() const;
 
     /**
-     * Sets the tqlayout direction of the sheet. For example, for Arabic or Hebrew
-     * documents, it is possibly to tqlayout the sheet from right to left.
+     * Sets the layout direction of the sheet. For example, for Arabic or Hebrew
+     * documents, it is possibly to layout the sheet from right to left.
      */
     void setLayoutDirection( LayoutDirection dir );
 
@@ -1064,7 +1064,7 @@ public:
 #endif
 
     /**
-     * Calculates the cell if necessary, makes its tqlayout if necessary,
+     * Calculates the cell if necessary, makes its layout if necessary,
      * and force redraw.
      * Then it sets the cell's @ref Cell::m_bDisplayDirtyFlag to false.
      */
diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h
index 94affb99..1f22dc7d 100644
--- a/kspread/kspread_sheetprint.h
+++ b/kspread/kspread_sheetprint.h
@@ -148,12 +148,12 @@ public:
     void setPaperOrientation(KoOrientation _orient);
 
     /**
-     * Returns the page tqlayout
+     * Returns the page layout
      */
     KoPageLayout paperLayout() const;
 
      /**
-     * Changes the paper tqlayout and repaints the currently displayed Sheet.
+     * Changes the paper layout and repaints the currently displayed Sheet.
      */
     void setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBoder,
                          KoFormat _paper, KoOrientation orientation );
diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc
index af5b91a1..dc8b7add 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cc
@@ -134,7 +134,7 @@ bool Style::operator == (const Style& style) const
   if ( m_type != style.m_type )
     return false;
   // NOTE Stefan: Only compare the values of the set features.
-  if ( // tqlayout (4)
+  if ( // layout (4)
        ( m_featuresSet & SAlignX ) && ( m_alignX != style.m_alignX ) ||
        ( m_featuresSet & SAlignY ) && ( m_alignY != style.m_alignY ) ||
        ( m_featuresSet & SAngle )  && ( m_rotateAngle != style.m_rotateAngle ) ||
diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc
index 6036344c..28f59265 100644
--- a/kspread/kspread_undo.cc
+++ b/kspread/kspread_undo.cc
@@ -266,7 +266,7 @@ UndoRemoveColumn::UndoRemoveColumn( Doc *_doc, Sheet *_sheet, int _column,int _n
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store tqunicode
+    // This is a terrible hack to store unicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -385,7 +385,7 @@ UndoRemoveRow::UndoRemoveRow( Doc *_doc, Sheet *_sheet, int _row,int _nbRow) :
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store tqunicode
+    // This is a terrible hack to store unicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -942,20 +942,20 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
     /* Don't need to go through the loop twice...
       for (int i = range.left(); i <= right; ++i)
       {
-      layoutColumn tmptqlayout;
-      tmptqlayout.col = i;
-      tmptqlayout.l = new ColumnFormat( sheet, i );
-      tmptqlayout.l->copy( *(sheet->columnFormat( i )) );
-      listCol.append(tmptqlayout);
+      layoutColumn tmplayout;
+      tmplayout.col = i;
+      tmplayout.l = new ColumnFormat( sheet, i );
+      tmplayout.l->copy( *(sheet->columnFormat( i )) );
+      listCol.append(tmplayout);
       }
     */
     for ( int c = range.left(); c <= right; ++c )
     {
-      layoutColumn tmptqlayout;
-      tmptqlayout.col = c;
-      tmptqlayout.l = new ColumnFormat( sheet, c );
-      tmptqlayout.l->copy( *(sheet->columnFormat( c )) );
-      listCol.append(tmptqlayout);
+      layoutColumn tmplayout;
+      tmplayout.col = c;
+      tmplayout.l = new ColumnFormat( sheet, c );
+      tmplayout.l->copy( *(sheet->columnFormat( c )) );
+      listCol.append(tmplayout);
 
       cell = sheet->getFirstCellColumn( c );
       while ( cell )
@@ -966,12 +966,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
           continue;
         }
 
-        layoutCell tmptqlayout;
-        tmptqlayout.col = c;
-        tmptqlayout.row = cell->row();
-        tmptqlayout.l = new Format( sheet, 0 );
-        tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
-        list.append(tmptqlayout);
+        layoutCell tmplayout;
+        tmplayout.col = c;
+        tmplayout.row = cell->row();
+        tmplayout.l = new Format( sheet, 0 );
+        tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
+        list.append(tmplayout);
 
         cell = sheet->getNextCellDown( c, cell->row() );
       }
@@ -984,12 +984,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
       if ( range.left() <= col && right >= col
           && !c->isPartOfMerged())
       {
-        layoutCell tmptqlayout;
-        tmptqlayout.col = c->column();
-        tmptqlayout.row = c->row();
-        tmptqlayout.l = new Format( sheet, 0 );
-        tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
-        list.append(tmptqlayout);
+        layoutCell tmplayout;
+        tmplayout.col = c->column();
+        tmplayout.row = c->row();
+        tmplayout.l = new Format( sheet, 0 );
+        tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) );
+        list.append(tmplayout);
       }
       }
     */
@@ -998,11 +998,11 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
   {
     for ( int row = range.top(); row <= bottom; ++row )
     {
-      layoutRow tmptqlayout;
-      tmptqlayout.row = row;
-      tmptqlayout.l = new RowFormat( sheet, row );
-      tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
-      listRow.append(tmptqlayout);
+      layoutRow tmplayout;
+      tmplayout.row = row;
+      tmplayout.l = new RowFormat( sheet, row );
+      tmplayout.l->copy( *(sheet->rowFormat( row )) );
+      listRow.append(tmplayout);
 
       cell = sheet->getFirstCellRow( row );
       while ( cell )
@@ -1012,12 +1012,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
           cell = sheet->getNextCellRight( cell->column(), row );
           continue;
         }
-        layoutCell tmptqlayout;
-        tmptqlayout.col = cell->column();
-        tmptqlayout.row = row;
-        tmptqlayout.l = new Format( sheet, 0 );
-        tmptqlayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) );
-        list.append(tmptqlayout);
+        layoutCell tmplayout;
+        tmplayout.col = cell->column();
+        tmplayout.row = row;
+        tmplayout.l = new Format( sheet, 0 );
+        tmplayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) );
+        list.append(tmplayout);
 
         cell = sheet->getNextCellRight( cell->column(), row );
       }
@@ -1030,12 +1030,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
       if ( range.top() <= row && bottom >= row
            && !c->isPartOfMerged())
       {
-        layoutCell tmptqlayout;
-        tmptqlayout.col = c->column();
-        tmptqlayout.row = c->row();
-        tmptqlayout.l = new Format( sheet, 0 );
-        tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
-        list.append(tmptqlayout);
+        layoutCell tmplayout;
+        tmplayout.col = c->column();
+        tmplayout.row = c->row();
+        tmplayout.l = new Format( sheet, 0 );
+        tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) );
+        list.append(tmplayout);
       }
       }
     */
@@ -1048,12 +1048,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
         Cell * cell = sheet->nonDefaultCell( x, y );
         if ( !cell->isPartOfMerged() )
         {
-          layoutCell tmptqlayout;
-          tmptqlayout.col = x;
-          tmptqlayout.row = y;
-          tmptqlayout.l = new Format( sheet, 0 );
-          tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) );
-          list.append(tmptqlayout);
+          layoutCell tmplayout;
+          tmplayout.col = x;
+          tmplayout.row = y;
+          tmplayout.l = new Format( sheet, 0 );
+          tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) );
+          list.append(tmplayout);
         }
       }
   }
@@ -1265,24 +1265,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol
     Cell * c;
     for (int col = m_rctRect.left(); col <= m_rctRect.right(); ++col)
     {
-      layoutColumn tmptqlayout;
-      tmptqlayout.col = col;
-      tmptqlayout.l = new ColumnFormat( sheet, col );
-      tmptqlayout.l->copy( *(sheet->columnFormat( col )) );
-      listCol.append(tmptqlayout);
+      layoutColumn tmplayout;
+      tmplayout.col = col;
+      tmplayout.l = new ColumnFormat( sheet, col );
+      tmplayout.l->copy( *(sheet->columnFormat( col )) );
+      listCol.append(tmplayout);
 
       c = sheet->getFirstCellColumn( col );
       while ( c )
       {
         if ( !c->isPartOfMerged() )
         {
-          layoutTextCell tmptqlayout;
-          tmptqlayout.col = col;
-          tmptqlayout.row = c->row();
-          tmptqlayout.l = new Format( sheet, 0 );
-          tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
-          tmptqlayout.text = c->text();
-          list.append(tmptqlayout);
+          layoutTextCell tmplayout;
+          tmplayout.col = col;
+          tmplayout.row = c->row();
+          tmplayout.l = new Format( sheet, 0 );
+          tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
+          tmplayout.text = c->text();
+          list.append(tmplayout);
         }
 
         c = sheet->getNextCellDown( col, c->row() );
@@ -1294,24 +1294,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol
     Cell * c;
     for ( int row = m_rctRect.top(); row <= m_rctRect.bottom(); ++row)
     {
-      layoutRow tmptqlayout;
-      tmptqlayout.row = row;
-      tmptqlayout.l = new RowFormat( sheet, row );
-      tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
-      listRow.append(tmptqlayout);
+      layoutRow tmplayout;
+      tmplayout.row = row;
+      tmplayout.l = new RowFormat( sheet, row );
+      tmplayout.l->copy( *(sheet->rowFormat( row )) );
+      listRow.append(tmplayout);
 
       c = sheet->getFirstCellRow( row );
       while ( c )
       {
         if ( !c->isPartOfMerged() )
         {
-          layoutTextCell tmptqlayout;
-          tmptqlayout.col = c->column();
-          tmptqlayout.row = row;
-          tmptqlayout.l   = new Format( sheet, 0 );
-          tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
-          tmptqlayout.text = c->text();
-          list.append(tmptqlayout);
+          layoutTextCell tmplayout;
+          tmplayout.col = c->column();
+          tmplayout.row = row;
+          tmplayout.l   = new Format( sheet, 0 );
+          tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
+          tmplayout.text = c->text();
+          list.append(tmplayout);
         }
         c = sheet->getNextCellRight( c->column(), row );
       }
@@ -1328,13 +1328,13 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol
         cell = sheet->nonDefaultCell( x, y );
         if (!cell->isPartOfMerged())
         {
-          layoutTextCell tmptqlayout;
-          tmptqlayout.col = x;
-          tmptqlayout.row = y;
-          tmptqlayout.l   = new Format( sheet, 0 );
-          tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) );
-          tmptqlayout.text = cell->text();
-          list.append(tmptqlayout);
+          layoutTextCell tmplayout;
+          tmplayout.col = x;
+          tmplayout.row = y;
+          tmplayout.l   = new Format( sheet, 0 );
+          tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) );
+          tmplayout.text = cell->text();
+          list.append(tmplayout);
         }
       }
   }
@@ -1557,7 +1557,7 @@ void UndoDelete::createListCell( TQCString &listCell,TQValueList<columnSize> &li
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store tqunicode
+    // This is a terrible hack to store unicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2243,7 +2243,7 @@ void UndoAutofill::createListCell( TQCString &list, Sheet* sheet )
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store tqunicode
+    // This is a terrible hack to store unicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2400,7 +2400,7 @@ UndoRemoveCellRow::UndoRemoveCellRow( Doc *_doc, Sheet *_sheet, const TQRect &re
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store tqunicode
+    // This is a terrible hack to store unicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2459,7 +2459,7 @@ UndoRemoveCellCol::UndoRemoveCellCol( Doc *_doc, Sheet *_sheet, const TQRect &_r
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store tqunicode
+    // This is a terrible hack to store unicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2529,7 +2529,7 @@ void UndoConditional::createListCell( TQCString &list, Sheet* sheet )
     TQDomDocument doc = sheet->saveCellRegion( m_region );
     str << doc;
 
-    // This is a terrible hack to store tqunicode
+    // This is a terrible hack to store unicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2671,7 +2671,7 @@ void UndoCellPaste::createListCell(TQCString& listCell,
   TQTextStream str( &buffer, IO_WriteOnly );
   str << doc;
 
-  // This is a terrible hack to store tqunicode
+  // This is a terrible hack to store unicode
   // data in a TQCString in a way that
   // TQCString::length() == TQCString().size().
   // This allows us to treat the TQCString like a TQByteArray later on.
diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc
index 2bbbd0a0..e84f1d47 100644
--- a/kspread/kspread_util.cc
+++ b/kspread/kspread_util.cc
@@ -53,7 +53,7 @@ bool KSpread::formatIsFraction (FormatType fmt)
 
 
 //used in Point::init, Cell::encodeFormula and
-//  dialogs/kspread_dlg_papertqlayout.cc
+//  dialogs/kspread_dlg_paperlayout.cc
 int KSpread::util_decodeColumnLabelText( const TQString &_col )
 {
     int col = 0;
@@ -72,7 +72,7 @@ int KSpread::util_decodeColumnLabelText( const TQString &_col )
     return col;
 }
 
-//used in dialogs/kspread_dlg_papertqlayout.cc
+//used in dialogs/kspread_dlg_paperlayout.cc
 TQString KSpread::util_rangeColumnName( const TQRect &_area)
 {
     return TQString("%1:%2")
@@ -80,7 +80,7 @@ TQString KSpread::util_rangeColumnName( const TQRect &_area)
         .arg( Cell::columnName(_area.right()));
 }
 
-//used in dialogs/kspread_dlg_papertqlayout.cc
+//used in dialogs/kspread_dlg_paperlayout.cc
 TQString KSpread::util_rangeRowName( const TQRect &_area)
 {
     return TQString("%1:%2")
@@ -1065,7 +1065,7 @@ TQString KSpread::Oasis::decodeFormula(const TQString& expr, const KLocale* loca
        }
 
        // [ marks sheet name for 3-d cell, e.g ['Sales Q3'.A4]
-       else if ( ch.tqunicode() == '[' )
+       else if ( ch.unicode() == '[' )
        {
          ++i;
          state = InReference;
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index b54932da..02bd1407 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -911,7 +911,7 @@ void View::Private::initActions()
 
   actions->paperLayout = new KAction( i18n("Page Layout..."),
       0, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" );
-  actions->paperLayout->setToolTip(i18n("Specify the tqlayout of the spreadsheet for a printout."));
+  actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout."));
 
   actions->definePrintRange = new KAction( i18n("Define Print Range"),
       0, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" );
@@ -4135,7 +4135,7 @@ void View::paste()
   if (!koDocument()->isReadWrite()) // don't paste into a read only document
     return;
 
-  TQMimeSource *data = TQApplication::tqclipboard()->data( TQClipboard::Clipboard );
+  TQMimeSource *data = TQApplication::clipboard()->data( TQClipboard::Clipboard );
   for ( int i=0; data->format(i) != 0; i++ )
     kdDebug() << "format:" << data->format(i) << endl;
 
@@ -4206,7 +4206,7 @@ void View::paste()
   else
   {
     //TODO:  What if the clipboard data is available in both pixmap and OASIS format? (ie. for embedded parts)
-    TQPixmap clipboardPixmap = TQApplication::tqclipboard()->pixmap( TQClipboard::Clipboard );
+    TQPixmap clipboardPixmap = TQApplication::clipboard()->pixmap( TQClipboard::Clipboard );
     if (!clipboardPixmap.isNull())
     {
         d->activeSheet->insertPicture( markerDocumentPosition()  , clipboardPixmap );
@@ -4914,7 +4914,7 @@ void View::setupPrinter( KPrinter &prt )
 
     SheetPrint* print = d->activeSheet->print();
 
-    //apply page tqlayout parameters
+    //apply page layout parameters
     KoFormat pageFormat = print->paperFormat();
 
     prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) );
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index 57e52fcf..f1a5838b 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -445,20 +445,20 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
       /* Don't need to go through the loop twice...
         for (int i = range.left(); i <= right; ++i)
         {
-        layoutColumn tmptqlayout;
-        tmptqlayout.col = i;
-        tmptqlayout.l = new ColumnFormat( m_sheet, i );
-        tmptqlayout.l->copy( *(m_sheet->columnFormat( i )) );
-        listCol.append(tmptqlayout);
+        layoutColumn tmplayout;
+        tmplayout.col = i;
+        tmplayout.l = new ColumnFormat( m_sheet, i );
+        tmplayout.l->copy( *(m_sheet->columnFormat( i )) );
+        listCol.append(tmplayout);
         }
       */
       for ( int col = range.left(); col <= right; ++col )
       {
-        layoutColumn tmptqlayout;
-        tmptqlayout.col = col;
-        tmptqlayout.l = new ColumnFormat( m_sheet, col );
-        tmptqlayout.l->copy( *(m_sheet->columnFormat( col )) );
-        listCol.append(tmptqlayout);
+        layoutColumn tmplayout;
+        tmplayout.col = col;
+        tmplayout.l = new ColumnFormat( m_sheet, col );
+        tmplayout.l->copy( *(m_sheet->columnFormat( col )) );
+        listCol.append(tmplayout);
 
         cell = m_sheet->getFirstCellColumn( col );
         while ( cell )
@@ -469,12 +469,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
             continue;
           }
 
-          layoutCell tmptqlayout;
-          tmptqlayout.col = col;
-          tmptqlayout.row = cell->row();
-          tmptqlayout.l = new Format( m_sheet, 0 );
-          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
-          list.append(tmptqlayout);
+          layoutCell tmplayout;
+          tmplayout.col = col;
+          tmplayout.row = cell->row();
+          tmplayout.l = new Format( m_sheet, 0 );
+          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
+          list.append(tmplayout);
 
           cell = m_sheet->getNextCellDown( col, cell->row() );
         }
@@ -487,12 +487,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
         if ( range.left() <= col && right >= col
             && !cell->isPartOfMerged())
         {
-          layoutCell tmptqlayout;
-          tmptqlayout.col = cell->column();
-          tmptqlayout.row = cell->row();
-          tmptqlayout.l = new Format( m_sheet, 0 );
-          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
-          list.append(tmptqlayout);
+          layoutCell tmplayout;
+          tmplayout.col = cell->column();
+          tmplayout.row = cell->row();
+          tmplayout.l = new Format( m_sheet, 0 );
+          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) );
+          list.append(tmplayout);
         }
         }
       */
@@ -501,11 +501,11 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
     {
       for ( int row = range.top(); row <= bottom; ++row )
       {
-        layoutRow tmptqlayout;
-        tmptqlayout.row = row;
-        tmptqlayout.l = new RowFormat( m_sheet, row );
-        tmptqlayout.l->copy( *(m_sheet->rowFormat( row )) );
-        listRow.append(tmptqlayout);
+        layoutRow tmplayout;
+        tmplayout.row = row;
+        tmplayout.l = new RowFormat( m_sheet, row );
+        tmplayout.l->copy( *(m_sheet->rowFormat( row )) );
+        listRow.append(tmplayout);
 
         cell = m_sheet->getFirstCellRow( row );
         while ( cell )
@@ -515,12 +515,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
             cell = m_sheet->getNextCellRight( cell->column(), row );
             continue;
           }
-          layoutCell tmptqlayout;
-          tmptqlayout.col = cell->column();
-          tmptqlayout.row = row;
-          tmptqlayout.l = new Format( m_sheet, 0 );
-          tmptqlayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) );
-          list.append(tmptqlayout);
+          layoutCell tmplayout;
+          tmplayout.col = cell->column();
+          tmplayout.row = row;
+          tmplayout.l = new Format( m_sheet, 0 );
+          tmplayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) );
+          list.append(tmplayout);
 
           cell = m_sheet->getNextCellRight( cell->column(), row );
         }
@@ -533,12 +533,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
         if ( range.top() <= row && bottom >= row
             && !cell->isPartOfMerged())
         {
-          layoutCell tmptqlayout;
-          tmptqlayout.col = cell->column();
-          tmptqlayout.row = cell->row();
-          tmptqlayout.l = new Format( m_sheet, 0 );
-          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
-          list.append(tmptqlayout);
+          layoutCell tmplayout;
+          tmplayout.col = cell->column();
+          tmplayout.row = cell->row();
+          tmplayout.l = new Format( m_sheet, 0 );
+          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) );
+          list.append(tmplayout);
         }
         }
       */
@@ -551,12 +551,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
           Cell * cell = m_sheet->nonDefaultCell( col, row );
           if ( !cell->isPartOfMerged() )
           {
-            layoutCell tmptqlayout;
-            tmptqlayout.col = col;
-            tmptqlayout.row = row;
-            tmptqlayout.l = new Format( m_sheet, 0 );
-            tmptqlayout.l->copy( *(m_sheet->cellAt( col, row )->format()) );
-            list.append(tmptqlayout);
+            layoutCell tmplayout;
+            tmplayout.col = col;
+            tmplayout.row = row;
+            tmplayout.l = new Format( m_sheet, 0 );
+            tmplayout.l->copy( *(m_sheet->cellAt( col, row )->format()) );
+            list.append(tmplayout);
           }
         }
     }
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index cec64193..28ab2646 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -48,10 +48,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct)
   lay1->setSpacing( KDialog::spacingHint() );
 
   box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box");
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  box->tqlayout()->setMargin(KDialog::marginHint());
+  box->layout()->setSpacing(KDialog::spacingHint());
+  box->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),8,2);
+  TQGridLayout *grid1 = new TQGridLayout(box->layout(),8,2);
   label1 = new TQLabel(box);
   label1->setText(i18n("Foreground color:"));
   grid1->addWidget(label1,0,0);
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index e1a1d4c3..75051b17 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -390,12 +390,12 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     mainLayout->addLayout(btnLayout);
     mainLayout->addLayout(statusLayout);
 
-    // button tqlayout
+    // button layout
     btnLayout->addWidget(mSmallPage,0,AlignTop);
     btnLayout->addSpacing(mInternalSpacing);
     btnLayout->addWidget(mLargePage,0,AlignTop);
 
-    // small button tqlayout
+    // small button layout
     smallBtnLayout->addWidget(pbhyp, 0, 0);
     smallBtnLayout->addWidget(pbinv, 0, 1);
     smallBtnLayout->addWidget(pbA, 0, 2);
@@ -427,7 +427,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     smallBtnLayout->setRowStretch(4, 0);
     smallBtnLayout->setRowStretch(5, 0);
 
-    // large button tqlayout
+    // large button layout
     largeBtnLayout->addWidget(pbEE, 0, 0);
     largeBtnLayout->addWidget(pbMR, 0, 1);
     largeBtnLayout->addWidget(pbMplusminus, 0, 2);
@@ -472,11 +472,11 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     topLayout->addWidget(calc_display, 10);
 
 
-    // radiobutton tqlayout
+    // radiobutton layout
     radioLayout->addWidget(base_group);
     radioLayout->addWidget(angle_group);
 
-    // status tqlayout
+    // status layout
     statusLayout->addWidget(statusINVLabel);
     statusLayout->addWidget(statusHYPLabel);
     statusLayout->addWidget(statusERRORLabel, 10);
@@ -1465,9 +1465,9 @@ void TQtCalculator::configclicked(){
   lay1->setSpacing( KDialog::spacingHint() );
 
   TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box");
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  box->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),2,2);
+  box->layout()->setSpacing(KDialog::spacingHint());
+  box->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2);
   TQLabel  *label = new TQLabel(box,"label");
   TQLabel  *label2 = new TQLabel(box,"label2");
 
@@ -1628,7 +1628,7 @@ void TQtCalculator::display_selected(){
 
     if(calc_display->isLit()){
 
-      TQClipboard *cb = TQApplication::tqclipboard();
+      TQClipboard *cb = TQApplication::clipboard();
       cb->setText(calc_display->text());
       selection_timer->start(100);
 
@@ -1643,7 +1643,7 @@ void TQtCalculator::display_selected(){
   }
   else{
 
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
 
     CALCAMNT result;
     result = (CALCAMNT) cb->text().toDouble();
diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
index a34a4dd1..529a2d26 100755
--- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
+++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
@@ -30,11 +30,11 @@ class Dialog(qt.QDialog):
 		import qt
 		qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 		self.setCaption("Export to HTML File")
-		tqlayout = qt.QVBoxLayout(self)
+		layout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
 		box.setMargin(10)
 		box.setSpacing(10)
-		tqlayout.addWidget(box)
+		layout.addWidget(box)
 
 		sheetbox = qt.QHBox(box)
 		sheetbox.setSpacing(6)
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index e3d6237c..c6da1fe2 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -763,11 +763,11 @@ class SampleDialog(qt.QDialog):
 		import qt
 		qt.QDialog.__init__(self, parent, "SampleDialog", 1)
 
-		tqlayout = qt.QVBoxLayout(self)
+		layout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
 		box.setMargin(4)
 		box.setSpacing(10)
-		tqlayout.addWidget(box)
+		layout.addWidget(box)
 
 		self.scrollview = qt.QScrollView(box)
 		self.scrollview.setResizePolicy(qt.QScrollView.AutoOne)
@@ -829,11 +829,11 @@ class MainDialog(qt.QDialog):
 		qt.QDialog.__init__(self, parent, "MainDialog", 1, qt.Qt.WDestructiveClose)
 		self.setCaption("Script Editor")
 		
-		tqlayout = qt.QVBoxLayout(self)
+		layout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
 		box.setMargin(4)
 		box.setSpacing(10)
-		tqlayout.addWidget(box)
+		layout.addWidget(box)
 
 		menu = qt.QMenuBar(box)
 
diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc
index 5b4864ad..d16dc166 100644
--- a/kspread/tests/testrunner.cc
+++ b/kspread/tests/testrunner.cc
@@ -58,23 +58,23 @@ TestRunner::TestRunner():
   d = new Private;
 
   TQFrame* mainWidget = plainPage();
-  TQGridLayout* tqlayout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() );
+  TQGridLayout* layout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() );
   setMinimumSize( 360, 230 );
 
   TQLabel* typeLabel = new TQLabel( "Type of Test:", mainWidget );
-  tqlayout->addWidget( typeLabel, 0, 0 );
+  layout->addWidget( typeLabel, 0, 0 );
 
   d->testType = new KComboBox( mainWidget );
-  tqlayout->addWidget( d->testType, 0, 1 );
+  layout->addWidget( d->testType, 0, 1 );
 
   TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  tqlayout->addItem( spacerItem, 0, 2 );
+  layout->addItem( spacerItem, 0, 2 );
 
   d->runButton = new KPushButton( "Run", mainWidget );
-  tqlayout->addWidget( d->runButton, 0, 3 );
+  layout->addWidget( d->runButton, 0, 3 );
 
   d->logView = new TQTextEdit( mainWidget );
-  tqlayout->addMultiCellWidget( d->logView, 2, 2, 0, 3 );
+  layout->addMultiCellWidget( d->logView, 2, 2, 0, 3 );
   d->logView->setTextFormat( TQt::LogText );
 
   TQObject::connect( d->runButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( runTest() ) );