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

99 files changed, 1097 insertions, 1097 deletions

diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html
index 31059876..3c43a860 100644
--- a/kspread/DESIGN.html
+++ b/kspread/DESIGN.html
@@ -22,7 +22,7 @@ and the source code itself.</p>
 
 <h2>Document/View Architecture</h2>
 
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>MVC (Model/View/Controller) means that the application consists of three
 big parts, the <i>Model</i> which holds the data structure and objects,
@@ -49,7 +49,7 @@ to some extent he can take most part of the KSpread back-end and glue a new
 user interface around the code.</p>
 
 <h2>Dependency Handling</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>When a cell holds a formula, then it is likely that it depends on other
 cell(s) for calculating the result. For example, if cell A11 has the formula
@@ -181,7 +181,7 @@ and the dependency manager will do the rest. In addition, this gives us
 recursive dependency calculation at almost no cost.</p>
 
 <h2>Manipulators</h2>
-<p>tqStatus: PLANNED.</p>
+<p>Status: PLANNED.</p>
 
 <p>Currently, every operation on a cell or on a range of cells is quite complex.
 You need to ensure correct repainting, recalculation, iterate on a range and so on.</p>
@@ -218,7 +218,7 @@ below.</p>
 accomplish this.</p>
 
 <h2>Selection handling</h2>
-<p>tqStatus: PLANNED</p>
+<p>Status: PLANNED</p>
 
 <p>The selection shall be an instance of some RangeList class,
 or however we want to call it - this will contain a list of
@@ -227,7 +227,7 @@ more entries. This will allow easy implementation of CTRL-selections and so,
 because thanks to manipulators, each operation will automatically support these.</p>
 
 <h2>Repaint Triggering</h2>
-<p>tqStatus: PLANNED</p>
+<p>Status: PLANNED</p>
 
 <p>As mentioned above, the interface between the core and the GUI needs to be kept
 at minimum. Also, the number of repaints needs to be as low as possible, and repaints
@@ -255,7 +255,7 @@ the manipulators that derive from it, so that it knows whether it changed
 cell's content or formatting.</p>
 
 <h2>Formula Engine</h2>
-<p>tqStatus: FINISHED.</p>
+<p>Status: FINISHED.</p>
 
 <p>This formula engine is just an expression evaluator. To offer better
 performance, the expression is first compiled into byte codes which will
@@ -472,7 +472,7 @@ token right before the percent. If yes, then the following code is generated:
 
 <h2>Value</h2>
 
-<p>tqStatus: FINISHED.<br>
+<p>Status: FINISHED.<br>
 </p>
 
 <p>to be written.</p>
@@ -480,7 +480,7 @@ token right before the percent. If yes, then the following code is generated:
 <h2>Commands Based on KCommand<br>
 </h2>
 
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>Until lately, to implement undo and redo, KSpread creates corresponding
 KSpreadUndo classes for each action and runs them when the user undoes
@@ -492,15 +492,15 @@ hence we should be able to undo/redo every operation (provided that the
 corresponding manipulator provides methods to store/recall the undo information).</p>
 
 <h2>Cell Storage</h2>
-<p>tqStatus: PLANNED.</p>
+<p>Status: PLANNED.</p>
 
 <p>Cells are grouped together, and then hashed.</p>
 
 <h2>Format Storage</h2>
-<p>tqStatus: PLANNED.</p>
+<p>Status: PLANNED.</p>
 
 <p>Formatting specifies how a cell should look like. It involves font
-attributes like bold or italics, vertical and horizontal tqalignment,
+attributes like bold or italics, vertical and horizontal alignment,
 rotation angle, shading, background color and so on. Each cell can have
 its own format, but bear also in mind that a whole row or column format
 should also apply.</p>
@@ -589,7 +589,7 @@ be in more than one leaf in the quad-tree. <i>Details on the possible use of
 quad-tree or other methods should be explored further more</i>.</p>
 
 <h2>Default Toolbars</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>Relevant mailing-list threads:</p>
 
@@ -652,7 +652,7 @@ Borders, Background, Foreground</li>
 </ul>
 
 <h2>Test Framework</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>Relevant mailing-list threads:</p>
 
@@ -704,7 +704,7 @@ test cases.</p>
 </p>
 
 <h2>Coding Style</h2>
-<p>tqStatus: IN PROGRESS.</p>
+<p>Status: IN PROGRESS.</p>
 
 <p>(to be written in details).</p>
 
diff --git a/kspread/KSpreadColumnIface.cc b/kspread/KSpreadColumnIface.cc
index c0fc813f..b7686b2f 100644
--- a/kspread/KSpreadColumnIface.cc
+++ b/kspread/KSpreadColumnIface.cc
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqbrush.h>
+#include <brush.h>
 
 #include "kspread_format.h"
 #include "KSpreadLayoutIface.h"
diff --git a/kspread/KSpreadLayoutIface.cc b/kspread/KSpreadLayoutIface.cc
index 1ca174cf..8099df6f 100644
--- a/kspread/KSpreadLayoutIface.cc
+++ b/kspread/KSpreadLayoutIface.cc
@@ -21,54 +21,54 @@
 */
 
 #include "KSpreadLayoutIface.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include "kspread_format.h"
 
 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/KSpreadRowIface.cc b/kspread/KSpreadRowIface.cc
index 69db292f..826e49e5 100644
--- a/kspread/KSpreadRowIface.cc
+++ b/kspread/KSpreadRowIface.cc
@@ -22,7 +22,7 @@
 #include "KSpreadLayoutIface.h"
 #include "KSpreadRowIface.h"
 #include "kspread_format.h"
-#include <tqbrush.h>
+#include <brush.h>
 
 using namespace KSpread;
 
diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt
index 2eb878c8..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
@@ -155,29 +155,29 @@ Merged cells
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce3"/>
 
-Cell horizontal tqalignment: top
+Cell horizontal alignment: top
     <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="top"/>
     </style:style>
 
-Cell horizontal tqalignment: middle
+Cell horizontal alignment: middle
     <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="middle"/>
     </style:style>
 
-Cell horizontal tqalignment: bottom
+Cell horizontal alignment: bottom
     <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="bottom"/>
     </style:style>
 
-Cell vertical tqalignment: top
+Cell vertical alignment: top
     <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties fo:text-align="center" 
       style:text-align-source="fix" style:repeat-content="none" 
       fo:margin-left="0in" style:vertical-align="top"/>
     </style:style>
 
-Cell vertical tqalignment: middle
+Cell vertical alignment: middle
     <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties fo:text-align="center" 
       style:text-align-source="fix" style:repeat-content="none" 
@@ -185,7 +185,7 @@ Cell vertical tqalignment: middle
     </style:style>
 
 
-Cell vertical tqalignment: bottom
+Cell vertical alignment: bottom
     <style:style style:name="ce7" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties fo:text-align="center" 
       style:text-align-source="fix" style:repeat-content="none" 
diff --git a/kspread/commands.cc b/kspread/commands.cc
index a4788bda..490bee81 100644
--- a/kspread/commands.cc
+++ b/kspread/commands.cc
@@ -77,7 +77,7 @@ TQString MergeCellCommand::name() const
   if( rangeName.isEmpty() )
     return i18n("Merge Cells");
   else
-    return i18n("Merge Cells %1").tqarg( rangeName );
+    return i18n("Merge Cells %1").arg( rangeName );
 }
 
 void MergeCellCommand::execute()
@@ -174,7 +174,7 @@ void HideSheetCommand::unexecute()
 
 TQString HideSheetCommand::name() const
 {
-    TQString n = TQString( i18n("Hide Sheet %1") ).tqarg( sheetName );
+    TQString n = TQString( i18n("Hide Sheet %1") ).arg( sheetName );
     if( n.length() > 64 ) n = i18n("Hide Sheet");
     return n;
 }
@@ -205,7 +205,7 @@ void ShowSheetCommand::unexecute()
 
 TQString ShowSheetCommand::name() const
 {
-    TQString n = TQString( i18n("Show Sheet %1") ).tqarg( sheetName );
+    TQString n = TQString( i18n("Show Sheet %1") ).arg( sheetName );
     if( n.length() > 64 ) n = i18n("Show Sheet");
     return n;
 }
@@ -590,37 +590,37 @@ ChangeObjectGeometryCommand::~ChangeObjectGeometryCommand()
 
 void ChangeObjectGeometryCommand::execute()
 {
-    doc->tqrepaint( obj->tqgeometry() );
+    doc->repaint( obj->geometry() );
 
-    KoRect tqgeometry = obj->tqgeometry();
-    tqgeometry.moveBy( m_diff.x(),  m_diff.y() );
-    tqgeometry.setWidth( tqgeometry.width() + r_diff.width() );
-    tqgeometry.setHeight( tqgeometry.height() + r_diff.height() );
-    obj->setGeometry( tqgeometry );
+    KoRect geometry = obj->geometry();
+    geometry.moveBy( m_diff.x(),  m_diff.y() );
+    geometry.setWidth( geometry.width() + r_diff.width() );
+    geometry.setHeight( geometry.height() + r_diff.height() );
+    obj->setGeometry( geometry );
 
 //     if ( object->isSelected())
 //       doc->updateObjectStatusBarItem();
-    doc->tqrepaint( obj );
+    doc->repaint( obj );
 }
 
 void ChangeObjectGeometryCommand::unexecute()
 {
-  doc->tqrepaint( obj->tqgeometry() );
+  doc->repaint( obj->geometry() );
 
-  KoRect tqgeometry = obj->tqgeometry();
-  tqgeometry.moveBy( -m_diff.x(),  -m_diff.y() );
-  tqgeometry.setWidth( tqgeometry.width() - r_diff.width() );
-  tqgeometry.setHeight( tqgeometry.height() - r_diff.height() );
-  obj->setGeometry( tqgeometry );
+  KoRect geometry = obj->geometry();
+  geometry.moveBy( -m_diff.x(),  -m_diff.y() );
+  geometry.setWidth( geometry.width() - r_diff.width() );
+  geometry.setHeight( geometry.height() - r_diff.height() );
+  obj->setGeometry( geometry );
 
 //     if ( object->isSelected())
 //       doc->updateObjectStatusBarItem();
-  doc->tqrepaint( obj );
+  doc->repaint( obj );
 }
 
 TQString ChangeObjectGeometryCommand::name() const
 {
-  /*if ( fabs( obj->tqgeometry().width() - newGeometry.width() )<1e-3  && fabs( obj->tqgeometry().height() - newGeometry.height() ) < 1e-3 )
+  /*if ( fabs( obj->geometry().width() - newGeometry.width() )<1e-3  && fabs( obj->geometry().height() - newGeometry.height() ) < 1e-3 )
     return i18n("Move Object");
   else */
     return i18n("Resize Object");
@@ -665,7 +665,7 @@ void RemoveObjectCommand::execute()
   }
 
   obj->setSelected( false );
-  doc->tqrepaint( obj );
+  doc->repaint( obj );
   executed = true;
 }
 
@@ -677,7 +677,7 @@ void RemoveObjectCommand::unexecute()
     EmbeddedKOfficeObject *eko = dynamic_cast<EmbeddedKOfficeObject *>(obj);
     eko->embeddedObject()->setDeleted(false);
   }
-  doc->tqrepaint( obj );
+  doc->repaint( obj );
   executed = false;
 }
 
@@ -689,18 +689,18 @@ TQString RemoveObjectCommand::name() const
     return i18n("Remove Object");
 }
 
-InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
+InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
 {
-  tqgeometry = _tqgeometry;
+  geometry = _geometry;
   entry = _entry;
   canvas = _canvas;
   type = OBJECT_KOFFICE_PART;
   obj = 0;
 }
 
-InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
+InsertObjectCommand::InsertObjectCommand(const KoRect& _geometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
 {
-  tqgeometry = _tqgeometry;
+  geometry = _geometry;
   entry = _entry;
   data = _data;
   canvas = _canvas;
@@ -708,10 +708,10 @@ InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEn
   obj = 0;
 }
 
-InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry , KURL& _file, Canvas *_canvas ) //picture
+InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry , KURL& _file, Canvas *_canvas ) //picture
 {
   //In the case of pictures, only the top left point of the rectangle is relevant
-  tqgeometry = _tqgeometry;
+  geometry = _geometry;
   file = _file;
   canvas = _canvas;
   type = OBJECT_PICTURE;
@@ -737,7 +737,7 @@ void InsertObjectCommand::execute()
   if ( obj ) //restore the object which was removed from the object list in InsertObjectCommand::unexecute()
   {
     canvas->doc()->embeddedObjects().append( obj );
-    canvas->doc()->tqrepaint( obj );
+    canvas->doc()->repaint( obj );
   }
   else
   {
@@ -746,17 +746,17 @@ void InsertObjectCommand::execute()
     {
       case OBJECT_CHART:
       {
-        success = canvas->activeSheet()->insertChart( tqgeometry, entry, data );
+        success = canvas->activeSheet()->insertChart( geometry, entry, data );
         break;
       }
       case OBJECT_KOFFICE_PART:
       {
-        success = canvas->activeSheet()->insertChild( tqgeometry, entry );
+        success = canvas->activeSheet()->insertChild( geometry, entry );
         break;
       }
       case OBJECT_PICTURE:
       {
-        success = canvas->activeSheet()->insertPicture( tqgeometry.topLeft() , file );
+        success = canvas->activeSheet()->insertPicture( geometry.topLeft() , file );
         break;
       }
       default:
@@ -780,7 +780,7 @@ void InsertObjectCommand::unexecute()
 
   canvas->doc()->embeddedObjects().removeRef( obj );
   obj->setSelected( false );
-  canvas->doc()->tqrepaint( obj );
+  canvas->doc()->repaint( obj );
 
   executed = false;
 }
@@ -871,7 +871,7 @@ void GeometryPropertiesCommand::execute()
         {
             it.current()->setProtect( m_newValue );
             if ( it.current()->isSelected() )
-                m_doc->tqrepaint( it.current() );
+                m_doc->repaint( it.current() );
         }
         else if ( m_type == KeepRatio)
             it.current()->setKeepRatio( m_newValue );
@@ -887,7 +887,7 @@ void GeometryPropertiesCommand::unexecute()
         {
             obj->setProtect( *m_oldValue.at(i) );
             if ( obj->isSelected() )
-                m_doc->tqrepaint( obj );
+                m_doc->repaint( obj );
         }
         else if ( m_type == KeepRatio)
             obj->setKeepRatio( *m_oldValue.at(i) );
@@ -920,13 +920,13 @@ void MoveObjectByCmd::execute()
     TQRect oldRect;
 
     for ( unsigned int i = 0; i < objects.count(); i++ ) {
-        doc->tqrepaint( objects.at( i )->tqgeometry() );
+        doc->repaint( objects.at( i )->geometry() );
 
-        KoRect r = objects.at( i )->tqgeometry();
+        KoRect r = objects.at( i )->geometry();
         r.moveBy( diff.x(), diff.y() );
         objects.at( i )->setGeometry( r );
 
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( objects.at( i ) );
     }
 }
 
@@ -935,12 +935,12 @@ void MoveObjectByCmd::unexecute()
     TQRect oldRect;
 
     for ( unsigned int i = 0; i < objects.count(); i++ ) {
-        doc->tqrepaint( objects.at( i )->tqgeometry() );
+        doc->repaint( objects.at( i )->geometry() );
 
-        KoRect r = objects.at( i )->tqgeometry();
+        KoRect r = objects.at( i )->geometry();
         r.moveBy( -diff.x(), -diff.y() );
         objects.at( i )->setGeometry( r );
 
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( objects.at( i ) );
     }
 }
diff --git a/kspread/commands.h b/kspread/commands.h
index d0bd9132..b3622035 100644
--- a/kspread/commands.h
+++ b/kspread/commands.h
@@ -392,9 +392,9 @@ class RemoveObjectCommand : public KCommand
 class InsertObjectCommand : public KCommand
 {
   public:
-    InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, Canvas *_canvas ); //child
-    InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart
-    InsertObjectCommand( const KoRect& _tqgeometry, KURL& _file, Canvas *_canvas ); //picture
+    InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, Canvas *_canvas ); //child
+    InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart
+    InsertObjectCommand( const KoRect& _geometry, KURL& _file, Canvas *_canvas ); //picture
     ~InsertObjectCommand();
 
     virtual void execute();
@@ -402,7 +402,7 @@ class InsertObjectCommand : public KCommand
     virtual TQString name() const;
 
   protected:
-    KoRect tqgeometry;
+    KoRect geometry;
     Canvas *canvas;
     bool executed;
     KoDocumentEntry entry;
diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index 6e7f7403..095f1188 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -22,7 +22,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -168,7 +168,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -206,7 +206,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignHCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc
index 7c97f6c2..5dc3f83d 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cc
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kbuttonbox.h>
@@ -55,7 +55,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker)
   lay->addWidget( m_pAngle );
 
   TQWidget* spacer = new TQWidget( page );
-  spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) );
+  spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) );
   lay->addWidget( spacer );
 
   m_pAngle->setFocus();
diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc
index 9a78074b..71cb2ada 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cc
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 
@@ -51,7 +51,7 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke
   lay1->addWidget( label );
 
   m_areaName = new TQLineEdit(page);
-  m_areaName->setMinimumWidth( m_areaName->tqsizeHint().width() * 3 );
+  m_areaName->setMinimumWidth( m_areaName->sizeHint().width() * 3 );
 
   lay1->addWidget( m_areaName );
   m_areaName->setFocus();
diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc
index 9ed3c551..8705fc5a 100644
--- a/kspread/dialogs/kspread_dlg_comment.cc
+++ b/kspread/dialogs/kspread_dlg_comment.cc
@@ -23,7 +23,7 @@
 
 #include <tqmultilineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kbuttonbox.h>
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index 531f2ee3..83f37b2f 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -43,7 +43,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KSpread;
 
@@ -54,10 +54,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" );
   groupBox1_3->setColumnLayout(0, Qt::Vertical );
-  groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() );
-  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() );
-  groupBox1_3Layout->tqsetAlignment( TQt::AlignTop );
+  groupBox1_3->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_3->layout()->setMargin( KDialog::marginHint() );
+  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() );
+  groupBox1_3Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" );
   groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 );
@@ -89,11 +89,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" );
   groupBox1_2->setColumnLayout(0, Qt::Vertical );
-  groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox1_2->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_2->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() );
-  groupBox1_2Layout->tqsetAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() );
+  groupBox1_2Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" );
   groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 );
@@ -125,11 +125,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" );
   groupBox1_1->setColumnLayout(0, Qt::Vertical );
-  groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox1_1->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_1->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() );
-  groupBox1_1Layout->tqsetAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() );
+  groupBox1_1Layout->setAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" );
   groupBox1_1Layout->addWidget( textLabel1_1, 0, 0 );
@@ -158,7 +158,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
   groupBox1_1Layout->addItem( spacer_6, 1, 3 );
 
   Form1Layout->addWidget( groupBox1_1, 0, 0 );
-  resize( TQSize(702, 380).expandedTo( tqminimumSizeHint() ) );
+  resize( TQSize(702, 380).expandedTo( minimumSizeHint() ) );
   clearWState( WState_Polished );
 
   TQStringList list;
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index 91589f9f..7d63a668 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
@@ -197,14 +197,14 @@ void ConsolidateDialog::slotOk()
        h <= ( ( desc == D_BOTH || desc == D_ROW ) ? 1 : 0 ) )
   {
     m_pView->slotUpdateView( m_pView->activeSheet() );
-    KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).tqarg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).arg( *( r.begin() ) ));
     return;
   }
 
   if( (*it).range().bottom()==KS_rowMax || (*it).range().right()== KS_colMax )
   {
     m_pView->slotUpdateView( m_pView->activeSheet() );
-    KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( *( r.begin() ) ));
     return;
   }
 
@@ -220,7 +220,7 @@ void ConsolidateDialog::slotOk()
     if(currentRange.bottom()==KS_rowMax || currentRange.right()== KS_colMax)
     {
       m_pView->slotUpdateView( m_pView->activeSheet() );
-      KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( r[i]));
+      KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( r[i]));
       return;
     }
     if ( ( desc == D_NONE && ( w != w2 || h != h2 ) ) ||
@@ -228,7 +228,7 @@ void ConsolidateDialog::slotOk()
 	 ( desc == D_COL && w != w2 ) )
     {
       m_pView->slotUpdateView( m_pView->activeSheet() );
-      TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").tqarg( *( r.begin() ) ).tqarg( r[i] );
+      TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").arg( *( r.begin() ) ).arg( r[i] );
       KMessageBox::error( this, tmp);
       return;
     }
@@ -652,7 +652,7 @@ void ConsolidateDialog::slotReturnPressed()
   Range r( txt, m_pView->doc()->map() );
   if ( !r.isValid() )
   {
-    KMessageBox::error( this, i18n("The range\n%1\n is malformed").tqarg( txt ));
+    KMessageBox::error( this, i18n("The range\n%1\n is malformed").arg( txt ));
     return;
   }
 
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index c8ce2671..7008de4e 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -22,7 +22,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -78,7 +78,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_targetRect.setBottom( lastCell->row() );
 
   m_sheet = new TQTable( page, "m_table" );
-  //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
+  //m_sheet->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
   m_sheet->setNumRows( 0 );
   m_sheet->setNumCols( 0 );
 
@@ -86,13 +86,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   // Delimiter: comma, semicolon, tab, space, other
   m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" );
-  m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
+  m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
   m_delimiterBox->setTitle( i18n( "Delimiter" ) );
   m_delimiterBox->setColumnLayout(0, Qt::Vertical );
-  m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() );
-  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() );
-  m_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop );
+  m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() );
+  m_delimiterBox->layout()->setMargin( KDialog::marginHint() );
+  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() );
+  m_delimiterBoxLayout->setAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 );
 
   m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" );
@@ -122,20 +122,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 );
 
   m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" );
-  m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
+  m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
   m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) );
   m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 );
 
 
   // Format: number, text, currency,
   m_formatBox = new TQButtonGroup( page, "m_formatBox" );
-  m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
+  m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
   m_formatBox->setTitle( i18n( "Format" ) );
   m_formatBox->setColumnLayout(0, Qt::Vertical );
-  m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  m_formatBox->tqlayout()->setMargin( KDialog::marginHint() );
-  m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() );
-  m_formatBoxLayout->tqsetAlignment( TQt::AlignTop );
+  m_formatBox->layout()->setSpacing( KDialog::spacingHint() );
+  m_formatBox->layout()->setMargin( KDialog::marginHint() );
+  m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() );
+  m_formatBoxLayout->setAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 );
 
   m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" );
@@ -157,7 +157,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" );
   m_comboLine->insertItem( i18n( "1" ) );
-  m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
+  m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboLine, 1, 3 );
 
@@ -165,20 +165,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_comboQuote->insertItem( i18n( "\"" ) );
   m_comboQuote->insertItem( i18n( "'" ) );
   m_comboQuote->insertItem( i18n( "None" ) );
-  m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
+  m_comboQuote->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboQuote, 1, 2 );
   TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred );
   MyDialogLayout->addItem( spacer_2, 2, 3 );
 
   TextLabel3 = new TQLabel( page, "TextLabel3" );
-  TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
+  TextLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
   TextLabel3->setText( i18n( "Start at line:" ) );
 
   MyDialogLayout->addWidget( TextLabel3, 0, 3 );
 
   TextLabel2 = new TQLabel( page, "TextLabel2" );
-  TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
+  TextLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
   TextLabel2->setText( i18n( "Textquote:" ) );
 
   MyDialogLayout->addWidget( TextLabel2, 0, 2 );
@@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   if ( m_mode == Clipboard )
   {
     setCaption( i18n( "Inserting From Clipboard" ) );
-    TQMimeSource * mime = TQApplication::tqclipboard()->data();
+    TQMimeSource * mime = TQApplication::clipboard()->data();
     if ( !mime )
     {
       KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -200,7 +200,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_cancelled = true;
       return;
     }
-    m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) );
+    m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) );
   }
   else if ( mode == File )
   {
@@ -249,7 +249,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   fillSheet();
   fillComboBox();
 
-  resize(tqsizeHint());
+  resize(sizeHint());
 
   m_sheet->setSelectionMode(TQTable::NoSelection);
 
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 7cf242a9..4c1a5bcf 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -39,7 +39,7 @@
 #include <tqframe.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -48,7 +48,7 @@
 #include <tqsqlfield.h>
 #include <tqsqlquery.h>
 #include <tqsqlrecord.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
 #include <tqwhatsthis.h>
@@ -139,16 +139,16 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   Frame16Layout->addWidget( TextLabel5, 5, 0 );
   Frame5Layout->addWidget( Frame16 );
 
-  m_databasetqStatus = new TQLabel( Frame5, "m_databaseStatus" );
-  m_databasetqStatus->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetqStatus->sizePolicy().hasHeightForWidth() ) );
-  m_databasetqStatus->setMaximumSize( TQSize( 32767, 30 ) );
-  m_databasetqStatus->setText( " " );
-  Frame5Layout->addWidget( m_databasetqStatus );
+  m_databaseStatus = new TQLabel( Frame5, "m_databaseStatus" );
+  m_databaseStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) );
+  m_databaseStatus->setMaximumSize( TQSize( 32767, 30 ) );
+  m_databaseStatus->setText( " " );
+  Frame5Layout->addWidget( m_databaseStatus );
 
   m_databaseLayout->addWidget( Frame5, 0, 1 );
 
   TQFrame * Frame17 = new TQFrame( m_database, "Frame17" );
-  Frame17->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) );
+  Frame17->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) );
   Frame17->setMinimumSize( TQSize( 111, 0 ) );
   Frame17->setFrameShape( TQFrame::NoFrame );
   Frame17->setFrameShadow( TQFrame::Plain );
@@ -181,9 +181,9 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
 
   Frame5_2Layout->addLayout( Layout21, 0, 0 );
 
-  m_sheettqStatus = new TQLabel( Frame5_2, "m_tableStatus" );
-  m_sheettqStatus->setText( " " );
-  Frame5_2Layout->addWidget( m_sheettqStatus, 3, 0 );
+  m_sheetStatus = new TQLabel( Frame5_2, "m_tableStatus" );
+  m_sheetStatus->setText( " " );
+  Frame5_2Layout->addWidget( m_sheetStatus, 3, 0 );
 
   m_SelectSheetLabel = new TQLabel( Frame5_2, "m_SelectSheetLabel" );
   m_SelectSheetLabel->setText( i18n( "Select tables:" ) );
@@ -198,7 +198,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_sheetLayout->addWidget( Frame5_2, 0, 1 );
 
   TQFrame * Frame17_2 = new TQFrame( m_sheet, "Frame17_2" );
-  Frame17_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) );
+  Frame17_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) );
   Frame17_2->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_2->setFrameShape( TQFrame::NoFrame );
   Frame17_2->setFrameShadow( TQFrame::Plain );
@@ -227,14 +227,14 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
 
   Frame5_2_2Layout->addWidget( m_columnView, 1, 0 );
 
-  m_columnstqStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" );
-  m_columnstqStatus->setText( " " );
-  Frame5_2_2Layout->addWidget( m_columnstqStatus, 2, 0 );
+  m_columnsStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" );
+  m_columnsStatus->setText( " " );
+  Frame5_2_2Layout->addWidget( m_columnsStatus, 2, 0 );
 
   m_columnsLayout->addWidget( Frame5_2_2, 0, 1 );
 
   TQFrame * Frame17_3 = new TQFrame( m_columns, "Frame17_3" );
-  Frame17_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) );
+  Frame17_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) );
   Frame17_3->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_3->setFrameShape( TQFrame::NoFrame );
   Frame17_3->setFrameShadow( TQFrame::Plain );
@@ -353,7 +353,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_optionsLayout->addWidget( optionsFrame, 0, 1 );
 
   TQFrame * Frame17_4 = new TQFrame( m_options, "Frame17_4" );
-  Frame17_4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) );
+  Frame17_4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) );
   Frame17_4->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_4->setFrameShape( TQFrame::NoFrame );
   Frame17_4->setFrameShadow( TQFrame::Plain );
@@ -402,7 +402,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_resultLayout->addWidget( Frame5_2_2_3, 0, 1 );
 
   TQFrame * Frame17_5 = new TQFrame( m_result, "Frame17_5" );
-  Frame17_5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) );
+  Frame17_5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) );
   Frame17_5->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_5->setFrameShape( TQFrame::NoFrame );
   Frame17_5->setFrameShadow( TQFrame::Plain );
@@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext()
       m_dbConnection->setPort( port );
     }
 
-    m_databasetqStatus->setText( i18n("Connecting to database...") );
+    m_databaseStatus->setText( i18n("Connecting to database...") );
     if ( m_dbConnection->open() )
     {
-      m_databasetqStatus->setText( i18n("Connected. Retrieving table information...") );
+      m_databaseStatus->setText( i18n("Connected. Retrieving table information...") );
       TQStringList sheetList( m_dbConnection->tables() );
 
       if ( sheetList.isEmpty() )
@@ -741,7 +741,7 @@ bool DatabaseDialog::databaseDoNext()
       }
 
       m_sheetView->setEnabled( true );
-      m_databasetqStatus->setText( " " );
+      m_databaseStatus->setText( " " );
     }
     else
     {
@@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext()
         errorMsg.append( error.databaseText() );
         errorMsg.append( "\n" );
       }
-      m_databasetqStatus->setText( " " );
+      m_databaseStatus->setText( " " );
 
       KMessageBox::error( this, errorMsg );
       return false;
@@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext()
   else
   {
     KMessageBox::error( this, i18n("Driver could not be loaded") );
-    m_databasetqStatus->setText( " " );
+    m_databaseStatus->setText( " " );
     return false;
   }
   setNextEnabled(m_sheet, true);
@@ -778,7 +778,7 @@ bool DatabaseDialog::databaseDoNext()
 
 bool DatabaseDialog::sheetsDoNext()
 {
-  m_databasetqStatus->setText( i18n("Retrieving meta data of tables...") );
+  m_databaseStatus->setText( i18n("Retrieving meta data of tables...") );
   TQStringList sheets;
 
   for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling())
diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h
index 6e82adc3..9334935c 100644
--- a/kspread/dialogs/kspread_dlg_database.h
+++ b/kspread/dialogs/kspread_dlg_database.h
@@ -88,7 +88,7 @@ class DatabaseDialog : public KWizard
   TQSqlDatabase * m_dbConnection;
 
   TQWidget      * m_database;
-  TQLabel       * m_databasetqStatus;
+  TQLabel       * m_databaseStatus;
   TQLineEdit    * m_username;
   TQLineEdit    * m_port;
   TQLineEdit    * m_databaseName;
@@ -99,12 +99,12 @@ class DatabaseDialog : public KWizard
   TQWidget      * m_sheet;
   TQComboBox    * m_databaseList;
   KPushButton  * m_connectButton;
-  TQLabel       * m_sheettqStatus;
+  TQLabel       * m_sheetStatus;
   TQLabel       * m_SelectSheetLabel;
   KListView    * m_sheetView;
   TQWidget      * m_columns;
   KListView    * m_columnView;
-  TQLabel       * m_columnstqStatus;
+  TQLabel       * m_columnsStatus;
   TQWidget      * m_options;
   TQComboBox    * m_columns_1;
   TQComboBox    * m_columns_2;
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index d63bfd69..75330563 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -20,7 +20,7 @@
 
 #include "kspread_dlg_find.h"
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
@@ -30,17 +30,17 @@ using namespace KSpread;
 
 FindOption::FindOption( TQWidget *parent)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(parent);
+    TQVBoxLayout *layout = new TQVBoxLayout(parent);
     m_moreOptions = new TQPushButton( i18n( "More Options" ), parent );
-    tqlayout->addWidget(  m_moreOptions );
+    layout->addWidget(  m_moreOptions );
 
     connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) );
 
     m_findExtension = new TQWidget( parent );
-    tqlayout->addWidget( m_findExtension );
-    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension );
+    layout->addWidget( m_findExtension );
+    TQVBoxLayout *layout1 = new TQVBoxLayout( m_findExtension );
     m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension );
-    tqlayout1->addWidget( m_searchInAllSheet );
+    layout1->addWidget( m_searchInAllSheet );
 
     TQHBoxLayout *comboLayout = new TQHBoxLayout( m_findExtension );
     TQLabel *label = new TQLabel( i18n( "Search in:" ), m_findExtension );
@@ -48,7 +48,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchIn = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchIn );
-    tqlayout1->addLayout( comboLayout );
+    layout1->addLayout( comboLayout );
 
     TQStringList lst;
     lst << i18n( "Cell Values" );
@@ -61,7 +61,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchDirection = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchDirection );
-    tqlayout1->addLayout( comboLayout );
+    layout1->addLayout( comboLayout );
 
     lst.clear();
     lst << i18n( "Across then Down" );
@@ -120,7 +120,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 }
 
 FindDlg::~FindDlg()
@@ -144,7 +144,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 }
 
 SearchDlg::~SearchDlg()
diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc
index 6374c102..efb00f63 100644
--- a/kspread/dialogs/kspread_dlg_format.cc
+++ b/kspread/dialogs/kspread_dlg_format.cc
@@ -25,7 +25,7 @@
 
 #include <tqcombobox.h>
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
@@ -106,7 +106,7 @@ void FormatDialog::slotActivated( int index )
     if ( img.isEmpty() )
     {
 	TQString str( i18n( "Could not find image %1." ) );
-	str = str.tqarg( m_entries[ index ].image );
+	str = str.arg( m_entries[ index ].image );
 	KMessageBox::error( this, str ); 
 	
 	enableButtonOK(false);
@@ -118,7 +118,7 @@ void FormatDialog::slotActivated( int index )
     if ( pix.isNull() )
     {
 	TQString str( i18n( "Could not load image %1." ) );
-	str = str.tqarg( img );
+	str = str.arg( img );
 	KMessageBox::error( this,str );
 	
 	enableButtonOK(false);
@@ -138,7 +138,7 @@ void FormatDialog::slotOk()
     if ( xml.isEmpty() )
     {
 	TQString str( i18n( "Could not find sheet-style XML file '%1'." ) );
-	str = str.tqarg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.arg( m_entries[ m_combo->currentItem() ].xml );
 	KMessageBox::error( this, str );
 	return;
     }
@@ -152,7 +152,7 @@ void FormatDialog::slotOk()
     if ( !parseXML( doc ) )
     {
 	TQString str( i18n( "Parsing error in sheet-style XML file %1." ) );
-	str = str.tqarg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.arg( m_entries[ m_combo->currentItem() ].xml );
 	KMessageBox::error( this, str );
 	return;
     }
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index 62e637f5..a63ff039 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqtabwidget.h>
 
 #include "kspread_dlg_formula.h"
@@ -49,7 +49,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KSpread;
 
@@ -87,7 +87,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     searchFunct = new KLineEdit(page);
     TQSizePolicy sp3( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
-    searchFunct->tqsetSizePolicy( sp3 );
+    searchFunct->setSizePolicy( sp3 );
 
     grid1->addWidget( searchFunct, 0, 0 );
 
@@ -99,7 +99,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     functions = new TQListBox(page);
     TQSizePolicy sp1( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-    functions->tqsetSizePolicy( sp1 );
+    functions->setSizePolicy( sp1 );
     grid1->addWidget( functions, 2, 0 );
 
     selectFunction = new TQPushButton( page );
@@ -112,7 +112,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     m_tabwidget = new TQTabWidget( page );
     TQSizePolicy sp2( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-    m_tabwidget->tqsetSizePolicy( sp2 );
+    m_tabwidget->setSizePolicy( sp2 );
     grid1->addMultiCellWidget( m_tabwidget, 0, 2, 1, 1 );
 
     m_browser = new TQTextBrowser( m_tabwidget );
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index 8902cf6c..44af6b68 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -44,7 +44,7 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
@@ -152,7 +152,7 @@ GoalSeekDialog::GoalSeekDialog( View * parent,  TQPoint const & marker,
 
   m_resultText = new TQLabel( m_resultFrame, "m_resultText" );
   m_resultText->setText( "Goal seeking with cell <cell> found <a | no> solution:" );
-  m_resultText->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+  m_resultText->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
   m_resultFrameLayout->addMultiCellWidget( m_resultText, 0, 0, 0, 1 );
 
@@ -459,7 +459,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal)
     //    m_targetCell->setCalcDirtyFlag();
     m_targetCell->calc( false );
 
-    m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).tqarg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).arg( m_sourceEdit->text() ) );
     m_newValue->setText( m_pView->doc()->locale()->formatNumber( startA ) );
     m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) );
     m_restored = false;
@@ -471,7 +471,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal)
     m_targetCell->setCalcDirtyFlag();
     m_sourceCell->sheet()->setRegionPaintDirty(m_sourceCell->cellRect());
     m_targetCell->calc( false );
-    m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).tqarg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).arg( m_sourceEdit->text() ) );
     m_newValue->setText( "" );
     m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) );
     m_restored = true;
diff --git a/kspread/dialogs/kspread_dlg_goto.cc b/kspread/dialogs/kspread_dlg_goto.cc
index 2d9935ac..83ae08bd 100644
--- a/kspread/dialogs/kspread_dlg_goto.cc
+++ b/kspread/dialogs/kspread_dlg_goto.cc
@@ -23,7 +23,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klineedit.h>
 
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index 8cd3f89f..f7b0ce44 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -27,7 +27,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kbuttonbox.h>
 #include <kdebug.h>
@@ -55,7 +55,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->tqlayout();
+  grp->layout();
   lay1->addWidget(grp);
   if( insRem==Insert)
   {
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index 53942457..2bac0636 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqfontdatabase.h>
 #include <tqradiobutton.h>
@@ -78,7 +78,7 @@ PatternSelect::PatternSelect( TQWidget *parent, const char * )
 {
     penStyle = Qt::NoPen;
     penWidth = 1;
-    penColor = tqcolorGroup().text();
+    penColor = colorGroup().text();
     selected = false;
     undefined = false;
 }
@@ -88,7 +88,7 @@ void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle
     penStyle = _style;
     penColor = _color;
     penWidth = _width;
-    tqrepaint();
+    repaint();
 }
 
 void PatternSelect::setUndefined()
@@ -127,7 +127,7 @@ void PatternSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    tqrepaint();
+    repaint();
 }
 
 void PatternSelect::slotSelect()
@@ -136,7 +136,7 @@ void PatternSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    tqrepaint();
+    repaint();
 }
 
 
@@ -151,16 +151,16 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
   : TQWidget( parent ),
     m_dlg( dlg )
 {
-  TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout");
+  TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout");
 
   TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->setTitle( i18n( "Style" ) );
-  groupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  groupBox->tqlayout()->setMargin( KDialog::marginHint() );
+  groupBox->layout()->setSpacing( KDialog::spacingHint() );
+  groupBox->layout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
-  groupBoxLayout->tqsetAlignment( TQt::AlignTop );
+  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
+  groupBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * label1 = new TQLabel( groupBox, "label1" );
   label1->setText( i18n( "Name:" ) );
@@ -198,8 +198,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
 
   TQSpacerItem * spacer = new TQSpacerItem( 20, 260, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
-  tqlayout->addWidget( groupBox, 0, 0 );
-  tqlayout->addItem( spacer, 1, 0 );
+  layout->addWidget( groupBox, 0, 0 );
+  layout->addItem( spacer, 1, 0 );
 
   if ( m_dlg->getStyle()->type() == Style::BUILTIN )
   {
@@ -207,7 +207,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
     m_parentBox->setEnabled( false );
   }
 
-  resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize( 534, 447 ).expandedTo(minimumSizeHint()) );
 }
 
 GeneralTab::~GeneralTab()
@@ -262,7 +262,7 @@ bool GeneralTab::checkParent( const TQString & parentName )
     {
       KMessageBox::sorry( this,
                           i18n( "The style cannot inherit from '%1' because of recursive references." )
-                          .tqarg( m_parentBox->currentText() ) );
+                          .arg( m_parentBox->currentText() ) );
       return false;
     }
 
@@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y)
 
 void CellFormatDialog::init()
 {
-  TQColorGroup tqcolorGroup = TQApplication::tqpalette().active();
+  TQColorGroup colorGroup = TQApplication::palette().active();
 
   // Did we initialize the bitmaps ?
   if ( formatOnlyNegSignedPixmap == 0L )
   {
-    TQColor black = tqcolorGroup.text(); // not necessarily black :)
+    TQColor black = colorGroup.text(); // not necessarily black :)
     formatOnlyNegSignedPixmap    = paintFormatPixmap( "123.456", black, "-123.456", black );
     formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red );
     formatRedNeverSignedPixmap   = paintFormatPixmap( "123.456", black, "123.456", TQt::red );
@@ -948,7 +948,7 @@ TQPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const TQC
 
   TQPainter painter;
   painter.begin( pixmap );
-  painter.fillRect( 0, 0, 150, 14, TQApplication::tqpalette().active().base() );
+  painter.fillRect( 0, 0, 150, 14, TQApplication::palette().active().base() );
   painter.setPen( _color1 );
   painter.drawText( 2, 11, TQString(_string1) );
   painter.setPen( _color2 );
@@ -1082,7 +1082,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
   : TQWidget ( parent ),
     dlg( _dlg )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6,10 );
 
     TQButtonGroup *grp = new TQButtonGroup( i18n("Format"),this);
     TQGridLayout *grid = new TQGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint());
@@ -1149,7 +1149,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
     listFormat=new TQListBox(grp);
     grid->addMultiCellWidget(listFormat,2,7,1,1);
     TQWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) );
-    tqlayout->addWidget(grp);
+    layout->addWidget(grp);
 
     /* *** */
 
@@ -1245,7 +1245,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
         format->setCurrentItem( 3 );
     else if ( dlg->floatFormat == Format::AlwaysSigned && dlg->floatColor == Format::NegRed )
         format->setCurrentItem( 4 );
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     cellFormatType=dlg->formatType;
     newFormatType = cellFormatType;
@@ -1465,8 +1465,8 @@ void CellFormatPageFloat::init()
     TQString tmp;
     TQString tmp2;
     TQDate tmpDate( 2000,2,18);
-    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true);
-    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false);
+    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), true);
+    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), false);
 
     ValueFormatter *fmt = dlg->getDoc()->formatter();
 
@@ -1965,7 +1965,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg
 
   TQStringList tmpListFont;
   TQFontDatabase *fontDataBase = new TQFontDatabase();
-  tmpListFont = fontDataBase->tqfamilies();
+  tmpListFont = fontDataBase->families();
   delete fontDataBase;
 
   family_combo->insertStringList( tmpListFont);
@@ -1996,7 +1996,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg
   TQStringList lst;
   lst.append("");
   for ( unsigned int i = 1; i < 100; ++i )
-        lst.append( TQString( "%1" ).tqarg( i ) );
+        lst.append( TQString( "%1" ).arg( i ) );
 
   size_combo->insertStringList( lst );
 
@@ -2151,7 +2151,7 @@ void CellFormatPageFont::display_example(const TQFont& font)
   TQString string;
   fontChanged=true;
   example_label->setFont(font);
-  example_label->tqrepaint();
+  example_label->repaint();
 }
 
 void CellFormatPageFont::setCombos()
@@ -2164,10 +2164,10 @@ void CellFormatPageFont::setCombos()
  if ( dlg->bTextColor )
    textColor = dlg->textColor;
  else
-   textColor = tqcolorGroup().text();
+   textColor = colorGroup().text();
 
  if ( !textColor.isValid() )
-   textColor =tqcolorGroup().text();
+   textColor =colorGroup().text();
 
  textColorButton->setColor( textColor );
 
@@ -2281,7 +2281,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial
     if ( dlg->isRowSelected )
         width->setEnabled(false);
 
-    defaultWidth->setText(i18n("Default width (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName()));
+    defaultWidth->setText(i18n("Default width (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName()));
     if ( dlg->isRowSelected )
         defaultWidth->setEnabled(false);
 
@@ -2296,7 +2296,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial
     if ( dlg->isColumnSelected )
         height->setEnabled(false);
 
-    defaultHeight->setText(i18n("Default height (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); //annma
+    defaultHeight->setText(i18n("Default height (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); //annma
     if ( dlg->isColumnSelected )
         defaultHeight->setEnabled(false);
 
@@ -2533,7 +2533,7 @@ BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton
 {
   penStyle = Qt::NoPen;
   penWidth = 1;
-  penColor = tqcolorGroup().text();
+  penColor = colorGroup().text();
   setToggleButton( true );
   setOn( false);
   setChanged(false);
@@ -2549,7 +2549,7 @@ void BorderButton::setUndefined()
 {
  setPenStyle(Qt::SolidLine );
  setPenWidth(1);
- setColor(tqcolorGroup().midlight());
+ setColor(colorGroup().midlight());
 }
 
 
@@ -2558,7 +2558,7 @@ void BorderButton::unselect()
   setOn(false);
   setPenWidth(1);
   setPenStyle(Qt::NoPen);
-  setColor( tqcolorGroup().text() );
+  setColor( colorGroup().text() );
   setChanged(true);
 }
 
@@ -2586,7 +2586,7 @@ void Border::paintEvent( TQPaintEvent *_ev )
   TQPen pen;
   TQPainter painter;
   painter.begin( this );
-  pen=TQPen( tqcolorGroup().midlight(),2,SolidLine);
+  pen=TQPen( colorGroup().midlight(),2,SolidLine);
   painter.setPen( pen );
 
   painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY );
@@ -2678,18 +2678,18 @@ void CellFormatPageBorder::InitializeGrids()
     { {0,0}, {0,1},{0,2} };
   /***********************/
 
-  /* set up a tqlayout box for most of the border setting buttons */
+  /* set up a layout box for most of the border setting buttons */
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Border") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
   grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint());
   int fHeight = tmpTQGroupBox->fontMetrics().height();
   grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title
 
   area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow);
   grid2->addMultiCellWidget(area,2,4,1,3);
-  area->setBackgroundColor( tqcolorGroup().base() );
+  area->setBackgroundColor( colorGroup().base() );
 
   /* initailize the buttons that are in this box */
   for (int i=BorderType_Top; i < BorderType_END; i++)
@@ -2709,7 +2709,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Preselect") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint());
 
@@ -2748,7 +2748,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Pattern") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint());
   fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -2804,7 +2804,7 @@ void CellFormatPageBorder::InitializeGrids()
   style->insertItem(paintFormatPixmap(DashDotLine),2 );
   style->insertItem(paintFormatPixmap(DashDotDotLine),3  );
   style->insertItem(paintFormatPixmap(SolidLine),4);
-  style->setBackgroundColor( tqcolorGroup().background() );
+  style->setBackgroundColor( colorGroup().background() );
 
   grid2->addMultiCell(grid3,6,6,0,1);
   grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1);
@@ -2813,7 +2813,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Preview") );
-  tmpTQGroupBox->tqsetAlignment( AlignLeft );
+  tmpTQGroupBox->setAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint());
   fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -2970,9 +2970,9 @@ TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style)
   TQPixmap pixmap( style->width(), 14 );
   TQPainter painter;
   TQPen pen;
-  pen=TQPen( tqcolorGroup().text(),1,_style);
+  pen=TQPen( colorGroup().text(),1,_style);
   painter.begin( &pixmap );
-  painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() );
+  painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() );
   painter.setPen( pen );
   painter.drawLine( 0, 7, style->width(), 7 );
   painter.end();
@@ -3223,7 +3223,7 @@ void CellFormatPageBorder::preselect( BorderButton *_p )
       vertical->setChanged(true);
     }
   }
-  area->tqrepaint();
+  area->repaint();
 }
 
 void CellFormatPageBorder::changeState( BorderButton *_p)
@@ -3240,10 +3240,10 @@ void CellFormatPageBorder::changeState( BorderButton *_p)
   {
     _p->setPenWidth(1);
     _p->setPenStyle(Qt::NoPen);
-    _p->setColor( tqcolorGroup().text() );
+    _p->setColor( colorGroup().text() );
   }
 
- area->tqrepaint();
+ area->repaint();
 }
 
 void CellFormatPageBorder::draw()
@@ -3483,7 +3483,7 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y())))
     }
   }
 
-  area->tqrepaint();
+  area->repaint();
 }
 
 
@@ -3505,7 +3505,7 @@ void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style )
 {
     brushStyle = _style;
     brushColor = _color;
-    tqrepaint();
+    repaint();
 }
 
 
@@ -3535,7 +3535,7 @@ void BrushSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    tqrepaint();
+    repaint();
 }
 
 void BrushSelect::slotSelect()
@@ -3544,7 +3544,7 @@ void BrushSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    tqrepaint();
+    repaint();
 }
 
 
@@ -3567,7 +3567,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" );
     tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
     tmpTQGroupBox->setTitle( i18n("Pattern") );
-    tmpTQGroupBox->tqsetAlignment( AlignLeft );
+    tmpTQGroupBox->setAlignment( AlignLeft );
 
     TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint());
     int fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -3656,10 +3656,10 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     if ( dlg->bBgColor )
         bgColor = dlg->bgColor;
     else
-        bgColor = tqcolorGroup().base();
+        bgColor = colorGroup().base();
 
     if (!bgColor.isValid())
-        bgColor = tqcolorGroup().base();
+        bgColor = colorGroup().base();
 
     bgColorButton->setColor( bgColor );
     connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ),
@@ -3678,7 +3678,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" );
     tmpTQGroupBox->setTitle( i18n("Preview") );
     tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
-    tmpTQGroupBox->tqsetAlignment( AlignLeft );
+    tmpTQGroupBox->setAlignment( AlignLeft );
 
     grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint());
     fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -3753,8 +3753,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
 void CellFormatPagePattern::slotNotAnyColor()
 {
   b_notAnyColor = true;
-  bgColorButton->setColor( tqcolorGroup().base() );
-  current->setBackgroundColor( tqcolorGroup().base() );
+  bgColorButton->setColor( colorGroup().base() );
+  current->setBackgroundColor( colorGroup().base() );
 }
 
 void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color )
diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h
index b8ec0bba..8d38663a 100644
--- a/kspread/dialogs/kspread_dlg_layout.h
+++ b/kspread/dialogs/kspread_dlg_layout.h
@@ -101,16 +101,16 @@ class PatternSelect : public TQFrame
 public:
     PatternSelect( TQWidget *parent, const char *_name );
 
-    void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); }
+    void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; repaint(); }
     Qt::PenStyle getPenStyle() { return penStyle; }
-    void setColor( const TQColor &_col ) { penColor = _col; tqrepaint(); }
+    void setColor( const TQColor &_col ) { penColor = _col; repaint(); }
     const TQColor& getColor() { return penColor; }
-    void setPenWidth( int _w ) { penWidth = _w; tqrepaint(); }
+    void setPenWidth( int _w ) { penWidth = _w; repaint(); }
     int getPenWidth() { return penWidth; }
 
     void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style );
     void setUndefined();
-    void setDefined() { undefined = FALSE; tqrepaint(); }
+    void setDefined() { undefined = FALSE; repaint(); }
 
     bool isDefined() { return !undefined; }
 
@@ -389,7 +389,7 @@ class BrushSelect : public TQFrame
 public:
     BrushSelect( TQWidget *parent, const char *_name );
 
-    void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); }
+    void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; repaint(); }
     Qt::BrushStyle getBrushStyle() const { return brushStyle; }
     TQColor getBrushColor() const { return brushColor; }
     void setBrushColor(const TQColor &_c) { brushColor=_c;}
diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc
index f4e03269..cdff22f1 100644
--- a/kspread/dialogs/kspread_dlg_list.cc
+++ b/kspread/dialogs/kspread_dlg_list.cc
@@ -20,7 +20,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqmultilineedit.h>
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index f0e6f664..6e89e2cf 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -37,7 +37,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhgroupbox.h>
 
 #include <kapplication.h>
@@ -48,11 +48,11 @@
 using namespace KSpread;
 
 PaperLayout::PaperLayout( TQWidget * parent, const char * name,
-                                        const KoPageLayout & tqlayout,
+                                        const KoPageLayout & layout,
                                         const KoHeadFoot & headfoot,
                                         int tabs, KoUnit::Unit unit,
                                         Sheet * sheet, View * view)
-  : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/),
+  : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/),
     m_pSheet( sheet ),
     m_pView( view )
 {
@@ -130,7 +130,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox )
     rangeGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( rangeGroup );
 
-    TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() );
+    TQGridLayout *grid = new TQGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() );
 
     TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup );
     grid->addWidget( pPrintRange, 0, 0 );
@@ -182,7 +182,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     zoomGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( zoomGroup );
 
-    TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6,
+    TQGridLayout *grid = new TQGridLayout( zoomGroup->layout(), 2, 6,
                                          KDialog::spacingHint() );
 
     m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup );
@@ -194,17 +194,17 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     TQStringList lst;
     for( int i = 5; i < 500; i += 5 )
     {
-        lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) );
+        lst.append( TQString( i18n( "%1%" ) ).arg( i ) );
         if( tqRound( print->zoom() * 100 ) > i &&
             tqRound( print->zoom() * 100 ) < i + 5 )
         {
-            lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) );
+            lst.append( TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ) );
         }
     }
     m_cZoom->insertStringList( lst );
 
     int number_of_entries = m_cZoom->count();
-    TQString string = TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) );
+    TQString string = TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) );
     for (int i = 0; i < number_of_entries ; i++)
     {
         if ( string == (TQString) m_cZoom->text(i) )
@@ -227,11 +227,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstX.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstX.append( TQString( "%1" ).tqarg( i ) );
+        lstX.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitX() > 20 )
     {
-      lstX.append( TQString( "%1" ).tqarg( print->pageLimitX() ) );
+      lstX.append( TQString( "%1" ).arg( print->pageLimitX() ) );
     }
     m_cLimitPagesX->insertStringList( lstX );
 
@@ -250,11 +250,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstY.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstY.append( TQString( "%1" ).tqarg( i ) );
+        lstY.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitY() > 20 )
     {
-      lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) );
+      lstY.append( TQString( "%1" ).arg( print->pageLimitY() ) );
     }
     m_cLimitPagesY->insertStringList( lstY );
 
@@ -312,7 +312,7 @@ void PaperLayout::slotOk()
     {
       SheetPrint *print = sheet->print();
 
-      KoPageLayout pl = tqlayout();
+      KoPageLayout pl = layout();
       KoHeadFoot hf = headFoot();
       KoUnit::Unit unit = sheet->doc()->unit();
       print->setPrintGrid( pPrintGrid->isChecked() );
@@ -407,7 +407,7 @@ void PaperLayout::slotOk()
       if ( m_rScalingZoom->isChecked() )
       {
         kdDebug() << "Zoom is selected" << endl;
-        if( TQString( "%1%" ).tqarg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
+        if( TQString( "%1%" ).arg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
         {
           kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl;
           TQString zoomtext = m_cZoom->currentText();
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h
index c9a9e6e5..0260c1c8 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.h
+++ b/kspread/dialogs/kspread_dlg_paperlayout.h
@@ -42,7 +42,7 @@ class PaperLayout: public KoPageLayoutDia
   TQ_OBJECT
 public:
   PaperLayout( TQWidget* parent, const char* name,
-                      const KoPageLayout& tqlayout,
+                      const KoPageLayout& layout,
                       const KoHeadFoot& headfoot,
                       int tabs, KoUnit::Unit unit,
                       Sheet * sheet, View *view);
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc
index 9b54644d..8dda529e 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kbuttonbox.h>
 #include <tqbuttongroup.h>
@@ -49,7 +49,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->tqlayout();
+  grp->layout();
   lay1->addWidget(grp);
   rb1 = new TQRadioButton( i18n("Move towards right"), grp );
   rb2 = new TQRadioButton( i18n("Move towards bottom"), grp );
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 51ca3cdc..531e6260 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -26,7 +26,7 @@
 */
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqvgroupbox.h>
@@ -192,12 +192,12 @@ void parameterLocale::updateDefaultSystemConfig()
 
 void parameterLocale::updateToMatchLocale(KLocale* locale)
 {
-  m_language->setText( i18n("Language: %1").tqarg( locale->language() ));
-  m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) ));
-  m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() )));
-  m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ,true) ));
-  m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) ));
-  m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) ));
+  m_language->setText( i18n("Language: %1").arg( locale->language() ));
+  m_number->setText( i18n("Default number format: %1").arg( locale->formatNumber(12.55) ));
+  m_date->setText( i18n("Long date format: %1").arg( locale->formatDate( TQDate::currentDate() )));
+  m_shortDate->setText( i18n("Short date format: %1").arg( locale->formatDate( TQDate::currentDate() ,true) ));
+  m_time->setText( i18n("Time format: %1").arg( locale->formatTime( TQTime::currentTime() ) ));
+  m_money->setText( i18n("Currency format: %1").arg( locale->formatMoney(12.55) ));
 }
 
 configure::configure( View* _view, TQVBox *box , char *name )
@@ -488,7 +488,7 @@ miscParameters::miscParameters( View* _view,TQVBox *box, char *name )
 //   valIndent->setRange( 0.0, 100.0, 10.0 );
   valIndent->setValue ( KoUnit::toUserValue( _indent, indentUnit ) );
   TQWhatsThis::add(valIndent, i18n( "Lets you define the amount of indenting used by the Increase Indent and Decrease Indent option in the Format menu." ) );
-  valIndent->setLabel(i18n("&Indentation step (%1):").tqarg(KoUnit::unitName(indentUnit)));
+  valIndent->setLabel(i18n("&Indentation step (%1):").arg(KoUnit::unitName(indentUnit)));
 
   msgError= new TQCheckBox(i18n("&Show error message for invalid formulae"),tmpTQGroupBox);
   msgError->setChecked(m_bMsgError);
@@ -790,10 +790,10 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name )
   m_pView = _view;
 
   TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" );
-  tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+  tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->tqlayout(),8,1);
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->layout(),8,1);
   grid1->addRowSpacing( 0, KDialog::marginHint()  );
   grid1->setRowStretch( 7, 10 );
 
@@ -905,7 +905,7 @@ configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name )
   TQWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) );
 
   TQWidget* spacer = new TQWidget( box );
-  spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+  spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     if( config->hasGroup("KSpell kspread") )
     {
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index c456efb3..7c3007e8 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -40,7 +40,7 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kbuttonbox.h>
 #include <kmessagebox.h>
@@ -75,7 +75,7 @@ reference::reference( View* parent, const char* name )
   m_pOk = bb->addButton( KStdGuiItem::ok() );
   m_pCancel = bb->addButton( KStdGuiItem::cancel() );
   m_pOk->setDefault( TRUE );
-  bb->tqlayout();
+  bb->layout();
   lay1->addWidget( bb );
 
   TQString text;
@@ -110,7 +110,7 @@ reference::reference( View* parent, const char* name )
            TQT_SLOT(slotDoubleClicked(TQListBoxItem *)));
   connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this,
            TQT_SLOT(slotHighlighted(TQListBoxItem * )));
-  m_rangeName->setText(i18n("Area: %1").tqarg(""));
+  m_rangeName->setText(i18n("Area: %1").arg(""));
 
   resize( 250, 200 );
 }
@@ -134,7 +134,7 @@ void reference::displayAreaValues(TQString const & areaName)
     }
   }
 
-  tmpName = i18n("Area: %1").tqarg(tmpName);
+  tmpName = i18n("Area: %1").arg(tmpName);
   m_rangeName->setText(tmpName);
 }
 
@@ -206,7 +206,7 @@ void reference::slotEdit()
   EditAreaName editDlg( m_pView, "EditArea", name );
   editDlg.exec();
 
-  m_rangeName->setText(i18n("Area: %1").tqarg(""));
+  m_rangeName->setText(i18n("Area: %1").arg(""));
   TQString tmp = m_list->text(m_list->currentItem());
   if (!tmp.isEmpty())
     displayAreaValues( tmp );
@@ -254,7 +254,7 @@ EditAreaName::EditAreaName( View * parent,
   m_pView = parent;
 
   resize( 350, 142 );
-  tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
+  setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
                               (TQSizePolicy::SizeType)4, 0, 0,
                               sizePolicy().hasHeightForWidth() ) );
 
diff --git a/kspread/dialogs/kspread_dlg_resize2.cc b/kspread/dialogs/kspread_dlg_resize2.cc
index e6d74d26..4185847e 100644
--- a/kspread/dialogs/kspread_dlg_resize2.cc
+++ b/kspread/dialogs/kspread_dlg_resize2.cc
@@ -26,7 +26,7 @@
 #include <float.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <knuminput.h>
 
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc
index 0158dd2a..4ce74abd 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cc
@@ -30,7 +30,7 @@
 #include "kspread_sheet.h"
 #include "kspread_view.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqlabel.h>
 
diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc
index c73f71ec..e497a790 100644
--- a/kspread/dialogs/kspread_dlg_show.cc
+++ b/kspread/dialogs/kspread_dlg_show.cc
@@ -22,7 +22,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqlistbox.h>
 #include <tqlabel.h>
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc
index 75a50cc3..450737a1 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cc
@@ -21,7 +21,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 
@@ -78,9 +78,9 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type )
         for( it = listInt.begin(); it != listInt.end(); ++it )
 	  {
 	    if(!showColNumber)
-	      listCol+=i18n("Column: %1").tqarg(Cell::columnName(*it));
+	      listCol+=i18n("Column: %1").arg(Cell::columnName(*it));
 	    else
-	      listCol+=i18n("Column: %1").tqarg(text.setNum(*it));
+	      listCol+=i18n("Column: %1").arg(text.setNum(*it));
 	  }
         list->insertStringList(listCol);
         }
@@ -98,7 +98,7 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type )
         qHeapSort(listInt);
         TQValueList<int>::Iterator it;
         for( it = listInt.begin(); it != listInt.end(); ++it )
-	  listRow+=i18n("Row: %1").tqarg(text.setNum(*it));
+	  listRow+=i18n("Row: %1").arg(text.setNum(*it));
 
         list->insertStringList(listRow);
         }
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 1e58ccf5..4ce0d91e 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -85,7 +85,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" );
   orientationGroup->setLineWidth(0);
   orientationGroup->setMargin(0);
-  orientationGroup->tqlayout()->setMargin(0);
+  orientationGroup->layout()->setMargin(0);
 
   m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" );
   m_sortColumn->setText( i18n( "Sort &Rows" ) );
@@ -108,10 +108,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort1Box->setTitle( i18n( "Sort By" ) );
   sort1Box->setFlat(true);
   sort1Box->setColumnLayout(0, Qt::Vertical );
-  sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort1Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() );
-  sort1BoxLayout->tqsetAlignment( TQt::AlignTop );
+  sort1Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort1Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() );
+  sort1BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" );
   sort1BoxLayout->addWidget( m_sortKey1 );
@@ -127,10 +127,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort2Box->setTitle( i18n( "Then By" ) );
   sort2Box->setFlat(true);
   sort2Box->setColumnLayout(0, Qt::Vertical );
-  sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort2Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() );
-  sort2BoxLayout->tqsetAlignment( TQt::AlignTop );
+  sort2Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort2Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() );
+  sort2BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" );
   m_sortKey2->insertItem( i18n( "None" ) );
@@ -147,10 +147,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort3Box->setTitle( i18n( "Then By" ) );
   sort3Box->setFlat(true);
   sort3Box->setColumnLayout(0, Qt::Vertical );
-  sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  sort3Box->tqlayout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() );
-  sort3BoxLayout->tqsetAlignment( TQt::AlignTop );
+  sort3Box->layout()->setSpacing( KDialog::spacingHint() );
+  sort3Box->layout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() );
+  sort3BoxLayout->setAlignment( TQt::AlignTop );
 
   m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" );
   m_sortKey3->insertItem( i18n( "None" ) );
@@ -171,15 +171,15 @@ SortDialog::SortDialog( View * parent,  const char * name,
 
   m_page2 = new TQWidget( m_tabWidget, "m_page2" );
   TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout");
-  page2Layout->tqsetAlignment(TQt::AlignTop);
+  page2Layout->setAlignment(TQt::AlignTop);
 
   TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" );
   firstKeyBox->setTitle( i18n( "First Key" ) );
   firstKeyBox->setColumnLayout(0, Qt::Vertical );
-  firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() );
-  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() );
-  firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop );
+  firstKeyBox->layout()->setSpacing( KDialog::spacingHint() );
+  firstKeyBox->layout()->setMargin( KDialog::marginHint() );
+  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() );
+  firstKeyBoxLayout->setAlignment( TQt::AlignTop );
 
   m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" );
   m_useCustomLists->setText( i18n( "&Use custom list" ) );
@@ -201,12 +201,12 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" );
   resultToBox->setTitle( i18n( "Location to Store Sort Results" ) );
   resultToBox->setColumnLayout(0, Qt::Vertical );
-  resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() );
-  resultToBox->tqlayout()->setMargin( KDialog::marginHint() );
+  resultToBox->layout()->setSpacing( KDialog::spacingHint() );
+  resultToBox->layout()->setMargin( KDialog::marginHint() );
   
   
-  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() );
-  resultToBoxLayout->tqsetAlignment( TQt::AlignTop );
+  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() );
+  resultToBoxLayout->setAlignment( TQt::AlignTop );
 
   TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet");
   destinationSheet->setText("Destination Sheet:");
@@ -351,7 +351,7 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -359,13 +359,13 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+		m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
 		
 		if ( i == r.left() )
 		  selectionMayHaveHeader=false;
             }
     }
-     // m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+     // m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
   }
   // Entire rows selected ?
   else if ( util_isRowSelected(r) )
@@ -377,7 +377,7 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i)
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").tqarg(i);
+	    TQString rowName=i18n(" (Row %1)").arg(i);
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -385,7 +385,7 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listRow += i18n("Row %1").tqarg(i);
+		m_listRow += i18n("Row %1").arg(i);
 		
 		if ( i == r.top() )
 		  selectionMayHaveHeader=false;
@@ -419,13 +419,13 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 		    m_listColumn += guessName + colName;
 	    else
 	    {
-		    m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+		    m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
 		    
 		    if (i == r.left())
 		      selectionMayHaveHeader=false;
@@ -435,13 +435,13 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i) 
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").tqarg(i);
+	    TQString rowName=i18n(" (Row %1)").arg(i);
 	    
 	    if (!guessName.isEmpty())
 		    m_listRow += guessName + rowName;
 	    else
 	    {
-		    m_listRow += i18n("Row %1").tqarg(i);
+		    m_listRow += i18n("Row %1").arg(i);
 		    
 		    if (i == r.top())
 		      selectionMayHaveHeader=false;
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 3f0c27e0..5c9f44a3 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
@@ -46,7 +46,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page );
     grp->setRadioButtonExclusive( TRUE );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
     rb1 = new TQRadioButton( i18n("Everything"), grp );
     rb2 = new TQRadioButton( i18n("Text"), grp );
@@ -59,7 +59,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page);
     grp->setRadioButtonExclusive( TRUE );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
 
 
@@ -71,7 +71,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
     rb5->setChecked(true);
 
     // cb = new TQCheckBox(i18n("Transpose"),this);
-    // cb->tqlayout();
+    // cb->layout();
     // lay1->addWidget(cb);
 
     connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) );
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 32a5474a..071aae69 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 
 #include <kcombobox.h>
@@ -42,15 +42,15 @@ using namespace KSpread;
 StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
   : TQWidget( parent, name, fl )
 {
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout");
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "layout");
 
   m_styleList = new KListView( this, "m_styleList" );
   m_styleList->addColumn( i18n( "Styles" ) );
   m_styleList->setResizeMode( KListView::AllColumns );
-  tqlayout->addWidget( m_styleList );
+  layout->addWidget( m_styleList );
 
   m_displayBox = new KComboBox( FALSE, this, "m_displayBox" );
-  tqlayout->addWidget( m_displayBox );
+  layout->addWidget( m_displayBox );
 
   m_styleList->header()->setLabel( 0, i18n( "Styles" ) );
   m_displayBox->clear();
@@ -59,7 +59,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
   m_displayBox->insertItem( i18n( "Custom Styles" ) );
   m_displayBox->insertItem( i18n( "Hierarchical" ) );
   connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle()));
-  resize( TQSize(446, 384).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(446, 384).expandedTo(minimumSizeHint()) );
 }
 
 StyleWidget::~StyleWidget()
@@ -232,11 +232,11 @@ void StyleDlg::slotUser1()
     s = m_styleManager->defaultStyle();
 
   int i = 1;
-  TQString newName( i18n( "style%1" ).tqarg( m_styleManager->count() + i ) );
+  TQString newName( i18n( "style%1" ).arg( m_styleManager->count() + i ) );
   while ( m_styleManager->style( newName ) != 0 )
   {
     ++i;
-    newName = i18n( "style%1" ).tqarg( m_styleManager->count() + i );
+    newName = i18n( "style%1" ).arg( m_styleManager->count() + i );
   }
 
   CustomStyle * style = new CustomStyle( newName, s );
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc
index 1b899ebf..f88f3a7f 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cc
@@ -243,7 +243,7 @@ void SubtotalDialog::fillColumnBoxes()
 
     if ( text.length() > 0 )
     {
-      text = col.tqarg( Cell::columnName( i ) );
+      text = col.arg( Cell::columnName( i ) );
     }
 
     m_dialog->m_columnBox->insertItem( text );
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 8f61c5d8..4a370246 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -28,7 +28,7 @@
 #include "kspread_sheet.h"
 #include "kspread_view.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <knumvalidator.h>
 #include <kdebug.h>
@@ -38,7 +38,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqcheckbox.h>
 
 using namespace KSpread;
@@ -54,9 +54,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
 
   TQGroupBox* tmpTQButtonGroup;
   tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" );
-  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2);
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2);
 
   TQLabel *tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_1" );
   tmpTQLabel->setText(i18n("Allow:" ));
@@ -148,9 +148,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" );
-  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
 
   displayMessage = new TQCheckBox(i18n( "Show error message when invalid values are entered" ),tmpTQButtonGroup );
   displayMessage->setChecked( true );
@@ -188,10 +188,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" );
-  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
+  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
+  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
 
   displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup );
   displayMessage->setChecked( false );
@@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index)
         }
         break;
     }
-    if ( width() < tqsizeHint().width() )
-        resize( tqsizeHint() );
+    if ( width() < sizeHint().width() )
+        resize( sizeHint() );
 }
 
 void DlgValidity::changeIndexCond(int _index)
diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui
index cb73b12d..341d72a9 100644
--- a/kspread/dialogs/kspreadsubtotal.ui
+++ b/kspread/dialogs/kspreadsubtotal.ui
@@ -195,7 +195,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>152</height>
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index aba1a170..58b27528 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdesktopfile.h>
 #include <kdialogbase.h>
@@ -105,7 +105,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
     fLayout->add( d->fileLink );
     fLayout->add( new TQLabel( i18n("Recent file:" ), d->filePage ) );
     TQComboBox* recentFile = new TQComboBox( d->filePage );
-    recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+    recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
     fLayout->add( recentFile );
     fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) );
     connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this,
diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui
index df2ff211..5e4af84d 100644
--- a/kspread/dialogs/position_cell_format.ui
+++ b/kspread/dialogs/position_cell_format.ui
@@ -55,7 +55,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -271,7 +271,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -298,7 +298,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>10</width>
                                     <height>20</height>
@@ -331,7 +331,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -358,7 +358,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui
index 0768d4f7..c9c3eb7a 100644
--- a/kspread/dialogs/protection_cell_format.ui
+++ b/kspread/dialogs/protection_cell_format.ui
@@ -60,7 +60,7 @@ Note that you can print it even if the cell is protected</string>
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -79,7 +79,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -95,7 +95,7 @@ Note that you can print it even if the cell is protected</string>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>21</height>
@@ -120,7 +120,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -136,7 +136,7 @@ Note that you can print it even if the cell is protected</string>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>20</height>
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index 69397687..7cdd6449 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -39,7 +39,7 @@ SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* parent ):
   TQVBox* mainWidget = makeVBoxMainWidget();
   d = new SheetPropertiesBase( mainWidget );
   TQWidget* spacer = new TQWidget( mainWidget );
-  spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
+  spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
   enableButtonSeparator( true );
 }
 
diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui
index 0750b8a9..d2a24d6c 100644
--- a/kspread/dialogs/sheet_properties_base.ui
+++ b/kspread/dialogs/sheet_properties_base.ui
@@ -47,7 +47,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -99,7 +99,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -118,7 +118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -127,7 +127,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
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 d3c739a8..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>
 
@@ -129,7 +129,7 @@ that is demanded can be handled in several different ways:</p>
   <li>The content can be partially shown, i.e. cut.
 
   <li>The content can overflow into neighbor cell(s). Which cells that
-      are affected is dependent on tqalignment, if the neighbors are
+      are affected is dependent on alignment, if the neighbors are
       empty, etc, etc.  </ul>
 
 <h3>Borders and overflow</h3>
diff --git a/kspread/formula.cc b/kspread/formula.cc
index 1e42867a..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
@@ -1479,10 +1479,10 @@ TQString Formula::dump() const
     compile( tokens );
   }
 
-  result = TQString("Expression: [%1]\n").tqarg( d->expression );
+  result = TQString("Expression: [%1]\n").arg( d->expression );
 #if 0
   Value value = eval();
-  result.append( TQString("Result: %1\n").tqarg(
+  result.append( TQString("Result: %1\n").arg(
       converter->asString(value).asString() ) );
 #endif
 
@@ -1491,12 +1491,12 @@ TQString Formula::dump() const
   {
     TQString vtext;
     Value val = d->constants[c];
-    if( val.isString() ) vtext = TQString("[%1]").tqarg( val.asString() );
-    else if( val.isNumber() ) vtext = TQString("%1").tqarg( val.asFloat() );
-    else if( val.isBoolean() ) vtext = TQString("%1").tqarg( val.asBoolean() ? "True":"False");
+    if( val.isString() ) vtext = TQString("[%1]").arg( val.asString() );
+    else if( val.isNumber() ) vtext = TQString("%1").arg( val.asFloat() );
+    else if( val.isBoolean() ) vtext = TQString("%1").arg( val.asBoolean() ? "True":"False");
     else if( val.isError() ) vtext = "error";
     else vtext = "???";
-    result += TQString("    #%1 = %2\n").tqarg(c).tqarg( vtext );
+    result += TQString("    #%1 = %2\n").arg(c).arg( vtext );
   }
 
   result.append("\n");
@@ -1506,9 +1506,9 @@ TQString Formula::dump() const
     TQString ctext;
     switch( d->codes[i].type )
     {
-      case Opcode::Load:     ctext = TQString("Load #%1").tqarg( d->codes[i].index ); break;
-      case Opcode::Ref:      ctext = TQString("Ref #%1").tqarg( d->codes[i].index ); break;
-      case Opcode::Function: ctext = TQString("Function (%1)").tqarg( d->codes[i].index ); break;
+      case Opcode::Load:     ctext = TQString("Load #%1").arg( d->codes[i].index ); break;
+      case Opcode::Ref:      ctext = TQString("Ref #%1").arg( d->codes[i].index ); break;
+      case Opcode::Function: ctext = TQString("Function (%1)").arg( d->codes[i].index ); break;
       case Opcode::Add:      ctext = "Add"; break;
       case Opcode::Sub:      ctext = "Sub"; break;
       case Opcode::Mul:      ctext = "Mul"; break;
diff --git a/kspread/kspread_brush.cc b/kspread/kspread_brush.cc
index 3a66549b..f3c6953c 100644
--- a/kspread/kspread_brush.cc
+++ b/kspread/kspread_brush.cc
@@ -103,8 +103,8 @@ void KSpreadBrush::saveOasisFillStyle( KoGenStyle &styleObjectAuto, KoGenStyles&
 
     if ( m_unbalanced )
     {
-        unbalancedx = TQString( "%1%" ).tqarg( m_xfactor / 4 + 50 );
-        unbalancedy = TQString( "%1%" ).tqarg( m_yfactor / 4 + 50 );
+        unbalancedx = TQString( "%1%" ).arg( m_xfactor / 4 + 50 );
+        unbalancedy = TQString( "%1%" ).arg( m_yfactor / 4 + 50 );
     }
     gradientStyle.addAttribute( "draw:cx", unbalancedx );
     gradientStyle.addAttribute( "draw:cy", unbalancedy );
diff --git a/kspread/kspread_brush.h b/kspread/kspread_brush.h
index ebb0c5f6..4a5679aa 100644
--- a/kspread/kspread_brush.h
+++ b/kspread/kspread_brush.h
@@ -21,7 +21,7 @@
 #ifndef KSPREADBRUSH_H
 #define KSPREADBRUSH_H
 
-#include <tqbrush.h>
+#include <brush.h>
 
 #include "kspread_global.h"
 
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 3f482e27..08ab33e0 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -47,7 +47,7 @@
 
 #include <tqapplication.h>
 #include <tqbuffer.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdrawutil.h>
 #include <tqlabel.h>
 #include <tqpoint.h>
@@ -547,7 +547,7 @@ void Canvas::validateSelection()
                 ypos = sheet->dblRowPos( moveY );
             }
             //d->validationInfo->setGeometry( 3, y + 3, len + 2, hei + 2 );
-            d->validationInfo->tqsetAlignment( TQt::AlignVCenter );
+            d->validationInfo->setAlignment( TQt::AlignVCenter );
             TQPainter painter;
             painter.begin( this );
             int len = 0;
@@ -1011,7 +1011,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
               (int) _ev->y() );
     if ( ( obj = getObject( p, activeSheet() ) ) && obj->isSelected() )
     {
-      KoRect const bound = obj->tqgeometry();
+      KoRect const bound = obj->geometry();
       TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(),
       bound.width(),
       bound.height() ) );
@@ -1056,7 +1056,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
   }
 
   //Check to see if the mouse is over a highlight range size grip and if it is, change the cursor
-  //tqshape to a resize arrow
+  //shape to a resize arrow
   if (highlightRangeSizeGripAt(ev_PosX,ev_PosY))
   {
     if ( sheet->layoutDirection()==Sheet::RightToLeft )
@@ -1177,7 +1177,7 @@ void Canvas::mouseReleaseEvent( TQMouseEvent* /*_ev*/)
             doc()->addCommand( cmd );
         } else
         {
-          tqrepaint();
+          repaint();
         }
         d->m_isMoving = false;
         break;
@@ -1253,13 +1253,13 @@ void Canvas::processLeftClickAnchor()
 
 	if ( KRun::isExecutableFile( d->anchor , type ) )
 	{
-        	//TQString question = i18n("Do you want to open this link to '%1'?\n").tqarg(d->anchor);
+        	//TQString question = i18n("Do you want to open this link to '%1'?\n").arg(d->anchor);
 
           	//question += i18n("Note that opening a link to a local file may "
                           //   "compromise your system's security.");
 
 		TQString question = i18n("This link points to the program or script '%1'.\n"
-					"Malicious programs can harm your computer.  Are you sure that you want to run this program?").tqarg(d->anchor);
+					"Malicious programs can harm your computer.  Are you sure that you want to run this program?").arg(d->anchor);
         	// this will also start local programs, so adding a "don't warn again"
         	// checkbox will probably be too dangerous
         	int choice = KMessageBox::warningYesNo(this, question, i18n("Open Link?"));
@@ -1352,9 +1352,9 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev )
 
         d->m_resizeObject = obj;
 
-        d->m_ratio = static_cast<double>( obj->tqgeometry().width() ) /
-            static_cast<double>( obj->tqgeometry().height() );
-        d->m_rectBeforeResize = obj->tqgeometry();
+        d->m_ratio = static_cast<double>( obj->geometry().width() ) /
+            static_cast<double>( obj->geometry().height() );
+        d->m_rectBeforeResize = obj->geometry();
       }
 
       KoPoint docPoint ( doc()->unzoomPoint( _ev->pos() ) );
@@ -1816,7 +1816,7 @@ void Canvas::dropEvent( TQDropEvent * _ev )
     }
 
 
-    b = _ev->tqencodedData( TextDrag::selectionMimeType() );
+    b = _ev->encodedData( TextDrag::selectionMimeType() );
     sheet->paste( b, TQRect( col, row, 1, 1 ), makeUndo );
 
     if ( _ev->source() == this )
@@ -2150,13 +2150,13 @@ void Canvas::processEscapeKey(TQKeyEvent * event)
       case MT_RESIZE_RU:
       case MT_RESIZE_RD:
       {
-        TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->tqgeometry()/*getRepaintRect()*/);
+        TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->geometry()/*getRepaintRect()*/);
         d->m_resizeObject->setGeometry( d->m_rectBeforeResize );
         oldBoundingRect.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) ,
                             (int)( -yOffset() * doc()->zoomedResolutionY()) );
 
         activeSheet()->setRegionPaintDirty( oldBoundingRect );
-        tqrepaint( oldBoundingRect );
+        repaint( oldBoundingRect );
         repaintObject( d->m_resizeObject );
         d->m_ratio = 0.0;
         d->m_resizeObject = 0;
@@ -3290,7 +3290,7 @@ KSpread::EmbeddedObject *Canvas::getObject( const TQPoint &pos, Sheet *_sheet )
   {
     if ( itObject.current()->sheet() == _sheet )
     {
-        KoRect const bound = ( itObject.current() )->tqgeometry();
+        KoRect const bound = ( itObject.current() )->geometry();
         TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(),
                                 bound.width(),
                                 bound.height() ) );
@@ -3429,7 +3429,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 {
     EmbeddedObject *obj = d->m_resizeObject;
 
-    KoRect objRect = obj->tqgeometry();
+    KoRect objRect = obj->geometry();
     objRect.moveBy( -xOffset(), -yOffset() );
     TQRect oldBoundingRect( doc()->zoomRect( objRect ) );
 
@@ -3440,22 +3440,22 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
     if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU )
     {
         top = true;
-//         snaptqStatus |= KoGuides::SNAP_HORIZ;
+//         snapStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD )
     {
         bottom = true;
-//         snaptqStatus |= KoGuides::SNAP_HORIZ;
+//         snapStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD )
     {
         left = true;
-//         snaptqStatus |= KoGuides::SNAP_VERT;
+//         snapStatus |= KoGuides::SNAP_VERT;
     }
     if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD )
     {
         right = true;
-//         snaptqStatus |= KoGuides::SNAP_VERT;
+//         snapStatus |= KoGuides::SNAP_VERT;
     }
 
     double newLeft = objRect.left();
@@ -3572,34 +3572,34 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 //       {
 //         sp.setY( rect.bottom() );
 //       }
-//       m_gl.repaintSnapping( sp, snaptqStatus );
+//       m_gl.repaintSnapping( sp, snapStatus );
 //     }
 
-    tqrepaint( oldBoundingRect );
+    repaint( oldBoundingRect );
     repaintObject( obj );
     emit objectSizeChanged();
   }
 }
 
 
-void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ )
+void Canvas::finishResizeObject( const TQString &/*name*/, bool /*layout*/ )
 {
   if ( d->m_resizeObject )
   {
-    KoPoint move = KoPoint( d->m_resizeObject->tqgeometry().x() - d->m_rectBeforeResize.x(),
-                            d->m_resizeObject->tqgeometry().y() - d->m_rectBeforeResize.y() );
-    KoSize size = KoSize( d->m_resizeObject->tqgeometry().width() - d->m_rectBeforeResize.width(),
-                          d->m_resizeObject->tqgeometry().height() - d->m_rectBeforeResize.height() );
+    KoPoint move = KoPoint( d->m_resizeObject->geometry().x() - d->m_rectBeforeResize.x(),
+                            d->m_resizeObject->geometry().y() - d->m_rectBeforeResize.y() );
+    KoSize size = KoSize( d->m_resizeObject->geometry().width() - d->m_rectBeforeResize.width(),
+                          d->m_resizeObject->geometry().height() - d->m_rectBeforeResize.height() );
 
-    if ( ( d->m_resizeObject->tqgeometry() ) != d->m_rectBeforeResize )
+    if ( ( d->m_resizeObject->geometry() ) != d->m_rectBeforeResize )
     {
         ChangeObjectGeometryCommand *resizeCmd = new ChangeObjectGeometryCommand( d->m_resizeObject, move, size );
         // the command is not executed as the object is allready resized.
         doc()->addCommand( resizeCmd );
     }
 
-//     if ( tqlayout )
-//       doc()->tqlayout( m_resizeObject );
+//     if ( layout )
+//       doc()->layout( m_resizeObject );
 
     d->m_ratio = 0.0;
     d->m_isResizing = false;
@@ -3669,7 +3669,7 @@ void Canvas::deleteEditor (bool saveChanges, bool array)
 
   TQString t = d->cellEditor->text();
   // Delete the cell editor first and after that update the document.
-  // That means we get a synchronous tqrepaint after the cell editor
+  // That means we get a synchronous repaint after the cell editor
   // widget is gone. Otherwise we may get painting errors.
   delete d->cellEditor;
   d->cellEditor = 0;
@@ -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() );
@@ -3819,8 +3819,8 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys )
 
 void Canvas::repaintObject( EmbeddedObject *obj )
 {
-	//Calculate where the object appears on the canvas widget and then tqrepaint that part of the widget
-	TQRect canvasRelativeGeometry = doc()->zoomRect( obj->tqgeometry() );
+	//Calculate where the object appears on the canvas widget and then repaint that part of the widget
+	TQRect canvasRelativeGeometry = doc()->zoomRect( obj->geometry() );
 	canvasRelativeGeometry.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) ,
 			   			(int)( -yOffset() * doc()->zoomedResolutionY()) );
 
@@ -3828,17 +3828,17 @@ void Canvas::repaintObject( EmbeddedObject *obj )
 
  /* if ( !obj->isSelected() )
   {
-    KoRect g = obj->tqgeometry();
+    KoRect g = obj->geometry();
     g.moveBy( -xOffset(), -yOffset() );
-    TQRect tqgeometry( doc()->zoomRect( g ) );
+    TQRect geometry( doc()->zoomRect( g ) );
 
-    update( tqgeometry );
+    update( geometry );
   }
   else
   {
     TQPainter p(this);
     p.translate( -xOffset() * doc()->zoomedResolutionX() , -yOffset() * doc()->zoomedResolutionY() );
-    obj->draw(&p); //this goes faster than calling tqrepaint
+    obj->draw(&p); //this goes faster than calling repaint
     p.end();
   }*/
 }
@@ -3888,7 +3888,7 @@ void Canvas::copyOasisObjects()
       for( ; itObject.current(); ++itObject )
       {
         if ( itObject.current()->isSelected() )
-          p.drawPixmap( itObject.current()->tqgeometry().toTQRect().left() - r.left(), itObject.current()->tqgeometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) );
+          p.drawPixmap( itObject.current()->geometry().toTQRect().left() - r.left(), itObject.current()->geometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) );
       }
       p.end();
       if (!pixmap.isNull())
@@ -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()
@@ -4064,7 +4064,7 @@ void Canvas::paintUpdates()
   }
   else
   {
-    matrix = painter.tqworldMatrix();
+    matrix = painter.worldMatrix();
   }
 
 
@@ -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();
@@ -4202,7 +4202,7 @@ void Canvas::paintUpdates()
   paintHighlightedRanges(painter, unzoomedRect);
   paintNormalMarker(painter, unzoomedRect);
 
-  //restore clip region with tqchildren area
+  //restore clip region with children area
   painter.restore();
   //painter.setClipRegion( rgnComplete );
 }
@@ -4223,7 +4223,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const
   {
     if ( ( itObject.current() )->sheet() == activeSheet() )
     {
-	TQRect childGeometry = doc()->zoomRect( itObject.current()->tqgeometry());
+	TQRect childGeometry = doc()->zoomRect( itObject.current()->geometry());
 
 	//The clipping region is given in device coordinates
 	//so subtract the current offset (scroll position) of the canvas
@@ -4232,7 +4232,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const
 	if (painter.window().intersects(childGeometry))
 		rgn -= childGeometry;
 
-      //painter.fillRect( doc()->zoomRect( itObject.current()->tqgeometry() ), TQColor("red" ) );
+      //painter.fillRect( doc()->zoomRect( itObject.current()->geometry() ), TQColor("red" ) );
     }
   }
 
@@ -4263,11 +4263,11 @@ void Canvas::paintChildren( TQPainter& painter, TQWMatrix& /*matrix*/ )
 
   for( ; itObject.current(); ++itObject )
   {
-    TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->tqgeometry() );
+    TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->geometry() );
     if ( ( itObject.current() )->sheet() == activeSheet() &&
            zoomedWindowGeometry.intersects( zoomedObjectGeometry ) )
     {
-	    //To prevent unnecessary redrawing of the embedded object, we only tqrepaint
+	    //To prevent unnecessary redrawing of the embedded object, we only repaint
 	    //if one or more of the cells underneath the object has been marked as 'dirty'.
 
 	   TQRect canvasRelativeGeometry = zoomedObjectGeometry;
@@ -4656,7 +4656,7 @@ VBorder::~VBorder()
     delete m_scrollTimer;
 }
 
-TQSize VBorder::tqsizeHint() const
+TQSize VBorder::sizeHint() const
 {
   return TQSize( 40, 10 );
 }
@@ -5036,9 +5036,9 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
 
     TQString tmpSize;
     if ( m_iResizePos != y )
-        tmpSize = i18n("Height: %1 %2").tqarg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ),
+        tmpSize = i18n("Height: %1 %2").arg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ),
                                                                m_pView->doc()->unit() ) )
-                                       .tqarg( m_pView->doc()->unitName() );
+                                       .arg( m_pView->doc()->unitName() );
     else
         tmpSize = i18n( "Hide Row" );
 
@@ -5057,7 +5057,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
           else
             m_lSize->setGeometry( 3, y + 3, len + 2,hei + 2 );
 
-          m_lSize->tqsetAlignment( TQt::AlignVCenter );
+          m_lSize->setAlignment( TQt::AlignVCenter );
           m_lSize->setText( tmpSize );
           m_lSize->setPalette( TQToolTip::palette() );
           m_lSize->show();
@@ -5095,7 +5095,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
   TQColor highlightColor = View::highlightColor();
   TQPen pen( TQt::black, 1 );
   painter.setPen( pen );
-  // painter.setBackgroundColor( tqcolorGroup().base() );
+  // painter.setBackgroundColor( colorGroup().base() );
 
   // painter.eraseRect( _ev->rect() );
 
@@ -5146,7 +5146,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
     }
     else
     {
-      TQColor c = tqcolorGroup().background();
+      TQColor c = colorGroup().background();
       TQBrush fill( c );
       qDrawPlainRect ( &painter, 0, zoomedYPos, width, height+1, c.dark(150),
            1, &fill );
@@ -5156,10 +5156,10 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
 
     // Reset painter
     painter.setFont( normalFont );
-    painter.setPen( tqcolorGroup().text() );
+    painter.setPen( colorGroup().text() );
 
     if ( selected )
-      painter.setPen( tqcolorGroup().highlightedText() );
+      painter.setPen( colorGroup().highlightedText() );
     else if ( highlighted )
       painter.setFont( boldFont );
 
@@ -5212,7 +5212,7 @@ HBorder::~HBorder()
     delete m_scrollTimer;
 }
 
-TQSize HBorder::tqsizeHint() const
+TQSize HBorder::sizeHint() const
 {
   return TQSize( 40, 10 );
 }
@@ -5738,9 +5738,9 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     TQString tmpSize;
     if ( m_iResizePos != x )
         tmpSize = i18n("Width: %1 %2")
-                  .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
+                  .arg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
                                                                            m_pView->doc()->unit() )))
-                  .tqarg( m_pView->doc()->unitName() );
+                  .arg( m_pView->doc()->unitName() );
     else
         tmpSize = i18n( "Hide Column" );
 
@@ -5758,7 +5758,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
         else
           m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 );
 
-        m_lSize->tqsetAlignment( TQt::AlignVCenter );
+        m_lSize->setAlignment( TQt::AlignVCenter );
         m_lSize->setText( tmpSize );
         m_lSize->setPalette( TQToolTip::palette() );
         m_lSize->show();
@@ -5866,7 +5866,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
       }
       else
       {
-        TQColor c = tqcolorGroup().background();
+        TQColor c = colorGroup().background();
         TQBrush fill( c );
         qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150),
            1, &fill );
@@ -5874,10 +5874,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
 
       // Reset painter
       painter.setFont( normalFont );
-      painter.setPen( tqcolorGroup().text() );
+      painter.setPen( colorGroup().text() );
 
       if ( selected )
-        painter.setPen( tqcolorGroup().highlightedText() );
+        painter.setPen( colorGroup().highlightedText() );
       else if ( highlighted )
         painter.setFont( boldFont );
       if ( !m_pView->activeSheet()->getShowColumnNumber() )
@@ -5929,7 +5929,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
       }
       else
       {
-        TQColor c = tqcolorGroup().background();
+        TQColor c = colorGroup().background();
         TQBrush fill( c );
         qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150),
            1, &fill );
@@ -5937,10 +5937,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
 
       // Reset painter
       painter.setFont( normalFont );
-      painter.setPen( tqcolorGroup().text() );
+      painter.setPen( colorGroup().text() );
 
       if ( selected )
-        painter.setPen( tqcolorGroup().highlightedText() );
+        painter.setPen( colorGroup().highlightedText() );
       else if ( highlighted )
         painter.setFont( boldFont );
       if ( !m_pView->activeSheet()->getShowColumnNumber() )
@@ -5991,7 +5991,7 @@ ToolTip::ToolTip( Canvas* canvas )
 // this is a hack of course, because it's not available from TQToolTip
 TQLabel *tip_findLabel()
 {
-    TQWidgetList  *list = TQApplication::tqallWidgets();
+    TQWidgetList  *list = TQApplication::allWidgets();
     TQWidgetListIt it( *list );
     TQWidget * w;
     while ( (w=it.current()) != 0 )
diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h
index f5aa6746..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
@@ -444,7 +444,7 @@ private:
     TQRect cellsInArea( const TQRect area ) const;
     
     /**
-     * Paints the tqchildren
+     * Paints the children
      */
     void paintChildren( TQPainter& painter, TQWMatrix& matrix );
 
@@ -586,7 +586,7 @@ public:
 
     void updateColumns( int from, int to );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 private slots:
     void doAutoScroll();
@@ -672,7 +672,7 @@ public:
     void equalizeRow( double resize );
     void updateRows( int from, int to );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 private slots:
     void doAutoScroll();
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index fdcf38be..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 );
 }
 
@@ -1049,20 +1049,20 @@ TQString Cell::encodeFormula( bool _era, int _col, int _row ) const
                         int col = 0;
                         col = util_decodeColumnLabelText( buffer );
                         if ( fix1 )
-                            erg += TQString( "$%1" ).tqarg( col );
+                            erg += TQString( "$%1" ).arg( col );
                         else
                             if (_era)
-                                erg += TQChar(0xA7) + TQString( "%1" ).tqarg( col );
+                                erg += TQChar(0xA7) + TQString( "%1" ).arg( col );
                             else
-                                erg += TQString( "#%1" ).tqarg( col - _col );
+                                erg += TQString( "#%1" ).arg( col - _col );
 
                         if ( fix2 )
-                            erg += TQString( "$%1#").tqarg( row );
+                            erg += TQString( "$%1#").arg( row );
                         else
                             if (_era)
-                                erg += TQChar(0xA7) + TQString( "%1#" ).tqarg( row );
+                                erg += TQChar(0xA7) + TQString( "%1#" ).arg( row );
                             else
-                                erg += TQString( "#%1#" ).tqarg( row - _row );
+                                erg += TQString( "#%1#" ).arg( row - _row );
                     }
                 }
                 else
@@ -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;
@@ -1687,7 +1687,7 @@ void Cell::offsetAlign( int _col, int _row )
   const double effTop = BORDER_SPACE + 0.5 * effTopBorderPen( _col, _row ).width();
   const double effBottom = h - BORDER_SPACE - 0.5 * effBottomBorderPen( _col, _row ).width();
 
-  // Calculate d->textY based on the vertical tqalignment and a few
+  // Calculate d->textY based on the vertical alignment and a few
   // other inputs.
   switch( ay )
   {
@@ -1846,7 +1846,7 @@ void Cell::offsetAlign( int _col, int _row )
     a = Format::Left;
   }
 
-  // Calculate d->textX based on tqalignment and textwidth.
+  // Calculate d->textX based on alignment and textwidth.
   switch ( a ) {
   case Format::Left:
     d->textX = 0.5 * effLeftBorderPen( _col, _row ).width() + BORDER_SPACE;
@@ -2052,7 +2052,7 @@ bool Cell::makeFormula()
     if (format()->sheet()->doc()->getShowMessageError())
     {
       TQString tmp(i18n("Error in cell %1\n\n"));
-      tmp = tmp.tqarg( fullName() );
+      tmp = tmp.arg( fullName() );
       KMessageBox::error( (TQWidget*)0L, tmp);
     }
     setFlag(Flag_ParseError);
@@ -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
@@ -2253,14 +2253,14 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
     selected = selected && !( markerArea.contains( cellRef ) );
 
     // Don't draw any selection at all when printing.
-    if ( painter.tqdevice()->isExtDev() || !drawCursor )
+    if ( painter.device()->isExtDev() || !drawCursor )
       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
@@ -2299,7 +2299,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
 
   // 2. Paint the default borders if we are on screen or if we are printing
   //    and the checkbox to do this is checked.
-  if ( painter.tqdevice()->devType() != TQInternal::Printer
+  if ( painter.device()->devType() != TQInternal::Printer
        || format()->sheet()->print()->printGrid())
     paintDefaultBorders( painter, rect, cellRect, cellRef,
        paintBorderRight, paintBorderBottom,
@@ -2336,7 +2336,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
 
   // If we print pages, then we disable clipping, otherwise borders are
   // cut in the middle at the page borders.
-  if ( painter.tqdevice()->isExtDev() )
+  if ( painter.device()->isExtDev() )
     painter.setClipping( false );
 
   // Paint the borders if this cell is not part of another merged cell.
@@ -2350,7 +2350,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   }
 
   // Turn clipping back on.
-  if ( painter.tqdevice()->isExtDev() )
+  if ( painter.device()->isExtDev() )
     painter.setClipping( true );
 
   // 5. Paint diagonal lines and page borders.
@@ -2364,12 +2364,12 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   if ( !isObscured() ) {
 
     // 6a. Paint possible comment indicator.
-    if ( !painter.tqdevice()->isExtDev()
+    if ( !painter.device()->isExtDev()
    || format()->sheet()->print()->printCommentIndicator() )
       paintCommentIndicator( painter, cellRect, cellRef, backgroundColor );
 
     // 6b. Paint possible formula indicator.
-    if ( !painter.tqdevice()->isExtDev()
+    if ( !painter.device()->isExtDev()
    || format()->sheet()->print()->printFormulaIndicator() )
       paintFormulaIndicator( painter, cellRect, backgroundColor );
 
@@ -2389,7 +2389,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
     //  b) something indicates that the text should not be painted
     //  c) the sheet is protected and the cell is hidden.
     if ( !d->strOutText.isEmpty()
-   && ( !painter.tqdevice()->isExtDev()
+   && ( !painter.device()->isExtDev()
         || !format()->getDontprintText( cellRef.x(), cellRef.y() ) )
    && !( format()->sheet()->isProtected()
          && format()->isHideAll( cellRef.x(), cellRef.y() ) ) )
@@ -2402,7 +2402,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   //    cells, then paint the obscuring cell(s).  Otherwise don't do
   //    anything so that we don't cause an infinite loop.
   if ( isObscured() && paintingObscured == 0 &&
-       !( sheetDir == Sheet::RightToLeft && painter.tqdevice()->isExtDev() ) )
+       !( sheetDir == Sheet::RightToLeft && painter.device()->isExtDev() ) )
   {
 
     //kdDebug(36001) << "painting cells that obscure " << name() << endl;
@@ -2498,7 +2498,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
      */
   if ( d->style == Cell::ST_Button ) {
     TQBrush fill( TQt::lightGray );
-    TQApplication::style().tqdrawControl( TQStyle::CE_PushButton, &_painter, this,
+    TQApplication::style().drawControl( TQStyle::CE_PushButton, &_painter, this,
                TQRect( _tx + 1, _ty + 1, w2 - 1, h2 - 1 ),
                defaultColorGroup ); //, selected, &fill );
   }
@@ -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
@@ -2723,7 +2723,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect,
     TQColor bg( backgroundColor );
 
     // Handle printers separately.
-    if ( !painter.tqdevice()->isExtDev() ) {
+    if ( !painter.device()->isExtDev() ) {
       if ( bg.isValid() )
         painter.setBackgroundColor( bg );
       else
@@ -2742,7 +2742,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect,
   }
 
   // Erase the background of the cell.
-  if ( !painter.tqdevice()->isExtDev() )
+  if ( !painter.device()->isExtDev() )
     painter.eraseRect( zoomedCellRect );
 
   // Get a background brush
@@ -2791,7 +2791,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect,
   Doc* doc = sheet()->doc();
 
   Sheet::LayoutDirection sheetDir =  format()->sheet()->layoutDirection();
-  bool paintingToExternalDevice = painter.tqdevice()->isExtDev();
+  bool paintingToExternalDevice = painter.device()->isExtDev();
 
   // Each cell is responsible for drawing it's top and left portions
   // of the "default" grid. --Or not drawing it if it shouldn't be
@@ -2948,7 +2948,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() )     {
+    if ( painter.device()->isExtDev() )     {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( doc->zoomItX( TQMAX( rect.left(),   cellRect.x() ) ),
                           doc->zoomItY( TQMAX( rect.top(),    cellRect.y() + dt ) ),
@@ -2995,7 +2995,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       painter.drawLine( doc->zoomItX( TQMAX( rect.left(),   cellRect.x() + dl ) ),
                         doc->zoomItY( TQMAX( rect.top(),    cellRect.bottom() ) ),
                         doc->zoomItX( TQMIN( rect.right(),  cellRect.right() - dr ) ),
@@ -3026,7 +3026,7 @@ void Cell::paintCommentIndicator( TQPainter& painter,
        && cellRect.width() > 10.0
        && cellRect.height() > 10.0
        && ( sheet()->print()->printCommentIndicator()
-           || ( !painter.tqdevice()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) {
+           || ( !painter.device()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) {
     TQColor penColor = TQt::red;
 
     // If background has high red part, switch to blue.
@@ -3123,7 +3123,7 @@ void Cell::paintMoreTextIndicator( TQPainter& painter,
   // Show a red triangle when it's not possible to write all text in cell.
   // Don't print the red triangle if we're printing.
   if( testFlag( Flag_CellTooShortX ) &&
-      !painter.tqdevice()->isExtDev() &&
+      !painter.device()->isExtDev() &&
       cellRect.height() > 4.0  &&
       cellRect.width()  > 4.0 )
   {
@@ -3175,15 +3175,15 @@ 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).
   if ( !textColorPrint.isValid() ) {
-    if ( painter.tqdevice()->isExtDev() )
+    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 );
@@ -3466,7 +3466,7 @@ void Cell::paintPageBorders( TQPainter& painter,
            bool paintBorderBottom )
 {
   // Not screen?  Return immediately.
-  if ( painter.tqdevice()->isExtDev() )
+  if ( painter.device()->isExtDev() )
     return;
 
   if ( ! format()->sheet()->isShowPageBorders() )
@@ -3628,7 +3628,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       // FIXME: There is probably Cut&Paste bugs here as well as below.
       //        The TQMIN/TQMAX and left/right pairs don't really make sense.
       //
@@ -3675,7 +3675,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( TQMAX( zrect_left, zcellRect_left ),
                           TQMAX( zrect_top, zcellRect_top - top ),
@@ -3716,7 +3716,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( zcellRect_top >= zrect_top + top_penWidth / 2)
   painter.drawLine( TQMAX( zrect_left,   zcellRect_left ),
         zcellRect_top,
@@ -3738,7 +3738,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( zcellRect_bottom <= zrect_bottom + bottom_penWidth / 2)
   painter.drawLine( TQMAX( zrect_left,   zcellRect_left ),
         zcellRect_bottom,
@@ -3762,7 +3762,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 #if 0
   // Look at the cells on our corners. It may happen that we
   // just erased parts of their borders corner, so we might need
-  // to tqrepaint these corners.
+  // to repaint these corners.
   //
   TQPen  vert_pen, horz_pen;
   int   vert_penWidth, horz_penWidth;
@@ -3810,7 +3810,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
     painter.setPen( vert_pen );
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( TQMAX( zrect_left, zcellRect_right ),
                           TQMAX( zrect_top, zcellRect_top ),
@@ -3860,7 +3860,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
     painter.setPen( vert_pen );
     //If we are on paper printout, we limit the length of the lines
     //On paper, we always have full cells, on screen not
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( TQMAX( zrect_left, zcellRect_left ),
                           TQMAX( zrect_top, zcellRect_top ),
@@ -3913,7 +3913,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
       painter.setPen( vert_pen );
       // If we are on paper printout, we limit the length of the lines.
       // On paper, we always have full cells, on screen not.
-      if ( painter.tqdevice()->isExtDev() ) {
+      if ( painter.device()->isExtDev() ) {
         if ( sheetDir == Sheet::RightToLeft )
           painter.drawLine( TQMAX( zrect_left, zcellRect_right ),
                             TQMAX( zrect_top, zcellRect_bottom - bottom ),
@@ -3965,7 +3965,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
       painter.setPen( vert_pen );
       // If we are on paper printout, we limit the length of the lines.
       // On paper, we always have full cells, on screen not.
-      if ( painter.tqdevice()->isExtDev() )      {
+      if ( painter.device()->isExtDev() )      {
         if ( sheetDir == Sheet::RightToLeft )
           painter.drawLine( TQMAX( zrect_left, zcellRect_left ),
                             TQMAX( zrect_top, zcellRect_bottom - bottom ),
@@ -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
   */
@@ -5232,7 +5232,7 @@ TQDomElement Cell::save( TQDomDocument& doc,
         {
                 TQDomElement dateMin = doc.createElement( "datemin" );
                 TQString tmp("%1/%2/%3");
-                tmp = tmp.tqarg(d->extra()->validity->dateMin.year()).tqarg(d->extra()->validity->dateMin.month()).tqarg(d->extra()->validity->dateMin.day());
+                tmp = tmp.arg(d->extra()->validity->dateMin.year()).arg(d->extra()->validity->dateMin.month()).arg(d->extra()->validity->dateMin.day());
                 dateMin.appendChild( doc.createTextNode( tmp ) );
                 validity.appendChild( dateMin );
         }
@@ -5240,7 +5240,7 @@ TQDomElement Cell::save( TQDomDocument& doc,
         {
                 TQDomElement dateMax = doc.createElement( "datemax" );
                 TQString tmp("%1/%2/%3");
-                tmp = tmp.tqarg(d->extra()->validity->dateMax.year()).tqarg(d->extra()->validity->dateMax.month()).tqarg(d->extra()->validity->dateMax.day());
+                tmp = tmp.arg(d->extra()->validity->dateMax.year()).arg(d->extra()->validity->dateMax.month()).arg(d->extra()->validity->dateMax.day());
                 dateMax.appendChild( doc.createTextNode( tmp ) );
                 validity.appendChild( dateMax );
         }
@@ -5312,7 +5312,7 @@ bool Cell::saveCellResult( TQDomDocument& doc, TQDomElement& result,
           TQDate dd = value().asDateTime().date();
           dataType = "Date";
           str = "%1/%2/%3";
-          str = str.tqarg(dd.year()).tqarg(dd.month()).tqarg(dd.day());
+          str = str.arg(dd.year()).arg(dd.month()).arg(dd.day());
       }
       else if( isTime() )
       {
@@ -6048,25 +6048,25 @@ void Cell::loadOasisObjects( const TQDomElement &parent, KoOasisLoadingContext&
             if ( !point.isValid() )
               continue;
 
-            KoRect tqgeometry = obj->tqgeometry();
-            tqgeometry.setLeft( tqgeometry.left() + sheet()->columnPos( d->column, 0 ) );
-            tqgeometry.setTop( tqgeometry.top() + sheet()->rowPos( d->row, 0 ) );
+            KoRect geometry = obj->geometry();
+            geometry.setLeft( geometry.left() + sheet()->columnPos( d->column, 0 ) );
+            geometry.setTop( geometry.top() + sheet()->rowPos( d->row, 0 ) );
 
             TQString str = e.attributeNS( KoXmlNS::table, "end-x", TQString() );
             if ( !str.isNull() )
             {
               uint end_x = (uint) KoUnit::parseValue( str );
-              tqgeometry.setRight( sheet()->columnPos( point.column(), 0) + end_x );
+              geometry.setRight( sheet()->columnPos( point.column(), 0) + end_x );
             }
 
             str = e.attributeNS( KoXmlNS::table, "end-y", TQString() );
             if ( !str.isNull() )
             {
               uint end_y = (uint) KoUnit::parseValue( str );
-              tqgeometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y );
+              geometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y );
             }
 
-            obj->setGeometry( tqgeometry );
+            obj->setGeometry( geometry );
           }
         }
     }
@@ -6744,8 +6744,8 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op )
           if( inside_tag )
           {
             inside_tag = false;
-            if( tag.tqstartsWith( "a href=\"", true ) )
-            if( tag.tqendsWith( "\"" ) )
+            if( tag.startsWith( "a href=\"", true ) )
+            if( tag.endsWith( "\"" ) )
               qml_link = tag.mid( 8, tag.length()-9 );
             tag = TQString();
           }
diff --git a/kspread/kspread_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 188dbe2e..ea698845 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -218,7 +218,7 @@ Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, cons
   if ( !name )
   {
       TQString tmp( "Document%1" );
-      tmp = tmp.tqarg( d->s_docId++ );
+      tmp = tmp.arg( d->s_docId++ );
       setName( tmp.local8Bit());//tmp.latin1() );
       dcopObject();
   }
@@ -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();
     }
 
@@ -998,7 +998,7 @@ bool Doc::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const
         if ( localName.isEmpty() )
             setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) );
         else
-            setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
         deleteLoadingInfo();
         return false;
     }
@@ -1086,7 +1086,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc )
   if ( spread.attribute( "mime" ) != "application/x-kspread" && spread.attribute( "mime" ) != "application/vnd.kde.kspread" )
   {
     d->isLoading = false;
-    setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).tqarg( spread.attribute("mime") ) );
+    setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).arg( spread.attribute("mime") ) );
     return false;
   }
 
@@ -1095,7 +1095,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc )
   {
       int ret = KMessageBox::warningContinueCancel(
           0, i18n("This document was created with a newer version of KSpread (syntax version: %1)\n"
-                  "When you open it with this version of KSpread, some information may be lost.").tqarg(d->syntaxVersion),
+                  "When you open it with this version of KSpread, some information may be lost.").arg(d->syntaxVersion),
           i18n("File Format Mismatch"), KStdGuiItem::cont() );
       if ( ret == KMessageBox::Cancel )
       {
@@ -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 )
     {
@@ -1656,12 +1656,12 @@ void Doc::paintContent( TQPainter& painter, const TQRect& rect,
     if ( m_zoomedResolutionX != zoomX )
         d_zoom *= ( zoomX / m_zoomedResolutionX );
 
-    // KSpread support zoom, therefore no need to scale with tqworldMatrix
-    TQWMatrix matrix = painter.tqworldMatrix();
+    // KSpread support zoom, therefore no need to scale with worldMatrix
+    TQWMatrix matrix = painter.worldMatrix();
     matrix.setMatrix( 1, 0, 0, 1, matrix.dx(), matrix.dy() );
     TQRect prect = rect;
-    prect.setWidth( (int) (prect.width() * painter.tqworldMatrix().m11()) );
-    prect.setHeight( (int) (prect.height() * painter.tqworldMatrix().m22()) );
+    prect.setWidth( (int) (prect.width() * painter.worldMatrix().m11()) );
+    prect.setHeight( (int) (prect.height() * painter.worldMatrix().m22()) );
     setZoomAndResolution( (int) ( d_zoom * 100 ), KoGlobal::dpiX(), KoGlobal::dpiY() );
     // paint the content, now zoom is correctly set
     kdDebug(36001)<<"paintContent-------------------------------------\n";
@@ -1731,7 +1731,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect,
 			   const Sheet* sheet, bool /*drawCursor*/)
 {
   //
-  // Clip away tqchildren
+  // Clip away children
   //
 
   TQRegion rgn = painter.clipRegion();
@@ -1746,10 +1746,10 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect,
                       - view->canvasWidget()->yOffset() );
   }
   else {
-    matrix = painter.tqworldMatrix();
+    matrix = painter.worldMatrix();
   }
 
-//   TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+//   TQPtrListIterator<KoDocumentChild> it( children() );
 //   for( ; it.current(); ++it ) {
 //     // if ( ((Child*)it.current())->sheet() == sheet &&
 //     //    !m_pView->hasDocumentInWindow( it.current()->document() ) )
@@ -2192,7 +2192,7 @@ void Doc::emitBeginOperation(bool waitCursor)
     //are expected to be completed in a short time anyway.
     TQCursor* activeOverride = static_cast<TQCursor*>(TQApplication::overrideCursor());
 
-    if (waitCursor && ( (!activeOverride) || (activeOverride->tqshape() != TQt::waitCursor.tqshape()) )  )
+    if (waitCursor && ( (!activeOverride) || (activeOverride->shape() != TQt::waitCursor.shape()) )  )
     {
         TQApplication::setOverrideCursor(TQt::waitCursor);
     }
@@ -2200,7 +2200,7 @@ void Doc::emitBeginOperation(bool waitCursor)
 //    /* just duplicate the current cursor on the stack, then */
 //  else if (TQApplication::overrideCursor() != NULL)
 //    {
-//        TQApplication::setOverrideCursor(TQApplication::overrideCursor()->tqshape());
+//        TQApplication::setOverrideCursor(TQApplication::overrideCursor()->shape());
 //    }
 
     KoDocument::emitBeginOperation();
@@ -2379,7 +2379,7 @@ KoPictureCollection *Doc::pictureCollection()
   return &d->m_pictureCollection;
 }
 
-void Doc::tqrepaint( const TQRect& rect )
+void Doc::repaint( const TQRect& rect )
 {
   TQRect r;
   TQPtrListIterator<KoView> it( views() );
@@ -2393,7 +2393,7 @@ void Doc::tqrepaint( const TQRect& rect )
   }
 }
 
-void Doc::tqrepaint( EmbeddedObject *obj )
+void Doc::repaint( EmbeddedObject *obj )
 {
   TQPtrListIterator<KoView> it( views() );
   for( ; it.current(); ++it )
@@ -2404,7 +2404,7 @@ void Doc::tqrepaint( EmbeddedObject *obj )
   }
 }
 
-void Doc::tqrepaint( const KoRect& rect )
+void Doc::repaint( const KoRect& rect )
 {
   TQRect r;
   TQPtrListIterator<KoView> it( views() );
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index 63320a96..64d1fbf5 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -565,7 +565,7 @@ public:
   virtual void emitBeginOperation();
 
   /**
-   * Mark the end of an operation and triggers a tqrepaint of any cells or regions of cells which
+   * Mark the end of an operation and triggers a repaint of any cells or regions of cells which
    * have been marked as 'dirty' via calls to Sheet::setRegionPaintDirty
    * See above comment to emitBeginOperation(bool).
    */
@@ -640,10 +640,10 @@ public:
   void loadConfigFromFile();
   bool configLoadFromFile() const;
 
-  // tqrepaint (update) all views
-  void tqrepaint( const TQRect& );
-  void tqrepaint( EmbeddedObject* );
-  void tqrepaint( const KoRect& );
+  // repaint (update) all views
+  void repaint( const TQRect& );
+  void repaint( EmbeddedObject* );
+  void repaint( const KoRect& );
 
   virtual void addShell( KoMainWindow *shell );
 
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index ddf41d31..7f0fa282 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -315,11 +315,11 @@ TQObject( editor )
   d->editor = editor;
   d->hintLabel = 0;
 
-  d->completionPopup = new TQVBox( editor->tqtopLevelWidget(), 0, WType_Popup );
+  d->completionPopup = new TQVBox( editor->topLevelWidget(), 0, WType_Popup );
   d->completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
   d->completionPopup->setLineWidth( 1 );
   d->completionPopup->installEventFilter( this );
-  d->completionPopup->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
+  d->completionPopup->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
 
   d->completionListBox = new KListBox( d->completionPopup );
   d->completionPopup->setFocusProxy( d->completionListBox );
@@ -430,7 +430,7 @@ void FunctionCompletion::showCompletion( const TQStringList &choices )
 
   // size of the pop-up
   d->completionPopup->setMaximumHeight( 100 );
-  d->completionPopup->resize( d->completionListBox->tqsizeHint() +
+  d->completionPopup->resize( d->completionListBox->sizeHint() +
     TQSize( d->completionListBox->verticalScrollBar()->width() + 4,
         d->completionListBox->horizontalScrollBar()->height() + 4 ) );
   int h = d->completionListBox->height();
@@ -612,7 +612,7 @@ void CellEditor::triggerFunctionAutoComplete()
   TQStringList fnames = KSpread::FunctionRepository::self()->functionNames();
   TQStringList choices;
   for( unsigned i=0; i<fnames.count(); i++ )
-    if( fnames[i].tqstartsWith( id, false ) )
+    if( fnames[i].startsWith( id, false ) )
       choices.append( fnames[i] );
   choices.sort();
 
@@ -828,7 +828,7 @@ void CellEditor::setEditorFont(TQFont const & font, bool updateSize)
     d->fontLength = fm.width('x');
 
     int mw = fm.width( d->textEdit->text() ) + d->fontLength;
-    // don't make it smaller: then we would have to tqrepaint the obscured cells
+    // don't make it smaller: then we would have to repaint the obscured cells
     if (mw < width())
       mw = width();
 
@@ -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_format.cc b/kspread/kspread_format.cc
index ecebff60..b0960735 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cc
@@ -2725,7 +2725,7 @@ void RowFormat::setBottomBorderPen( const TQPen & p )
     Format::setBottomBorderPen( p );
 }
 
-void RowFormat::setHide( bool _hide, bool tqrepaint )
+void RowFormat::setHide( bool _hide, bool repaint )
 {
     if ( _hide != m_bHide ) // only if we change the status
     {
@@ -2734,14 +2734,14 @@ void RowFormat::setHide( bool _hide, bool tqrepaint )
 	    // Lower maximum size by height of row
 	    m_pSheet->adjustSizeMaxY ( - dblHeight() );
 	    m_bHide = _hide; //hide must be set after we requested the height
-      m_pSheet->emit_updateRow( this, m_iRow, tqrepaint );
+      m_pSheet->emit_updateRow( this, m_iRow, repaint );
 	}
 	else
 	{
 	    // Rise maximum size by height of row
 	    m_bHide = _hide; //unhide must be set before we request the height
 	    m_pSheet->adjustSizeMaxY ( dblHeight() );
-            m_pSheet->emit_updateRow( this, m_iRow, tqrepaint );
+            m_pSheet->emit_updateRow( this, m_iRow, repaint );
 	}
     }
 }
diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h
index ed89807a..83b2daee 100644
--- a/kspread/kspread_format.h
+++ b/kspread/kspread_format.h
@@ -22,7 +22,7 @@
 #ifndef __kspread_format_h__
 #define __kspread_format_h__
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqfont.h>
 #include <tqpen.h>
@@ -557,7 +557,7 @@ public:
     /**
      * Sets the hide flag
      */
-    void setHide( bool _hide, bool tqrepaint = true );
+    void setHide( bool _hide, bool repaint = true );
     bool isHide()const { return m_bHide;}
 
     bool operator==( const RowFormat& other ) const;
diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cc
index 42246838..23f2ca01 100644
--- a/kspread/kspread_functions_conversion.cc
+++ b/kspread/kspread_functions_conversion.cc
@@ -168,7 +168,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *)
   if ((value < 0) || (value > 3999))
     return Value::errorNA();
   TQString result;
-  result = TQString::tqfromLatin1 (RNThousands[(value / 1000)] +
+  result = TQString::fromLatin1 (RNThousands[(value / 1000)] +
                                 RNHundreds[(value / 100) % 10] +
                                 RNTens[(value / 10 ) % 10] +
                                 RNUnits[(value) % 10]);
@@ -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_datetime.cc b/kspread/kspread_functions_datetime.cc
index b139057d..0136d298 100644
--- a/kspread/kspread_functions_datetime.cc
+++ b/kspread/kspread_functions_datetime.cc
@@ -32,8 +32,8 @@
 using namespace KSpread;
 
 // prototypes, sorted
-Value func_tqcurrentDate (valVector args, ValueCalc *calc, FuncExtra *);
-Value func_tqcurrentDateTime (valVector args, ValueCalc *calc, FuncExtra *);
+Value func_currentDate (valVector args, ValueCalc *calc, FuncExtra *);
+Value func_currentDateTime (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_currentTime (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_date (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_datevalue (valVector args, ValueCalc *calc, FuncExtra *);
@@ -77,10 +77,10 @@ void RegisterDateTimeFunctions()
   FunctionRepository* repo = FunctionRepository::self();
   Function *f;
   
-  f = new Function ("CURRENTDATE",  func_tqcurrentDate);
+  f = new Function ("CURRENTDATE",  func_currentDate);
   f->setParamCount (0);
   repo->add (f);
-  f = new Function ("CURRENTDATETIME",  func_tqcurrentDateTime);
+  f = new Function ("CURRENTDATETIME",  func_currentDateTime);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("CURRENTTIME",  func_currentTime);
@@ -140,7 +140,7 @@ void RegisterDateTimeFunctions()
   f = new Function ("MONTHS",  func_months);
   f->setParamCount (3);
   repo->add (f);
-  f = new Function ("NOW",  func_tqcurrentDateTime);
+  f = new Function ("NOW",  func_currentDateTime);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("SECOND",  func_second);
@@ -154,7 +154,7 @@ void RegisterDateTimeFunctions()
   repo->add (f);
   f = new Function ("TIMEVALUE",  func_timevalue);
   repo->add (f);
-  f = new Function ("TODAY",  func_tqcurrentDate);
+  f = new Function ("TODAY",  func_currentDate);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("WEEKDAY",  func_weekday);
@@ -519,7 +519,7 @@ Value func_monthname (valVector args, ValueCalc *calc, FuncExtra *)
   int number = calc->conv()->asInteger (args[0]).asInteger();
 
   TQString monthName = calc->conv()->locale()->calendar()->monthName (number,
-      TQDate::tqcurrentDate().year());
+      TQDate::currentDate().year());
   if (monthName.isNull())
     return Value::errorVALUE();
   return Value (monthName);
@@ -555,10 +555,10 @@ Value func_time (valVector args, ValueCalc *calc, FuncExtra *)
   return Value (TQTime (h, m, s));
 }
 
-// Function: tqcurrentDate
-Value func_tqcurrentDate (valVector, ValueCalc *, FuncExtra *)
+// Function: currentDate
+Value func_currentDate (valVector, ValueCalc *, FuncExtra *)
 {
-  return Value (TQDate::tqcurrentDate ());
+  return Value (TQDate::currentDate ());
 }
 
 // Function: currentTime
@@ -567,10 +567,10 @@ Value func_currentTime (valVector, ValueCalc *, FuncExtra *)
   return Value (TQTime::currentTime ());
 }
 
-// Function: tqcurrentDateTime
-Value func_tqcurrentDateTime (valVector, ValueCalc *, FuncExtra *)
+// Function: currentDateTime
+Value func_currentDateTime (valVector, ValueCalc *, FuncExtra *)
 {
-  return Value (TQDateTime::tqcurrentDateTime ());
+  return Value (TQDateTime::currentDateTime ());
 }
 
 // Function: dayOfYear
diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc
index 52ae0f99..2a5775aa 100644
--- a/kspread/kspread_functions_information.cc
+++ b/kspread/kspread_functions_information.cc
@@ -158,8 +158,8 @@ Value func_info (valVector args, ValueCalc *calc, FuncExtra *)
     struct utsname name;
     if (uname (&name) >= 0)
     {
-       TQString os = TQString("%1 %2 (%3)").tqarg( name.sysname ).
-         tqarg( name.release ).tqarg( name.machine );
+       TQString os = TQString("%1 %2 (%3)").arg( name.sysname ).
+         arg( name.release ).arg( name.machine );
        return Value (os);
     }
   }
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..506626bf 100644
--- a/kspread/kspread_generalProperty.cpp
+++ b/kspread/kspread_generalProperty.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 #include <knuminput.h>
@@ -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_map.cc b/kspread/kspread_map.cc
index 7d55a8ff..a24c8cf2 100644
--- a/kspread/kspread_map.cc
+++ b/kspread/kspread_map.cc
@@ -80,7 +80,7 @@ void Map::setProtected( TQCString const & passwd )
 Sheet* Map::createSheet()
 {
   TQString s( i18n("Sheet%1") );
-  s = s.tqarg( tableId++ );
+  s = s.arg( tableId++ );
   Sheet *t = new Sheet ( this, s , s.utf8());
   t->setSheetName( s, true ); // huh? (Werner)
   return t;
@@ -159,7 +159,7 @@ void Map::loadOasisSettings( KoOasisSettings &settings )
 
 void Map::saveOasisSettings( KoXmlWriter &settingsWriter )
 {
-    settingsWriter.addConfigItem( "ViewId", TQString::tqfromLatin1( "View1" ) );
+    settingsWriter.addConfigItem( "ViewId", TQString::fromLatin1( "View1" ) );
     // Save visual info for the first view, such as active sheet and active cell
     // It looks like a hack, but reopening a document creates only one view anyway (David)
     View * view = m_doc->views().isEmpty() ? 0 : dynamic_cast<View*>(m_doc->views().getFirst());
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc
index 9257a3f5..8c273700 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cc
@@ -55,8 +55,8 @@ class View;
  * EmbeddedObject
  *
  **********************************************************/
-EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry )
-  : m_tqgeometry( _tqgeometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine )
+EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry )
+  : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine )
 {
   angle = 0.0;
   inObjList = true;
@@ -66,23 +66,23 @@ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry )
 EmbeddedObject::~EmbeddedObject()
 {
 }
-KoRect EmbeddedObject::tqgeometry()
+KoRect EmbeddedObject::geometry()
 {
-    return m_tqgeometry;
+    return m_geometry;
 }
 void EmbeddedObject::setGeometry( const KoRect &rect )
 {
-    m_tqgeometry = rect;
+    m_geometry = rect;
 }
 
 void EmbeddedObject::moveBy( const KoPoint &_point )
 {
-  m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + _point );
+  m_geometry.moveTopLeft( m_geometry.topLeft() + _point );
 }
 
 void EmbeddedObject::moveBy( double _dx, double _dy )
 {
-  m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + KoPoint( _dx, _dy ) );
+  m_geometry.moveTopLeft( m_geometry.topLeft() + KoPoint( _dx, _dy ) );
 }
 
 void EmbeddedObject::resizeBy( const KoSize & _size )
@@ -92,7 +92,7 @@ void EmbeddedObject::resizeBy( const KoSize & _size )
 
 void EmbeddedObject::resizeBy( double _dx, double _dy)
 {
-  m_tqgeometry.setSize( KoSize( m_tqgeometry.width()+_dx, m_tqgeometry.height()+_dy) );
+  m_geometry.setSize( KoSize( m_geometry.width()+_dx, m_geometry.height()+_dy) );
 } // call (possibly reimplemented) setSize
 
 bool EmbeddedObject::load( const TQDomElement& /*element*/ )
@@ -105,10 +105,10 @@ void EmbeddedObject::loadOasis(const TQDomElement &element, KoOasisLoadingContex
 {
   if(element.hasAttributeNS( KoXmlNS::draw, "name" ))
     m_objectName = element.attributeNS( KoXmlNS::draw, "name", TQString());
-  m_tqgeometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) );
-  m_tqgeometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) );
-  m_tqgeometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) );
-  m_tqgeometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) );
+  m_geometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) );
+  m_geometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) );
+  m_geometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) );
+  m_geometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) );
     //kdDebug()<<" orig.x() :"<<orig.x() <<" orig.y() :"<<orig.y() <<"ext.width() :"<<ext.width()<<" ext.height(): "<<ext.height()<<endl;
   KoStyleStack &styleStack = context.styleStack();
 
@@ -126,15 +126,15 @@ void EmbeddedObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj )
 {
     xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) );
     //save all into pt
-    xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.x() : m_tqgeometry.x() + 20.0 );
-    xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.y() : m_tqgeometry.y() + 20.0 );
-    xmlWriter.addAttributePt( "svg:width", m_tqgeometry.width() );
-    xmlWriter.addAttributePt( "svg:height", m_tqgeometry.height() );
+    xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_geometry.x() : m_geometry.x() + 20.0 );
+    xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_geometry.y() : m_geometry.y() + 20.0 );
+    xmlWriter.addAttributePt( "svg:width", m_geometry.width() );
+    xmlWriter.addAttributePt( "svg:height", m_geometry.height() );
 
 //     if ( kAbs( angle ) > 1E-6 )
 //     {
 //         double value = -1 * ( ( double )angle* M_PI )/180.0;
-//         TQString str=TQString( "rotate (%1)" ).tqarg( value );
+//         TQString str=TQString( "rotate (%1)" ).arg( value );
 //         xmlWriter.addAttribute( "draw:transform", str );
 //     }
 }
@@ -187,7 +187,7 @@ TQPixmap EmbeddedObject::toPixmap(double /*xZoom*/ , double /*yZoom*/)
 
 void EmbeddedObject::calculateRequiredZoom( TQSize desiredSize, double& xZoom, double& yZoom)
 {
-	TQSize actualSize = tqgeometry().size().toTQSize();
+	TQSize actualSize = geometry().size().toTQSize();
 
 	xZoom = (double) desiredSize.width() / (double)actualSize.width();
 	yZoom = (double) desiredSize.height() / (double)actualSize.height();
@@ -199,8 +199,8 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
     return;
 
   _painter->save();
-  KoRect bound( tqgeometry().left(), tqgeometry().top(),
-                tqgeometry().width() , tqgeometry().height() );
+  KoRect bound( geometry().left(), geometry().top(),
+                geometry().width() , geometry().height() );
   TQRect zoomedBound = sheet()->doc()->zoomRect( bound ) ;
 
   //_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) );
@@ -261,14 +261,14 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
   _painter->restore();
 }
 
-TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry) const
+TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry) const
 {
     int px = /*sheet()->doc()->zoomItX*/(_point.x());
     int py = /*sheet()->doc()->zoomItY*/(_point.y());
-    int ox = /*sheet()->doc()->zoomItX*/(/*orig*/tqgeometry.x());
-    int oy = /*sheet()->doc()->zoomItY*/(/*orig*/tqgeometry.y());
-    int ow = /*sheet()->doc()->zoomItX*/(/*ext*/tqgeometry.width());
-    int oh = /*sheet()->doc()->zoomItY*/(/*ext*/tqgeometry.height());
+    int ox = /*sheet()->doc()->zoomItX*/(/*orig*/geometry.x());
+    int oy = /*sheet()->doc()->zoomItY*/(/*orig*/geometry.y());
+    int ow = /*sheet()->doc()->zoomItX*/(/*ext*/geometry.width());
+    int oh = /*sheet()->doc()->zoomItY*/(/*ext*/geometry.height());
 
 //     if ( angle != 0.0 )
 //     {
@@ -367,10 +367,10 @@ void EmbeddedObject::doDelete()
  * EmbeddedKOfficeObject
  *
  **********************************************************/
-EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
-    : EmbeddedObject( _sheet, tqgeometry ), m_parent(parent)
+EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry )
+    : EmbeddedObject( _sheet, geometry ), m_parent(parent)
 {
-    m_embeddedObject = new KoDocumentChild(parent, doc, tqgeometry.toTQRect() );
+    m_embeddedObject = new KoDocumentChild(parent, doc, geometry.toTQRect() );
 }
 
 EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet )
@@ -399,7 +399,7 @@ bool EmbeddedKOfficeObject::saveOasisObjectAttributes( KSpreadOasisSaveContext &
     kdDebug() << "EmbeddedKOfficeObject::saveOasisPart " << sc.partIndexObj << endl;
 
     sc.xmlWriter.startElement( "draw:object" );
-    const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 );
+    const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 );
     ++sc.partIndexObj;
     m_embeddedObject->saveOasisAttributes( sc.xmlWriter, name );
 
@@ -417,7 +417,7 @@ bool EmbeddedKOfficeObject::load( const TQDomElement& element )
 {
     kdDebug() << "Loading EmbeddedKOfficeObject" << endl;
     bool result = embeddedObject()->load( element );
-    setGeometry( KoRect::fromTQRect( embeddedObject()->tqgeometry() ) );
+    setGeometry( KoRect::fromTQRect( embeddedObject()->geometry() ) );
     return result;
 }
 
@@ -436,7 +436,7 @@ void EmbeddedKOfficeObject::loadOasis(const TQDomElement &element, KoOasisLoadin
 TQDomElement EmbeddedKOfficeObject::save( TQDomDocument& doc )
 {
     kdDebug() << "Saving EmbeddedKOfficeObject" << endl;
-    embeddedObject()->setGeometry( tqgeometry().toTQRect() );
+    embeddedObject()->setGeometry( geometry().toTQRect() );
     return m_embeddedObject->save( doc );
 }
 
@@ -446,21 +446,21 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
 
   int const penw = pen.width() ;
   KoRect bound( 0, 0,
-                tqgeometry().width() - ( 2 * penw ), tqgeometry().height() - ( 2 * penw ) );
+                geometry().width() - ( 2 * penw ), geometry().height() - ( 2 * penw ) );
   TQRect const zoomedBound = sheet()->doc()->zoomRect( bound );
 
   _painter->save();
-  int const xOffset = sheet()->doc()->zoomItX( tqgeometry().left() + penw);
-  int const yOffset = sheet()->doc()->zoomItY( tqgeometry().top() + penw );
+  int const xOffset = sheet()->doc()->zoomItX( geometry().left() + penw);
+  int const yOffset = sheet()->doc()->zoomItY( geometry().top() + penw );
 
-  TQRect new_tqgeometry = zoomedBound;
+  TQRect new_geometry = zoomedBound;
 
   //if ( translate )
   //{
   	_painter->translate( xOffset , yOffset );
 
-  	new_tqgeometry.moveBy(  xOffset , yOffset );
-  	new_tqgeometry.moveBy( -_painter->window().x(), -_painter->window().y() );
+  	new_geometry.moveBy(  xOffset , yOffset );
+  	new_geometry.moveBy( -_painter->window().x(), -_painter->window().y() );
   //}
 
   _painter->setClipRect( zoomedBound, TQPainter::CoordPainter );
@@ -477,7 +477,7 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
         zoomY );
 
 
-   embeddedObject()->setGeometry( new_tqgeometry );
+   embeddedObject()->setGeometry( new_geometry );
   _painter->restore();
 
   EmbeddedObject::draw( _painter );
@@ -485,10 +485,10 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
 
 TQPixmap EmbeddedKOfficeObject::toPixmap( double xZoom , double yZoom )
 {
-	TQPixmap pixmap( (int)( tqgeometry().width()*xZoom ), (int)( tqgeometry().height()*yZoom ) );
+	TQPixmap pixmap( (int)( geometry().width()*xZoom ), (int)( geometry().height()*yZoom ) );
 
 	TQPainter painter(&pixmap);
-	TQRect  bound( 0,0,(int)( tqgeometry().width()*xZoom ), (int)(tqgeometry().height()*yZoom) );
+	TQRect  bound( 0,0,(int)( geometry().width()*xZoom ), (int)(geometry().height()*yZoom) );
 	embeddedObject()->document()->paintEverything(painter,bound,
 					embeddedObject()->isTransparent(),
 					0,
@@ -516,10 +516,10 @@ void EmbeddedKOfficeObject::deactivate()
 void EmbeddedKOfficeObject::updateChildGeometry()
 {
 //   KoZoomHandler* zh = m_sheet->doc();
-//   embeddedObject()->setGeometry( zh->zoomRect( tqgeometry() ), true );
+//   embeddedObject()->setGeometry( zh->zoomRect( geometry() ), true );
 
 //   return;
-//   TQRect r = sheet()->doc()->zoomRect( tqgeometry() );
+//   TQRect r = sheet()->doc()->zoomRect( geometry() );
 //   if ( _canvas )
 //   {
 //     kdDebug() << "_canvas->xOffset():" << _canvas->xOffset() << endl;
@@ -537,8 +537,8 @@ void EmbeddedKOfficeObject::updateChildGeometry()
  *
  **********************************************************/
 
-EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
-  : EmbeddedKOfficeObject( _spread, _sheet, doc, tqgeometry )
+EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& geometry )
+  : EmbeddedKOfficeObject( _spread, _sheet, doc, geometry )
 {
     m_pBinding = 0;
 }
@@ -687,8 +687,8 @@ KoChart::Part* EmbeddedChart::chart()
  * EmbeddedPictureObject
  *
  **********************************************************/
-EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection )
-   : EmbeddedObject( _sheet, _tqgeometry )
+EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection )
+   : EmbeddedObject( _sheet, _geometry )
 {
     imageCollection = _imageCollection;
     pen = KoPen( TQt::black, 1.0, Qt::NoPen );
@@ -706,8 +706,8 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqge
 }
 
 
-EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key )
-    : EmbeddedObject( _sheet, _tqgeometry )
+EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key )
+    : EmbeddedObject( _sheet, _geometry )
 {
     imageCollection = _imageCollection;
 
@@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href/*.mid(1)*/);
-        const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
+        const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
         image.setKey(key);
 
         KoStore* store = context.store();
@@ -1149,10 +1149,10 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin
 
 void EmbeddedPictureObject::drawShadow( TQPainter* /*_painter*/,  KoZoomHandler* /*_zoomHandler*/)
 {
-//     const double ox = /*orig*/m_tqgeometry.x();
-//     const double oy = /*orig*/m_tqgeometry.y();
-//     const double ow = /*ext*/m_tqgeometry.width();
-//     const double oh = /*ext*/m_tqgeometry.height();
+//     const double ox = /*orig*/m_geometry.x();
+//     const double oy = /*orig*/m_geometry.y();
+//     const double ow = /*ext*/m_geometry.width();
+//     const double oh = /*ext*/m_geometry.height();
 //
 //     _painter->save();
 //
@@ -1208,7 +1208,7 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler)
 {
     const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 );
 
-    TQSize size( _zoomHandler->zoomSize( m_tqgeometry.size() /*ext*/ ) );
+    TQSize size( _zoomHandler->zoomSize( m_geometry.size() /*ext*/ ) );
     //kdDebug(33001) << "EmbeddedPictureObject::generatePixmap size= " << size << endl;
     TQPixmap pixmap(size);
     TQPainter paint;
@@ -1221,8 +1221,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler)
     paint.setBrush( getBrush() );
 
     TQRect rect( (int)( penw ), (int)( penw ),
-                 (int)( _zoomHandler->zoomItX( /*ext*/m_tqgeometry.width() ) - 2.0 * penw ),
-                 (int)( _zoomHandler->zoomItY( /*ext*/m_tqgeometry.height() ) - 2.0 * penw ) );
+                 (int)( _zoomHandler->zoomItX( /*ext*/m_geometry.width() ) - 2.0 * penw ),
+                 (int)( _zoomHandler->zoomItY( /*ext*/m_geometry.height() ) - 2.0 * penw ) );
 
 //      if ( getFillType() == FT_BRUSH || !gradient )
          paint.drawRect( rect );
@@ -1231,8 +1231,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler)
 //         gradient->setSize( size );
 //         paint.drawPixmap( (int)( penw ), (int)( penw ),
 //                           gradient->pixmap(), 0, 0,
-//                           (int)( _zoomHandler->zoomItX( m_tqgeometry/*ext*/.width() ) - 2 * penw ),
-//                           (int)( _zoomHandler->zoomItY( m_tqgeometry/*ext*/.height() ) - 2 * penw ) );
+//                           (int)( _zoomHandler->zoomItX( m_geometry/*ext*/.width() ) - 2 * penw ),
+//                           (int)( _zoomHandler->zoomItY( m_geometry/*ext*/.height() ) - 2 * penw ) );
 //    }
 
 
@@ -1260,10 +1260,10 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand
 //     if ( shadowDistance > 0 && !drawContour )
 //         drawShadow(_painter, _zoomHandler);
 
-    const double ox = /*orig*/m_tqgeometry.x();
-    const double oy = /*orig*/m_tqgeometry.y();
-    const double ow = /*ext*/m_tqgeometry.width();
-    const double oh = /*ext*/m_tqgeometry.height();
+    const double ox = /*orig*/m_geometry.x();
+    const double oy = /*orig*/m_geometry.y();
+    const double ow = /*ext*/m_geometry.width();
+    const double oh = /*ext*/m_geometry.height();
     //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 );
 
     _painter->save();
diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h
index 46074109..b66d67ac 100644
--- a/kspread/kspread_object.h
+++ b/kspread/kspread_object.h
@@ -108,13 +108,13 @@ enum AlignType {
 class EmbeddedObject
 {
   public:
-    EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry );
+    EmbeddedObject( Sheet *_sheet, const KoRect& _geometry );
     virtual ~EmbeddedObject();
     virtual ObjType getType() const { return OBJECT_GENERAL; }
     virtual TQString getTypeString() const
         { return TQString(); }
 
-    KoRect tqgeometry();
+    KoRect geometry();
     void setGeometry( const KoRect &rect );
     virtual void moveBy( const KoPoint &_point );
     virtual void moveBy( double _dx, double _dy );
@@ -183,7 +183,7 @@ class EmbeddedObject
     
     
     void paintSelection( TQPainter *_painter, SelectionMode selectionMode );
-    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry ) const;
+    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry ) const;
 
     virtual void removeFromObjList()
         { inObjList = false; }
@@ -217,7 +217,7 @@ class EmbeddedObject
      */
     void calculateRequiredZoom( TQSize desiredSize , double& xZoom, double& yZoom );
     
-    KoRect m_tqgeometry;
+    KoRect m_geometry;
     Sheet *m_sheet;
     Canvas *m_canvas;
     TQString m_objectName;
@@ -238,7 +238,7 @@ class EmbeddedObject
 class EmbeddedKOfficeObject : public EmbeddedObject
 {
   public:
-    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry );
+    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry );
     EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet );
     virtual ~EmbeddedKOfficeObject();
     virtual ObjType getType() const { return OBJECT_KOFFICE_PART; }
@@ -314,8 +314,8 @@ class EmbeddedChart : public EmbeddedKOfficeObject
 class EmbeddedPictureObject : public EmbeddedObject
 {
   public:
-    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection );
-    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key );
     EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection *_imageCollection );
     virtual ~EmbeddedPictureObject();
     EmbeddedPictureObject &operator=( const EmbeddedPictureObject & );
diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp
index 6f38c25e..3b84a3db 100644
--- a/kspread/kspread_propertyEditor.cpp
+++ b/kspread/kspread_propertyEditor.cpp
@@ -280,7 +280,7 @@ KCommand * PropertyEditor::getCommand()
                 TQPtrListIterator<EmbeddedObject> it( m_objects );
                 for ( ; it.current(); ++it )
                 {
-                    KoRect oldRect = it.current()->tqgeometry()/*getRect()*/;
+                    KoRect oldRect = it.current()->geometry()/*getRect()*/;
                     KoRect newRect = oldRect;
 
                     if ( change & GeneralProperty::Left )
@@ -446,7 +446,7 @@ GeneralProperty::GeneralValue PropertyEditor::getGeneralValue()
         generalValue.m_protect = protect ? STATE_ON : STATE_OFF;
         keepRatio = it.current()->isKeepRatio();
         generalValue.m_keepRatio = keepRatio ? STATE_ON : STATE_OFF;
-        generalValue.m_rect = it.current()->tqgeometry()/*getRect()*/;
+        generalValue.m_rect = it.current()->geometry()/*getRect()*/;
         ++it;
     }
 
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 09abcf8a..d0eb13d7 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -29,9 +29,9 @@
 
 #include <tqapplication.h>
 #include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpicture.h>
 #include <tqregexp.h>
@@ -151,7 +151,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ )
 	//Ensure display gets updated by marking all cells underneath the chart as
 	//dirty
 
-	const TQRect chartGeometry = m_child->tqgeometry().toTQRect();
+	const TQRect chartGeometry = m_child->geometry().toTQRect();
 
 	double tmp;
   	int left = sheet()->leftColumn( chartGeometry.left() , tmp );
@@ -201,7 +201,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ )
 
     // Force a redraw of the chart on all views
 
-    /** TODO - replace the call below with something that will tqrepaint this chart */
+    /** TODO - replace the call below with something that will repaint this chart */
 #endif
     //    sheet()->emit_polygonInvalidated( m_child->framePointArray() );
 }
@@ -222,12 +222,12 @@ TextDrag::~TextDrag()
 }
 
 
-TQByteArray TextDrag::tqencodedData( const char * mime ) const
+TQByteArray TextDrag::encodedData( const char * mime ) const
 {
   if ( strcmp( selectionMimeType(), mime ) == 0)
     return m_kspread;
   else
-    return TQTextDrag::tqencodedData( mime );
+    return TQTextDrag::encodedData( mime );
 }
 
 bool TextDrag::canDecode( TQMimeSource* e )
@@ -1819,7 +1819,7 @@ struct SetSelectionFirstLetterUpperWorker : public Sheet::CellWorker
   cell->setDisplayDirtyFlag();
   TQString tmp = cell->text();
   int len = tmp.length();
-  cell->setCellText( (tmp.tqat(0).upper()+tmp.right(len-1)) );
+  cell->setCellText( (tmp.at(0).upper()+tmp.right(len-1)) );
   cell->clearDisplayDirtyFlag();
     }
 };
@@ -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;
 
@@ -5125,13 +5125,13 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
 
     if ( mime->provides( TextDrag::selectionMimeType() ) )
     {
-        b = mime->tqencodedData( TextDrag::selectionMimeType() );
+        b = mime->encodedData( TextDrag::selectionMimeType() );
     }
     else if( mime->provides( "text/plain" ) )
     {
-        // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" )
+        // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" )
         // In particular it handles charsets (in the mimetype). Copied from KPresenter ;-)
-        TQString _text = TQApplication::tqclipboard()->text( clipboardMode );
+        TQString _text = TQApplication::clipboard()->text( clipboardMode );
         doc()->emitBeginOperation();
         pasteTextPlain( _text, pasteArea );
         emit sig_updateView( this );
@@ -5152,7 +5152,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
 void Sheet::pasteTextPlain( TQString &_text, TQRect pasteArea)
 {
 //  TQString tmp;
-//  tmp= TQString::fromLocal8Bit(_mime->tqencodedData( "text/plain" ));
+//  tmp= TQString::fromLocal8Bit(_mime->encodedData( "text/plain" ));
   if( _text.isEmpty() )
     return;
 
@@ -5523,14 +5523,14 @@ 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;
 
     TQByteArray b;
 
     if ( mime->provides( "application/x-kspread-snippet" ) )
-        b = mime->tqencodedData( "application/x-kspread-snippet" );
+        b = mime->encodedData( "application/x-kspread-snippet" );
     else
         return false;
 
@@ -6129,7 +6129,7 @@ KoRect Sheet::getRealRect( bool all )
     {
 
         if ( all || ( it.current()->isSelected() && ! it.current()->isProtect() ) )
-            rect |= it.current()->tqgeometry();
+            rect |= it.current()->geometry();
     }
 
     return rect;
@@ -6149,12 +6149,12 @@ KCommand *Sheet::moveObject(View *_view, double diffx, double diffy)
         if ( it.current()->isSelected() && !it.current()->isProtect())
         {
             _objects.append( it.current() );
-            KoRect tqgeometry = it.current()->tqgeometry();
-            tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
-            TQRect br = doc()->zoomRect( tqgeometry/*it.current()->tqgeometry()*/ );
+            KoRect geometry = it.current()->geometry();
+            geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
+            TQRect br = doc()->zoomRect( geometry/*it.current()->geometry()*/ );
             br.moveBy( doc()->zoomItX( diffx ), doc()->zoomItY( diffy ) );
             br.moveBy( doc()->zoomItX( -canvas->xOffset() ), doc()->zoomItY( -canvas->yOffset() ) );
-            canvas->tqrepaint( br ); // Previous position
+            canvas->repaint( br ); // Previous position
             canvas->repaintObject( it.current() ); // New position
             createCommand=true;
         }
@@ -6179,18 +6179,18 @@ KCommand *Sheet::moveObject(View *_view,const KoPoint &_move,bool key)
     {
         if ( it.current()->isSelected() && !it.current()->isProtect()) {
 
-            KoRect tqgeometry = it.current()->tqgeometry();
-            tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
-            TQRect oldBoundingRect = doc()->zoomRect( tqgeometry );
+            KoRect geometry = it.current()->geometry();
+            geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
+            TQRect oldBoundingRect = doc()->zoomRect( geometry );
 
 
-            KoRect r = it.current()->tqgeometry();
+            KoRect r = it.current()->geometry();
             r.moveBy( _move.x(), _move.y() );
 
             it.current()->setGeometry( r );
             _objects.append( it.current() );
 
-            canvas->tqrepaint( oldBoundingRect );
+            canvas->repaint( oldBoundingRect );
             canvas->repaintObject( it.current() );
         }
     }
@@ -6235,7 +6235,7 @@ void Sheet::unifyObjectName( EmbeddedObject *object ) {
         if ( rx.search( objectName ) != -1 ) {
             objectName.remove( rx );
         }
-        objectName += TQString(" (%1)").tqarg( count );
+        objectName += TQString(" (%1)").arg( count );
         object->setObjectName( objectName );
     }
 }
@@ -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 );
                       }
@@ -6479,7 +6479,7 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext&
                     loadRowFormat( rowElement, rowIndex, oasisContext, /*rowNode.isNull() ,*/ styleMap );
                     kdDebug()<<" table-row found :index row after "<<rowIndex<<endl;
                 }
-                else if ( rowElement.localName() == "tqshapes" )
+                else if ( rowElement.localName() == "shapes" )
                     loadOasisObjects( rowElement, oasisContext );
             }
         }
@@ -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" ) )
@@ -6685,7 +6685,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
             kdDebug()<<" table-centering unknown :"<<str<<endl;
 #endif
     }
-    format = TQString( "%1x%2" ).tqarg( width ).tqarg( height );
+    format = TQString( "%1x%2" ).arg( width ).arg( height );
     kdDebug()<<" format : "<<format<<endl;
     d->print->setPaperLayout( left, top, right, bottom, format, orientation );
 
@@ -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;
     }
@@ -7171,7 +7171,7 @@ void Sheet::convertPart( const TQString & part, KoXmlWriter & xmlWriter ) const
                     TQDomElement t = dd.createElement( "text:date" );
                     t.setAttribute( "text:date-value", "0-00-00" );
                     // todo: "style:data-style-name", "N2"
-                    t.appendChild( dd.createTextNode( TQDate::tqcurrentDate().toString() ) );
+                    t.appendChild( dd.createTextNode( TQDate::currentDate().toString() ) );
                     parent.appendChild( t );
 #endif
                 }
@@ -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() )
     {
@@ -8071,7 +8071,7 @@ void Sheet::updateCell( Cell */*cell*/, int _column, int _row )
   updateCellArea(cellArea);
 }
 
-void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint )
+void Sheet::emit_updateRow( RowFormat *_format, int _row, bool repaint )
 {
     if ( doc()->isLoading() )
         return;
@@ -8081,7 +8081,7 @@ void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint )
       if ( c->row() == _row )
           c->setLayoutDirtyFlag( true );
 
-    if ( tqrepaint )
+    if ( repaint )
     {
         //All the cells in this row, or below this row will need to be repainted
         //So add that region of the sheet to the paint dirty list.
@@ -8256,7 +8256,7 @@ bool Sheet::saveChildren( KoStore* _store, const TQString &_path )
     {
         if ( it.current()->sheet() == this && ( it.current()->getType() == OBJECT_KOFFICE_PART || it.current()->getType() == OBJECT_CHART ) )
         {
-            TQString path = TQString( "%1/%2" ).tqarg( _path ).tqarg( i++ );
+            TQString path = TQString( "%1/%2" ).arg( _path ).arg( i++ );
             if ( !dynamic_cast<EmbeddedKOfficeObject*>( it.current() )->embeddedObject()->document()->saveToStore( _store, path ) )
                 return false;
         }
@@ -8279,7 +8279,7 @@ bool Sheet::saveOasisObjects( KoStore */*store*/, KoXmlWriter &xmlWriter, KoGenS
     {
       if ( !objectFound )
       {
-        xmlWriter.startElement( "table:tqshapes" );
+        xmlWriter.startElement( "table:shapes" );
         objectFound = true;
       }
       if ( !it.current()->saveOasisObject(sc)  )
@@ -8565,7 +8565,7 @@ void Sheet::printDebug()
                 cellDescr += " | ";
                 cellDescr += cell->text();
                 if ( cell->isFormula() )
-                    cellDescr += TQString("  [result: %1]").tqarg( cell->value().asString() );
+                    cellDescr += TQString("  [result: %1]").arg( cell->value().asString() );
                 kdDebug(36001) << cellDescr << endl;
             }
         }
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index 5d907810..723e6807 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -22,7 +22,7 @@
 #ifndef KSPREAD_SHEET
 #define KSPREAD_SHEET
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdragobject.h>
 #include <tqintdict.h>
 #include <tqmemarray.h>
@@ -160,7 +160,7 @@ public:
     void setPlain( TQString const & _plain ) { setText( _plain ); }
     void setKSpread( TQByteArray const & _kspread ) { m_kspread = _kspread; }
 
-    virtual TQByteArray tqencodedData( const char * mime ) const;
+    virtual TQByteArray encodedData( const char * mime ) const;
     virtual const char* format( int i ) const;
 
     static bool canDecode( TQMimeSource * e );
@@ -240,11 +240,11 @@ public:
     Doc* doc() const;
 
     /**
-     * Saves the sheet and all it's tqchildren in XML format
+     * Saves the sheet and all it's children in XML format
      */
     virtual TQDomElement saveXML( TQDomDocument& );
     /**
-     * Loads the sheet and all it's tqchildren in XML format
+     * Loads the sheet and all it's children in XML format
      */
     virtual bool loadXML( const TQDomElement& );
 
@@ -259,12 +259,12 @@ public:
     void saveOasisPrintStyleLayout( KoGenStyle &style ) const;
 
     /**
-     * Saves a tqchildren
+     * Saves a children
      */
     virtual bool saveChildren( KoStore* _store, const TQString &_path );
     bool saveOasisObjects( KoStore *store, KoXmlWriter &xmlWriter, KoGenStyles& mainStyles, int & indexObj, int &partIndexObj );
     /**
-     * Loads a tqchildren
+     * Loads a children
      */
     virtual bool loadChildren( KoStore* _store );
 
@@ -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 );
 
@@ -991,9 +991,9 @@ public:
     void autofill( TQRect &src, TQRect &dest );
 
 
-    bool insertChild( const KoRect& _tqgeometry, KoDocumentEntry& );
+    bool insertChild( const KoRect& _geometry, KoDocumentEntry& );
 
-    bool insertChart( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data );
+    bool insertChart( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data );
 
 
     /**
@@ -1016,9 +1016,9 @@ public:
      */
     bool insertPicture( const KoPoint& point, const TQPixmap& pixmap );
 
-    void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _tqgeometry );
+    void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _geometry );
 
-    const TQColorGroup& tqcolorGroup() { return widget()->tqcolorGroup(); }
+    const TQColorGroup& colorGroup() { return widget()->colorGroup(); }
 
     int id() const;
 
@@ -1033,7 +1033,7 @@ public:
      * Checks if the argument _column is out of the current maximum range of the vertical border
      * If this is the case, the current maximum value m_iMaxColumn is adjusted and the vertical border
      * is resized.
-     * Use this function with care, as it involves a tqrepaint of the border, when it is out of range.
+     * Use this function with care, as it involves a repaint of the border, when it is out of range.
      */
     void checkRangeHBorder ( int _column );
 
@@ -1048,7 +1048,7 @@ public:
      * Checks if the argument _row is out of the current maximum range of the horizontal border
      * If this is the case, the current maximum value m_iMaxRow is adjusted and the horizontal border
      * is resized.
-     * Use this function with care, as it involves a tqrepaint of the border, when it is out of range.
+     * Use this function with care, as it involves a repaint of the border, when it is out of range.
      */
     void checkRangeVBorder ( int _row );
 
@@ -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.
      */
@@ -1102,7 +1102,7 @@ public:
      */
     void refreshView(const Region& region);
 
-    void emit_updateRow( RowFormat *_format, int _row, bool tqrepaint = true );
+    void emit_updateRow( RowFormat *_format, int _row, bool repaint = true );
     void emit_updateColumn( ColumnFormat *_format, int _column );
 
     /**
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index c3c12117..a70445eb 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -126,8 +126,8 @@ TQRect SheetPrint::cellsPrintRange()
         }
     }
 
-    // Now look at the tqchildren
-    TQPtrListIterator<KoDocumentChild> cit( m_pDoc->tqchildren() );
+    // Now look at the children
+    TQPtrListIterator<KoDocumentChild> cit( m_pDoc->children() );
     double dummy;
     int i;
     for( ; cit.current(); ++cit )
@@ -190,7 +190,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range )
 	    }
                // filled = true;
 
-    //Page empty, but maybe tqchildren on it?
+    //Page empty, but maybe children on it?
 
         TQRect intView = TQRect( TQPoint( m_pDoc->zoomItX( m_pSheet->dblColumnPos( page_range.left() ) ),
                                        m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.top() ) ) ),
@@ -199,7 +199,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range )
                                        m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.bottom() ) +
                                                         m_pSheet->rowFormat( page_range.bottom() )->dblHeight() ) ) );
 
-        TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() );
+        TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() );
         for( ;it.current(); ++it )
         {
             TQRect bound = it.current()->boundingRect();
@@ -295,7 +295,7 @@ bool SheetPrint::print( TQPainter &painter, KPrinter *_printer )
            ( obj->getType() == OBJECT_CHART && m_bPrintCharts ) ) )
         continue;
 
-      TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->tqgeometry() );
+      TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->geometry() );
       TQPixmap *p = new TQPixmap( zoomRect.size() );
       TQPainter painter(p);
       painter.fillRect( p->rect(), TQColor("white") );
@@ -575,24 +575,24 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft,
     }
 
     //
-    // Draw the tqchildren
+    // Draw the children
     //
     TQRect zoomedView = m_pDoc->zoomRect( view );
-    //TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() );
+    //TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() );
     //TQPtrListIterator<EmbeddedObject> itObject( m_pDoc->embeddedObjects() );
 
     TQValueList<PrintObject *>::iterator itObject;
     for ( itObject = m_printObjects.begin(); itObject != m_printObjects.end(); ++itObject ) {
           EmbeddedObject *obj = (*itObject)->obj;
 //        TQString tmp=TQString("Testing child %1/%2 %3/%4 against view %5/%6 %7/%8")
-//        .tqarg(it.current()->contentRect().left())
-//        .tqarg(it.current()->contentRect().top())
-//        .tqarg(it.current()->contentRect().right())
-//        .tqarg(it.current()->contentRect().bottom())
-//        .tqarg(view.left()).tqarg(view.top()).tqarg(zoomedView.right()).tqarg(zoomedView.bottom());
+//        .arg(it.current()->contentRect().left())
+//        .arg(it.current()->contentRect().top())
+//        .arg(it.current()->contentRect().right())
+//        .arg(it.current()->contentRect().bottom())
+//        .arg(view.left()).arg(view.top()).arg(zoomedView.right()).arg(zoomedView.bottom());
 //        kdDebug(36001)<<tmp<<" offset "<<_childOffset.x()<<"/"<<_childOffset.y()<<endl;
 
-          KoRect const bound = obj->tqgeometry();
+          KoRect const bound = obj->geometry();
           TQRect zoomedBound = m_pDoc->zoomRect( KoRect(bound.left(), bound.top(),
               bound.width(),
               bound.height() ) );
@@ -614,14 +614,14 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft,
                                 -zoomedView.top() + m_pDoc->zoomItY( topLeft.y() ) );
 
             //obj->draw( &painter );
-            painter.drawPixmap( m_pDoc->zoomRect( obj->tqgeometry() ).topLeft(), *(*itObject)->p ); //draw the cached object
+            painter.drawPixmap( m_pDoc->zoomRect( obj->geometry() ).topLeft(), *(*itObject)->p ); //draw the cached object
 
             //painter.fillRect(zoomedBound, TQBrush("red")); //for debug purpose
             painter.restore();
         }
     }
 
-    //Don't let obscuring cells and tqchildren overpaint this area
+    //Don't let obscuring cells and children overpaint this area
     clipRegion -= TQRegion ( m_pDoc->zoomItX( leftBorderPts() + topLeft.x() ),
                             m_pDoc->zoomItY( topBorderPts() + topLeft.y() ),
                             m_pDoc->zoomItX( xpos ),
@@ -1273,7 +1273,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ
         fileName="";
 
     TQString t(TQTime::currentTime().toString());
-    TQString d(TQDate::tqcurrentDate().toString());
+    TQString d(TQDate::currentDate().toString());
     TQString ta;
     if ( !_sheet.isEmpty() )
         ta = _sheet;
@@ -1303,7 +1303,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ
  	full_name=p->pw_gecos;
 
     if( email_addr.isEmpty())
-	email_addr = TQString("%1@%2").tqarg(p->pw_name).tqarg(hostname);
+	email_addr = TQString("%1@%2").arg(p->pw_name).arg(hostname);
 
     tmp = _data;
     int pos = 0;
diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h
index 0062476d..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 );
@@ -449,7 +449,7 @@ private:
      *             the printing frame.
      *
      * @param _childOffset KoPoint used to calculate the correct position of
-     *                     tqchildren, if there are repeated columns/rows.
+     *                     children, if there are repeated columns/rows.
      */
     void printPage( TQPainter &_painter, const TQRect& page_range,
                     const KoRect& view, const KoPoint _childOffset );
@@ -492,7 +492,7 @@ private:
 
     /**
      * Returns a rect, which contains the cols and rows to be printed.
-     * It respects the printrange and the tqchildren
+     * It respects the printrange and the children
      */
     TQRect cellsPrintRange();
 
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_style.h b/kspread/kspread_style.h
index 2ae6299c..a0e7f0d5 100644
--- a/kspread/kspread_style.h
+++ b/kspread/kspread_style.h
@@ -20,7 +20,7 @@
 #ifndef __kspread_style__
 #define __kspread_style__
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqfont.h>
 #include <tqpen.h>
diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc
index 06e7a689..d2b6edcd 100644
--- a/kspread/kspread_toolbox.cc
+++ b/kspread/kspread_toolbox.cc
@@ -22,7 +22,7 @@
 
 #include <twin.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 #include <tqobjectlist.h>
 
@@ -59,7 +59,7 @@ void ToolBox::setEnabled( bool enable )
     }
     else
     {
-	if ( tqfocusWidget() == this )
+	if ( focusWidget() == this )
 	    focusNextPrevChild( TRUE );
 	TQObjectList clo = childrenListObject();
 	if ( !clo.isEmpty() )
@@ -97,12 +97,12 @@ void ToolBox::childEvent( TQChildEvent* ev )
 {
     if ( ev->inserted() && ev->child()->isWidgetType() )
 	m_layout->addWidget( (TQWidget*)ev->child() );
-    resize( tqsizeHint() );
+    resize( sizeHint() );
 }
 
 void ToolBox::mousePressEvent( TQMouseEvent* ev )
 {
-    m_startPos = tqgeometry().topLeft();
+    m_startPos = geometry().topLeft();
     m_mousePos = ev->globalPos();
 }
 
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 47edd2ac..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,20 +72,20 @@ 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")
-        .tqarg( Cell::columnName( _area.left()))
-        .tqarg( Cell::columnName(_area.right()));
+        .arg( Cell::columnName( _area.left()))
+        .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")
-        .tqarg( _area.top())
-        .tqarg(_area.bottom());
+        .arg( _area.top())
+        .arg(_area.bottom());
 }
 
 TQString KSpread::util_rangeName(const TQRect &_area)
@@ -933,7 +933,7 @@ TQString KSpread::convertOasisPenToString( const TQPen & pen )
     //              a fast algorithm for diagonals. A line width of 1 will
     //              also produce a 1 pixel wide line, but uses a slower more
     //              accurate algorithm for diagonals.
-    TQString s = TQString( "%1pt " ).tqarg( (pen.width() == 0) ? 1 : pen.width() );
+    TQString s = TQString( "%1pt " ).arg( (pen.width() == 0) ? 1 : pen.width() );
     switch( pen.style() )
     {
     case TQt::NoPen:
@@ -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_value.cc b/kspread/kspread_value.cc
index 898abd11..a4532fdc 100644
--- a/kspread/kspread_value.cc
+++ b/kspread/kspread_value.cc
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <float.h>
 #include <math.h>
diff --git a/kspread/kspread_value.h b/kspread/kspread_value.h
index 0c76e40f..b43ac909 100644
--- a/kspread/kspread_value.h
+++ b/kspread/kspread_value.h
@@ -22,7 +22,7 @@
 
 #include <tqdatetime.h>
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <koffice_export.h>
 
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index cb947f34..67b326e5 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -35,9 +35,9 @@
 
 // TQt includes
 #include <tqbuffer.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcursor.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
@@ -237,7 +237,7 @@ public:
 
     TQPopupMenu *popupRow;
     TQPopupMenu *popupColumn;
-    TQPopupMenu* popupChild;       // for embedded tqchildren
+    TQPopupMenu* popupChild;       // for embedded children
     TQPopupMenu* popupListChoose;  // for list of choose
 
     // the child for which the popup menu has been opened.
@@ -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" );
@@ -1473,7 +1473,7 @@ bool KPSheetSelectPage::isValid(TQString& /*msg*/)
 
 TQString KPSheetSelectPage::printOptionForIndex(unsigned int index)
 {
-  return TQString("sheetprintorder%1").tqarg(index);
+  return TQString("sheetprintorder%1").arg(index);
 }
 
 void KPSheetSelectPage::prependAvailableSheet(const TQString& sheetname)
@@ -1880,7 +1880,7 @@ View::~View()
     // of embedded child documents possible repaints in Sheet are not
     // performed. The repains can happen if you delete an embedded document,
     // which leads to an regionInvalidated() signal emission in KoView, which calls
-    // tqrepaint, etc.etc. :-) (Simon)
+    // repaint, etc.etc. :-) (Simon)
 
     delete d->selection;
     delete d->choice;
@@ -1968,8 +1968,8 @@ void View::initView()
 
     d->hBorderWidget = new HBorder( this, d->canvas,this );
     d->vBorderWidget = new VBorder( this, d->canvas ,this );
-    d->hBorderWidget->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    d->vBorderWidget->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+    d->hBorderWidget->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    d->vBorderWidget->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
     d->canvas->setFocusPolicy( TQ_StrongFocus );
     TQWidget::setFocusPolicy( TQ_StrongFocus );
@@ -3832,8 +3832,8 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet )
   if ( updateSheet )
   {
     d->tabBar->setActiveTab( _t->sheetName() );
-    d->vBorderWidget->tqrepaint();
-    d->hBorderWidget->tqrepaint();
+    d->vBorderWidget->repaint();
+    d->hBorderWidget->repaint();
     d->activeSheet->setRegionPaintDirty(TQRect(TQPoint(0,0), TQPoint(KS_colMax, KS_rowMax)));
     d->canvas->slotMaxColumn( d->activeSheet->maxColumn() );
     d->canvas->slotMaxRow( d->activeSheet->maxRow() );
@@ -3914,8 +3914,8 @@ void View::changeSheet( const TQString& _name )
     updateBorderButton();
 
     //update visible area
-    d->vBorderWidget->tqrepaint();
-    d->hBorderWidget->tqrepaint();
+    d->vBorderWidget->repaint();
+    d->hBorderWidget->repaint();
     d->canvas->slotMaxColumn( d->activeSheet->maxColumn() );
     d->canvas->slotMaxRow( d->activeSheet->maxRow() );
     t->setRegionPaintDirty( t->visibleRect( d->canvas ) );
@@ -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;
 
@@ -4143,7 +4143,7 @@ void View::paste()
   {
     canvasWidget()->deselectAllObjects();
     TQCString returnedTypeMime = "application/vnd.oasis.opendocument.spreadsheet";
-    const TQByteArray arr = data->tqencodedData( returnedTypeMime );
+    const TQByteArray arr = data->encodedData( returnedTypeMime );
     if( arr.isEmpty() )
       return;
     TQBuffer buffer( arr );
@@ -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 ) ) );
@@ -4971,7 +4971,7 @@ void View::print( KPrinter &prt )
         Sheet* sheet = doc()->map()->findSheet(*sheetlistiterator);
         if (sheet == NULL)
         {
-          kdWarning() << i18n("Sheet %1 could not be found for printing").tqarg(*sheetlistiterator) << endl;
+          kdWarning() << i18n("Sheet %1 could not be found for printing").arg(*sheetlistiterator) << endl;
           continue;
         }
 
@@ -5038,7 +5038,7 @@ void View::print( KPrinter &prt )
             if( !prt.previewOnly() )
             {
                 KMessageBox::information( 0,
-                i18n("Nothing to print for sheet %1.").tqarg(
+                i18n("Nothing to print for sheet %1.").arg(
                 d->activeSheet->sheetName()) );
                 //@todo: make sure we really can comment this out,
                 //       what to do with partially broken printouts?
@@ -5051,13 +5051,13 @@ void View::print( KPrinter &prt )
     this->setActiveSheet(selectedsheet);
 }
 
-void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e )
+void View::insertChart( const TQRect& _geometry, KoDocumentEntry& _e )
 {
     if ( !d->activeSheet )
       return;
 
     // Transform the view coordinates to document coordinates
-    KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
+    KoRect unzoomedRect = doc()->unzoomRect( _geometry );
     unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() );
 
     InsertObjectCommand *cmd = 0;
@@ -5073,13 +5073,13 @@ void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e )
     cmd->execute();
 }
 
-void View::insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _e )
+void View::insertChild( const TQRect& _geometry, KoDocumentEntry& _e )
 {
   if ( !d->activeSheet )
     return;
 
   // Transform the view coordinates to document coordinates
-  KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
+  KoRect unzoomedRect = doc()->unzoomRect( _geometry );
   unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() );
 
   InsertObjectCommand *cmd = new InsertObjectCommand( unzoomedRect, _e, d->canvas );
@@ -5135,11 +5135,11 @@ void View::slotUpdateChildGeometry( EmbeddedKOfficeObject */*_child*/ )
   assert( f != 0L );
 
   // Are we already up to date ?
-  if ( _child->tqgeometry() == f->partGeometry() )
+  if ( _child->geometry() == f->partGeometry() )
     return;
 
   // TODO zooming
-  f->setPartGeometry( _child->tqgeometry() );
+  f->setPartGeometry( _child->geometry() );
     */
 }
 
@@ -5498,7 +5498,7 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ )
 //                 return 0;
 //     }
 //
-//     TQPtrListIterator<KoDocumentChild> it( doc()->tqchildren() );
+//     TQPtrListIterator<KoDocumentChild> it( doc()->children() );
 //     for (; it.current(); ++it )
 //     {
 //         // Is the child document on the visible sheet ?
@@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( )
 
   if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
   {
-    p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 );
+    p2.setX( p2.x() - d->popupListChoose->sizeHint().width() + 1 );
   }
 
   d->popupListChoose->popup( p2 );
@@ -6401,7 +6401,7 @@ void View::styleDialog()
     d->activeSheet->setRegionPaintDirty( d->activeSheet->visibleRect( d->canvas ) );
   }
   if ( d->canvas )
-    d->canvas->tqrepaint();
+    d->canvas->repaint();
 }
 
 void View::paperLayoutDlg()
@@ -6748,9 +6748,9 @@ void View::zoomMinus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->tqrepaint();
-  d->vBorderWidget->tqrepaint();
-  d->hBorderWidget->tqrepaint();
+  d->canvas->repaint();
+  d->vBorderWidget->repaint();
+  d->hBorderWidget->repaint();
 }
 
 void View::zoomPlus()
@@ -6763,9 +6763,9 @@ void View::zoomPlus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->tqrepaint();
-  d->vBorderWidget->tqrepaint();
-  d->hBorderWidget->tqrepaint();
+  d->canvas->repaint();
+  d->vBorderWidget->repaint();
+  d->hBorderWidget->repaint();
 }
 */
 
@@ -6911,9 +6911,9 @@ void View::slotAddSheet( Sheet *_sheet )
 void View::slotRefreshView()
 {
   refreshView();
-  d->canvas->tqrepaint();
-  d->vBorderWidget->tqrepaint();
-  d->hBorderWidget->tqrepaint();
+  d->canvas->repaint();
+  d->vBorderWidget->repaint();
+  d->hBorderWidget->repaint();
 }
 
 void View::slotUpdateView( Sheet *_sheet )
@@ -7209,7 +7209,7 @@ void View::transformPart()
 
     if ( d->transformToolBox.isNull() )
     {
-        d->transformToolBox = new KoTransformToolBox( selectedChild(), tqtopLevelWidget() );
+        d->transformToolBox = new KoTransformToolBox( selectedChild(), topLevelWidget() );
         d->transformToolBox->show();
 
         d->transformToolBox->setDocumentChild( selectedChild() );
@@ -7537,7 +7537,7 @@ void View::runInspector()
 
 TQColor View::highlightColor()
 {
-    return TQApplication::tqpalette().active().highlight().light( 175 );
+    return TQApplication::palette().active().highlight().light( 175 );
 }
 
 } // namespace KSpread
diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h
index 2dfecfa5..f9ce1bdd 100644
--- a/kspread/kspread_view.h
+++ b/kspread/kspread_view.h
@@ -253,22 +253,22 @@ public:
 
     /**
      *
-     * @param _tqgeometry is the zoomed tqgeometry of the new child.
+     * @param _geometry is the zoomed geometry of the new child.
      * @param _entry is the entry to insert.
      *
      * @todo check validity of @p _entry docs.
      */
-    void insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _entry );
+    void insertChart( const TQRect& _geometry, KoDocumentEntry& _entry );
     /**
      *
-     * @param _tqgeometry is the tqgeometry of the new child.
+     * @param _geometry is the geometry of the new child.
      * @param _entry is the entry to insert.
      *
      * @todo check validity of @p _entry docs.
      */
-    void insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _entry );
+    void insertChild( const TQRect& _geometry, KoDocumentEntry& _entry );
 
-   // void insertPicture( const TQRect& _tqgeometry, KURL& _file );
+   // void insertPicture( const TQRect& _geometry, KURL& _file );
 
     virtual void print( KPrinter &printer );
     virtual void setupPrinter( KPrinter &printer );
@@ -321,7 +321,7 @@ public:
     void updateShowSheetMenu();
 
     /**
-     * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a tqrepaint)
+     * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a repaint)
      * They will be repainted on the next call to paintUpdates()
      */
     void markSelectionAsDirty();
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index bed111ba..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);
           }
         }
     }
@@ -1444,20 +1444,20 @@ double AdjustColumnRowManipulator::adjustColumnHelper(Cell* cell, int col, int r
   if ( cell->textWidth() > long_max )
   {
     double indent = 0.0;
-    Format::Align tqalignment = cell->format()->align(cell->column(), cell->row());
-    if (tqalignment == Format::Undefined)
+    Format::Align alignment = cell->format()->align(cell->column(), cell->row());
+    if (alignment == Format::Undefined)
     {
       if (cell->value().isNumber() || cell->isDate() || cell->isTime())
       {
-        tqalignment = Format::Right;
+        alignment = Format::Right;
       }
       else
       {
-        tqalignment = Format::Left;
+        alignment = Format::Left;
       }
     }
 
-    if (tqalignment == Format::Left)
+    if (alignment == Format::Left)
     {
       indent = cell->format()->getIndent( cell->column(), cell->row() );
     }
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index cec64193..e02d914d 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // Undefine HAVE_LONG_DOUBLE for Beta 4 since RedHat 5.0 comes with a borken
 // glibc
@@ -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 4c80e7b4..b15f844c 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -26,7 +26,7 @@
 #include "version.h"
 #include <klocale.h>
 #include <knotifyclient.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
 #include <kapplication.h>
@@ -80,7 +80,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     // Create the display
     calc_display = new DLabel( this, "display" );
     calc_display->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken );
-    calc_display->tqsetAlignment( AlignRight|AlignVCenter );
+    calc_display->setAlignment( AlignRight|AlignVCenter );
     calc_display->setFocus();
     calc_display->setFocusPolicy( TQ_StrongFocus );
 
@@ -89,18 +89,18 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     statusINVLabel = new TQLabel( this, "INV" );
     Q_CHECK_PTR( statusINVLabel );
     statusINVLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusINVLabel->tqsetAlignment( AlignCenter );
+    statusINVLabel->setAlignment( AlignCenter );
     statusINVLabel->setText("NORM");
 
     statusHYPLabel = new TQLabel( this, "HYP" );
     Q_CHECK_PTR( statusHYPLabel );
     statusHYPLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusHYPLabel->tqsetAlignment( AlignCenter );
+    statusHYPLabel->setAlignment( AlignCenter );
 
     statusERRORLabel = new TQLabel( this, "ERROR" );
     Q_CHECK_PTR( statusERRORLabel );
     statusERRORLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusERRORLabel->tqsetAlignment( AlignLeft|AlignVCenter );
+    statusERRORLabel->setAlignment( AlignLeft|AlignVCenter );
 
     // create angle button group
 
@@ -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);
@@ -578,7 +578,7 @@ void TQtCalculator::updateGeometry()
     s.setWidth(mSmallPage->fontMetrics().width("MMM"));
     s.setHeight(mSmallPage->fontMetrics().lineSpacing());
 
-    l = (TQObjectList*)mSmallPage->tqchildren(); // silence please
+    l = (TQObjectList*)mSmallPage->children(); // silence please
 
     for(uint i=0; i < l->count(); i++)
     {
@@ -586,20 +586,20 @@ void TQtCalculator::updateGeometry()
         if( o->isWidgetType() )
         {
             margin = TQApplication::style().
-                tqpixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
+                pixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
             ((TQWidget*)o)->setMinimumSize(s.width()+margin, s.height()+margin);
             ((TQWidget*)o)->installEventFilter( this );
             ((TQWidget*)o)->setAcceptDrops(true);
         }
     }
 
-    l = (TQObjectList*)mLargePage->tqchildren(); // silence please
+    l = (TQObjectList*)mLargePage->children(); // silence please
 
-    int h1 = pbF->tqminimumSize().height();
+    int h1 = pbF->minimumSize().height();
     int h2 = (int)((((float)h1 + 4.0) / 5.0));
     s.setWidth(mLargePage->fontMetrics().width("MMM") +
                TQApplication::style().
-               tqpixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
+               pixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
     s.setHeight(h1 + h2);
 
     for(uint i = 0; i < l->count(); i++)
@@ -621,7 +621,7 @@ void TQtCalculator::updateGeometry()
     statusINVLabel->setMinimumWidth(s.width());
     statusHYPLabel->setMinimumWidth(s.width());
 
-    //setFixedSize(tqminimumSize());
+    //setFixedSize(minimumSize());
 }
 
 void TQtCalculator::exit()
@@ -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");
 
@@ -1494,10 +1494,10 @@ void TQtCalculator::configclicked(){
                       "enabled. See the README for details.");
 #endif
 
-  label->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
+  label->setAlignment(AlignLeft|WordBreak|ExpandTabs);
   label->setText(labelstring);
 
-  label2->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
+  label2->setAlignment(AlignLeft|WordBreak|ExpandTabs);
   label2->setText(labelstring2);
 
   // HACK
@@ -1540,7 +1540,7 @@ void TQtCalculator::configclicked(){
     set_precision();
     set_style();
     updateGeometry();
-    resize(tqminimumSize());
+    resize(minimumSize());
   }
   delete configdlg;
 }
@@ -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/calculator/kcalc.h b/kspread/plugins/calculator/kcalc.h
index dfa67b63..a1205bc2 100644
--- a/kspread/plugins/calculator/kcalc.h
+++ b/kspread/plugins/calculator/kcalc.h
@@ -35,7 +35,7 @@ using std::queue;
 #include <ctype.h>
 
 #include <tqlistbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqptrlist.h>
 #include <tqaccel.h>
 #include <tqtabdialog.h>
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
index d55c332b..0311c913 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
@@ -40,7 +40,7 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name)
   
   //we start with a default calendar for the current month;
 
-  TQDate first_day_in_month = TQDate::tqcurrentDate();
+  TQDate first_day_in_month = TQDate::currentDate();
   first_day_in_month.setYMD(first_day_in_month.year(),first_day_in_month.month(),1);
   
   TQDate last_day_in_month(first_day_in_month.year(),first_day_in_month.month(),first_day_in_month.daysInMonth());
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
index 712b11b4..d2c8fc08 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>400</width>
                     <height>19</height>
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index 1bb16a95..c0d5c1ca 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -194,7 +194,7 @@ void PluginInsertCalendar::slotInsertCalendar(const TQDate &start, const TQDate
   int row = selection.y();
   int col = selection.x();
   int colstart = col; //this is where we get back after each week
-  sheet->setText(row,colstart,i18n("Calendar from %1 to %2").tqarg(start.toString()).tqarg(end.toString()));
+  sheet->setText(row,colstart,i18n("Calendar from %1 to %2").arg(start.toString()).arg(end.toString()));
 
   TQDate current(start);
 //   TQDate previous(current);
diff --git a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
index 108516dc..9f67dfbb 100644
--- a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
+++ b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
@@ -45,9 +45,9 @@ using namespace Kross::KSpreadCore;
 KSpreadCoreModule::KSpreadCoreModule(Kross::Api::Manager* manager)
     : Kross::Api::Module("kspreadcore") , m_manager(manager)
 {
-    TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren();
-    kdDebug() << " there are " << tqchildren.size() << endl;
-    for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++)
+    TQMap<TQString, Object::Ptr> children = manager->getChildren();
+    kdDebug() << " there are " << children.size() << endl;
+    for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
     {
         kdDebug() << it.key() << " " << it.data() << endl;
     }
diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc
index 44f8fa01..a919b31d 100644
--- a/kspread/plugins/scripting/scripting.cc
+++ b/kspread/plugins/scripting/scripting.cc
@@ -43,9 +43,9 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
     setInstance(KSpreadScriptingFactory::instance());
 
     kdDebug() << "Scripting plugin. Class: "
-          << tqmetaObject()->className()
+          << metaObject()->className()
           << ", Parent: "
-          << parent->tqmetaObject()->className()
+          << parent->metaObject()->className()
           << "\n";
 
     if ( parent->inherits("KSpread::View") )
diff --git a/kspread/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/inspector.cc b/kspread/tests/inspector.cc
index 17179793..f861343c 100644
--- a/kspread/tests/inspector.cc
+++ b/kspread/tests/inspector.cc
@@ -19,9 +19,9 @@
 
 #include "inspector.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kdialogbase.h>
 
@@ -65,7 +65,7 @@ static TQString boolAsString( bool b )
 
 static TQString longAsHexstring( long l )
 {
-    return TQString("%1").tqarg(l, 8, 16);
+    return TQString("%1").arg(l, 8, 16);
 }
 
 static TQString dirAsString( Sheet::LayoutDirection dir )
diff --git a/kspread/tests/tester.cc b/kspread/tests/tester.cc
index 05df95d1..cdadeaef 100644
--- a/kspread/tests/tester.cc
+++ b/kspread/tests/tester.cc
@@ -20,7 +20,7 @@
 #include "tester.h"
 
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 using namespace KSpread;
 
diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc
index 53fe60b3..fa45c9c0 100644
--- a/kspread/tests/testrunner.cc
+++ b/kspread/tests/testrunner.cc
@@ -22,8 +22,8 @@
 #include <tqapplication.h>
 #include <tqdict.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 
 #include <kcombobox.h>
 #include <kdialogbase.h>
@@ -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* tqspacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  tqlayout->addItem( tqspacerItem, 0, 2 );
+  TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+  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() ) );
@@ -108,7 +108,7 @@ void TestRunner::runTest()
   if( tester )
   {
     d->logView->clear();
-    d->logView->append( TQString("Test: %1").tqarg( testName ) );
+    d->logView->append( TQString("Test: %1").arg( testName ) );
 
     TQApplication::setOverrideCursor(TQt::waitCursor);
     tester->run();
@@ -117,13 +117,13 @@ void TestRunner::runTest()
     TQStringList errorList = tester->errors();
     if( tester->failed() )
     {
-      d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").tqarg( tester->count() ).
+      d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").arg( tester->count() ).
         arg(  tester->failed() ) );
       for( unsigned k = 0; k < errorList.count(); k++ )
         d->logView->append( errorList[k] );
     }
     else
-      d->logView->append( TQString( "%1 tests, everything is OK. ").tqarg( tester->count() ) );
+      d->logView->append( TQString( "%1 tests, everything is OK. ").arg( tester->count() ) );
 
     d->logView->append( "Test finished." );
   }
diff --git a/kspread/valueconverter.cc b/kspread/valueconverter.cc
index 8dda86d1..cd649c36 100644
--- a/kspread/valueconverter.cc
+++ b/kspread/valueconverter.cc
@@ -228,11 +228,11 @@ Value ValueConverter::asDateTime (const Value &value) const
   
   switch (value.type()) {
     case Value::Empty:
-      val.setValue (TQDateTime::tqcurrentDateTime());
+      val.setValue (TQDateTime::currentDateTime());
     break;
     case Value::Boolean:
       //ignore the bool value... any better idea? ;)
-      val.setValue (TQDateTime::tqcurrentDateTime());
+      val.setValue (TQDateTime::currentDateTime());
     break;
     case Value::Integer:
       val.setValue (value.asFloat());
@@ -269,11 +269,11 @@ Value ValueConverter::asDate (const Value &value) const
   
   switch (value.type()) {
     case Value::Empty:
-      val.setValue (TQDate::tqcurrentDate());
+      val.setValue (TQDate::currentDate());
     break;
     case Value::Boolean:
       //ignore the bool value... any better idea? ;)
-      val.setValue (TQDate::tqcurrentDate());
+      val.setValue (TQDate::currentDate());
     break;
     case Value::Integer:
       val.setValue (value.asFloat());
diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc
index 9e3c57da..1eda41da 100644
--- a/kspread/valueformatter.cc
+++ b/kspread/valueformatter.cc
@@ -358,15 +358,15 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType)
         diff = fabs(result - calc);
       }
     }
-    if( index1 == 0 ) return TQString("%1").tqarg( floor(value) );
-    if( index1 == index ) return TQString("%1").tqarg( floor(value)+1 );
+    if( index1 == 0 ) return TQString("%1").arg( floor(value) );
+    if( index1 == index ) return TQString("%1").arg( floor(value)+1 );
     if( floor(value) == 0)
-      return TQString("%1/%2").tqarg( index1 ).tqarg( index );
+      return TQString("%1/%2").arg( index1 ).arg( index );
 
     return TQString("%1 %2/%3")
-        .tqarg( floor(value) )
-        .tqarg( index1 )
-        .tqarg( index );
+        .arg( floor(value) )
+        .arg( index1 )
+        .arg( index );
   }
 
 
@@ -407,12 +407,12 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType)
   else
   {
     if ( floor(value) == 0 )
-      return TQString("%1/%2").tqarg(numerator).tqarg(denominator);
+      return TQString("%1/%2").arg(numerator).arg(denominator);
     else
       return TQString("%1 %2/%3")
-        .tqarg(floor(value))
-        .tqarg(numerator)
-        .tqarg(denominator);
+        .arg(floor(value))
+        .arg(numerator)
+        .arg(denominator);
   }
 }
 
@@ -436,35 +436,35 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType)
 
   if (fmtType == Time_format1) {  // 9 : 01 AM
     return TQString("%1:%2 %3")
-      .tqarg((pm ? h - 12 : h),2)
-      .tqarg(minute,2)
-      .tqarg(AMPM);
+      .arg((pm ? h - 12 : h),2)
+      .arg(minute,2)
+      .arg(AMPM);
   }
 
   if (fmtType == Time_format2) {  //9:01:05 AM
     return TQString("%1:%2:%3 %4")
-      .tqarg((pm ? h-12 : h),2)
-      .tqarg(minute,2)
-      .tqarg(second,2)
-      .tqarg(AMPM);
+      .arg((pm ? h-12 : h),2)
+      .arg(minute,2)
+      .arg(second,2)
+      .arg(AMPM);
   }
 
   if (fmtType == Time_format3) {
     return TQString("%1 %2 %3 %4 %5 %6")      // 9 h 01 min 28 s
-      .tqarg(hour,2)
-      .tqarg(i18n("h"))
-      .tqarg(minute,2)
-      .tqarg(i18n("min"))
-      .tqarg(second,2)
-      .tqarg(i18n("s"));
+      .arg(hour,2)
+      .arg(i18n("h"))
+      .arg(minute,2)
+      .arg(i18n("min"))
+      .arg(second,2)
+      .arg(i18n("s"));
   }
 
   if (fmtType == Time_format4) {  // 9:01
-    return TQString("%1:%2").tqarg(hour, 2).tqarg(minute, 2);
+    return TQString("%1:%2").arg(hour, 2).arg(minute, 2);
   }
 
   if (fmtType == Time_format5) {  // 9:01:12
-    return TQString("%1:%2:%3").tqarg(hour, 2).tqarg(minute, 2).tqarg(second, 2);
+    return TQString("%1:%2:%3").arg(hour, 2).arg(minute, 2).arg(second, 2);
   }
 
   TQDate d1(dt.date());
@@ -476,15 +476,15 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType)
   if (fmtType == Time_format6)
   {  // [mm]:ss
     m += (h * 60);
-    return TQString("%1:%2").tqarg(m, 1).tqarg(second, 2);
+    return TQString("%1:%2").arg(m, 1).arg(second, 2);
   }
   if (fmtType == Time_format7) {  // [h]:mm:ss
-    return TQString("%1:%2:%3").tqarg(h, 1).tqarg(minute, 2).tqarg(second, 2);
+    return TQString("%1:%2:%3").arg(h, 1).arg(minute, 2).arg(second, 2);
   }
   if (fmtType == Time_format8)
   {  // [h]:mm
     m += (h * 60);
-    return TQString("%1:%2").tqarg(h, 1).tqarg(minute, 2);
+    return TQString("%1:%2").arg(h, 1).arg(minute, 2);
   }
 
   return converter->locale()->formatTime( dt.time(), false );
@@ -540,7 +540,7 @@ TQString ValueFormatter::dateFormat (const TQDate &date, FormatType fmtType)
     tmp += TQString::number(date.year());
   }
   else if (fmtType == date_format10) {  /*F-99 */
-    tmp = converter->locale()->calendar()->monthString(date, false).tqat(0) + "-";
+    tmp = converter->locale()->calendar()->monthString(date, false).at(0) + "-";
     tmp += TQString::number(date.year()).right(2);
   }
   else if (fmtType == date_format11) {  /*18/Feb */