Rename obsolete tq methods to standard names

123 files changed, 1116 insertions, 1116 deletions

diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
index 8222cd77..456fc67a 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -80,7 +80,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui
index c91ecd99..88d24dc6 100644
--- a/filters/chalk/pdf/pdfimportwidgetbase.ui
+++ b/filters/chalk/pdf/pdfimportwidgetbase.ui
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -65,7 +65,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -160,7 +160,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -185,7 +185,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui
index dcb733b8..5797c407 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -50,7 +50,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -88,7 +88,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui
index ffd7c59d..59d9642e 100644
--- a/filters/chalk/raw/wdgrawimport.ui
+++ b/filters/chalk/raw/wdgrawimport.ui
@@ -45,7 +45,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -330,7 +330,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -355,7 +355,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index f1854d43..29038890 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -51,7 +51,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -119,7 +119,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -289,7 +289,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout5</cstring>
+                                    <cstring>layout5</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout4_2</cstring>
+                                            <cstring>layout4_2</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout5_2</cstring>
+                                    <cstring>layout5_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout4</cstring>
+                                            <cstring>layout4</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout5_2_2</cstring>
+                                    <cstring>layout5_2_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout4_3</cstring>
+                                            <cstring>layout4_3</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc
index 82debb58..fd81b108 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.cc
+++ b/filters/karbon/applixgraphics/applixgraphicimport.cc
@@ -156,7 +156,7 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from,
     str += "<!DOCTYPE karbon>\n";
     str += " <karbon mime=\"application/x-karbon\" version=\"2\" editor=\"APPLIXGRAPHICS import filter\">\n";
 //      str += "  <head>\n";
-//      str += "   <tqlayout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
+//      str += "   <layout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
 //      str += "   <grid dx=\"20\" dy=\"20\" align=\"0\">\n";
 //      str += "    <helplines align=\"0\"/>\n";
 //      str += "   </grid>\n";
diff --git a/filters/karbon/kontour/kontourimport.cpp b/filters/karbon/kontour/kontourimport.cpp
index 6e515b3f..30b77ccf 100644
--- a/filters/karbon/kontour/kontourimport.cpp
+++ b/filters/karbon/kontour/kontourimport.cpp
@@ -198,8 +198,8 @@ KontourImport::convert()
 	if( docElem.attribute( "version" ).toInt() == 2 )
 	{
 		lay = docElem;
-		height = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "height" ).toDouble();
-		width = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "width" ).toDouble();
+		height = lay.firstChild().namedItem( "layout" ).toElement().attribute( "height" ).toDouble();
+		width = lay.firstChild().namedItem( "layout" ).toElement().attribute( "width" ).toDouble();
 	}
 	else
 	{
diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc
index 015c4006..c3d6ab6a 100644
--- a/filters/karbon/xfig/xfigimport.cc
+++ b/filters/karbon/xfig/xfigimport.cc
@@ -167,7 +167,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
 
   char buf[255];
   int value;
-  KoPageLayout tqlayout;
+  KoPageLayout layout;
 
   ifstream fin( file.local8Bit() );
   if (! fin)
@@ -177,7 +177,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
     GDocument *gdoc             = kidoc->gdoc();
     //GPage *activePage           = gdoc->activePage();
 
-  tqlayout = gdoc->activePage()->pageLayout ();
+  layout = gdoc->activePage()->pageLayout ();
 
   fin.getline (buf, 255);
   if (::strncmp (buf, "#FIG 3", 6)) {
@@ -203,9 +203,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
   // orientation
   fin.getline (buf, 255);
   if (::strcmp (buf, "Landscape") == 0)
-      tqlayout.orientation = PG_LANDSCAPE;
+      layout.orientation = PG_LANDSCAPE;
   else if (::strcmp (buf, "Portrait") == 0)
-      tqlayout.orientation = PG_PORTRAIT;
+      layout.orientation = PG_PORTRAIT;
   else
       kdDebug() << "ERROR: invalid orientation" << endl;
 
@@ -215,9 +215,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
   // units
   fin.getline (buf, 255);
   if (::strcmp (buf, "Metric") == 0)
-      tqlayout.unit = PG_MM;
+      layout.unit = PG_MM;
   else if (::strcmp (buf, "Inches") == 0)
-      tqlayout.unit = PG_INCH;
+      layout.unit = PG_INCH;
   else
       kdDebug() << "ERROR: invalid units" << endl;
 
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc
index fb0407e0..21d321ca 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cc
@@ -190,13 +190,13 @@ void PNGExportDia::setupGUI()
     width->setText( i18n( "Width" ) );
     heightEdit = new KIntNumInput( page, "heightEdit" );
 
-    TQGridLayout* tqlayout1 = new TQGridLayout;
-    tqlayout1->addWidget( height, 1, 0 );
-    tqlayout1->addWidget( widthEdit, 0, 1 );
-    tqlayout1->addWidget( width, 0, 0 );
-    tqlayout1->addWidget( heightEdit, 1, 1 );
+    TQGridLayout* layout1 = new TQGridLayout;
+    layout1->addWidget( height, 1, 0 );
+    layout1->addWidget( widthEdit, 0, 1 );
+    layout1->addWidget( width, 0, 0 );
+    layout1->addWidget( heightEdit, 1, 1 );
 
-    mainLayout->addLayout( tqlayout1 );
+    mainLayout->addLayout( layout1 );
 
     TQLabel* percentHeight = new TQLabel( page, "PercentHeight" );
     percentHeight->setText( i18n( "Height (%)" ) );
@@ -205,15 +205,15 @@ void PNGExportDia::setupGUI()
     percWidthEdit = new KDoubleNumInput( page, "percWidthEdit" );
     percHeightEdit = new KDoubleNumInput( page, "percHeightEdit" );
 
-    TQGridLayout* tqlayout2 = new TQGridLayout;
-    tqlayout2->addWidget( percWidthEdit, 0, 1 );
-    tqlayout2->addWidget( percHeightEdit, 1, 1 );
-    tqlayout2->addWidget( percentHeight, 1, 0 );
-    tqlayout2->addWidget( percentWidth, 0, 0 );
+    TQGridLayout* layout2 = new TQGridLayout;
+    layout2->addWidget( percWidthEdit, 0, 1 );
+    layout2->addWidget( percHeightEdit, 1, 1 );
+    layout2->addWidget( percentHeight, 1, 0 );
+    layout2->addWidget( percentWidth, 0, 0 );
 
-    mainLayout->addLayout( tqlayout2 );
+    mainLayout->addLayout( layout2 );
 
-    /* Display the main tqlayout */
+    /* Display the main layout */
     mainLayout->addStretch( 5 );
     mainLayout->activate();
 }
diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index c0609de6..97527471 100755
--- a/filters/kpresenter/magicpoint/mgp2kpr.py
+++ b/filters/kpresenter/magicpoint/mgp2kpr.py
@@ -283,7 +283,7 @@ class MgpImporter:
     if (self.fontItalic!=0):
       elem.setAttribute("italic", "1")
     
-    text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore'))
+    text=self.document.createTextNode(unicode(line, self.charset, 'ignore'))
     elem.appendChild(text)
     pElem.appendChild(elem)
     self.textElem.appendChild(pElem)
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc
index 55a3e265..47173cb9 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ
     TQDomElement noteTextBox = doc.createElement( "draw:text-box" );
 
     //TODO : add draw:text-box size :
-    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="tqlayout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
+    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="layout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
 
     TQStringList text = TQStringList::split( "\n", noteText );
     for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) {
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 8b9d1e77..7b84c3d0 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -178,10 +178,10 @@ TQByteArray PowerPointImport::createStyles()
 
   // office:automatic-styles
   stylesWriter->startElement( "office:automatic-styles" );
-  stylesWriter->startElement( "style:page-tqlayout" );
+  stylesWriter->startElement( "style:page-layout" );
   stylesWriter->addAttribute( "style:name","pm1" );
   stylesWriter->addAttribute( "style:page-usage","all" );
-  stylesWriter->startElement( "style:page-tqlayout-properties" );
+  stylesWriter->startElement( "style:page-layout-properties" );
   stylesWriter->addAttribute( "fo:margin-bottom","0pt" ); 
   stylesWriter->addAttribute( "fo:margin-left","0pt" );   
   stylesWriter->addAttribute( "fo:margin-right","0pt" );  
@@ -189,8 +189,8 @@ TQByteArray PowerPointImport::createStyles()
   stylesWriter->addAttribute( "fo:page-height", pageHeight );
   stylesWriter->addAttribute( "fo:page-width", pageWidth );
   stylesWriter->addAttribute( "style:print-orientation","landscape" );
-  stylesWriter->endElement(); // style:page-tqlayout-properties
-  stylesWriter->endElement(); // style:page-tqlayout
+  stylesWriter->endElement(); // style:page-layout-properties
+  stylesWriter->endElement(); // style:page-layout
 
   stylesWriter->startElement( "style:style" );
   stylesWriter->addAttribute( "style:name","dp1" );
@@ -237,7 +237,7 @@ TQByteArray PowerPointImport::createStyles()
   stylesWriter->startElement( "office:master-styles" );
   stylesWriter->startElement( "style:master-page" );
   stylesWriter->addAttribute( "style:name", "Standard" );
-  stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" );
+  stylesWriter->addAttribute( "style:page-layout-name", "pm1" );
   stylesWriter->addAttribute( "draw:style-name", "dp1" );
   stylesWriter->endElement();
   stylesWriter->endElement();
@@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->endElement(); // draw:ellipse
 }
 
@@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
   }
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->endElement(); // draw:rect
 }
 
@@ -463,7 +463,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
  // xmlWriter->addAttribute( "svg:x", xStr );
  // xmlWriter->addAttribute( "svg:y", yStr );
   
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
     xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "round-rectangle"); 
       xmlWriter->startElement( "draw:equation" );
@@ -525,7 +525,7 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "diamond");
     xmlWriter->endElement();    
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->endElement(); 
 }
 
@@ -546,7 +546,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
     xmlWriter->startElement( "draw:glue-point" );
     xmlWriter->addAttribute( "svg:x", 5 );
     xmlWriter->addAttribute( "svg:y", 0 );
@@ -657,7 +657,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
@@ -738,7 +738,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 6.25 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -854,7 +854,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -918,7 +918,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -998,7 +998,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
     xmlWriter->startElement( "draw:enhanced-geometry" );
     
                 if (drawObject->shape() == DrawObject::RightArrow)
@@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit
   xmlWriter->addAttribute( "svg:y2", y2Str );
   xmlWriter->addAttribute( "svg:x1", x1Str );
   xmlWriter->addAttribute( "svg:x2", x2Str );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
  
  xmlWriter->endElement(); 
 }
@@ -1111,7 +1111,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -1176,7 +1176,7 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 1 );
@@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );  
+    xmlWriter->addAttribute( "draw:layer", "layout" );  
     xmlWriter->endElement(); // path
 }
 
@@ -1324,7 +1324,7 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 
   xmlWriter->startElement( "draw:frame" );
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+  xmlWriter->addAttribute( "draw:layer", "layout" );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
@@ -1389,7 +1389,7 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
   xmlWriter->addAttribute( "draw:name", nameStr );
   xmlWriter->addAttribute( "draw:style-name", styleNameStr );
-  xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0");
+  xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0");
 
   GroupObject* root = slide->rootObject();
   if( root )
diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp
index abfa9385..2a78b79f 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -94,7 +94,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in tqunicode anymore 
+    std::string name;      // the name, not in unicode anymore 
     bool dir;              // true if directory   
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp
index 23b61d30..b0a44e56 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.cpp
+++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp
@@ -216,13 +216,13 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.tqunicode() )
+    : uc( c.unicode() )
 {
 }
 
 UChar UChar::toLower() const
 {
-  // ### properly support tqunicode tolower
+  // ### properly support unicode tolower
   if (uc >= 256 || islower(uc))
     return *this;
 
@@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->tqunicode() < c2->tqunicode());
+    return (c1->unicode() < c2->unicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h
index c0e34cf4..52a43afe 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.h
+++ b/filters/kpresenter/powerpoint/libppt/ustring.h
@@ -71,7 +71,7 @@ namespace Libppt {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short tqunicode() const { return uc; }
+    unsigned short unicode() const { return uc; }
   public:
     /**
      * @return The character converted to lower case.
@@ -128,7 +128,7 @@ namespace Libppt {
     /**
      * @return Unicode value.
      */
-    unsigned short tqunicode() const { return ref().tqunicode(); }
+    unsigned short unicode() const { return ref().unicode(); }
     /**
      * @return Lower byte.
      */
diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui
index 6f7633ec..f8960f4b 100644
--- a/filters/kspread/csv/dialogui.ui
+++ b/filters/kspread/csv/dialogui.ui
@@ -66,7 +66,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout3</cstring>
+                            <cstring>layout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui
index d02f6712..f6a552e1 100644
--- a/filters/kspread/csv/exportdialogui.ui
+++ b/filters/kspread/csv/exportdialogui.ui
@@ -47,7 +47,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout3</cstring>
+                            <cstring>layout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 6985a434..2a3a6247 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode )
 class EString::Private
 {
 public:
-  bool tqunicode;
+  bool unicode;
   bool richText;
   UString str;
   unsigned size;
@@ -194,7 +194,7 @@ public:
 EString::EString()
 {
   d = new EString::Private();
-  d->tqunicode  = false;
+  d->unicode  = false;
   d->richText = false;
   d->str      = UString::null;
   d->size     = 0;
@@ -208,7 +208,7 @@ EString::EString( const EString& es )
 
 EString& EString::operator=( const EString& es )
 {
-  d->tqunicode  = es.d->tqunicode;
+  d->unicode  = es.d->unicode;
   d->richText = es.d->richText;
   d->size     = es.d->size;
   d->str      = es.d->str;
@@ -220,14 +220,14 @@ EString::~EString()
   delete d;
 }
 
-bool EString::tqunicode() const
+bool EString::unicode() const
 {
-  return d->tqunicode;
+  return d->unicode;
 }
 
 void EString::setUnicode( bool u )
 {
-  d->tqunicode = u;
+  d->unicode = u;
 }
 
 bool EString::richText() const
@@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   unsigned char flag = data[ offset ];
   offset++; // for flag (1 byte)
   
-  bool tqunicode = flag & 0x01;
+  bool unicode = flag & 0x01;
   bool richText = flag & 0x08;
   unsigned formatRuns = 0;
   
@@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   
   // find out total bytes used in this string
   unsigned size = offset + len; // string data
-  if( tqunicode ) size += len; // because tqunicode takes 2-bytes char
+  if( unicode ) size += len; // because unicode takes 2-bytes char
   if( richText ) size += (formatRuns*4);
   
-  if( !tqunicode )
+  if( !unicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   }
   
   EString result;
-  result.setUnicode( tqunicode );
+  result.setUnicode( unicode );
   result.setRichText( richText );
   result.setSize( size );
   result.setStr( str );
@@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   
   unsigned len = data[0];
   unsigned flag = data[1];
-  bool tqunicode = flag & 1;
+  bool unicode = flag & 1;
   
   if( len > datasize-2 ) len = datasize-2;
   if( len == 0 ) return EString();
   
   unsigned offset = 2;
   
-  if( !tqunicode )
+  if( !unicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   }
   
   EString result;
-  result.setUnicode( tqunicode );
+  result.setUnicode( unicode );
   result.setRichText( richText );
   result.setSize( datasize );
   result.setStr( str );
@@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data )
   d->visibility = data[4];
   d->type = data[5];
   
-  /* FIXME: it turned out that sheet name is not normal tqunicode string
+  /* FIXME: it turned out that sheet name is not normal unicode string
      where the first two bytes specifies string length, but instead
      only the first specifies it.
      the next byte could be correctly interpreted as flag.
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index c05d223b..5221b518 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 };
 
 class Record;
 
-// rich-text, tqunicode, far-east support Excel string
+// rich-text, unicode, far-east support Excel string
 
 class EString
 {
@@ -50,7 +50,7 @@ public:
   
   ~EString();
   
-  bool tqunicode() const;
+  bool unicode() const;
   
   void setUnicode( bool u );
   
diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp
index 6f12ae13..e4090cd9 100644
--- a/filters/kspread/excel/sidewinder/pole.cpp
+++ b/filters/kspread/excel/sidewinder/pole.cpp
@@ -95,7 +95,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in tqunicode anymore
+    std::string name;      // the name, not in unicode anymore
     bool dir;              // true if directory
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp
index b26ee196..304fed18 100644
--- a/filters/kspread/excel/sidewinder/ustring.cpp
+++ b/filters/kspread/excel/sidewinder/ustring.cpp
@@ -39,7 +39,7 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.tqunicode() )
+    : uc( c.unicode() )
 {
 }
 
@@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->tqunicode() < c2->tqunicode());
+    return (c1->unicode() < c2->unicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h
index 1c4f2bc5..3f41867b 100644
--- a/filters/kspread/excel/sidewinder/ustring.h
+++ b/filters/kspread/excel/sidewinder/ustring.h
@@ -68,7 +68,7 @@ namespace Swinder {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short tqunicode() const { return uc; }
+    unsigned short unicode() const { return uc; }
   public:
     /**
      * A static instance of UChar(0).
@@ -120,7 +120,7 @@ namespace Swinder {
     /**
      * @return Unicode value.
      */
-    unsigned short tqunicode() const { return ref().uc; }
+    unsigned short unicode() const { return ref().uc; }
     /**
      * @return Lower byte.
      */
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index b0709ede..22cc7407 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -540,7 +540,7 @@ TQDomElement GNUMERICExport::GetLinkStyle(TQDomDocument gnumeric_doc)
 
 TQDomElement GNUMERICExport::GetCellStyle(TQDomDocument gnumeric_doc,Cell * cell, int currentcolumn, int currentrow)
 {
-    TQColorGroup defaultColorGroup = TQApplication::tqpalette().active();
+    TQColorGroup defaultColorGroup = TQApplication::palette().active();
 
 	TQDomElement cell_style;
 
diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html
index 7bd198cc..a25cdf4b 100644
--- a/filters/kspread/gnumeric/status.html
+++ b/filters/kspread/gnumeric/status.html
@@ -211,7 +211,7 @@ Bold
 <br>Cell Size:Qt::Horizontal &amp;Qt::Vertical
 <br>Hidden columns/rows&nbsp;
 <br>Selected Tab
-<br>Paper tqlayout
+<br>Paper layout
 <br>area name
 <br>Cell comment
 <br>Text Rotation
diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui
index cfaedfa7..1b6ad59b 100644
--- a/filters/kspread/html/exportwidget.ui
+++ b/filters/kspread/html/exportwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -86,7 +86,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -222,7 +222,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
index 82f95406..fad0e0be 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
+++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
@@ -35,7 +35,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout5</cstring>
+                    <cstring>layout5</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -110,7 +110,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout8</cstring>
+                    <cstring>layout8</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -180,7 +180,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/filters/kspread/latex/export/config.h b/filters/kspread/latex/export/config.h
index 6e35bd1c..80549c41 100644
--- a/filters/kspread/latex/export/config.h
+++ b/filters/kspread/latex/export/config.h
@@ -84,8 +84,8 @@ class Config
 		bool convertPictures() const { return _convertPictures; }
 		TQString getPicturesDir() const { return _picturesDir; }
 		
-		bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
-		bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
+		bool mustUseUnicode() const { return (_encoding == "unicode"); }
+		bool mustUseLatin1() const { return (_encoding != "unicode"); }
 		TQString getEncoding() const { return _encoding; }
 		TQStringList getLanguagesList() const { return _languagesList; }
 		TQString getDefaultLanguage() const { return _defaultLanguage; }
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 7713a9dc..7a058550 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -99,7 +99,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
   classComboBox->insertItem("report");
   classComboBox->insertItem("slides");
 
-	encodingComboBox->insertItem("tqunicode");
+	encodingComboBox->insertItem("unicode");
   encodingComboBox->insertItem("ansinew");
   encodingComboBox->insertItem("applemac");
   encodingComboBox->insertItem("ascii");
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 8e0327c9..60412181 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -168,7 +168,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
 
   double height = -1.0;
   bool insertPageBreak = false;
-  Format tqlayout( table, table->doc()->styleManager()->defaultStyle() );
+  Format layout( table, table->doc()->styleManager()->defaultStyle() );
 
   while( !node.isNull() )
   {
@@ -190,7 +190,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
         }
       }
 
-      loadStyleProperties( &tqlayout, property );
+      loadStyleProperties( &layout, property );
     }
 
     node = node.nextSibling();
@@ -219,7 +219,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
   for ( int i = 0; i < number; ++i )
   {
     RowFormat * rowL = table->nonDefaultRowFormat( row );
-    rowL->copy( tqlayout );
+    rowL->copy( layout );
 
     if ( height != -1 )
     {
@@ -480,10 +480,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet  * table, int row,
         psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() );
 
       kdDebug(30518) << "Default style: " << psName << endl;
-      Format * tqlayout = m_defaultStyles[psName];
+      Format * layout = m_defaultStyles[psName];
 
-      if ( tqlayout )
-        cell->format()->copy( *tqlayout );
+      if ( layout )
+        cell->format()->copy( *layout );
 
       TQDomElement * st = 0;
       if ( e.hasAttributeNS( ooNS::table, "style-name" ) )
@@ -548,10 +548,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet  * table, int row,
 
       TQString psName( "Default" );
       kdDebug(30518) << "Default style: " << psName << endl;
-      Format * tqlayout = m_defaultStyles[psName];
+      Format * layout = m_defaultStyles[psName];
 
-      if ( tqlayout )
-        cell->format()->copy( *tqlayout );
+      if ( layout )
+        cell->format()->copy( *layout );
     }
     if ( e.hasAttributeNS( ooNS::table, "formula" ) )
     {
@@ -959,16 +959,16 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table )
       return false;
 
     RowFormat * srcLayout = table->nonDefaultRowFormat( backupRow );
-    RowFormat * tqlayout = 0;
+    RowFormat * layout = 0;
 
     if ( collapsed )
       srcLayout->setHide( true );
 
     for ( i = 1; i < number; ++i )
     {
-      tqlayout = table->nonDefaultRowFormat( backupRow + i );
+      layout = table->nonDefaultRowFormat( backupRow + i );
 
-      tqlayout->copy( *srcLayout );
+      layout->copy( *srcLayout );
 
       /*
        * TODO: Test: do we need to copy the cells, too?
@@ -1047,14 +1047,14 @@ bool OpenCalcImport::readColLayouts( TQDomElement & content, Sheet * table )
 
         if ( st && !st->isNull() )
         {
-          Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+          Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
 
-          readInStyle( tqlayout, *st );
+          readInStyle( layout, *st );
 
-          m_defaultStyles.insert( name, tqlayout );
+          m_defaultStyles.insert( name, layout );
           kdDebug(30518) << "Insert default cell style: " << name << endl;
 
-          defaultStyle = tqlayout;
+          defaultStyle = layout;
         }
       }
 
@@ -1281,7 +1281,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
     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( ooNS::fo, "page-width" ) )
@@ -1962,32 +1962,32 @@ TQString * OpenCalcImport::loadFormat( TQDomElement * element,
   return format;
 }
 
-void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font ) const
+void OpenCalcImport::loadFontStyle( Format * layout, TQDomElement const * font ) const
 {
-  if ( !font || !tqlayout )
+  if ( !font || !layout )
     return;
 
-  kdDebug(30518) << "Copy font style from the tqlayout " << font->tagName() << ", " << font->nodeName() << endl;
+  kdDebug(30518) << "Copy font style from the layout " << font->tagName() << ", " << font->nodeName() << endl;
 
   if ( font->hasAttributeNS( ooNS::fo, "font-family" ) )
-    tqlayout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
+    layout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
   if ( font->hasAttributeNS( ooNS::fo, "color" ) )
-    tqlayout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
+    layout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
   if ( font->hasAttributeNS( ooNS::fo, "font-size" ) )
-      tqlayout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
+      layout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
   else
-    tqlayout->setTextFontSize( 10 );
+    layout->setTextFontSize( 10 );
   if ( font->hasAttributeNS( ooNS::fo, "font-style" ) )
   {
     kdDebug(30518) << "italic" << endl;
-    tqlayout->setTextFontItalic( true ); // only thing we support
+    layout->setTextFontItalic( true ); // only thing we support
   }
   if ( font->hasAttributeNS( ooNS::fo, "font-weight" ) )
-    tqlayout->setTextFontBold( true ); // only thing we support
+    layout->setTextFontBold( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::fo, "text-underline" ) || font->hasAttributeNS( ooNS::style, "text-underline" ) )
-    tqlayout->setTextFontUnderline( true ); // only thing we support
+    layout->setTextFontUnderline( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::style, "text-crossing-out" ) )
-    tqlayout->setTextFontStrike( true ); // only thing we support
+    layout->setTextFontStrike( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::style, "font-pitch" ) )
   {
     // TODO: possible values: fixed, variable
@@ -1996,7 +1996,7 @@ void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font
   // text-underline-color
 }
 
-void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, bPos pos ) const
+void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bPos pos ) const
 {
   if ( borderDef == "none" )
     return;
@@ -2038,24 +2038,24 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef,
   pen.setColor( TQColor( borderDef.right( p - p2 ) ) );
 
   if ( pos == Left )
-    tqlayout->setLeftBorderPen( pen );
+    layout->setLeftBorderPen( pen );
   else if ( pos == Top )
-    tqlayout->setTopBorderPen( pen );
+    layout->setTopBorderPen( pen );
   else if ( pos == Right )
-    tqlayout->setRightBorderPen( pen );
+    layout->setRightBorderPen( pen );
   else if ( pos == Bottom )
-    tqlayout->setBottomBorderPen( pen );
+    layout->setBottomBorderPen( pen );
   else if ( pos == Border )
   {
-    tqlayout->setLeftBorderPen( pen );
-    tqlayout->setTopBorderPen( pen );
-    tqlayout->setRightBorderPen( pen );
-    tqlayout->setBottomBorderPen( pen );
+    layout->setLeftBorderPen( pen );
+    layout->setTopBorderPen( pen );
+    layout->setRightBorderPen( pen );
+    layout->setBottomBorderPen( pen );
   }
   // TODO Diagonals not supported by oocalc
 }
 
-void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const & property ) const
+void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const & property ) const
 {
   kdDebug(30518) << "*** Loading style properties *****" << endl;
 
@@ -2064,16 +2064,16 @@ void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const
     bool ok = false;
     int p = property.attributeNS( ooNS::style, "decimal-places", TQString() ).toInt( &ok );
     if (ok )
-      tqlayout->setPrecision( p );
+      layout->setPrecision( p );
   }
 
   if ( property.hasAttributeNS( ooNS::style, "font-name" ) )
   {
     TQDomElement * font = m_styles[ property.attributeNS( ooNS::style, "font-name", TQString() ) ];
-    loadFontStyle( tqlayout, font ); // generell font style
+    loadFontStyle( layout, font ); // generell font style
   }
 
-  loadFontStyle( tqlayout, &property ); // specific font style
+  loadFontStyle( layout, &property ); // specific font style
 
   // TODO:
   //   diagonal: fall + goup
@@ -2090,133 +2090,133 @@ void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const
     bool ok = false;
     int a = property.attributeNS( ooNS::style, "rotation-angle", TQString() ).toInt( &ok );
     if ( ok )
-      tqlayout->setAngle( -a + 1 );
+      layout->setAngle( -a + 1 );
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "direction" ) )
   {
-      tqlayout->setVerticalText( true );
+      layout->setVerticalText( true );
   }
   if ( property.hasAttributeNS( ooNS::fo, "text-align" ) )
   {
     TQString s = property.attributeNS( ooNS::fo, "text-align", TQString() );
     if ( s == "center" )
-      tqlayout->setAlign( Format::Center );
+      layout->setAlign( Format::Center );
     else if ( s == "end" )
-      tqlayout->setAlign( Format::Right );
+      layout->setAlign( Format::Right );
     else if ( s == "start" )
-      tqlayout->setAlign( Format::Left );
+      layout->setAlign( Format::Left );
     else if ( s == "justify" ) // TODO in KSpread!
-      tqlayout->setAlign( Format::Center );
+      layout->setAlign( Format::Center );
   }
   if (  property.hasAttributeNS( ooNS::fo, "margin-left" ) )
   {
       kdDebug(30518)<<"margin-left :"<<KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 )<<endl;
-      tqlayout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
+      layout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
   }
   if ( property.hasAttributeNS( ooNS::fo, "background-color" ) )
-    tqlayout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
+    layout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
 
   if ( property.hasAttributeNS( ooNS::style, "print-content" ) )
   {
     if ( property.attributeNS( ooNS::style, "print-content", TQString() ) == "false" )
-      tqlayout->setDontPrintText( false );
+      layout->setDontPrintText( false );
   }
   if ( property.hasAttributeNS( ooNS::style, "cell-protect" ) )
   {
     TQString prot( property.attributeNS( ooNS::style, "cell-protect", TQString() ) );
     if ( prot == "none" )
     {
-      tqlayout->setNotProtected( true );
-      tqlayout->setHideFormula( false );
-      tqlayout->setHideAll( false );
+      layout->setNotProtected( true );
+      layout->setHideFormula( false );
+      layout->setHideAll( false );
     }
     else if ( prot == "formula-hidden" )
     {
-      tqlayout->setNotProtected( true );
-      tqlayout->setHideFormula( true );
-      tqlayout->setHideAll( false );
+      layout->setNotProtected( true );
+      layout->setHideFormula( true );
+      layout->setHideAll( false );
     }
     else if ( prot == "protected formula-hidden" )
     {
-      tqlayout->setNotProtected( false );
-      tqlayout->setHideFormula( true );
-      tqlayout->setHideAll( false );
+      layout->setNotProtected( false );
+      layout->setHideFormula( true );
+      layout->setHideAll( false );
     }
     else if ( prot == "hidden-and-protected" )
     {
-      tqlayout->setNotProtected( false );
-      tqlayout->setHideFormula( false );
-      tqlayout->setHideAll( true );
+      layout->setNotProtected( false );
+      layout->setHideFormula( false );
+      layout->setHideAll( true );
     }
     else if ( prot == "protected" )
     {
-      tqlayout->setNotProtected( false );
-      tqlayout->setHideFormula( false );
-      tqlayout->setHideAll( false );
+      layout->setNotProtected( false );
+      layout->setHideFormula( false );
+      layout->setHideAll( false );
     }
     kdDebug(30518) << "Cell " << prot << endl;
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "padding-left" ) )
-    tqlayout->setIndent(  KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
+    layout->setIndent(  KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
 
   if ( property.hasAttributeNS( ooNS::fo, "vertical-align" ) )
   {
     TQString s = property.attributeNS( ooNS::fo, "vertical-align", TQString() );
     if ( s == "middle" )
-      tqlayout->setAlignY( Format::Middle );
+      layout->setAlignY( Format::Middle );
     else if ( s == "bottom" )
-      tqlayout->setAlignY( Format::Bottom );
+      layout->setAlignY( Format::Bottom );
     else
-      tqlayout->setAlignY( Format::Top );
+      layout->setAlignY( Format::Top );
   }
   else
-      tqlayout->setAlignY( Format::Bottom );
+      layout->setAlignY( Format::Bottom );
 
   if ( property.hasAttributeNS( ooNS::fo, "wrap-option" ) )
   {
-    tqlayout->setMultiRow( true );
+    layout->setMultiRow( true );
 
     /* we do not support anything else yet
       TQString s = property.attributeNS( ooNS::fo, "wrap-option", TQString() );
       if ( s == "wrap" )
-      tqlayout->setMultiRow( true );
+      layout->setMultiRow( true );
     */
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-bottom" ) )
   {
-    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
+    loadBorder( layout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
     // TODO: style:border-line-width-bottom if double!
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-right" ) )
   {
-    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
+    loadBorder( layout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
     // TODO: style:border-line-width-right
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-top" ) )
   {
-    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
+    loadBorder( layout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
     // TODO: style:border-line-width-top
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-left" ) )
   {
-    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
+    loadBorder( layout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
     // TODO: style:border-line-width-left
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border" ) )
   {
-    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
+    loadBorder( layout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
     // TODO: style:border-line-width-left
   }
 }
 
-void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style )
+void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
 {
   kdDebug(30518) << "** Reading Style: " << style.tagName() << "; " << style.attributeNS( ooNS::style, "name", TQString()) << endl;
   if ( style.localName() == "style" && style.namespaceURI()==ooNS::style)
@@ -2225,20 +2225,20 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
     {
       Format * cp
         = m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) );
-      kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
+      kdDebug(30518) << "Copying layout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
 
       if ( cp != 0 )
-        tqlayout->copy( *cp );
+        layout->copy( *cp );
     }
     else if ( style.hasAttributeNS( ooNS::style, "family") )
     {
       TQString name = style.attribute( "style-family" ) + "default";
       Format * cp = m_defaultStyles.find( name );
 
-      kdDebug(30518) << "Copying tqlayout from " << name << ", " << !cp << endl;
+      kdDebug(30518) << "Copying layout from " << name << ", " << !cp << endl;
 
       if ( cp != 0 )
-        tqlayout->copy( *cp );
+        layout->copy( *cp );
     }
 
     if ( style.hasAttributeNS( ooNS::style, "data-style-name" ) )
@@ -2255,8 +2255,8 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
 
       if ( format )
       {
-        tqlayout->setFormatString( *format );
-        tqlayout->setFormatType( formatType );
+        layout->setFormatString( *format );
+        layout->setFormatType( formatType );
       }
 
       // <number:currency-symbol number:language="de" number:country="DE">€</number:currency-symbol>
@@ -2267,9 +2267,9 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
   forEachElement( property, style )
   {
     if ( property.localName() == "properties" && property.namespaceURI() == ooNS::style )
-      loadStyleProperties( tqlayout, property );
+      loadStyleProperties( layout, property );
 
-    kdDebug(30518) << tqlayout->textFontFamily( 0, 0 ) << endl;
+    kdDebug(30518) << layout->textFontFamily( 0, 0 ) << endl;
   }
 }
 
@@ -2358,13 +2358,13 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
 
     if ( !e.isNull() )
     {
-      Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+      Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
 
-      readInStyle( tqlayout, e );
+      readInStyle( layout, e );
       kdDebug(30518) << "Default style " << e.attributeNS( ooNS::style, "family", TQString() ) << "default" << " loaded " << endl;
 
-      m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", tqlayout );
-      //      TQFont font = tqlayout->font();
+      m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", layout );
+      //      TQFont font = layout->font();
       //      kdDebug(30518) << "Font: " << font.family() << ", " << font.toString() << endl;
     }
 
@@ -2384,12 +2384,12 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
       continue;
     }
 
-    Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
-    readInStyle( tqlayout, defs );
+    Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+    readInStyle( layout, defs );
     kdDebug(30518) << "Default style " << defs.attributeNS( ooNS::style, "name", TQString() ) << " loaded " << endl;
 
-    m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), tqlayout );
-    //    kdDebug(30518) << "Font: " << tqlayout->font().family() << ", " << tqlayout->font().toString() << endl;
+    m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), layout );
+    //    kdDebug(30518) << "Font: " << layout->font().family() << ", " << layout->font().toString() << endl;
 
     defs = defs.nextSibling().toElement();
   }
diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h
index 071a87ff..8965dae5 100644
--- a/filters/kspread/opencalc/opencalcimport.h
+++ b/filters/kspread/opencalc/opencalcimport.h
@@ -90,10 +90,10 @@ class OpenCalcImport : public KoFilter
   bool readRowsAndCells( TQDomElement & content, KSpread::Sheet * table );
   bool readCells( TQDomElement & rowNode, KSpread::Sheet  * table, int row, int & columns );
   void convertFormula( TQString & text, TQString const & f ) const;
-  void loadFontStyle( KSpread::Format * tqlayout, TQDomElement const * font ) const;
-  void readInStyle( KSpread::Format * tqlayout, TQDomElement const & style );
-  void loadStyleProperties( KSpread::Format * tqlayout, TQDomElement const & property ) const;
-  void loadBorder( KSpread::Format * tqlayout, TQString const & borderDef, bPos pos ) const;
+  void loadFontStyle( KSpread::Format * layout, TQDomElement const * font ) const;
+  void readInStyle( KSpread::Format * layout, TQDomElement const & style );
+  void loadStyleProperties( KSpread::Format * layout, TQDomElement const & property ) const;
+  void loadBorder( KSpread::Format * layout, TQString const & borderDef, bPos pos ) const;
   void loadTableMasterStyle( KSpread::Sheet * table, TQString const & stylename );
   TQString * loadFormat( TQDomElement * element,
                         KSpread::FormatType & formatType,
diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html
index 2bd1fc05..b23f6ae9 100644
--- a/filters/kspread/opencalc/status.html
+++ b/filters/kspread/opencalc/status.html
@@ -51,7 +51,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
     Borders, background colors<br>
     column width, row width<br>
     column layouts, row layouts<br>
-    page tqlayout (size, border)<br>
+    page layout (size, border)<br>
     OpenCalc style import, default style<br>
     format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)<br>
     header, footer (including macros)<br>
@@ -169,7 +169,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
 
 <td>
  Jan 12, 2003 - Initial Revision<br>
- Jan 18, 2003 - page tqlayout, header, footer<br>
+ Jan 18, 2003 - page layout, header, footer<br>
  Jan 19, 2003 - Added support for fonts, text color, background color, formula 
 conversion<br>
  Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells<br>
diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc
index 1687e958..7c45f07a 100644
--- a/filters/kword/abiword/ImportFormatting.cc
+++ b/filters/kword/abiword/ImportFormatting.cc
@@ -208,7 +208,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement,
             followingElement.setAttribute("name","Normal");
             layoutElement.appendChild(followingElement);
         }
-        // Else: we are a tqlayout, so we leave the work to KWord (from the style)
+        // Else: we are a layout, so we leave the work to KWord (from the style)
     }
     else
     {
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index d4a9819f..cacfcea7 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -84,7 +84,7 @@ public:
     virtual bool doCloseFile(void); // Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doOpenTextFrameSet(void); // AbiWord's <section>
     virtual bool doCloseTextFrameSet(void); // AbiWord's </section>
@@ -95,7 +95,7 @@ public:
     virtual bool doCloseHead(void); // Write <papersize>
     virtual bool doOpenStyles(void); // AbiWord's <styles>
     virtual bool doCloseStyles(void); // AbiWord's </styles>
-    virtual bool doFullDefineStyle(LayoutData& tqlayout); // AbiWord's <s></s>
+    virtual bool doFullDefineStyle(LayoutData& layout); // AbiWord's <s></s>
     virtual bool doOpenSpellCheckIgnoreList (void); // AbiWord's <ignorewords>
     virtual bool doCloseSpellCheckIgnoreList (void); // AbiWord's </ignorewords>
     virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); // AbiWord's <iw>
@@ -116,7 +116,7 @@ private:
     TQString textFormatToAbiProps(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force) const;
     TQString layoutToCss(const LayoutData& layoutOrigin,
-        const LayoutData& tqlayout, const bool force) const;
+        const LayoutData& layout, const bool force) const;
     TQString escapeAbiWordText(const TQString& strText) const;
     bool makeTable(const FrameAnchor& anchor);
     bool makePicture(const FrameAnchor& anchor);
@@ -649,7 +649,7 @@ void AbiWordWorker::processVariable ( const TQString&,
                         TQString fstr;
                         TQValueList<ParaData>::ConstIterator it;
                         for (it=paraList->begin();it!=paraList->end();it++)
-                            fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList);
+                            fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList);
                         str += "{\\super ";
                         str += automatic ? "\\chftn " : value;
                         str += "{\\footnote ";
@@ -719,50 +719,50 @@ void AbiWordWorker::processParagraphData ( const TQString &paraText,
 }
 
 TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
-    const LayoutData& tqlayout, const bool force) const
+    const LayoutData& layout, const bool force) const
 {
     TQString props;
 
-    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
+    if (force || (layoutOrigin.alignment!=layout.alignment))
     {
         // Check if the current alignment is a valid one for AbiWord.
-        if ((tqlayout.alignment == "left") || (tqlayout.alignment == "right")
-            || (tqlayout.alignment == "center")  || (tqlayout.alignment == "justify"))
+        if ((layout.alignment == "left") || (layout.alignment == "right")
+            || (layout.alignment == "center")  || (layout.alignment == "justify"))
         {
             props += "text-align:";
-            props += tqlayout.alignment;
+            props += layout.alignment;
             props += "; ";
         }
-        else if (tqlayout.alignment == "auto")
+        else if (layout.alignment == "auto")
         {
             // We assume a left alignment as AbiWord is not really bi-di (and this filter even less.)
             props += "text-align:left; ";
         }
         else
         {
-            kdWarning(30506) << "Unknown alignment: " << tqlayout.alignment << endl;
+            kdWarning(30506) << "Unknown alignment: " << layout.alignment << endl;
         }
     }
 
     // TODO/FIXME: what if all tabulators must be erased?
 #if 0
     // DEPRECATED!
-    if (!tqlayout.tabulator.isEmpty()
-        && (force || (layoutOrigin.tabulator!=tqlayout.tabulator)))
+    if (!layout.tabulator.isEmpty()
+        && (force || (layoutOrigin.tabulator!=layout.tabulator)))
     {
         props += "tabstops:";
-        props += tqlayout.tabulator;
+        props += layout.tabulator;
         props += "; ";
     }
 #endif
-    if (!tqlayout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
+    if (!layout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
     {
         props += "tabstops:";
         bool first=true;
         TabulatorList::ConstIterator it;
-		TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
-        for (it=tqlayout.tabulatorList.begin();it!=end;++it)
+		TabulatorList::ConstIterator end(layout.tabulatorList.end());
+        for (it=layout.tabulatorList.begin();it!=end;++it)
         {
             if (first)
             {
@@ -789,48 +789,48 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
         props += "; ";
     }
 
-    if ((tqlayout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
+    if ((layout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
     {
-        props += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
+        props += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
     }
 
-    if ((tqlayout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
+    if ((layout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
     {
-        props += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
+        props += TQString("margin-right:%1pt; ").arg(layout.indentRight);
     }
 
-    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
     {
         props += "text-indent: ";
-        props += TQString::number(tqlayout.indentFirst);
+        props += TQString::number(layout.indentFirst);
         props += "pt; ";
     }
 
-    if ((tqlayout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
+    if ((layout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
     {
-       props += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
+       props += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
     }
 
-    if ((tqlayout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
+    if ((layout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
     {
-       props += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
+       props += TQString("margin-top:%1pt; ").arg(layout.marginTop);
     }
 
     if (force
-        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
     {
-        switch ( tqlayout.lineSpacingType )
+        switch ( layout.lineSpacingType )
         {
         case LayoutData::LS_CUSTOM:
             {
                 // We have a custom line spacing (in points). However AbiWord cannot do it, so transform in "at-least"
                 props += "line-height=:";
-                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
                 props += "pt+; ";
                 break;
             }
@@ -852,7 +852,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
         case LayoutData::LS_MULTIPLE:
             {
                 props += "line-height:";
-                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
                 props += "; ";
                 break;
             }
@@ -860,7 +860,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
             {
                 // We have a fixed line height (in points)
                 props += "line-height:";
-                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
                 props += "pt; ";
                 break;
             }
@@ -868,32 +868,32 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
             {
                 // We have an "at-least" line height (in points)
                 props += "line-height=:";
-                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
                 props += "pt+; "; // The + makes the difference
                 break;
             }
         default:
             {
-                kdWarning(30506) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30506) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
     }
 
     // Add all AbiWord properties collected in the <FORMAT> element
-    props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force);
+    props += textFormatToAbiProps(layoutOrigin.formatData.text,layout.formatData.text,force);
 
     return props;
 }
 
-bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
     const ValueListFormatData& paraFormatDataList)
 {
-    TQString style=tqlayout.styleName;
+    TQString style=layout.styleName;
 
     const LayoutData& styleLayout=m_styleMap[style];
 
-    TQString props=layoutToCss(styleLayout,tqlayout,false);
+    TQString props=layoutToCss(styleLayout,layout,false);
 
     *m_streamOut << "<p";
     if (!style.isEmpty())
@@ -916,16 +916,16 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
     *m_streamOut << ">";  //Warning: No trailing white space or else it's in the text!!!
 
     // Before processing the text, test if we have a page break
-    if (tqlayout.pageBreakBefore)
+    if (layout.pageBreakBefore)
     {
         // We have a page break before the paragraph
         *m_streamOut << "<pbr/>";
     }
 
-    processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
+    processParagraphData(paraText, layout.formatData.text, paraFormatDataList);
 
     // Before closing the paragraph, test if we have a page break
-    if (tqlayout.pageBreakAfter)
+    if (layout.pageBreakAfter)
     {
         // We have a page break after the paragraph
         *m_streamOut << "<pbr/>";
@@ -935,26 +935,26 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
     return true;
 }
 
-bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout)
+bool AbiWordWorker::doFullDefineStyle(LayoutData& layout)
 {
     //Register style in the style map
-    m_styleMap[tqlayout.styleName]=tqlayout;
+    m_styleMap[layout.styleName]=layout;
 
     *m_streamOut << "<s";
 
     // TODO: cook the style name to the standard style names in AbiWord
-    *m_streamOut << " name=\"" << EscapeXmlText(tqlayout.styleName,true,true) << "\"";
-    *m_streamOut << " followedby=\"" << EscapeXmlText(tqlayout.styleFollowing,true,true) << "\"";
+    *m_streamOut << " name=\"" << EscapeXmlText(layout.styleName,true,true) << "\"";
+    *m_streamOut << " followedby=\"" << EscapeXmlText(layout.styleFollowing,true,true) << "\"";
 
-    if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
-        && (tqlayout.counter.depth<10) )
+    if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
+        && (layout.counter.depth<10) )
     {
         *m_streamOut << " level=\"";
-        *m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
+        *m_streamOut << TQString::number(layout.counter.depth+1,10);
         *m_streamOut << "\"";
     }
 
-    TQString abiprops=layoutToCss(tqlayout,tqlayout,true);
+    TQString abiprops=layoutToCss(layout,layout,true);
 
     const int result=abiprops.findRev(";");
     if (result>=0)
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index b21c6609..2c7e4d3f 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -363,7 +363,7 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent,
     stackItem->stackElementFormatsPlural=formatsPluralElementOut; // <FORMATS>
     stackItem->pos=0; // No text characters yet
 
-    // Now we populate the tqlayout
+    // Now we populate the layout
     TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
     paragraphElementOut.appendChild(layoutElement);
 
@@ -817,7 +817,7 @@ static bool StartElementPBR(StackItem* /*stackItem*/, StackItem* stackCurrent,
     TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS");
     paragraphElementOut.appendChild(formatsPluralElementOut);
 
-    // We must now copy/clone the tqlayout of elementText.
+    // We must now copy/clone the layout of elementText.
 
     TQDomNodeList nodeList=stackCurrent->stackElementParagraph.elementsByTagName("LAYOUT");
 
@@ -1159,7 +1159,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
     stackItem->strTemp2=TQString::number(tableNumber); // needed as I18N does not allow adding phrases
     stackItem->pos=1; // Just #
 
-    // Now we populate the tqlayout
+    // Now we populate the layout
     TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
     paragraphElementOut.appendChild(layoutElement);
 
diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt
index f628f595..15f20037 100644
--- a/filters/kword/amipro/FileFormat.txt
+++ b/filters/kword/amipro/FileFormat.txt
@@ -185,7 +185,7 @@ Normally this appears in beginning of paragraph.
 
 5  Page Layout
 -------------
-Page tqlayout is defined in section [lay]. Here is the format,
+Page layout is defined in section [lay]. Here is the format,
 along with an example:
 
   [lay]
diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc
index 4084d335..e6703fc0 100644
--- a/filters/kword/amipro/amiproexport.cc
+++ b/filters/kword/amipro/amiproexport.cc
@@ -50,7 +50,7 @@ class AmiProWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
@@ -116,7 +116,7 @@ static TQString AmiProEscape( const TQString& text )
   for( unsigned i=0; i<text.length(); i++ )
   {
     TQChar ch = text[i];
-    switch( ch.tqunicode() )
+    switch( ch.unicode() )
     {
       case '<': result += "<<"; break;
       case '>': result += "<;>"; break;
@@ -131,7 +131,7 @@ static TQString AmiProEscape( const TQString& text )
 }
 
 bool AmiProWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList)
 {
   TQString amiproText = "";
   TQString text = paraText;
diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc
index 6061da20..fe45ca18 100644
--- a/filters/kword/amipro/amiproimport.cc
+++ b/filters/kword/amipro/amiproimport.cc
@@ -124,43 +124,43 @@ static TQString AmiProFormatListAsXML( AmiProFormatList& formatList )
   return result;
 }
 
-// helper function to convert AmiPro paragraph tqlayout to KWord's LAYOUT
-static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout )
+// helper function to convert AmiPro paragraph layout to KWord's LAYOUT
+static TQString AmiProLayoutAsXML( const AmiProLayout& layout )
 {
   TQString result;
 
-  TQString referredStyle = tqlayout.name;
+  TQString referredStyle = layout.name;
   if( referredStyle.isEmpty() ) referredStyle = "Standard";
 
-  TQString fontname = tqlayout.fontFamily;
+  TQString fontname = layout.fontFamily;
   if( fontname.isEmpty() ) fontname = KoGlobal::defaultFont().family();
-  TQString fontsize = TQString::number( tqlayout.fontSize );
-  TQString fontcolor = "red=\"" + TQString::number( tqlayout.fontColor.red() ) +
-    "\"  green=\"" +  TQString::number( tqlayout.fontColor.green() ) +
-    "\"  blue=\"" + TQString::number( tqlayout.fontColor.blue() ) + "\"";
-  TQString boldness = tqlayout.bold ? "75" : "50";
-  TQString italic = tqlayout.italic ? "1" : "0";
-  TQString strikeout = tqlayout.strikethrough ? "1" : "0";
-  TQString vertalign = tqlayout.superscript ? "2" : tqlayout.subscript ? "1" : "0";
-  TQString underline = tqlayout.double_underline ? "double" :
-    tqlayout.underline|tqlayout.word_underline ? "1" : "0";
+  TQString fontsize = TQString::number( layout.fontSize );
+  TQString fontcolor = "red=\"" + TQString::number( layout.fontColor.red() ) +
+    "\"  green=\"" +  TQString::number( layout.fontColor.green() ) +
+    "\"  blue=\"" + TQString::number( layout.fontColor.blue() ) + "\"";
+  TQString boldness = layout.bold ? "75" : "50";
+  TQString italic = layout.italic ? "1" : "0";
+  TQString strikeout = layout.strikethrough ? "1" : "0";
+  TQString vertalign = layout.superscript ? "2" : layout.subscript ? "1" : "0";
+  TQString underline = layout.double_underline ? "double" :
+    layout.underline|layout.word_underline ? "1" : "0";
 
   TQString align;
-  align = tqlayout.align==TQt::AlignLeft ? "left" :
-          tqlayout.align==TQt::AlignRight ? "right" :
-          tqlayout.align==TQt::AlignCenter ? "center" :
-          tqlayout.align==TQt::AlignJustify ? "justify" :
+  align = layout.align==TQt::AlignLeft ? "left" :
+          layout.align==TQt::AlignRight ? "right" :
+          layout.align==TQt::AlignCenter ? "center" :
+          layout.align==TQt::AlignJustify ? "justify" :
           "left";
 
   TQString offsets;
-  offsets = "before=\"" + TQString::number(tqlayout.spaceBefore) +
-            "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\"";
+  offsets = "before=\"" + TQString::number(layout.spaceBefore) +
+            "\" after=\"" + TQString::number(layout.spaceAfter) + "\"";
 
   TQString linespacing;
-  linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
-                tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
-                tqlayout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
-                  TQString::number( tqlayout.linespace );
+  linespacing = layout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
+                layout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
+                layout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
+                  TQString::number( layout.linespace );
 
   result.append( "<LAYOUT>\n" );
   result.append( "  <NAME value=\"" + XMLEscape( referredStyle ) + "\" />\n" );
@@ -308,12 +308,12 @@ bool AmiProConverter::doDefineStyle( const AmiProStyle& style )
 }
 
 bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList formatList,
-  AmiProLayout& tqlayout )
+  AmiProLayout& layout )
 {
   root.append( "<PARAGRAPH>\n" );
   root.append( "<TEXT>" + XMLEscape( text ) + "</TEXT>\n" );
   root.append( AmiProFormatListAsXML( formatList ) );
-  root.append( AmiProLayoutAsXML( tqlayout ) );
+  root.append( AmiProLayoutAsXML( layout ) );
   root.append( "</PARAGRAPH>\n" );
 
   return true;
diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp
index 8d2bed03..3b07c201 100644
--- a/filters/kword/amipro/amiproparser.cpp
+++ b/filters/kword/amipro/amiproparser.cpp
@@ -83,7 +83,7 @@ static TQString AmiProUnescape( const TQString& str )
         else
         {
           result.truncate( result.length() - 1 ); // remove the '<'
-          result.append( TQChar(str[i+2].tqunicode() + 0x40 ) );
+          result.append( TQChar(str[i+2].unicode() + 0x40 ) );
           i += 3;
         }
       }
@@ -92,7 +92,7 @@ static TQString AmiProUnescape( const TQString& str )
       if( str[i+1] == '\\' )
       {
         result.truncate( result.length() - 1 ); // remove the '<'
-        result.append( TQChar(str[i+2].tqunicode() | 0x80 ) );
+        result.append( TQChar(str[i+2].unicode() | 0x80 ) );
         i += 3;
       }
 
@@ -628,7 +628,7 @@ void AmiProFormat::applyStyle( const AmiProStyle& style )
   strikethrough = style.strikethrough;
 }
 
-// paragraph tqlayout
+// paragraph layout
 AmiProLayout::AmiProLayout()
 {
   name = "";
diff --git a/filters/kword/amipro/amiproparser.h b/filters/kword/amipro/amiproparser.h
index 40a8f82b..b6f07753 100644
--- a/filters/kword/amipro/amiproparser.h
+++ b/filters/kword/amipro/amiproparser.h
@@ -104,7 +104,7 @@ class AmiProListener
     virtual bool doCloseDocument();   
     virtual bool doDefineStyle( const AmiProStyle& style );
     virtual bool doParagraph( const TQString& text, AmiProFormatList formatList, 
-      AmiProLayout& tqlayout );
+      AmiProLayout& layout );
 };
 
 class AmiProParser
@@ -144,7 +144,7 @@ class AmiProParser
     bool processOpenDocument();
     bool processCloseDocument();
     bool processParagraph( const TQString& text, AmiProFormatList formatList,
-      AmiProLayout& tqlayout );
+      AmiProLayout& layout );
 
 };
 
diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui
index 8ba0d757..9345a64c 100644
--- a/filters/kword/ascii/ExportDialogUI.ui
+++ b/filters/kword/ascii/ExportDialogUI.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui
index d173386f..4b32a441 100644
--- a/filters/kword/ascii/ImportDialogUI.ui
+++ b/filters/kword/ascii/ImportDialogUI.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc
index 7bba005c..f31818f9 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cc
@@ -86,7 +86,7 @@ public:
     virtual bool doFullParagraphList(const TQValueList<ParaData>& paraList);
     virtual bool doFullParagraph(const ParaData& para);
     virtual bool doFullParagraph(const TQString& paraText,
-        const LayoutData& tqlayout,
+        const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
 
 public:
@@ -204,10 +204,10 @@ bool ASCIIWorker::doFullParagraphList(const TQValueList<ParaData>& paraList)
 
 bool ASCIIWorker::doFullParagraph(const ParaData& para)
 {
-    return doFullParagraph(para.text, para.tqlayout, para.formattingList);
+    return doFullParagraph(para.text, para.layout, para.formattingList);
 }
 
-bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
     const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30502) << "Entering ASCIIWorker::doFullParagraph" << endl;
@@ -216,15 +216,15 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq
     // As KWord has only one depth of lists, we can process lists very simply.
     // --
     // Not anymore - Clarence
-    if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
+    if ( layout.counter.numbering == CounterData::NUM_LIST )
     {
         // Are we still in a list of the right type?
-        if (!m_inList || (tqlayout.counter.style!=m_typeList))
+        if (!m_inList || (layout.counter.style!=m_typeList))
         {
             // We are not yet part of a list
             m_inList=true;
             m_counterList=1; // Start numbering
-            m_typeList=tqlayout.counter.style;
+            m_typeList=layout.counter.style;
         }
 
         switch (m_typeList)
@@ -307,26 +307,26 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq
     else
     {
         m_inList=false; // Close an eventual list
-        if ( tqlayout.counter.numbering == CounterData::NUM_CHAPTER )
+        if ( layout.counter.numbering == CounterData::NUM_CHAPTER )
         {
-            if (!tqlayout.counter.depth)
+            if (!layout.counter.depth)
             {   // HEAD 1
                 *m_streamOut << "###################################" << m_eol;
                 *m_streamOut << "# ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
                 *m_streamOut << "###################################" << m_eol;
             }
-            else if (tqlayout.counter.depth==1)
+            else if (layout.counter.depth==1)
             {   // HEAD 2
                 *m_streamOut << "#### ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
             }
-            else if (tqlayout.counter.depth==2)
+            else if (layout.counter.depth==2)
             {   // HEAD 3
                 *m_streamOut << "## ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
             }
-            else if (tqlayout.counter.depth==3)
+            else if (layout.counter.depth==3)
             {   // HEAD 4
                 *m_streamOut << "# ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
@@ -342,8 +342,8 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq
         }
     }
 #else
-    if (!tqlayout.counter.text.isEmpty())
-        *m_streamOut << tqlayout.counter.text << " ";
+    if (!layout.counter.text.isEmpty())
+        *m_streamOut << layout.counter.text << " ";
 
     if (!ProcessParagraphData(paraText, paraFormatDataList)) return false;
 #endif
@@ -357,7 +357,7 @@ bool ASCIIWorker::ProcessTable(const Table& table)
 {
     kdDebug(30502) << "processTable CALLED!" << endl;
 
-    // just dump the table out (no tqlayout for now)
+    // just dump the table out (no layout for now)
     for (TQValueList<TableCell>::ConstIterator it = table.cellList.begin();
          it != table.cellList.end();
          it++)
diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc
index 372a3b5c..f54bec6b 100644
--- a/filters/kword/docbook/docbookexport.cc
+++ b/filters/kword/docbook/docbookexport.cc
@@ -296,12 +296,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData &para,
                         fixedFont = true;
                     }
 
-                    if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic )
+                    if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic )
                     {
                         outputText += "<EMPHASIS>";
                     }
 
-                    if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
+                    if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
                     {
                         outputText += "<EMPHASIS ROLE=bold>";
                     }
@@ -318,12 +318,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData &para,
                         outputText += "</LITERAL>";
                     }
 
-                    if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
+                    if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
                     {
                         outputText += "</EMPHASIS>";
                     }
 
-                    if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic )
+                    if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic )
                     {
                         outputText += "</EMPHASIS>";
                     }
@@ -516,10 +516,10 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
 	TQValueList<ParaData>::ConstIterator end(paraList.end ());
     for ( paraIt = paraList.begin (); paraIt != end ; ++paraIt )
     {
-        switch ( (*paraIt).tqlayout.counter.numbering )
+        switch ( (*paraIt).layout.counter.numbering )
         {
             case CounterData::NUM_LIST:
-                switch ( (*paraIt).tqlayout.counter.style )
+                switch ( (*paraIt).layout.counter.style )
                 {
                     case CounterData::STYLE_CUSTOMBULLET:
                     case CounterData::STYLE_CIRCLEBULLET:
@@ -581,7 +581,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
                         break;
 
                     default:
-                        kdError (30507) << "Unknown counter style " << (*paraIt).tqlayout.counter.style << "!" << endl;
+                        kdError (30507) << "Unknown counter style " << (*paraIt).layout.counter.style << "!" << endl;
                         CloseLists ();
                         OpenArticleUnlessHead1 ();
                         ProcessParagraphData (*paraIt, "PARA" );
@@ -590,7 +590,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
                 break;
 
             case CounterData::NUM_CHAPTER:
-                switch ( (*paraIt).tqlayout.counter.depth )
+                switch ( (*paraIt).layout.counter.depth )
                 {
                     case 0:
                         CloseHead1AndArticle ();
@@ -629,7 +629,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
                         break;
 
                     default:
-                        kdError (30507) << "Unexpected chapter depth " << (*paraIt).tqlayout.counter.depth << "!" << endl;
+                        kdError (30507) << "Unexpected chapter depth " << (*paraIt).layout.counter.depth << "!" << endl;
                         CloseLists ();
                         OpenArticleUnlessHead1 ();
                         ProcessParagraphData (*paraIt, "PARA" );
diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp
index 261ef526..cb3771f5 100644
--- a/filters/kword/hancomword/pole.cpp
+++ b/filters/kword/hancomword/pole.cpp
@@ -96,7 +96,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in tqunicode anymore 
+    std::string name;      // the name, not in unicode anymore 
     bool dir;              // true if directory   
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc
index b0290371..8199f173 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cc
@@ -308,37 +308,37 @@ void HtmlBasicWorker::closeFormatData(const FormatData& formatOrigin,
 }
 
 void HtmlBasicWorker::openParagraph(const TQString& strTag,
-    const LayoutData& tqlayout, TQChar::Direction direction)
+    const LayoutData& layout, TQChar::Direction direction)
 {
     *m_streamOut << '<' << strTag;
 
-    if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
-        || (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
+    if ( (layout.alignment=="left") || (layout.alignment== "right")
+        || (layout.alignment=="center") || (layout.alignment=="justify"))
     {
-        *m_streamOut << " align=\"" << tqlayout.alignment << "\"";
+        *m_streamOut << " align=\"" << layout.alignment << "\"";
         if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) )
           *m_streamOut << " dir=\"rtl\"";
     }
-    else if ( tqlayout.alignment=="auto")
+    else if ( layout.alignment=="auto")
     {
         // Do nothing, the user-agent should be more intelligent than us.
     }
     else
     {
-        kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
+        kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
     }
 
     *m_streamOut << ">";
 
     // Allow bold only if tag is not a heading!
-    openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
+    openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
 }
 
 void HtmlBasicWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& tqlayout)
+    const LayoutData& layout)
 {
      // Allow bold only if tag is not a heading!
-    closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
+    closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
 
     *m_streamOut << "</" << strTag << ">\n";
 }
diff --git a/filters/kword/html/export/ExportBasic.h b/filters/kword/html/export/ExportBasic.h
index a6de0082..c8f2864c 100644
--- a/filters/kword/html/export/ExportBasic.h
+++ b/filters/kword/html/export/ExportBasic.h
@@ -33,9 +33,9 @@ public:
 protected:
     virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
     virtual void openParagraph(const TQString& strTag,
-        const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
+        const LayoutData& layout,TQChar::Direction direction=TQChar::DirL);
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& tqlayout);
+        const LayoutData& layout);
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual bool doOpenBody(void); ///< HTML's \<body\>
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index 52d56fbf..7af3dcdf 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -52,7 +52,7 @@ TQString HtmlCssWorker::escapeCssIdentifier(const TQString& strText) const
     for (uint i=0; i<strText.length(); i++)
     {
         const TQChar qch(strText.at(i));
-        const ushort ch=qch.tqunicode();
+        const ushort ch=qch.unicode();
 
         if (((ch>='a') && (ch<='z'))
             || ((ch>='A') && (ch<='Z'))
@@ -309,68 +309,68 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi
 }
 
 TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
-    const LayoutData& tqlayout, const bool force) const
+    const LayoutData& layout, const bool force) const
 {
     TQString strLayout;
 
-    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
+    if (force || (layoutOrigin.alignment!=layout.alignment))
     {
-        if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
-            || (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
+        if ( (layout.alignment=="left") || (layout.alignment== "right")
+            || (layout.alignment=="center") || (layout.alignment=="justify"))
         {
-            strLayout += TQString("text-align:%1; ").arg(tqlayout.alignment);
+            strLayout += TQString("text-align:%1; ").arg(layout.alignment);
         }
-        else if ( tqlayout.alignment=="auto")
+        else if ( layout.alignment=="auto")
         {
             // Do nothing, the user-agent should be more intelligent than us.
         }
         else
         {
-            kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
+            kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
         }
     }
 
-    if ((tqlayout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
+    if ((layout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
     {
-            strLayout += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
+            strLayout += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
     }
 
-    if ((tqlayout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
+    if ((layout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
     {
-        strLayout += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
+        strLayout += TQString("margin-right:%1pt; ").arg(layout.indentRight);
     }
 
-    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
     {
-        strLayout += TQString("text-indent:%1pt; ").arg(tqlayout.indentFirst);
+        strLayout += TQString("text-indent:%1pt; ").arg(layout.indentFirst);
     }
 
-    if ((tqlayout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
+    if ((layout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
     {
-       strLayout += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
+       strLayout += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
     }
 
-    if ((tqlayout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
+    if ((layout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
     {
-       strLayout += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
+       strLayout += TQString("margin-top:%1pt; ").arg(layout.marginTop);
     }
 
     if (force
-        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
     {
-        switch ( tqlayout.lineSpacingType )
+        switch ( layout.lineSpacingType )
         {
         case LayoutData::LS_CUSTOM:
             { 
                 // ### TODO: CSS 2 does not known "at-least".
 #if 0
                 // We have a custom line spacing (in points)
-                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
                 strLayout += "style:line-spacing:";
                 strLayout += height;
                 strLayout += "pt; ";
@@ -394,7 +394,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
             }
         case LayoutData::LS_MULTIPLE:
             {
-                const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) );
+                const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) );
                 strLayout += "line-height:";
                 strLayout += mult;
                 strLayout += "%; ";
@@ -403,7 +403,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
         case LayoutData::LS_FIXED:
             {
                 // We have a fixed line height (in points)
-                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
                 strLayout += "line-height:";
                 strLayout += height;
                 strLayout += "pt; ";
@@ -414,7 +414,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
                 // ### TODO: CSS 2 does not known "at-least".
                 // ### TODO:  however draft CCS3 (module 'line') has 'line-stacking-strategy' to tweak this behaviour
                 // We have a at-least line height (in points)
-                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
                 strLayout += "line-height:";
                 strLayout += height;
                 strLayout += "pt; ";
@@ -422,7 +422,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
             }
         default:
             {
-                kdWarning(30503) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30503) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
@@ -430,12 +430,12 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
 
     // TODO: Konqueror/KHTML does not support "text-shadow"
     if (!force
-        && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection )
-        && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
+        && ( layoutOrigin.shadowDirection == layout.shadowDirection )
+        && ( layoutOrigin.shadowDistance == layout.shadowDistance ) )
     {
         // Do nothing!
     }
-    else if ((!tqlayout.shadowDirection) || (!tqlayout.shadowDistance))
+    else if ((!layout.shadowDirection) || (!layout.shadowDistance))
     {
         strLayout += "text-shadow:";
         strLayout+="none; ";
@@ -443,8 +443,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
     else
     {
         double xDistance,yDistance;
-        const double distance=tqlayout.shadowDistance;
-        switch (tqlayout.shadowDirection)
+        const double distance=layout.shadowDistance;
+        switch (layout.shadowDirection)
         {
         case 1: // SD_LEFT_UP
             {
@@ -509,7 +509,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
         else
         {
             strLayout += "text-shadow:";
-            strLayout+=TQString("%1 %2pt %3pt; ").arg(tqlayout.shadowColor.name())
+            strLayout+=TQString("%1 %2pt %3pt; ").arg(layout.shadowColor.name())
                 .arg(xDistance,0,'f',0).arg(yDistance,0,'f',0);
                 // We do not want any scientific notation or any decimal
         }
@@ -519,60 +519,60 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
 
     // This must remain last, as the last property does not have a semi-colon
     strLayout+=textFormatToCss(layoutOrigin.formatData.text,
-        tqlayout.formatData.text,force);
+        layout.formatData.text,force);
 
     return strLayout;
 }
 
 void HtmlCssWorker::openParagraph(const TQString& strTag,
-    const LayoutData& tqlayout, TQChar::Direction direction)
+    const LayoutData& layout, TQChar::Direction direction)
 {
-    const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
+    const LayoutData& styleLayout=m_styleMap[layout.styleName];
 
     *m_streamOut << '<' << strTag;
 
     // Opening elements
-    *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName);
+    *m_streamOut << " class=\"" << escapeCssIdentifier(layout.styleName);
     *m_streamOut << "\"";
 
-    TQString strStyle=layoutToCss(styleLayout,tqlayout,false);
+    TQString strStyle=layoutToCss(styleLayout,layout,false);
     if (!strStyle.isEmpty())
     {
         *m_streamOut << " style=\"" << strStyle;
         if (direction == TQChar::DirRLE) {
-            *m_streamOut << "direction: rtl; tqunicode-bidi: embed; ";
+            *m_streamOut << "direction: rtl; unicode-bidi: embed; ";
         } else if (direction == TQChar::DirRLO) {
-            *m_streamOut << "direction: rtl; tqunicode-bidi: override; ";
+            *m_streamOut << "direction: rtl; unicode-bidi: override; ";
         }
         *m_streamOut<< "\"";
     }
 
     *m_streamOut << ">";
 
-    if ( 1==tqlayout.formatData.text.verticalAlignment )
+    if ( 1==layout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "<sub>"; //Subscript
     }
-    else if ( 2==tqlayout.formatData.text.verticalAlignment )
+    else if ( 2==layout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "<sup>"; //Superscript
     }
-    if ( tqlayout.alignment == "center" ) *m_streamOut << "<center>";
+    if ( layout.alignment == "center" ) *m_streamOut << "<center>";
 }
 
 void HtmlCssWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& tqlayout)
+    const LayoutData& layout)
 {
-    if ( 2==tqlayout.formatData.text.verticalAlignment )
+    if ( 2==layout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "</sup>"; //Superscript
     }
-    else if ( 1==tqlayout.formatData.text.verticalAlignment )
+    else if ( 1==layout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "</sub>"; //Subscript
     }
 
-    if ( tqlayout.alignment == "center" ) *m_streamOut << "</center>";
+    if ( layout.alignment == "center" ) *m_streamOut << "</center>";
     *m_streamOut << "</" << strTag << ">\n";
 }
 
@@ -680,16 +680,16 @@ bool HtmlCssWorker::doOpenStyles(void)
     return true;
 }
 
-bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout)
+bool HtmlCssWorker::doFullDefineStyle(LayoutData& layout)
 {
     //Register style in the style map
-    m_styleMap[tqlayout.styleName]=tqlayout;
+    m_styleMap[layout.styleName]=layout;
 
     // We do not limit (anymore) any style to <h1> ... <h6>, because
-    //   the style could be forced on <p> by the tqlayout.
+    //   the style could be forced on <p> by the layout.
 
-    *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName);
-    *m_streamOut << "\n{\n  " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n";
+    *m_streamOut << "." << escapeCssIdentifier(layout.styleName);
+    *m_streamOut << "\n{\n  " << layoutToCss(layout,layout,true) << "\n}\n";
 
     return true;
 }
diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h
index 358ea688..a33a0049 100644
--- a/filters/kword/html/export/ExportCss.h
+++ b/filters/kword/html/export/ExportCss.h
@@ -41,20 +41,20 @@ public:
 public:
     virtual bool doOpenStyles(void); ///< HTML's \<style\>
     virtual bool doCloseStyles(void); ///< HTML's \</style\>
-    virtual bool doFullDefineStyle(LayoutData& tqlayout);
+    virtual bool doFullDefineStyle(LayoutData& layout);
     virtual bool doFullPaperFormat(const int format,
         const double width, const double height, const int orientation);
     virtual bool doFullPaperBorders (const double top, const double left,
         const double bottom, const double right); ///< Like KWord's \<PAPERBORDERS\>
 protected:
     virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
-    virtual void openParagraph(const TQString& strTag, const LayoutData& tqlayout,
+    virtual void openParagraph(const TQString& strTag, const LayoutData& layout,
                                TQChar::Direction direction=TQChar::DirL);
-    virtual void closeParagraph(const TQString& strTag, const LayoutData& tqlayout);
+    virtual void closeParagraph(const TQString& strTag, const LayoutData& layout);
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
 private:
-    TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout,
+    TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& layout,
         const bool force) const;
     TQString escapeCssIdentifier(const TQString& strText) const;
     TQString textFormatToCss(const TextFormatting& formatOrigin,
diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui
index e68cb6ab..a6683c04 100644
--- a/filters/kword/html/export/ExportDialogUI.ui
+++ b/filters/kword/html/export/ExportDialogUI.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -196,7 +196,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -221,7 +221,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc
index f0e4b3aa..969ccd40 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cc
@@ -140,16 +140,16 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin,
 }
 
 void HtmlDocStructWorker::openParagraph(const TQString& strTag,
-    const LayoutData& tqlayout,TQChar::Direction /*direction*/)
+    const LayoutData& layout,TQChar::Direction /*direction*/)
 {
     *m_streamOut << '<' << strTag << ">";
-    openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
+    openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
 }
 
 void HtmlDocStructWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& tqlayout)
+    const LayoutData& layout)
 {
-    closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
+    closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
     *m_streamOut << "</" << strTag << ">\n";
 }
 
diff --git a/filters/kword/html/export/ExportDocStruct.h b/filters/kword/html/export/ExportDocStruct.h
index 43b1e76a..6e963183 100644
--- a/filters/kword/html/export/ExportDocStruct.h
+++ b/filters/kword/html/export/ExportDocStruct.h
@@ -33,9 +33,9 @@ public:
 protected:
     virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
     virtual void openParagraph(const TQString& strTag,
-        const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
+        const LayoutData& layout,TQChar::Direction direction=TQChar::DirL);
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& tqlayout);
+        const LayoutData& layout);
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
 private:
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index 441048b4..05892740 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -275,13 +275,13 @@ void HtmlWorker::formatTextParagraph(const TQString& strText,
 }
 
 void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &paraText,
-    const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList)
+    const LayoutData& layout, const ValueListFormatData &paraFormatDataList)
 {
     if (paraText.isEmpty() && paraFormatDataList.first().id != 6)
     {
-        openParagraph(strTag,tqlayout);
+        openParagraph(strTag,layout);
         *m_streamOut << "&nbsp;" ; // A paragraph can never be empty in HTML
-        closeParagraph(strTag,tqlayout);
+        closeParagraph(strTag,layout);
     }
     else
     {
@@ -302,17 +302,17 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
                 // For normal text, we need an opened paragraph
                 if (paragraphNotOpened)
                 {
-                    openParagraph(strTag,tqlayout,partialText.ref(0).direction());
+                    openParagraph(strTag,layout,partialText.ref(0).direction());
                     paragraphNotOpened=false;
                 }
-                formatTextParagraph(partialText,tqlayout.formatData,*paraFormatDataIt);
+                formatTextParagraph(partialText,layout.formatData,*paraFormatDataIt);
             }
             else if (4==(*paraFormatDataIt).id)
             {
                 // For variables, we need an opened paragraph
                 if (paragraphNotOpened)
                 {
-                    openParagraph(strTag,tqlayout);
+                    openParagraph(strTag,layout);
                     paragraphNotOpened=false;
                 }
                 if (9==(*paraFormatDataIt).variable.m_type)
@@ -341,7 +341,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
                     if (!paragraphNotOpened)
                     {
                         // The paragraph was opened, so close it.
-                        closeParagraph(strTag,tqlayout);
+                        closeParagraph(strTag,layout);
                     }
                     makeTable((*paraFormatDataIt).frameAnchor);
                     // The paragraph will need to be opened again
@@ -355,7 +355,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
                     // <img> and <object> need to be in a paragraph
                     if (paragraphNotOpened)
                     {
-                        openParagraph( strTag, tqlayout,partialText.ref(0). direction() );
+                        openParagraph( strTag, layout,partialText.ref(0). direction() );
                         paragraphNotOpened=false;
                     }
                     makeImage((*paraFormatDataIt).frameAnchor);
@@ -370,30 +370,30 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
         if (!paragraphNotOpened)
         {
             // The paragraph was opened, so close it.
-            closeParagraph(strTag,tqlayout);
+            closeParagraph(strTag,layout);
         }
     }
 }
 
 bool HtmlWorker::doFullParagraph(const TQString& paraText,
-    const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
+    const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30503) << "Entering HtmlWorker::doFullParagraph" << endl << paraText << endl;
     TQString strParaText=paraText;
     TQString strTag; // Tag that will be written.
 
-    if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
+    if ( layout.counter.numbering == CounterData::NUM_LIST )
     {
-        const uint layoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0!
+        const uint layoutDepth=layout.counter.depth+1; // Word's depth starts at 0!
         const uint listDepth=m_listStack.size();
         // We are in a list, but has it the right depth?
         if (layoutDepth>listDepth)
         {
             ListInfo newList;
-            newList.m_typeList=tqlayout.counter.style;
+            newList.m_typeList=layout.counter.style;
             for (uint i=listDepth; i<layoutDepth; i++)
             {
-                *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
+                *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList);
                 m_listStack.push(newList);
             }
         }
@@ -414,7 +414,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
         }
 
         // We have a list but does it have the right type?
-        if ( tqlayout.counter.style!=m_listStack.top().m_typeList)
+        if ( layout.counter.style!=m_listStack.top().m_typeList)
         {
             // No, then close the previous list
             ListInfo oldList=m_listStack.pop();
@@ -427,8 +427,8 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
                 *m_streamOut << "</ul>\n";
             }
             ListInfo newList;
-            *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
-            newList.m_typeList=tqlayout.counter.style;
+            *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList);
+            newList.m_typeList=layout.counter.style;
             m_listStack.push(newList);
         }
 
@@ -453,10 +453,10 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
                 }
             }
         }
-        if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
-            && (tqlayout.counter.depth<6) )
+        if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
+            && (layout.counter.depth<6) )
         {
-            strTag=TQString("h%1").arg(tqlayout.counter.depth + 1); // H1 ... H6
+            strTag=TQString("h%1").arg(layout.counter.depth + 1); // H1 ... H6
         }
         else
         {
@@ -464,7 +464,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
         }
     }
 
-    ProcessParagraphData(strTag, strParaText, tqlayout, paraFormatDataList);
+    ProcessParagraphData(strTag, strParaText, layout, paraFormatDataList);
 
     kdDebug(30503) << "Quiting HtmlWorker::doFullParagraph" << endl;
     return true;
diff --git a/filters/kword/html/export/ExportFilter.h b/filters/kword/html/export/ExportFilter.h
index f8446c1b..04d3129f 100644
--- a/filters/kword/html/export/ExportFilter.h
+++ b/filters/kword/html/export/ExportFilter.h
@@ -42,7 +42,7 @@ public:
     virtual bool doCloseFile(void); // Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
     virtual bool doOpenTextFrameSet(void);
@@ -58,9 +58,9 @@ protected:
      * be detected from the actual string data
      */
     virtual void openParagraph(const TQString& strTag,
-        const LayoutData& tqlayout, TQChar::Direction direction=TQChar::DirL)=0;
+        const LayoutData& layout, TQChar::Direction direction=TQChar::DirL)=0;
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& tqlayout)=0;
+        const LayoutData& layout)=0;
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format)=0;
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format)=0;
     virtual void writeDocType(void);
@@ -84,7 +84,7 @@ protected:
     TQString getAdditionalFileName(const TQString& additionalName);
 private:
     void ProcessParagraphData ( const TQString& strTag, const TQString &paraText,
-        const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList);
+        const LayoutData& layout, const ValueListFormatData &paraFormatDataList);
     void formatTextParagraph(const TQString& strText,
         const FormatData& formatOrigin, const FormatData& format);
     bool makeTable(const FrameAnchor& anchor);
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 482c90a5..8545fb0d 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -80,7 +80,7 @@ HTMLReader_state *KHTMLReader::state()
 		s->frameset=_writer->mainFrameset();
 		s->paragraph = _writer->addParagraph(s->frameset);
 		s->format=_writer->currentFormat(s->paragraph,true);
-		s->tqlayout=_writer->currentLayout(s->paragraph);
+		s->layout=_writer->currentLayout(s->paragraph);
 		s->in_pre_mode = false;
 		_state.push(s);
 	}
@@ -93,7 +93,7 @@ HTMLReader_state *KHTMLReader::pushNewState()
         s->frameset=state()->frameset;
         s->paragraph=state()->paragraph;
         s->format=state()->format;
-        s->tqlayout=state()->tqlayout;
+        s->layout=state()->layout;
 	s->in_pre_mode=state()->in_pre_mode;
         _writer->cleanUpParagraph(s->paragraph);
         _state.push(s);
@@ -118,9 +118,9 @@ void KHTMLReader::popState()
 	if (s->frameset == state()->frameset)
 	{
 		state()->paragraph=s->paragraph;
-		if ((state()->tqlayout != s->tqlayout)) 
+		if ((state()->layout != s->layout)) 
                 {
-                  if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->tqlayout);
+                  if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout);
 		}
 		state()->format=_writer->startFormat(state()->paragraph, state()->format);
 	}
@@ -129,15 +129,15 @@ void KHTMLReader::popState()
 
 void KHTMLReader::startNewLayout(bool startNewFormat) 
 {
-	TQDomElement tqlayout;
-	startNewLayout(startNewFormat,tqlayout);
+	TQDomElement layout;
+	startNewLayout(startNewFormat,layout);
 }
 
-void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement tqlayout) 
+void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout) 
 {
         kdDebug() << "entering startNewLayout" << endl;
 	startNewParagraph(startNewFormat,true);
-	state()->tqlayout=_writer->setLayout(state()->paragraph,tqlayout);
+	state()->layout=_writer->setLayout(state()->paragraph,layout);
 }
 
 void KHTMLReader::completed() 
@@ -183,7 +183,7 @@ void KHTMLReader::parseNode(DOM::Node node)
 
 	// is this really needed ? it can't do harm anyway.
 	state()->format=_writer->currentFormat(state()->paragraph,true);
-	state()->tqlayout=_writer->currentLayout(state()->paragraph);
+	state()->layout=_writer->currentLayout(state()->paragraph);
 	pushNewState();
 
 	DOM::Element e=node;
@@ -227,13 +227,13 @@ void KHTMLReader::parse_head(DOM::Element e)
 		} \
 	}
 
-// the state->tqlayout=_writer->setLayout is meant to tell popState something changed in the tqlayout, and a new
-// tqlayout should probably be started after closing.
+// the state->layout=_writer->setLayout is meant to tell popState something changed in the layout, and a new
+// layout should probably be started after closing.
 
 #define _PL(x,a,b,c) { \
 		if (e.tagName().lower() == #x) \
 			{ \
-				state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\
+				state()->layout=_writer->setLayout(state()->paragraph,state()->layout);\
 				if (!(_writer->getText(state()->paragraph).isEmpty())) \
 					startNewParagraph(false,false); \
 				_writer->layoutAttribute(state()->paragraph, #a,#b,#c); \
@@ -283,20 +283,20 @@ bool KHTMLReader::parseTag(DOM::Element e)
   return true;
 }
 
-void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) 
+void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) 
 {
         kdDebug() << "Entering startNewParagraph" << endl;
 
 	TQDomElement qf=state()->format;
-	TQDomElement ql=state()->tqlayout;
+	TQDomElement ql=state()->layout;
 
 	_writer->cleanUpParagraph(state()->paragraph);
 
-        if ((startnewtqlayout==true) || ql.isNull())
+        if ((startnewlayout==true) || ql.isNull())
         	{state()->paragraph=_writer->addParagraph(state()->frameset);}
         else
 	        {state()->paragraph=
-	        	_writer->addParagraph(state()->frameset,state()->tqlayout);}
+	        	_writer->addParagraph(state()->frameset,state()->layout);}
 
 
 
@@ -403,7 +403,7 @@ bool KHTMLReader::parse_hr(DOM::Element /*e*/)
 
 bool KHTMLReader::parse_br(DOM::Element /*e*/) 
 {
-	startNewParagraph(false,false); //keep the current format and tqlayout
+	startNewParagraph(false,false); //keep the current format and layout
 	return false; // a BR tag has no childs.
 }
 
@@ -508,7 +508,7 @@ void KHTMLReader::parseStyle(DOM::Element e)
   // process e.g. <style="text-align: center">this is in the center</style>
     if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") )
     {
-      state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);
+      state()->layout=_writer->setLayout(state()->paragraph,state()->layout);
       _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
     }
   // done
diff --git a/filters/kword/html/import/khtmlreader.h b/filters/kword/html/import/khtmlreader.h
index 9987a589..db93531a 100644
--- a/filters/kword/html/import/khtmlreader.h
+++ b/filters/kword/html/import/khtmlreader.h
@@ -39,7 +39,7 @@ struct HTMLReader_state {
   TQDomElement format;
   TQDomElement frameset;
   TQDomElement paragraph;
-  TQDomElement tqlayout;
+  TQDomElement layout;
   bool in_pre_mode; // keep formatting as is.
 };
 
@@ -77,8 +77,8 @@ private:
         KWDWriter *_writer;
 
 	void startNewLayout(bool startNewFormat=false);
-	void startNewLayout(bool startNewFormat, TQDomElement tqlayout);
-        void startNewParagraph(bool startnewformat=true, bool startnewtqlayout=true);
+	void startNewLayout(bool startNewFormat, TQDomElement layout);
+        void startNewParagraph(bool startnewformat=true, bool startnewlayout=true);
         bool _it_worked;
 // -----------------------------------------------------
         int _list_depth;
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index 3223ef42..a194b219 100644
--- a/filters/kword/html/import/kwdwriter.cpp
+++ b/filters/kword/html/import/kwdwriter.cpp
@@ -328,12 +328,12 @@ TQDomElement KWDWriter::createLink(TQDomElement paragraph, TQString linkName, TQ
 }
 
 
-TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement tqlayout) {
+TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement layout) {
 	TQDomElement theLayout;
-	if (tqlayout.isNull())
+	if (layout.isNull())
 		theLayout=_doc->createElement("LAYOUT");
 	else
-		theLayout=tqlayout.cloneNode().toElement();
+		theLayout=layout.cloneNode().toElement();
 	TQDomElement oldLayout=currentLayout(paragraph);
 	paragraph.removeChild(oldLayout);
 	paragraph.appendChild(theLayout);
@@ -357,12 +357,12 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC
 
 	TQDomElement paragraph=_doc->createElement("PARAGRAPH");
 	TQDomElement formats=_doc->createElement("FORMATS");
-	TQDomElement tqlayout;
+	TQDomElement layout;
 	if (layoutToClone.isNull()) {
-		tqlayout=_doc->createElement("LAYOUT");
+		layout=_doc->createElement("LAYOUT");
 	}
 	else {
-		tqlayout=layoutToClone.cloneNode().toElement();
+		layout=layoutToClone.cloneNode().toElement();
 	}
 	TQDomElement text=_doc->createElement("TEXT");
 	TQDomText t=_doc->createTextNode(TQString(""));
@@ -370,7 +370,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC
 	paragraph.appendChild(formats);
 	paragraph.appendChild(text);
 	parent.appendChild(paragraph);
-	paragraph.appendChild(tqlayout);
+	paragraph.appendChild(layout);
 	layoutAttribute(paragraph,"NAME","value","Standard");
 	return paragraph;
 }
diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h
index 542a1748..2942f22a 100644
--- a/filters/kword/html/import/kwdwriter.h
+++ b/filters/kword/html/import/kwdwriter.h
@@ -93,7 +93,7 @@ public:
 
 
 	/**
-	 * create a horizontal ruler tqlayout
+	 * create a horizontal ruler layout
 	 **/
 	void createHR(TQDomElement paragraph, int width=1);
 
@@ -115,7 +115,7 @@ public:
 	 * adds a paragraph
 	 **/
 	TQDomElement addParagraph(TQDomElement parent);
-	TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout);
+	TQDomElement addParagraph(TQDomElement parent, TQDomElement layout);
 
 	/**
 	 * adds/changes an attribute to/of the current format
@@ -123,13 +123,13 @@ public:
         TQDomElement formatAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
 
         /**
-         * get a tqlayout attribute
+         * get a layout attribute
          **/
 	TQString getLayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName);
 
 
         /**
-         * adds/changes an attribute to/of the current tqlayout
+         * adds/changes an attribute to/of the current layout
          **/
         TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
 
@@ -164,9 +164,9 @@ public:
 	TQDomElement createLink(TQDomElement paragraph, TQString linkName, TQString hrefName);
 
 	/**
-	 * copy the given tqlayout, and set it as tqlayout of the given paragraph
+	 * copy the given layout, and set it as layout of the given paragraph
 	 **/
-	TQDomElement setLayout(TQDomElement paragraph, TQDomElement tqlayout);
+	TQDomElement setLayout(TQDomElement paragraph, TQDomElement layout);
 
 	/**
 	 * returns the text of this paragraph.
diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp
index cc8a7046..1ed00358 100644
--- a/filters/kword/kword1.3/import/kword13layout.cpp
+++ b/filters/kword/kword1.3/import/kword13layout.cpp
@@ -13,7 +13,7 @@ KWord13Layout::~KWord13Layout( void )
 
 void KWord13Layout::xmldump( TQTextStream& iostream )
 {
-    iostream << "    <tqlayout name=\"" << EscapeXmlDump( m_name )
+    iostream << "    <layout name=\"" << EscapeXmlDump( m_name )
         << "\" outline=\"" << ( m_outline ? TQString("true") : TQString("false") ) << "\">\n";
     
     for ( TQMap<TQString,TQString>::ConstIterator it = m_layoutProperties.begin();
@@ -25,7 +25,7 @@ void KWord13Layout::xmldump( TQTextStream& iostream )
     
     m_format.xmldump( iostream );
     
-    iostream << "    </tqlayout>\n";
+    iostream << "    </layout>\n";
 }
 
 TQString KWord13Layout::key( void ) const
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
index 6c7ec01f..7f246cad 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
@@ -178,11 +178,11 @@ double KWord13OasisGenerator::positiveNumberOrNull( const TQString& str ) const
 }
 
 // Inspired by KoParagStyle::saveStyle
-void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout )
+void KWord13OasisGenerator::declareLayout( KWord13Layout& layout )
 {
-    KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", tqlayout.m_name );
+    KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", layout.m_name );
 
-    // ### TODO: any display name? gs.addAttribute( "style:display-name", tqlayout.m_name );
+    // ### TODO: any display name? gs.addAttribute( "style:display-name", layout.m_name );
 #if 0
     // TODO: check that this is correct
     if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) {
@@ -192,21 +192,21 @@ void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout )
             gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
     }
 #endif
-    fillGenStyleWithLayout( tqlayout, gs, false );
-    fillGenStyleWithFormatOne( tqlayout.m_format , gs, false );
+    fillGenStyleWithLayout( layout, gs, false );
+    fillGenStyleWithFormatOne( layout.m_format , gs, false );
 
-    tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
+    layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
 
-    kdDebug(30520) << "Layout: Parent " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl;
+    kdDebug(30520) << "Layout: Parent " << layout.m_name << " => " << layout.m_autoStyleName << endl;
 }
 
 
 // Inspired by KoParagStyle::saveStyle
-void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout )
+void KWord13OasisGenerator::declareStyle( KWord13Layout& layout )
 {
     KoGenStyle gs( KoGenStyle::STYLE_USER, "paragraph", TQString() );
 
-    gs.addAttribute( "style:display-name", tqlayout.m_name );
+    gs.addAttribute( "style:display-name", layout.m_name );
 #if 0
     // TODO: check that this is correct
     if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) {
@@ -216,12 +216,12 @@ void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout )
             gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
     }
 #endif
-    fillGenStyleWithLayout( tqlayout, gs, true );
-    fillGenStyleWithFormatOne( tqlayout.m_format , gs, true );
+    fillGenStyleWithLayout( layout, gs, true );
+    fillGenStyleWithFormatOne( layout.m_format , gs, true );
 
-    tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, tqlayout.m_name, false );
+    layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, layout.m_name, false );
 
-    kdDebug(30520) << "Style: " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl;
+    kdDebug(30520) << "Style: " << layout.m_name << " => " << layout.m_autoStyleName << endl;
 }
 
 
@@ -341,13 +341,13 @@ void KWord13OasisGenerator::fillGenStyleWithFormatOne( const KWord13FormatOneDat
 }
 
 // Inspired from KoParagLayout::saveOasis but we have not the same data to start with.
-void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const
+void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const
 {
     // ### TODO syntaxVersion < 3
 
-    TQString str; // Help string to store each KWord 1.3 tqlayout property
+    TQString str; // Help string to store each KWord 1.3 layout property
 
-    str = tqlayout.getProperty( "FLOW:align" );
+    str = layout.getProperty( "FLOW:align" );
     if ( str.isEmpty() && ! style)
     {
         // Nothing to do!
@@ -361,7 +361,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou
         gs.addProperty( "fo:text-align", "start" ); // i.e. direction-dependent
     }
 
-    str = tqlayout.getProperty( "FLOW:dir" );
+    str = layout.getProperty( "FLOW:dir" );
     if ( str == "R" ) // ### TODO: check the right value
     {
             gs.addProperty( "style:writing-mode", "rl-tb" ); // right-to-left, top-to-bottom
@@ -372,11 +372,11 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou
     }
 
     // ### TODO: do not define if it does not exist and ! style
-    gs.addPropertyPt( "fo:margin-left", numberOrNull( tqlayout.getProperty( "INDENTS:left" ) ) );
-    gs.addPropertyPt( "fo:margin-right", numberOrNull( tqlayout.getProperty( "INDENTS:right" ) ) );
-    gs.addPropertyPt( "fo:text-indent", numberOrNull( tqlayout.getProperty( "INDENTS:first" ) ) );
-    gs.addPropertyPt( "fo:margin-top", numberOrNull( tqlayout.getProperty( "OFFSETS:before" ) ) );
-    gs.addPropertyPt( "fo:margin-bottom", numberOrNull( tqlayout.getProperty( "OFFSETS:after" ) ) );
+    gs.addPropertyPt( "fo:margin-left", numberOrNull( layout.getProperty( "INDENTS:left" ) ) );
+    gs.addPropertyPt( "fo:margin-right", numberOrNull( layout.getProperty( "INDENTS:right" ) ) );
+    gs.addPropertyPt( "fo:text-indent", numberOrNull( layout.getProperty( "INDENTS:first" ) ) );
+    gs.addPropertyPt( "fo:margin-top", numberOrNull( layout.getProperty( "OFFSETS:before" ) ) );
+    gs.addPropertyPt( "fo:margin-bottom", numberOrNull( layout.getProperty( "OFFSETS:after" ) ) );
 
 #if 0
     switch ( lineSpacingType ) {
@@ -614,7 +614,7 @@ void KWord13OasisGenerator::writeStylesXml( void )
     Q_ASSERT( styles.count() == 1 );
     it = styles.begin();
     for ( ; it != styles.end() ; ++it ) {
-        (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
+        (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
         //if ( m_pageLayout.columns > 1 ) TODO add columns element. This is a bit of a hack,
         // which only works as long as we have only one page master
         stylesWriter->endElement();
@@ -629,7 +629,7 @@ void KWord13OasisGenerator::writeStylesXml( void )
     stylesWriter->startElement( "office:master-styles" );
     stylesWriter->startElement( "style:master-page" );
     stylesWriter->addAttribute( "style:name", "Standard" );
-    stylesWriter->addAttribute( "style:page-tqlayout-name", pageLayoutName );
+    stylesWriter->addAttribute( "style:page-layout-name", pageLayoutName );
     stylesWriter->endElement();
     stylesWriter->endElement(); // office:master-styles
 
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.h b/filters/kword/kword1.3/import/kword13oasisgenerator.h
index 39bc232a..3db989f2 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.h
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.h
@@ -49,17 +49,17 @@ protected: // Generating phase
     void writePreviewFile(void);
     void writePictures( void );
 protected: // Preparing phase
-    /// Preparing page tqlayout
+    /// Preparing page layout
     void preparePageLayout( void );
     void prepareTextFrameset( KWordTextFrameset* frameset );
     /// Also sets the name of the automatical style
-    void declareLayout( KWord13Layout& tqlayout );
+    void declareLayout( KWord13Layout& layout );
     /// Also sets the name of the automatical style
-    void declareStyle( KWord13Layout& tqlayout );
+    void declareStyle( KWord13Layout& layout );
     double numberOrNull( const TQString& str ) const;
     double positiveNumberOrNull( const TQString& str ) const;
     void fillGenStyleWithFormatOne( const KWord13FormatOneData& one, KoGenStyle& gs, const bool style ) const;
-    void fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const;
+    void fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const;
 protected:
     KWord13Document* m_kwordDocument;
     KoStore* m_store;
diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp
index cbe650dc..a3e22290 100644
--- a/filters/kword/kword1.3/import/kword13parser.cpp
+++ b/filters/kword/kword1.3/import/kword13parser.cpp
@@ -133,7 +133,7 @@ bool KWord13Parser::startElementLayoutProperty( const TQString& name, const TQXm
     }
     else
     {
-        kdError(30520) << "No current tqlayout for storing property: " << name << endl;
+        kdError(30520) << "No current layout for storing property: " << name << endl;
         return false;
     }
 }
@@ -166,7 +166,7 @@ bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes&
     else if ( stackItem->elementType == KWord13TypeLayout )
     {
         stackItem->elementType = KWord13TypeLayoutFormatOne;
-        return true; // Everything is done directly on the tqlayout
+        return true; // Everything is done directly on the layout
     }
     else if ( stackItem->elementType != KWord13TypeFormatsPlural )
     {
@@ -247,7 +247,7 @@ bool KWord13Parser::startElementLayout( const TQString&, const TQXmlAttributes&
     if ( m_currentLayout )
     {
         // Delete an eventually already existing paragraph (should not happen)
-        kdWarning(30520) << "Current tqlayout already defined!" << endl;
+        kdWarning(30520) << "Current layout already defined!" << endl;
         delete m_currentLayout;
     }
         
@@ -795,7 +795,7 @@ bool KWord13Parser :: characters ( const TQString & ch )
             const uint length = ch.length();
             for ( uint i = 0; i < length; ++i )
             {
-                const ushort uni = ch.at(i).tqunicode();
+                const ushort uni = ch.at(i).unicode();
                 if ( uni >= 32 )
                     continue; // Normal character
                 else if ( uni == 9 || uni == 10 || uni == 13)
diff --git a/filters/kword/kword1.3/import/kword13parser.h b/filters/kword/kword1.3/import/kword13parser.h
index 21b25f20..754a618e 100644
--- a/filters/kword/kword1.3/import/kword13parser.h
+++ b/filters/kword/kword1.3/import/kword13parser.h
@@ -129,7 +129,7 @@ protected:
     KWord13StackItemStack parserStack;
     KWord13Document* m_kwordDocument;
     KWord13Paragraph* m_currentParagraph; ///< Current paragraph
-    KWord13Layout* m_currentLayout; ///< Current tqlayout (or style)
+    KWord13Layout* m_currentLayout; ///< Current layout (or style)
     KWord13Format* m_currentFormat; ///< Current format 
 };
 
diff --git a/filters/kword/kword1.3/import/kword13utils.cpp b/filters/kword/kword1.3/import/kword13utils.cpp
index d870f484..0caf48a7 100644
--- a/filters/kword/kword1.3/import/kword13utils.cpp
+++ b/filters/kword/kword1.3/import/kword13utils.cpp
@@ -8,7 +8,7 @@ TQString EscapeXmlDump( const TQString& strIn )
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.tqunicode())
+        switch (ch.unicode())
         {
         case 38: // &
             {
diff --git a/filters/kword/latex/export/config.h b/filters/kword/latex/export/config.h
index 7a81b168..1a87267c 100644
--- a/filters/kword/latex/export/config.h
+++ b/filters/kword/latex/export/config.h
@@ -84,8 +84,8 @@ class Config
 		bool convertPictures() const { return _convertPictures; }
 		TQString getPicturesDir() const { return _picturesDir; }
 		
-		bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
-		bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
+		bool mustUseUnicode() const { return (_encoding == "unicode"); }
+		bool mustUseLatin1() const { return (_encoding != "unicode"); }
 		TQString getEncoding() const { return _encoding; }
 		TQStringList getLanguagesList() const { return _languagesList; }
 		TQString getDefaultLanguage() const { return _defaultLanguage; }
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index 28bb48bf..145b30ed 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -101,7 +101,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
   classComboBox->insertItem("report");
   classComboBox->insertItem("slides");
 
-	encodingComboBox->insertItem("tqunicode");
+	encodingComboBox->insertItem("unicode");
   encodingComboBox->insertItem("ansinew");
   encodingComboBox->insertItem("applemac");
   encodingComboBox->insertItem("ascii");
diff --git a/filters/kword/latex/export/layout.h b/filters/kword/latex/export/layout.h
index 298b08ff..f09ccb1c 100644
--- a/filters/kword/latex/export/layout.h
+++ b/filters/kword/latex/export/layout.h
@@ -93,7 +93,7 @@ class Layout: public TextFormat
 		 * Nothing to do.
 		 */
 		virtual ~Layout() {
-			kdDebug(30522) << "Destruction of a tqlayout." << endl;
+			kdDebug(30522) << "Destruction of a layout." << endl;
 		}
 
 		/**
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc
index 4264d9c6..9cc829b5 100644
--- a/filters/kword/latex/export/para.cc
+++ b/filters/kword/latex/export/para.cc
@@ -210,7 +210,7 @@ void Para::analyseInfo(const TQDomNode balise)
 /*******************************************/
 /* AnalyseLayoutPara                       */
 /*******************************************/
-/* Analyse the tqlayout of a para.           */
+/* Analyse the layout of a para.           */
 /* For each format, keep the type (picture,*/
 /* text, variable, footnote) and put the   */
 /* zone in a list.                         */
diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cc
index cdcbba6a..d6141e96 100644
--- a/filters/kword/latex/export/textFrame.cc
+++ b/filters/kword/latex/export/textFrame.cc
@@ -217,7 +217,7 @@ void TextFrame::generate(TQTextStream &out)
 			lastPara->closeList(out, currentPara);
 			_lastTypeEnum = TL_NONE;
 		}
-		/* tqlayout management (left, center, justify, right) */
+		/* layout management (left, center, justify, right) */
 		if((!lastPara->isChapter() && _lastEnv != getNextEnv(_parags, _parags.at()) &&
 			lastPara->notEmpty()) ||
 			_lastEnv != getNextEnv(_parags, _parags.at()))
diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cc
index a4beb875..0bf4e436 100644
--- a/filters/kword/latex/export/textzone.cc
+++ b/filters/kword/latex/export/textzone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the tqunicode table
+/* MEMO: to see the unicode table
  * xset +fp /usr/X11R6/lib/X11/fonts/ucs/
  * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
  */
@@ -85,7 +85,7 @@ bool TextZone::useFormat() const
 /*******************************************/
 /* escapeLatin1                            */
 /*******************************************/
-/* Convert special caracters (tqunicode) in  */
+/* Convert special caracters (unicode) in  */
 /* latex usable caracters.                 */
 /*******************************************/
 TQString TextZone::escapeLatin1(TQString text)
@@ -114,7 +114,7 @@ TQString TextZone::escapeLatin1(TQString text)
 	};
 
 	TQString escapedText;
-	int tqunicode;         /* the character to be escaped */
+	int unicode;         /* the character to be escaped */
 
 	escapedText = text;  /* copy input text */
 	
@@ -185,8 +185,8 @@ TQString TextZone::escapeLatin1(TQString text)
 
 	for(int index = 0; index < 64; index++)
 	{
-		tqunicode = CSTART + index;
-		convert(escapedText, tqunicode, escapes[index]);
+		unicode = CSTART + index;
+		convert(escapedText, unicode, escapes[index]);
 	}
 
 	convert(escapedText, 0X2020, "\\textdied{}");		/* textcomp */
@@ -259,12 +259,12 @@ TQString TextZone::escapeLatin1(TQString text)
 /* Convert all the instance of one         */
 /* character in latex usable caracter.     */
 /*******************************************/
-void TextZone::convert(TQString& text, int tqunicode, const char* escape)
+void TextZone::convert(TQString& text, int unicode, const char* escape)
 {
 	TQString expression;
 	TQString value;
 
-	expression = TQString("\\x") + value.setNum(tqunicode, 16);
+	expression = TQString("\\x") + value.setNum(unicode, 16);
 
 	if( !TQString(escape).isEmpty() )
 	{
diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h
index fbc09280..1d28c73f 100644
--- a/filters/kword/latex/export/textzone.h
+++ b/filters/kword/latex/export/textzone.h
@@ -81,7 +81,7 @@ class TextZone: public TextFormat
 		/* ==== Helpfull functions ==== */
 
 		/**
-		 * convert a tqunicode text in latin1 enconding ala latex.
+		 * convert a unicode text in latin1 enconding ala latex.
 		 */
 		TQString escapeLatin1(TQString);
 		
diff --git a/filters/kword/latex/export/variablezone.cc b/filters/kword/latex/export/variablezone.cc
index 09a16635..b73788b3 100644
--- a/filters/kword/latex/export/variablezone.cc
+++ b/filters/kword/latex/export/variablezone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the tqunicode table
+/* MEMO: to see the unicode table
  * xset +fp /usr/X11R6/lib/X11/fonts/ucs/
  * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
  */
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc
index 9489d491..8354b9ab 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cc
@@ -92,8 +92,8 @@ void LATEXImportDia::createDialog()
 
 	TQBoxLayout *langLayout = new TQVBoxLayout(langBox);
 
-	tqunicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
-	langLayout->addWidget(tqunicodeRBtn);
+	unicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
+	langLayout->addWidget(unicodeRBtn);
 
 	latin1RBtn = new TQRadioButton(i18n("latin1"), langBox);
 	langLayout->addWidget(latin1RBtn);
@@ -124,7 +124,7 @@ void LATEXImportDia::createDialog()
 	docBox->setButton(0);			/* NEW DOC IS THE DEFAULT. */
 	docLayout->activate();
 
-	/* Display the main tqlayout */
+	/* Display the main layout */
 	mainLayout->addStretch(5);
 	mainLayout->activate();
 }
@@ -138,7 +138,7 @@ void LATEXImportDia::state()
 	else if(embededRBtn == docBox->selected())
 		config.setType(TYPE_EMBEDED);
 
-	if(tqunicodeRBtn == langBox->selected())
+	if(unicodeRBtn == langBox->selected())
 		config.setEncoding(ENC_UNICODE);
 	else if(latin1RBtn == langBox->selected())
 		config.setEncoding(ENC_LATIN1);
diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h
index b6f83baa..13afc1af 100644
--- a/filters/kword/latex/import/lateximportdia.h
+++ b/filters/kword/latex/import/lateximportdia.h
@@ -72,7 +72,7 @@ class LATEXImportDia : public KDialogBase, public DCOPObject
 	private:
 		TQVButtonGroup* styleBox,       *langBox,        *docBox;
 		TQRadioButton*  latexStyleRBtn, *kwordStyleRBtn;	/* Document style */
-		TQRadioButton*  tqunicodeRBtn,    *latin1RBtn;		/* Language       */
+		TQRadioButton*  unicodeRBtn,    *latin1RBtn;		/* Language       */
 		TQRadioButton*  newDocRBtn,     *embededRBtn;	/* Latex file     */
 	
 	k_dcop:
diff --git a/filters/kword/latex/status.html b/filters/kword/latex/status.html
index ea2a527c..0b78eac2 100644
--- a/filters/kword/latex/status.html
+++ b/filters/kword/latex/status.html
@@ -131,14 +131,14 @@
 <B>VERSION 1:</B>
 <table BORDER="0" WIDTH="100%">
 <tr><td>text with accent</td>			<td>DONE</td></tr>
-<tr><td>text with special characters</td>	<td>A LOT OF SPECIAL CHARS SUPPORTED for latin1  (all for tqunicode)!</td></tr>
-<tr><td>tqlayout</td>				<td>DONE</td></tr>
+<tr><td>text with special characters</td>	<td>A LOT OF SPECIAL CHARS SUPPORTED for latin1  (all for unicode)!</td></tr>
+<tr><td>layout</td>				<td>DONE</td></tr>
 <tr><td>title</td>				<td>DONE</td></tr>
 <tr><td>list</td>				<td>DONE</td></tr>
 <tr><td>paper</td>				<td>DONE</td></tr>
 <tr><td>footnote, head</td>			<td>DONE (still a little bug for first foot/header and a line is added)</td></tr>
 <tr><td>comments with kdoc</td>			<td>STARTED</td></tr>
-<tr><td>tqunicode support</td>			<td>DONE (omega package)</td></tr>
+<tr><td>unicode support</td>			<td>DONE (omega package)</td></tr>
 <tr><td>break (line, page)</td>			<td>STARTED</td></tr>
 <tr><td>indent list</td>			<td></td></tr>
 </table>
@@ -209,7 +209,7 @@
 	<ul>
 		<li>features
 		<ul>
-			<li>support of tqunicode with omega</li>
+			<li>support of unicode with omega</li>
 		</ul>
 		</li>
 	</ul>
diff --git a/filters/kword/libexport/KWEFBaseWorker.cc b/filters/kword/libexport/KWEFBaseWorker.cc
index d3d41ff3..a47f647d 100644
--- a/filters/kword/libexport/KWEFBaseWorker.cc
+++ b/filters/kword/libexport/KWEFBaseWorker.cc
@@ -62,7 +62,7 @@ bool KWEFBaseWorker::doFullAllParagraphs (const TQValueList<ParaData>& paraList)
 	TQValueList<ParaData>::ConstIterator end(paraList.end());
     for (it=paraList.begin();it!=end;++it)
     {
-        if (!doFullParagraph((*it).text,(*it).tqlayout,(*it).formattingList))
+        if (!doFullParagraph((*it).text,(*it).layout,(*it).formattingList))
             return false;
     }
     return true;
diff --git a/filters/kword/libexport/KWEFBaseWorker.h b/filters/kword/libexport/KWEFBaseWorker.h
index e2046913..67cdb691 100644
--- a/filters/kword/libexport/KWEFBaseWorker.h
+++ b/filters/kword/libexport/KWEFBaseWorker.h
@@ -57,7 +57,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker
 	virtual bool doVariableSettings (const VariableSettingsData &varSettings);
         virtual bool doFullDocument (const TQValueList<ParaData> &);
         virtual bool doFullAllParagraphs (const TQValueList<ParaData>& paraList);
-        virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+        virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
             const ValueListFormatData& paraFormatDataList);
         virtual bool doFullPaperFormat (const int format,
             const double width, const double height, const int orientation); ///< Like AbiWord's \<papersize\>
@@ -77,7 +77,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker
         virtual bool doCloseBody (void); ///< Like HTML's \</BODY\>
         virtual bool doOpenStyles (void); ///< Like HTML's \<style\>
         virtual bool doCloseStyles (void); ///< Like HTML's \</style\>
-        virtual bool doFullDefineStyle (LayoutData& tqlayout); ///< Defines a single style
+        virtual bool doFullDefineStyle (LayoutData& layout); ///< Defines a single style
         virtual bool doOpenSpellCheckIgnoreList (void); ///< like AbiWord's \<ignorewords\> and KWord's \<SPELLCHECKIGNORELIST\>
         virtual bool doCloseSpellCheckIgnoreList (void); ///< like AbiWord's \</ignorewords\> and Kwords \</SPELLCHECKIGNORELIST\>
         virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); ///< like AbiWord's \<iw\> and Kwords \</SPELLCHECKIGNOREWORD\>
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index 149e9b9d..a3fca243 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -189,11 +189,11 @@ static void ProcessParagraphTag ( TQDomNode         myNode,
     TQValueList<TagProcessing> tagProcessingList;
     tagProcessingList << TagProcessing ( "TEXT",    ProcessTextTag,     &paraData.text           )
                       << TagProcessing ( "FORMATS", ProcessFormatsTag,  &paraData.formattingList )
-                      << TagProcessing ( "LAYOUT",  ProcessLayoutTag,   &paraData.tqlayout         );
+                      << TagProcessing ( "LAYOUT",  ProcessLayoutTag,   &paraData.layout         );
     
     if ( leader->m_oldSyntax )
     {
-        tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.tqlayout.pageBreakBefore ) );
+        tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.layout.pageBreakBefore ) );
     }
     ProcessSubtags (myNode, tagProcessingList, leader);
 
@@ -203,9 +203,9 @@ static void ProcessParagraphTag ( TQDomNode         myNode,
     // TODO/FIXME: why !paraData.text.isEmpty()
     if ( paraData.formattingList.isEmpty () && !paraData.text.isEmpty () )
     {
-        if ( paraData.tqlayout.formatData.id == 1 )
+        if ( paraData.layout.formatData.id == 1 )
         {
-            paraData.formattingList << paraData.tqlayout.formatData;
+            paraData.formattingList << paraData.layout.formatData;
         }
         else
         {
@@ -591,11 +591,11 @@ static void ProcessFramesetsTag ( TQDomNode        myNode,
 
 static void ProcessStyleTag (TQDomNode myNode, void *, KWEFKWordLeader *leader )
 {
-    LayoutData tqlayout;
+    LayoutData layout;
 
-    ProcessLayoutTag (myNode, &tqlayout, leader);
+    ProcessLayoutTag (myNode, &layout, leader);
 
-    leader->doFullDefineStyle (tqlayout);
+    leader->doFullDefineStyle (layout);
 }
 
 
@@ -1227,10 +1227,10 @@ bool KWEFKWordLeader::doFullPaperFormatOther ( const int columns, const double c
     return false;
 }
 
-bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &tqlayout )
+bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &layout )
 {
     if ( m_worker )
-        return m_worker->doFullDefineStyle (tqlayout);
+        return m_worker->doFullDefineStyle (layout);
 
     return false;
 }
diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h
index ee1d7694..fc7e787a 100644
--- a/filters/kword/libexport/KWEFKWordLeader.h
+++ b/filters/kword/libexport/KWEFKWordLeader.h
@@ -63,7 +63,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader
         bool doCloseBody (void);
         bool doOpenStyles (void);
         bool doCloseStyles (void);
-        bool doFullDefineStyle (LayoutData& tqlayout);
+        bool doFullDefineStyle (LayoutData& layout);
         bool doOpenSpellCheckIgnoreList (void);
         bool doCloseSpellCheckIgnoreList (void);
         bool doFullSpellCheckIgnoreWord (const TQString& ignoreword);
diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h
index fe302965..682606fe 100644
--- a/filters/kword/libexport/KWEFStructures.h
+++ b/filters/kword/libexport/KWEFStructures.h
@@ -412,7 +412,7 @@ public:
     virtual ~TabulatorList(void) {}
 };
 
-/// Paragraph tqlayout
+/// Paragraph layout
 class LayoutData
 {
 public:
@@ -459,7 +459,7 @@ struct ParaData
 {
     TQString                    text;
     ValueListFormatData        formattingList;
-    LayoutData                 tqlayout;
+    LayoutData                 layout;
 };
 
 struct HeaderFooterData
diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cc
index 65a99977..a02a45ec 100644
--- a/filters/kword/libexport/KWEFUtil.cc
+++ b/filters/kword/libexport/KWEFUtil.cc
@@ -36,7 +36,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.tqunicode())
+        switch (ch.unicode())
         {
         case 38: // &
             {
@@ -78,7 +78,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
                 {
                     if (!codec->canEncode(ch))
                     {
-                        strReturn+=TQString("&#%1;").arg(ch.tqunicode());
+                        strReturn+=TQString("&#%1;").arg(ch.unicode());
                         break;
                     }
                 }
diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cc
index c6c0cb41..3a626f7f 100644
--- a/filters/kword/libexport/ProcessDocument.cc
+++ b/filters/kword/libexport/ProcessDocument.cc
@@ -607,7 +607,7 @@ static void SubProcessFormatSixTag(TQDomNode myNode,
         TQString instance;
 
         TQValueList<TagProcessing> tagProcessingList;
-        // TODO: We can have all tqlayout information as in regular texts
+        // TODO: We can have all layout information as in regular texts
         //       They simply apply to the table frames
         //       FONT is just the first that we've come across so far
         tagProcessingList << TagProcessing ( "FONT" )
@@ -765,12 +765,12 @@ static void ProcessLayoutTabulatorTag ( TQDomNode myNode, void *tagData, KWEFKWo
 
 static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ("first" , tqlayout->indentFirst );
-    attrProcessingList << AttrProcessing ("left"  , tqlayout->indentLeft  );
-    attrProcessingList << AttrProcessing ("right" , tqlayout->indentRight );
+    attrProcessingList << AttrProcessing ("first" , layout->indentFirst );
+    attrProcessingList << AttrProcessing ("left"  , layout->indentLeft  );
+    attrProcessingList << AttrProcessing ("right" , layout->indentRight );
     ProcessAttributes (myNode, attrProcessingList);
 
     AllowNoSubtags (myNode, leader);
@@ -779,11 +779,11 @@ static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader
 
 static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ("after" ,  tqlayout->marginBottom );
-    attrProcessingList << AttrProcessing ("before" , tqlayout->marginTop    );
+    attrProcessingList << AttrProcessing ("after" ,  layout->marginBottom );
+    attrProcessingList << AttrProcessing ("before" , layout->marginTop    );
     ProcessAttributes (myNode, attrProcessingList);
 
     AllowNoSubtags (myNode, leader);
@@ -792,14 +792,14 @@ static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordL
 
 static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
 
     TQString strBefore, strAfter;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ( "linesTogether",       tqlayout->keepLinesTogether  );
-    attrProcessingList << AttrProcessing ( "hardFrameBreak",      tqlayout->pageBreakBefore );
-    attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", tqlayout->pageBreakAfter  );
+    attrProcessingList << AttrProcessing ( "linesTogether",       layout->keepLinesTogether  );
+    attrProcessingList << AttrProcessing ( "hardFrameBreak",      layout->pageBreakBefore );
+    attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", layout->pageBreakAfter  );
     attrProcessingList << AttrProcessing ( "keepWithNext" ); // RTF import filter
     ProcessAttributes (myNode, attrProcessingList);
 
@@ -809,21 +809,21 @@ static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordL
 
 static void ProcessShadowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader)
 {
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
 
     int red=0;
     int green=0;
     int blue=0;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ( "distance", tqlayout->shadowDistance );
-    attrProcessingList << AttrProcessing ( "direction", tqlayout->shadowDirection );
+    attrProcessingList << AttrProcessing ( "distance", layout->shadowDistance );
+    attrProcessingList << AttrProcessing ( "direction", layout->shadowDirection );
     attrProcessingList << AttrProcessing ( "red",      red   );
     attrProcessingList << AttrProcessing ( "green",    green );
     attrProcessingList << AttrProcessing ( "blue",     blue  );
     ProcessAttributes (myNode, attrProcessingList);
 
-    tqlayout->shadowColor.setRgb(red,green,blue);
+    layout->shadowColor.setRgb(red,green,blue);
 
     AllowNoSubtags (myNode, leader);
 }
@@ -856,7 +856,7 @@ static void ProcessFollowingTag ( TQDomNode myNode, void *tagData, KWEFKWordLead
 
 static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
 {
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
     TQString oldValue, spacingType;
     double spacingValue;
 
@@ -873,9 +873,9 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea
     {
         // for old format
         if( oldValue == "oneandhalf" )
-            tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
+            layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
         else if ( oldValue == "double" )
-            tqlayout->lineSpacingType = LayoutData::LS_DOUBLE;
+            layout->lineSpacingType = LayoutData::LS_DOUBLE;
         else
         {
             bool ok = false;
@@ -883,38 +883,38 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea
             if ( ok && ( size >= 0.0 ) ) // 0 is allowed but negative values are not
             {
                 // We have a valid size
-                tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
-                tqlayout->lineSpacing     = size;
+                layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
+                layout->lineSpacing     = size;
             }
             else
-               tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
+               layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
          }
     }
     else
     {
         // for new format
         if( spacingType == "oneandhalf" )
-            tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
+            layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
         else if ( spacingType == "double" )
-            tqlayout->lineSpacingType = LayoutData::LS_DOUBLE;
+            layout->lineSpacingType = LayoutData::LS_DOUBLE;
         else if ( spacingType == "custom" )
-            tqlayout->lineSpacingType = LayoutData::LS_CUSTOM;
+            layout->lineSpacingType = LayoutData::LS_CUSTOM;
         else if ( spacingType == "atleast" )
-            tqlayout->lineSpacingType = LayoutData::LS_ATLEAST;
+            layout->lineSpacingType = LayoutData::LS_ATLEAST;
         else if ( spacingType == "multiple" )
-            tqlayout->lineSpacingType = LayoutData::LS_MULTIPLE;
+            layout->lineSpacingType = LayoutData::LS_MULTIPLE;
         else if ( spacingType == "fixed" )
-            tqlayout->lineSpacingType = LayoutData::LS_FIXED;
+            layout->lineSpacingType = LayoutData::LS_FIXED;
         else
-             tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
-        tqlayout->lineSpacing = spacingValue;
+             layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
+        layout->lineSpacing = spacingValue;
     }
 }
 
 static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
 {
     // <LINESPACE> is an old tag, of before syntax 1
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
     double spacingValue = 0.0;
 
     TQValueList<AttrProcessing> attrProcessingList;
@@ -923,13 +923,13 @@ static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeade
     attrProcessingList << AttrProcessing ( "inch" );
     ProcessAttributes (myNode, attrProcessingList);
 
-    tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
-    tqlayout->lineSpacing     = spacingValue;
+    layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
+    layout->lineSpacing     = spacingValue;
 }
 
 static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
 
     TQString oldAlign, normalAlign;
 
@@ -948,7 +948,7 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
     {
         if ( oldAlign.isEmpty() )
         {
-            tqlayout->alignment = "left"; // KWord 0.8 did not support right-to-left
+            layout->alignment = "left"; // KWord 0.8 did not support right-to-left
         }
         else
         {
@@ -956,19 +956,19 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
             if ( ( align < 0 ) || ( align > 3) )
             {
                 kdWarning(30508) << "KWord 0.8 flow unknown: " << oldAlign << endl;
-                tqlayout->alignment = "left"; // Unknown, so assume left
+                layout->alignment = "left"; // Unknown, so assume left
             }
             else
             {
                 const char* flows[]={"left", "right", "center", "justify" };
-                tqlayout->alignment = flows[ align ];
+                layout->alignment = flows[ align ];
             }
         }
-        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->alignment << endl;
+        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << layout->alignment << endl;
     }
     else
     {
-        tqlayout->alignment = normalAlign;
+        layout->alignment = normalAlign;
     }
 
 }
@@ -981,36 +981,36 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
     attrProcessingList << AttrProcessing ( "outline" ); // Only in <STYLE>
     ProcessAttributes (myNode, attrProcessingList);
 
-    LayoutData *tqlayout = (LayoutData *) tagData;
+    LayoutData *layout = (LayoutData *) tagData;
 
     ValueListFormatData formatDataList;
 
     TQValueList<TagProcessing> tagProcessingList;
-    tagProcessingList << TagProcessing ( "NAME",         ProcessStringValueTag,       &tqlayout->styleName           );
-    tagProcessingList << TagProcessing ( "FOLLOWING",    ProcessFollowingTag,         &tqlayout->styleFollowing      );
-    tagProcessingList << TagProcessing ( "FLOW",         ProcessFlowTag,              tqlayout );
-    tagProcessingList << TagProcessing ( "INDENTS",      ProcessIndentsTag,           tqlayout              );
-    tagProcessingList << TagProcessing ( "OFFSETS",      ProcessLayoutOffsetTag,      tqlayout              );
-    tagProcessingList << TagProcessing ( "LINESPACING",  ProcessLinespacingTag,       tqlayout              );
-    tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag,      tqlayout              );
-    tagProcessingList << TagProcessing ( "LEFTBORDER",   ProcessAnyBorderTag,         &tqlayout->leftBorder          );
-    tagProcessingList << TagProcessing ( "RIGHTBORDER",  ProcessAnyBorderTag,         &tqlayout->rightBorder         );
-    tagProcessingList << TagProcessing ( "TOPBORDER",    ProcessAnyBorderTag,         &tqlayout->topBorder           );
-    tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag,         &tqlayout->bottomBorder        );
-    tagProcessingList << TagProcessing ( "COUNTER",      ProcessCounterTag,           &tqlayout->counter    );
+    tagProcessingList << TagProcessing ( "NAME",         ProcessStringValueTag,       &layout->styleName           );
+    tagProcessingList << TagProcessing ( "FOLLOWING",    ProcessFollowingTag,         &layout->styleFollowing      );
+    tagProcessingList << TagProcessing ( "FLOW",         ProcessFlowTag,              layout );
+    tagProcessingList << TagProcessing ( "INDENTS",      ProcessIndentsTag,           layout              );
+    tagProcessingList << TagProcessing ( "OFFSETS",      ProcessLayoutOffsetTag,      layout              );
+    tagProcessingList << TagProcessing ( "LINESPACING",  ProcessLinespacingTag,       layout              );
+    tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag,      layout              );
+    tagProcessingList << TagProcessing ( "LEFTBORDER",   ProcessAnyBorderTag,         &layout->leftBorder          );
+    tagProcessingList << TagProcessing ( "RIGHTBORDER",  ProcessAnyBorderTag,         &layout->rightBorder         );
+    tagProcessingList << TagProcessing ( "TOPBORDER",    ProcessAnyBorderTag,         &layout->topBorder           );
+    tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag,         &layout->bottomBorder        );
+    tagProcessingList << TagProcessing ( "COUNTER",      ProcessCounterTag,           &layout->counter    );
     tagProcessingList << TagProcessing ( "FORMAT",       ProcessFormatTag,            &formatDataList     );
-    tagProcessingList << TagProcessing ( "TABULATOR",    ProcessLayoutTabulatorTag,   &tqlayout->tabulatorList       );
-    tagProcessingList << TagProcessing ( "SHADOW",       ProcessShadowTag,            tqlayout                       );
+    tagProcessingList << TagProcessing ( "TABULATOR",    ProcessLayoutTabulatorTag,   &layout->tabulatorList       );
+    tagProcessingList << TagProcessing ( "SHADOW",       ProcessShadowTag,            layout                       );
 
     if ( leader->m_oldSyntax )
     {
-        tqlayout->indentLeft = 0.0; // ### TODO: needed or not?
+        layout->indentLeft = 0.0; // ### TODO: needed or not?
         tagProcessingList
-            << TagProcessing ( "OHEAD",  ProcessOldLayoutChildTag, &tqlayout->marginTop )
-            << TagProcessing ( "OFOOT",  ProcessOldLayoutChildTag, &tqlayout->marginBottom )
-            << TagProcessing ( "ILEFT",  ProcessOldLayoutChildTag, &tqlayout->indentLeft )
-            << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &tqlayout->indentFirst )
-            << TagProcessing ( "LINESPACE", ProcessLineSpaceTag,   tqlayout )
+            << TagProcessing ( "OHEAD",  ProcessOldLayoutChildTag, &layout->marginTop )
+            << TagProcessing ( "OFOOT",  ProcessOldLayoutChildTag, &layout->marginBottom )
+            << TagProcessing ( "ILEFT",  ProcessOldLayoutChildTag, &layout->indentLeft )
+            << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &layout->indentFirst )
+            << TagProcessing ( "LINESPACE", ProcessLineSpaceTag,   layout )
             ;
     }
 
@@ -1023,7 +1023,7 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
     }
     else
     {
-        tqlayout->formatData = formatDataList.first ();
+        layout->formatData = formatDataList.first ();
 
         if ( formatDataList.count () > 1 )
         {
@@ -1031,10 +1031,10 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
         }
     }
 
-    if ( tqlayout->styleName.isEmpty () )
+    if ( layout->styleName.isEmpty () )
     {
-        tqlayout->styleName = "Standard";
-        kdWarning (30508) << "Empty tqlayout name!" << endl;
+        layout->styleName = "Standard";
+        kdWarning (30508) << "Empty layout name!" << endl;
     }
 
 }
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index ba359cd2..242a6d39 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -568,7 +568,7 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr
 
     m_paragraph = TQString( "" );
     m_index = 0;
-    m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks
+    m_oldLayout = layoutElement; // Keep a reference to the old layout for some hacks
 }
 
 void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
@@ -659,7 +659,7 @@ void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::P
             // which kword doesn't support. We map it to 0 with a clever '%4' :)
             tabElement.setAttribute( "type", td.tbd.jc % 4 );
             int filling = 0;
-            double width = 0.5; // default kword value, see koparagtqlayout.cc
+            double width = 0.5; // default kword value, see koparaglayout.cc
             switch ( td.tbd.tlc ) {
             case 1: // dots
             case 2: // hyphenated
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index 088a669e..a65cd330 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -1286,7 +1286,7 @@ public:
 
 	bool processTable (const Table &table)
 	{
-		// just dump the table out for now (no tqlayout)
+		// just dump the table out for now (no layout)
 		for (TQValueList <TableCell>::ConstIterator it = table.cellList.begin ();
 				it != table.cellList.end ();
 				it++)
@@ -1417,12 +1417,12 @@ public:
 	bool doFullParagraph (const ParaData &paraData)
 	{
 		return doFullParagraph (paraData.text,
-							 			paraData.tqlayout,
+							 			paraData.layout,
 										paraData.formattingList);
 	}
 
 	bool doFullParagraph (const TQString &paraText,
-						 			const LayoutData &tqlayout,
+						 			const LayoutData &layout,
 									const ValueListFormatData &paraFormatDataList)
 	{
 		MSWrite::FormatParaProperty paraProp;
@@ -1446,34 +1446,34 @@ public:
 		paraProp.setIsText (true);
 
 		// Alignment
-		if (!tqlayout.alignment.isEmpty ())
+		if (!layout.alignment.isEmpty ())
 		{
-			if (tqlayout.alignment == "left")
+			if (layout.alignment == "left")
 				// quite useless since MSWrite::Alignment::Left is the default anyway
 				paraProp.setAlignment (MSWrite::Alignment::Left);
-			else if (tqlayout.alignment == "right")
+			else if (layout.alignment == "right")
 				paraProp.setAlignment (MSWrite::Alignment::Right);
-			else if (tqlayout.alignment == "center")
+			else if (layout.alignment == "center")
 				paraProp.setAlignment (MSWrite::Alignment::Center);
-			else if (tqlayout.alignment == "justify")
+			else if (layout.alignment == "justify")
 				paraProp.setAlignment (MSWrite::Alignment::Justify);
 			else
-				kdWarning (30509) << "Unknown Alignment: " << tqlayout.alignment << endl;
+				kdWarning (30509) << "Unknown Alignment: " << layout.alignment << endl;
 		}
 
 		// Indentation
-		if (tqlayout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (tqlayout.indentFirst)));
-		if (tqlayout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (tqlayout.indentLeft)));
-		if (tqlayout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (tqlayout.indentRight)));
+		if (layout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (layout.indentFirst)));
+		if (layout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (layout.indentLeft)));
+		if (layout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (layout.indentRight)));
 	#if 0
-		kdDebug (30509) << "Indent: " << Point2Twip (tqlayout.indentFirst) << " "
-												<< Point2Twip (tqlayout.indentLeft) << " "
-												<< Point2Twip (tqlayout.indentRight) << endl;
+		kdDebug (30509) << "Indent: " << Point2Twip (layout.indentFirst) << " "
+												<< Point2Twip (layout.indentLeft) << " "
+												<< Point2Twip (layout.indentRight) << endl;
 	#endif
 
 		// Line Spacing
 		MSWrite::Word lineSpacing = MSWrite::LineSpacing::Normal;
-		switch (tqlayout.lineSpacingType)
+		switch (layout.lineSpacingType)
 		{
 		case LayoutData::LS_SINGLE:
 			lineSpacing = MSWrite::LineSpacing::Normal;
@@ -1487,12 +1487,12 @@ public:
 		case LayoutData::LS_CUSTOM:
 		case LayoutData::LS_FIXED:
 		case LayoutData::LS_ATLEAST:
-			lineSpacing = getClosestLineSpacing (tqlayout.lineSpacing);
+			lineSpacing = getClosestLineSpacing (layout.lineSpacing);
 			break;
 		case LayoutData::LS_MULTIPLE:
 			break;
 		default:
-			kdWarning (30509) << "unknown lineSpacingType \'" << tqlayout.lineSpacingType << "\'" << endl;
+			kdWarning (30509) << "unknown lineSpacingType \'" << layout.lineSpacingType << "\'" << endl;
 		}
 		paraProp.setLineSpacing (lineSpacing);
 
@@ -1500,8 +1500,8 @@ public:
 		// It seems that Write applies the 1st paragraph's Tabulator settings to the _entire_ document
 		// Word97 and KWord, however, will treat them like a Paragraph Property
 		int numTabs = 0;
-		for (TabulatorList::ConstIterator tabIt = tqlayout.tabulatorList.begin ();
-				tabIt != tqlayout.tabulatorList.end ();
+		for (TabulatorList::ConstIterator tabIt = layout.tabulatorList.begin ();
+				tabIt != layout.tabulatorList.end ();
 				tabIt++)
 		{
 			MSWrite::FormatParaPropertyTabulator tab;
@@ -1544,7 +1544,7 @@ public:
 
 		// get this paragraph's "default formatting"
 		MSWrite::FormatCharProperty charPropDefault;
-		processFormatData (charPropDefault, tqlayout.formatData.text);
+		processFormatData (charPropDefault, layout.formatData.text);
 
 		MSWrite::DWord uptoByte = 0;	// relative to start of KWord paragraph
 		MSWrite::DWord numBytes = paraText.length ();	// relative to start of KWord paragraph
@@ -1561,18 +1561,18 @@ public:
 			if (!m_generator->writeCharInfoBegin (&charPropDefault)) return false;
 
 			// page break at start of paragraph?
-			if (tqlayout.pageBreakBefore)
+			if (layout.pageBreakBefore)
 				if (!m_generator->writePageBreak ()) return false;
 
 			// counter data
-			processCounter (tqlayout.counter);
+			processCounter (layout.counter);
 
 			// end of line
 			if (!m_generator->writeCarriageReturn ()) return false;
 			if (!m_generator->writeNewLine (true/*end of paragraph*/)) return false;
 
 			// page break at end of paragraph?
-			if (tqlayout.pageBreakAfter)
+			if (layout.pageBreakAfter)
 				if (!m_generator->writePageBreak ()) return false;
 
 			// write default character property end
@@ -1595,11 +1595,11 @@ public:
 				if (uptoByte == 0)
 				{
 					// page break at start of paragraph?
-					if (tqlayout.pageBreakBefore)
+					if (layout.pageBreakBefore)
 						if (!m_generator->writePageBreak ()) return false;
 
 					// counter data
-					processCounter (tqlayout.counter);
+					processCounter (layout.counter);
 				}
 
 				// yes, this is slightly premature but it doesn't matter
@@ -1733,7 +1733,7 @@ public:
 					}
 
 					// page break at end of paragraph?
-					if (tqlayout.pageBreakAfter)
+					if (layout.pageBreakAfter)
 						if (!m_generator->writePageBreak ()) return false;
 				}
 
diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h
index 28f7cc4e..feb0f563 100644
--- a/filters/kword/mswrite/structures_generated.h
+++ b/filters/kword/mswrite/structures_generated.h
@@ -183,7 +183,7 @@ namespace MSWrite
 		void setNumPages (const Word val)	{	m_numPages = val;	}
 	};
 	
-	// Page tqlayout information (margins, dimensions, ...)
+	// Page layout information (margins, dimensions, ...)
 	class PageLayoutGenerated : public NeedsDevice
 	{
 	public:
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 5e2d3e42..73acf741 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -96,7 +96,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const
         }
 
         // ### TODO: would be switch/case or if/elseif the best?
-        switch (ch.tqunicode())
+        switch (ch.unicode())
         {
         case 9: // Tab
             {
@@ -180,7 +180,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const
         case 30:
         case 31:
             {
-                kdWarning(30518) << "Not allowed XML character: " << ch.tqunicode() << endl;
+                kdWarning(30518) << "Not allowed XML character: " << ch.unicode() << endl;
                 strReturn += '?';
                 break;
             }
@@ -1729,38 +1729,38 @@ void OOWriterWorker::processParagraphData ( const TQString &paraText,
 }
 
 TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
-    const LayoutData& tqlayout, const bool force, TQString& styleKey)
+    const LayoutData& layout, const bool force, TQString& styleKey)
 {
     TQString props; // Props has to remain empty, if there is no difference.
 
-    styleKey += tqlayout.styleName;
+    styleKey += layout.styleName;
     styleKey += ',';
 
-    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
+    if (force || (layoutOrigin.alignment!=layout.alignment))
     {
         // NOTE: OO 1.0.x uses start and end like left and right (section 3.11.4)
         // Unfortunately in XSL-FO's text-align, they are really supposed to be the start and the end.
-        if (tqlayout.alignment == "left")
+        if (layout.alignment == "left")
         {
             props += "fo:text-align=\"start\" ";
             styleKey += 'L';
         }
-        else if (tqlayout.alignment == "right")
+        else if (layout.alignment == "right")
         {
             props += "fo:text-align=\"end\" ";
             styleKey += 'R';
         }
-        else if (tqlayout.alignment == "center")
+        else if (layout.alignment == "center")
         {
             props += "fo:text-align=\"center\" ";
             styleKey += 'C';
         }
-        else if (tqlayout.alignment == "justify")
+        else if (layout.alignment == "justify")
         {
             props += "fo:text-align=\"justify\" ";
             styleKey += 'J';
         }
-        else if (tqlayout.alignment == "auto")
+        else if (layout.alignment == "auto")
         {
             props += "fo:text-align=\"start\" ";
 #ifndef STRICT_OOWRITER_VERSION_1
@@ -1770,68 +1770,68 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         }
         else
         {
-            kdWarning(30518) << "Unknown alignment: " << tqlayout.alignment << endl;
+            kdWarning(30518) << "Unknown alignment: " << layout.alignment << endl;
         }
     }
 
     styleKey += ',';
 
-    if ((tqlayout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
+    if ((layout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
     {
-        props += TQString("fo:margin-left=\"%1pt\" ").arg(tqlayout.indentLeft);
-        styleKey += TQString::number(tqlayout.indentLeft);
+        props += TQString("fo:margin-left=\"%1pt\" ").arg(layout.indentLeft);
+        styleKey += TQString::number(layout.indentLeft);
     }
 
     styleKey += ',';
 
-    if ((tqlayout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
+    if ((layout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
     {
-        props += TQString("fo:margin-right=\"%1pt\" ").arg(tqlayout.indentRight);
-        styleKey += TQString::number(tqlayout.indentRight);
+        props += TQString("fo:margin-right=\"%1pt\" ").arg(layout.indentRight);
+        styleKey += TQString::number(layout.indentRight);
     }
 
     styleKey += ',';
 
-    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
     {
         props += "fo:text-indent=\"";
-        props += TQString::number(tqlayout.indentFirst);
+        props += TQString::number(layout.indentFirst);
         props += "\" ";
-        styleKey += TQString::number(tqlayout.indentFirst);
+        styleKey += TQString::number(layout.indentFirst);
     }
 
     styleKey += ',';
 
-    if ((tqlayout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
+    if ((layout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
     {
-       props += TQString("fo:margin-bottom=\"%1pt\" ").arg(tqlayout.marginBottom);
-       styleKey += TQString::number(tqlayout.marginBottom);
+       props += TQString("fo:margin-bottom=\"%1pt\" ").arg(layout.marginBottom);
+       styleKey += TQString::number(layout.marginBottom);
     }
 
     styleKey += ',';
 
-    if ((tqlayout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
+    if ((layout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
     {
-       props += TQString("fo:margin-top=\"%1pt\" ").arg(tqlayout.marginTop);
-       styleKey += TQString::number(tqlayout.marginTop);
+       props += TQString("fo:margin-top=\"%1pt\" ").arg(layout.marginTop);
+       styleKey += TQString::number(layout.marginTop);
     }
 
     styleKey += ',';
 
     if (force
-        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
     {
-        switch ( tqlayout.lineSpacingType )
+        switch ( layout.lineSpacingType )
         {
         case LayoutData::LS_CUSTOM:
             {
                 // We have a custom line spacing (in points)
-                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
                 props += "style:line-spacing=\"";
                 props += height;
                 props += "pt\" ";
@@ -1860,7 +1860,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         case LayoutData::LS_MULTIPLE:
             {
                 // OOWriter 1.1 only allows up to 200%
-                const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) );
+                const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) );
                 props += "fo:line-height=\"";
                 props += mult;
                 props += "%\" ";
@@ -1871,7 +1871,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         case LayoutData::LS_FIXED:
             {
                 // We have a fixed line height (in points)
-                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
                 props += "fo:line-height=\"";
                 props += height;
                 props += "pt\" ";
@@ -1882,7 +1882,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         case LayoutData::LS_ATLEAST:
             {
                 // We have a at-least line height (in points)
-                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
                 props += "style:line-height-at-least=\"";
                 props += height;
                 props += "pt\" ";
@@ -1892,7 +1892,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
             }
         default:
             {
-                kdWarning(30518) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30518) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
@@ -1900,7 +1900,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     
     styleKey += ',';
 
-    if ( tqlayout.pageBreakBefore )
+    if ( layout.pageBreakBefore )
     {
         // We have a page break before the paragraph
         props += "fo:page-break-before=\"page\" ";
@@ -1909,7 +1909,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
 
     styleKey += ',';
 
-    if ( tqlayout.pageBreakAfter )
+    if ( layout.pageBreakAfter )
     {
         // We have a page break after the paragraph
         props += "fo:page-break-after=\"page\" ";
@@ -1918,20 +1918,20 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
 
     styleKey += '@'; // A more visible seperator
 
-    props += textFormatToStyle(layoutOrigin.formatData.text,tqlayout.formatData.text,force,styleKey);
+    props += textFormatToStyle(layoutOrigin.formatData.text,layout.formatData.text,force,styleKey);
 
     props += ">";
 
     styleKey += '@'; // A more visible seperator
 
     // ### TODO/FIXME: what if all tabulators must be erased?
-    if (!tqlayout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
+    if (!layout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
     {
         props += "\n    <style:tab-stops>\n";
         TabulatorList::ConstIterator it;
-		TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
-        for (it=tqlayout.tabulatorList.begin();it!=end;++it)
+		TabulatorList::ConstIterator end(layout.tabulatorList.end());
+        for (it=layout.tabulatorList.begin();it!=end;++it)
         {
             props+="     <style:tab-stop style:position=\"";
             props += TQString::number((*it).m_ptpos);
@@ -1966,27 +1966,27 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     return props;
 }
 
-bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
     const ValueListFormatData& paraFormatDataList)
 {
-    const bool header = ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
-        && (tqlayout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
+    const bool header = ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
+        && (layout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
 
     if (header)
     {
         *m_streamOut << "  <text:h text:level=\"";
-        *m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
+        *m_streamOut << TQString::number(layout.counter.depth+1,10);
         *m_streamOut << "\" ";
     }
     else
         *m_streamOut << "  <text:p ";
 
-    const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
+    const LayoutData& styleLayout=m_styleMap[layout.styleName];
 
     TQString styleKey;
-    const TQString props(layoutToParagraphStyle(styleLayout,tqlayout,false,styleKey));
+    const TQString props(layoutToParagraphStyle(styleLayout,layout,false,styleKey));
 
-    TQString actualStyle(tqlayout.styleName);
+    TQString actualStyle(layout.styleName);
     if (!props.isEmpty())
     {
         TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.find(styleKey) );
@@ -2003,7 +2003,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
 
             m_contentAutomaticStyles += "  <style:style";
             m_contentAutomaticStyles += " style:name=\"" + escapeOOText(automaticStyle) + "\"";
-            m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(tqlayout.styleName) + "\"";
+            m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(layout.styleName) + "\"";
             m_contentAutomaticStyles += " style:family=\"paragraph\" style:class=\"text\"";
             m_contentAutomaticStyles += ">\n";
             m_contentAutomaticStyles += "   <style:properties ";
@@ -2032,7 +2032,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
 
     *m_streamOut << ">";
 
-    processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
+    processParagraphData(paraText, layout.formatData.text, paraFormatDataList);
 
     if (header)
         *m_streamOut << "</text:h>\n";
@@ -2054,21 +2054,21 @@ bool OOWriterWorker::doOpenStyles(void)
     return true;
 }
 
-bool OOWriterWorker::doFullDefineStyle(LayoutData& tqlayout)
+bool OOWriterWorker::doFullDefineStyle(LayoutData& layout)
 {
     //Register style in the style map
-    m_styleMap[tqlayout.styleName]=tqlayout;
+    m_styleMap[layout.styleName]=layout;
 
     m_styles += "  <style:style";
 
-    m_styles += " style:name=\"" + escapeOOText( tqlayout.styleName ) + "\"";
-    m_styles += " style:next-style-name=\"" + escapeOOText( tqlayout.styleFollowing ) + "\"";
+    m_styles += " style:name=\"" + escapeOOText( layout.styleName ) + "\"";
+    m_styles += " style:next-style-name=\"" + escapeOOText( layout.styleFollowing ) + "\"";
     m_styles += " style:family=\"paragraph\" style:class=\"text\"";
     m_styles += ">\n";
     m_styles += "   <style:properties ";
 
     TQString debugKey; // Not needed
-    m_styles += layoutToParagraphStyle(tqlayout,tqlayout,true,debugKey);
+    m_styles += layoutToParagraphStyle(layout,layout,true,debugKey);
     kdDebug(30518) << "Defining style: " << debugKey << endl;
 
     m_styles += "</style:properties>\n";
diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h
index 0a898227..c89e15ac 100644
--- a/filters/kword/oowriter/ExportFilter.h
+++ b/filters/kword/oowriter/ExportFilter.h
@@ -68,7 +68,7 @@ public:
     virtual bool doCloseFile(void); ///< Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doFullPaperFormat(const int format,
         const double width, const double height, const int orientation);
@@ -81,7 +81,7 @@ public:
     virtual bool doFullPaperFormatOther ( const int columns, const double columnspacing, const int numPages );        
     virtual bool doOpenStyles(void);
     virtual bool doCloseStyles(void);
-    virtual bool doFullDefineStyle(LayoutData& tqlayout);
+    virtual bool doFullDefineStyle(LayoutData& layout);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
     virtual bool doVariableSettings(const VariableSettingsData& vs);
     virtual bool doOpenBody (void);
@@ -107,7 +107,7 @@ private:
     TQString textFormatToStyle(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force, TQString& key);
     TQString layoutToParagraphStyle(const LayoutData& layoutOrigin,
-        const LayoutData& tqlayout, const bool force, TQString& styleKey);
+        const LayoutData& layout, const bool force, TQString& styleKey);
     TQString escapeOOText(const TQString& strText) const;
     TQString escapeOOSpan(const TQString& strText) const;
     TQString cellToProperties( const TableCell& cell, TQString& key) const;
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 3f267beb..07262c86 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -873,13 +873,13 @@ void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& layoutEleme
         TQString bulletChar = listStyle.attributeNS( ooNS::text, "bullet-char", TQString() );
         if ( !bulletChar.isEmpty() ) {
 #if 0 // doesn't work well. Fonts lack those symbols!
-            counter.setAttribute( "bullet", bulletChar[0].tqunicode() );
-            kdDebug(30518) << "bullet code " << bulletChar[0].tqunicode() << endl;
+            counter.setAttribute( "bullet", bulletChar[0].unicode() );
+            kdDebug(30518) << "bullet code " << bulletChar[0].unicode() << endl;
             TQString fontName = listStyleProperties.attributeNS( ooNS::style, "font-name", TQString() );
             counter.setAttribute( "bulletfont", fontName );
 #endif
             // Reverse engineering, I found those codes:
-            switch( bulletChar[0].tqunicode() ) {
+            switch( bulletChar[0].unicode() ) {
             case 0x2022: // small disc
                 counter.setAttribute( "type", 10 ); // a disc bullet
                 break;
@@ -1209,12 +1209,12 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
     TQDomElement* paragraphStyle = m_styles[paragraph.attributeNS( ooNS::text, "style-name", TQString() )];
     TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( ooNS::style, "master-page-name", TQString() ) : TQString();
     if ( masterPageName.isEmpty() )
-        masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout...
+        masterPageName = "Standard"; // Seems to be a builtin name for the default layout...
     if ( masterPageName != m_currentMasterPage )
     {
-        // Detected a change in the master page -> this means we have to use a new page tqlayout
+        // Detected a change in the master page -> this means we have to use a new page layout
         // and insert a frame break if not on the first paragraph.
-        // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout.
+        // In KWord we don't support sections so the first paragraph is the one that determines the page layout.
         if ( m_currentMasterPage.isEmpty() ) {
             m_currentMasterPage = masterPageName; // before writePageLayout to avoid recursion
             writePageLayout( doc, masterPageName );
@@ -1228,7 +1228,7 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
                 layoutElement.appendChild( pageBreakElem );
             }
             pageBreakElem.setAttribute( "hardFrameBreak", "true" );
-            // We have no way to store the new page tqlayout, KWord doesn't have sections.
+            // We have no way to store the new page layout, KWord doesn't have sections.
         }
     }
 
diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp
index 7c2ea412..b7155fa8 100644
--- a/filters/kword/palmdoc/palmdb.cpp
+++ b/filters/kword/palmdoc/palmdb.cpp
@@ -18,7 +18,7 @@
 */
 
 /*
-   The database tqlayout for PalmDB files is described in 
+   The database layout for PalmDB files is described in 
    http://www.palmos.com/dev/support/docs/protein_books/FileFormats/Intro.html
 */
 
diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc
index 9b748fa7..37f8d9cf 100644
--- a/filters/kword/palmdoc/palmdocexport.cc
+++ b/filters/kword/palmdoc/palmdocexport.cc
@@ -53,7 +53,7 @@ public:
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
 private:
     TQString title;
@@ -101,7 +101,7 @@ bool PalmDocWorker::doFullDocumentInfo( const KWEFDocumentInfo& docInfo )
 }
 
 bool PalmDocWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*tqlayout*/, const ValueListFormatData& /*paraFormatDataList*/)
+  const LayoutData& /*layout*/, const ValueListFormatData& /*paraFormatDataList*/)
 {
   kdDebug(30525) << "Entering ::doFullParagraph" << endl;
   text.append( paraText );
diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc
index 54056085..a1e8107b 100644
--- a/filters/kword/palmdoc/palmdocimport.cc
+++ b/filters/kword/palmdoc/palmdocimport.cc
@@ -96,7 +96,7 @@ KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const
 
 TQString PalmDocImport::processPlainParagraph( TQString text )
 {
-  TQString formats, tqlayout, result;
+  TQString formats, layout, result;
 
   // specify FORMAT (just empty element)
   formats.append ( "  <FORMAT id=\"1\" pos=\"0\" len=\"" +
@@ -108,29 +108,29 @@ TQString PalmDocImport::processPlainParagraph( TQString text )
   double fontSize = font.pointSizeFloat();
 
   // default LAYOUT
-  tqlayout.append( "<LAYOUT>\n" );
-  tqlayout.append( "  <NAME value=\"Standard\" />\n" );
-  tqlayout.append( "  <FLOW align=\"left\" />\n" );
-  tqlayout.append( "  <LINESPACING value=\"0\" />\n" );
-  tqlayout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
-  tqlayout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
-  tqlayout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
-  tqlayout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
-  tqlayout.append( "  <INDENTS />\n" );
-  tqlayout.append( "  <OFFSETS after=\"9\" />\n" );
-  tqlayout.append( "  <PAGEBREAKING />\n" );
-  tqlayout.append( "  <COUNTER />\n" );
-  tqlayout.append( "  <FORMAT id=\"1\">\n" );
-  tqlayout.append( "    <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" );
-  tqlayout.append( "    <WEIGHT value=\"50\" />\n" );
-  tqlayout.append( "    <ITALIC value=\"0\" />\n" );
-  tqlayout.append( "    <UNDERLINE value=\"0\" />\n" );
-  tqlayout.append( "    <STRIKEOUT value=\"0\" />\n" );
-  tqlayout.append( "    <CHARSET value=\"0\" />\n" );
-  tqlayout.append( "    <VERTALIGN value=\"0\" />\n" );
-  tqlayout.append( "    <FONT name=\"" + fontFamily + "\" />\n" );
-  tqlayout.append( "  </FORMAT>\n" );
-  tqlayout.append( "</LAYOUT>\n" );
+  layout.append( "<LAYOUT>\n" );
+  layout.append( "  <NAME value=\"Standard\" />\n" );
+  layout.append( "  <FLOW align=\"left\" />\n" );
+  layout.append( "  <LINESPACING value=\"0\" />\n" );
+  layout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
+  layout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
+  layout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
+  layout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
+  layout.append( "  <INDENTS />\n" );
+  layout.append( "  <OFFSETS after=\"9\" />\n" );
+  layout.append( "  <PAGEBREAKING />\n" );
+  layout.append( "  <COUNTER />\n" );
+  layout.append( "  <FORMAT id=\"1\">\n" );
+  layout.append( "    <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" );
+  layout.append( "    <WEIGHT value=\"50\" />\n" );
+  layout.append( "    <ITALIC value=\"0\" />\n" );
+  layout.append( "    <UNDERLINE value=\"0\" />\n" );
+  layout.append( "    <STRIKEOUT value=\"0\" />\n" );
+  layout.append( "    <CHARSET value=\"0\" />\n" );
+  layout.append( "    <VERTALIGN value=\"0\" />\n" );
+  layout.append( "    <FONT name=\"" + fontFamily + "\" />\n" );
+  layout.append( "  </FORMAT>\n" );
+  layout.append( "</LAYOUT>\n" );
 
   // encode text for XML-ness
   text.replace( '&', "&amp;" );
@@ -145,7 +145,7 @@ TQString PalmDocImport::processPlainParagraph( TQString text )
   result.append( "<FORMATS>\n");
   result.append( formats );
   result.append( "</FORMATS>\n");
-  result.append( tqlayout );
+  result.append( layout );
   result.append( "</PARAGRAPH>\n" );
 
   return result;
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index 1ba81776..14d3d384 100644
--- a/filters/kword/pdf/FilterPage.cpp
+++ b/filters/kword/pdf/FilterPage.cpp
@@ -85,7 +85,7 @@ void Page::addString(TextString *str)
 //    TQString s;
 //    for (int i=0; i<str->len; i++) s += TQChar(str->text[i]);
 //    kdDebug(30516) << "string: " << s << " ("
-//                   << (str->len>0 ? s[0].tqunicode() : 0) << ")" << endl;
+//                   << (str->len>0 ? s[0].unicode() : 0) << ")" << endl;
     TextPage::addString(str);
 //    kdDebug(30516) << " ...addString done" << endl;
 }
@@ -315,14 +315,14 @@ void Page::fillParagraph(Paragraph &par, double &offset) const
                 TQChar c = par.blocks[bi].text[si];
                 int psi = par.charFromEnd(1, pbi);
                 TQChar prev = (psi<0 ? TQChar::null : par.blocks[pbi].text[psi]);
-                if ( !prev.isNull() && type(c.tqunicode())==Hyphen )
+                if ( !prev.isNull() && type(c.unicode())==Hyphen )
                     kdDebug(30516) << "hyphen ? " << TQString(prev)
-                                   << " type=" << type(prev.tqunicode())
+                                   << " type=" << type(prev.unicode())
                                    << endl;
                 TextString *next =
                     ((*it)->next ? (*it)->next->blocks->strings : 0);
-                if ( !prev.isNull() && type(c.tqunicode())==Hyphen
-                     && isLetter( type(prev.tqunicode()) )
+                if ( !prev.isNull() && type(c.unicode())==Hyphen
+                     && isLetter( type(prev.unicode()) )
                      && next && next->len>0
                      && isLetter( type(next->text[next->len-1]) ) ) {
                     kdDebug(30516) << "found hyphen" << endl;
@@ -389,7 +389,7 @@ void Page::fillParagraph(Paragraph &par, double &offset) const
 FontFamily Page::checkSpecial(TQChar &c, const Font &font) const
 {
     Unicode res = 0;
-    switch ( PDFImport::checkSpecial(c.tqunicode(), res) ) {
+    switch ( PDFImport::checkSpecial(c.unicode(), res) ) {
     case Bullet:
         kdDebug(30516) << "found bullet" << endl;
         // #### FIXME : if list, use a COUNTER
@@ -405,7 +405,7 @@ FontFamily Page::checkSpecial(TQChar &c, const Font &font) const
         kdDebug(30516) << "found latex special" << endl;
         return Times;
     case SpecialSymbol:
-        kdDebug(30516) << "found symbol=" << c.tqunicode() << endl;
+        kdDebug(30516) << "found symbol=" << c.unicode() << endl;
         return Times;
         //return Symbol;
     default:
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index 3c7caae4..3236aa39 100644
--- a/filters/kword/pdf/data.cpp
+++ b/filters/kword/pdf/data.cpp
@@ -189,13 +189,13 @@ void Data::createParagraph(const TQString &text, ParagraphType type,
     textElement.appendChild( _document.createTextNode(text) );
     paragraph.appendChild(textElement);
 
-    TQDomElement tqlayout = _document.createElement("LAYOUT");
-    paragraph.appendChild(tqlayout);
+    TQDomElement layout = _document.createElement("LAYOUT");
+    paragraph.appendChild(layout);
     TQDomElement element = _document.createElement("NAME");
     element.setAttribute("value", "Standard");
-    tqlayout.appendChild(element);
+    layout.appendChild(element);
     for (uint i=0; i<layouts.size(); i++)
-        tqlayout.appendChild(layouts[i]);
+        layout.appendChild(layouts[i]);
 
     if ( formats.size() ) {
         TQDomElement format = _document.createElement("FORMATS");
diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp
index d1a51fb4..013d4cb3 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -148,7 +148,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget)
     TQWhatsThis::add(_smart,
                     i18n("Removes returns and hyphens at end of line. "
                          "Also tries to compute the paragraph alignment. "
-                         "Note that the tqlayout of some pages can "
+                         "Note that the layout of some pages can "
                          "get messed up."));
     top->addWidget(_smart);
 
diff --git a/filters/kword/pdf/xpdf/xpdf/FTFont.cc b/filters/kword/pdf/xpdf/xpdf/FTFont.cc
index ebbbff40..8de09e0e 100644
--- a/filters/kword/pdf/xpdf/xpdf/FTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FTFont.cc
@@ -50,7 +50,7 @@ FTFontEngine::~FTFontEngine() {
 FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName,
 		       char **fontEnc, GBool pdfFontHasEncoding) {
   char *name;
-  int tqunicodeCmap, macRomanCmap, msSymbolCmap;
+  int unicodeCmap, macRomanCmap, msSymbolCmap;
   int i, j;
 
   ok = gFalse;
@@ -89,11 +89,11 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName,
     //        and use (0xf000 + char code).
     // 3. If none of these rules apply, use the first cmap and hope for
     //    the best (this shouldn't happen).
-    tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
+    unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
     for (i = 0; i < face->num_charmaps; ++i) {
       if (face->charmaps[i]->platform_id == 3 &&
 	  face->charmaps[i]->encoding_id == 1) {
-	tqunicodeCmap = i;
+	unicodeCmap = i;
       } else if (face->charmaps[i]->platform_id == 1 &&
 		 face->charmaps[i]->encoding_id == 0) {
 	macRomanCmap = i;
@@ -106,8 +106,8 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName,
     mode = ftFontModeCharCode;
     charMapOffset = 0;
     if (pdfFontHasEncoding) {
-      if (tqunicodeCmap != 0xffff) {
-	i = tqunicodeCmap;
+      if (unicodeCmap != 0xffff) {
+	i = unicodeCmap;
 	mode = ftFontModeUnicode;
       } else if (macRomanCmap != 0xffff) {
 	i = macRomanCmap;
diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cc
index 73a7f1d3..ccb880bf 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cc
@@ -3206,7 +3206,7 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA,
 				      GBool pdfFontHasEncoding,
 				      FontFileOutputFunc outputFunc,
 				      void *outputStream) {
-  int tqunicodeCmap, macRomanCmap, msSymbolCmap;
+  int unicodeCmap, macRomanCmap, msSymbolCmap;
   int nCmaps, cmapPlatform, cmapEncoding, cmapFmt, cmapOffset;
   T42FontIndexMode mode;
   const char *name;
@@ -3239,13 +3239,13 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA,
   // 3. If none of these rules apply, use the first cmap and hope for
   //    the best (this shouldn't happen).
   nCmaps = getUShort(pos+2);
-  tqunicodeCmap = macRomanCmap = msSymbolCmap = -1;
+  unicodeCmap = macRomanCmap = msSymbolCmap = -1;
   cmapOffset = 0;
   for (i = 0; i < nCmaps; ++i) {
     cmapPlatform = getUShort(pos + 4 + 8*i);
     cmapEncoding = getUShort(pos + 4 + 8*i + 2);
     if (cmapPlatform == 3 && cmapEncoding == 1) {
-      tqunicodeCmap = i;
+      unicodeCmap = i;
     } else if (cmapPlatform == 1 && cmapEncoding == 0) {
       macRomanCmap = i;
     } else if (cmapPlatform == 3 && cmapEncoding == 0) {
@@ -3255,8 +3255,8 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA,
   i = 0;
   mode = t42FontModeCharCode;
   if (pdfFontHasEncoding) {
-    if (tqunicodeCmap >= 0) {
-      i = tqunicodeCmap;
+    if (unicodeCmap >= 0) {
+      i = unicodeCmap;
       mode = t42FontModeUnicode;
     } else if (macRomanCmap >= 0) {
       i = macRomanCmap;
diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
index d25970de..8a7b36de 100644
--- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
@@ -139,7 +139,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
   nameToUnicode = new NameToCharCode();
   cidToUnicodes = new GHash(gTrue);
   residentUnicodeMaps = new GHash();
-  tqunicodeMaps = new GHash(gTrue);
+  unicodeMaps = new GHash(gTrue);
   cMapDirs = new GHash(gTrue);
   toUnicodeDirs = new GList();
   displayFonts = new GHash();
@@ -195,7 +195,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
   errQuiet = gFalse;
 
   cidToUnicodeCache = new CIDToUnicodeCache();
-  tqunicodeMapCache = new UnicodeMapCache();
+  unicodeMapCache = new UnicodeMapCache();
   cMapCache = new CMapCache();
 
   // set up the initial nameToUnicode table
@@ -318,7 +318,7 @@ void GlobalParams::parseFile(GString *fileName, FILE *f) {
 	parseNameToUnicode(tokens, fileName, line);
       } else if (!cmd->cmp("cidToUnicode")) {
 	parseCIDToUnicode(tokens, fileName, line);
-      } else if (!cmd->cmp("tqunicodeMap")) {
+      } else if (!cmd->cmp("unicodeMap")) {
 	parseUnicodeMap(tokens, fileName, line);
       } else if (!cmd->cmp("cMapDir")) {
 	parseCMapDir(tokens, fileName, line);
@@ -465,16 +465,16 @@ void GlobalParams::parseUnicodeMap(GList *tokens, GString *fileName,
   GString *encodingName, *name, *old;
 
   if (tokens->getLength() != 3) {
-    error(-1, "Bad 'tqunicodeMap' config file command (%s:%d)",
+    error(-1, "Bad 'unicodeMap' config file command (%s:%d)",
 	  fileName->getCString(), line);
     return;
   }
   encodingName = (GString *)tokens->get(1);
   name = (GString *)tokens->get(2);
-  if ((old = (GString *)tqunicodeMaps->remove(encodingName))) {
+  if ((old = (GString *)unicodeMaps->remove(encodingName))) {
     delete old;
   }
-  tqunicodeMaps->add(encodingName->copy(), name->copy());
+  unicodeMaps->add(encodingName->copy(), name->copy());
 }
 
 void GlobalParams::parseCMapDir(GList *tokens, GString *fileName, int line) {
@@ -765,7 +765,7 @@ GlobalParams::~GlobalParams() {
   delete nameToUnicode;
   deleteGHash(cidToUnicodes, GString);
   deleteGHash(residentUnicodeMaps, UnicodeMap);
-  deleteGHash(tqunicodeMaps, GString);
+  deleteGHash(unicodeMaps, GString);
   deleteGList(toUnicodeDirs, GString);
   deleteGHash(displayFonts, DisplayFontParam);
   deleteGHash(displayCIDFonts, DisplayFontParam);
@@ -793,7 +793,7 @@ GlobalParams::~GlobalParams() {
   delete cMapDirs;
 
   delete cidToUnicodeCache;
-  delete tqunicodeMapCache;
+  delete unicodeMapCache;
   delete cMapCache;
 }
 
@@ -825,7 +825,7 @@ UnicodeMap *GlobalParams::getResidentUnicodeMap(const GString *encodingName) {
 FILE *GlobalParams::getUnicodeMapFile(const GString *encodingName) {
   GString *fileName;
 
-  if (!(fileName = (GString *)tqunicodeMaps->lookup(encodingName))) {
+  if (!(fileName = (GString *)unicodeMaps->lookup(encodingName))) {
     return NULL;
   }
   return fopen(fileName->getCString(), "r");
@@ -959,7 +959,7 @@ UnicodeMap *GlobalParams::getUnicodeMap(GString *encodingName) {
     map->incRefCnt();
     return map;
   }
-  return tqunicodeMapCache->getUnicodeMap(encodingName);
+  return unicodeMapCache->getUnicodeMap(encodingName);
 }
 
 CMap *GlobalParams::getCMap(GString *collection, GString *cMapName) {
diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h
index 1f3e4c53..86114a15 100644
--- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h
+++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h
@@ -237,7 +237,7 @@ private:
 				//   [GString]
   GHash *residentUnicodeMaps;	// mappings from Unicode to char codes,
 				//   indexed by encoding name [UnicodeMap]
-  GHash *tqunicodeMaps;		// files for mappings from Unicode to char
+  GHash *unicodeMaps;		// files for mappings from Unicode to char
 				//   codes, indexed by encoding name [GString]
   GHash *cMapDirs;		// list of CMap dirs, indexed by collection
 				//   name [GList[GString]]
@@ -263,7 +263,7 @@ private:
   GBool psEmbedCIDTrueType;	// embed CID TrueType fonts?
   GBool psOPI;			// generate PostScript OPI comments?
   GBool psASCIIHex;		// use ASCIIHex instead of ASCII85?
-  GString *textEncoding;	// encoding (tqunicodeMap) to use for text
+  GString *textEncoding;	// encoding (unicodeMap) to use for text
 				//   output
   EndOfLineKind textEOL;	// type of EOL marker to use for text
 				//   output
@@ -280,7 +280,7 @@ private:
   GBool errQuiet;		// suppress error messages?
 
   CIDToUnicodeCache *cidToUnicodeCache;
-  UnicodeMapCache *tqunicodeMapCache;
+  UnicodeMapCache *unicodeMapCache;
   CMapCache *cMapCache;
 };
 
diff --git a/filters/kword/pdf/xpdf/xpdf/TTFont.cc b/filters/kword/pdf/xpdf/xpdf/TTFont.cc
index 6077f3c0..6107fd43 100644
--- a/filters/kword/pdf/xpdf/xpdf/TTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/TTFont.cc
@@ -48,7 +48,7 @@ TTFontEngine::~TTFontEngine() {
 TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName,
 		       char **fontEnc, GBool pdfFontHasEncoding) {
   TT_Face_Properties props;
-  TT_UShort tqunicodeCmap, macRomanCmap, msSymbolCmap;
+  TT_UShort unicodeCmap, macRomanCmap, msSymbolCmap;
   TT_UShort platform, encoding, i;
   int j;
 
@@ -77,11 +77,11 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName,
   //        and use (0xf000 + char code).
   // 3. If none of these rules apply, use the first cmap and hope for
   //    the best (this shouldn't happen).
-  tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
+  unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
   for (i = 0; i < props.num_CharMaps; ++i) {
     if (!TT_Get_CharMap_ID(face, i, &platform, &encoding)) {
       if (platform == 3 && encoding == 1) {
-	tqunicodeCmap = i;
+	unicodeCmap = i;
       } else if (platform == 1 && encoding == 0) {
 	macRomanCmap = i;
       } else if (platform == 3 && encoding == 0) {
@@ -93,8 +93,8 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName,
   mode = ttFontModeCharCode;
   charMapOffset = 0;
   if (pdfFontHasEncoding) {
-    if (tqunicodeCmap != 0xffff) {
-      i = tqunicodeCmap;
+    if (unicodeCmap != 0xffff) {
+      i = unicodeCmap;
       mode = ttFontModeUnicode;
     } else if (macRomanCmap != 0xffff) {
       i = macRomanCmap;
diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
index d197e5cf..fe1185d7 100644
--- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
@@ -46,7 +46,7 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
   char *tok1, *tok2, *tok3;
 
   if (!(f = globalParams->getUnicodeMapFile(encodingNameA))) {
-    error(-1, "Couldn't find tqunicodeMap file for the '%s' encoding",
+    error(-1, "Couldn't find unicodeMap file for the '%s' encoding",
 	  encodingNameA->getCString());
     return NULL;
   }
@@ -93,11 +93,11 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
 	eMap->nBytes = nBytes;
 	++map->eMapsLen;
       } else {
-	error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
+	error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding",
 	      line, encodingNameA->getCString());
       }
     } else {
-      error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
+      error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding",
 	    line, encodingNameA->getCString());
     }
     ++line;
@@ -110,8 +110,8 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
 
 UnicodeMap::UnicodeMap(GString *encodingNameA) {
   encodingName = encodingNameA;
-  tqunicodeOut = gFalse;
-  kind = tqunicodeMapUser;
+  unicodeOut = gFalse;
+  kind = unicodeMapUser;
   ranges = NULL;
   len = 0;
   eMaps = NULL;
@@ -119,11 +119,11 @@ UnicodeMap::UnicodeMap(GString *encodingNameA) {
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 		       UnicodeMapRange *rangesA, int lenA) {
   encodingName = new GString(encodingNameA);
-  tqunicodeOut = tqunicodeOutA;
-  kind = tqunicodeMapResident;
+  unicodeOut = unicodeOutA;
+  kind = unicodeMapResident;
   ranges = rangesA;
   len = lenA;
   eMaps = NULL;
@@ -131,11 +131,11 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 		       UnicodeMapFunc funcA) {
   encodingName = new GString(encodingNameA);
-  tqunicodeOut = tqunicodeOutA;
-  kind = tqunicodeMapFunc;
+  unicodeOut = unicodeOutA;
+  kind = unicodeMapFunc;
   func = funcA;
   eMaps = NULL;
   eMapsLen = 0;
@@ -144,7 +144,7 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 
 UnicodeMap::~UnicodeMap() {
   delete encodingName;
-  if (kind == tqunicodeMapUser && ranges) {
+  if (kind == unicodeMapUser && ranges) {
     gfree(ranges);
   }
   if (eMaps) {
@@ -170,7 +170,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) {
   int a, b, m, n, i, j;
   Guint code;
 
-  if (kind == tqunicodeMapFunc) {
+  if (kind == unicodeMapFunc) {
     return (*func)(u, buf, bufSize);
   }
 
@@ -219,7 +219,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) {
 UnicodeMapCache::UnicodeMapCache() {
   int i;
 
-  for (i = 0; i < tqunicodeMapCacheSize; ++i) {
+  for (i = 0; i < unicodeMapCacheSize; ++i) {
     cache[i] = NULL;
   }
 }
@@ -227,7 +227,7 @@ UnicodeMapCache::UnicodeMapCache() {
 UnicodeMapCache::~UnicodeMapCache() {
   int i;
 
-  for (i = 0; i < tqunicodeMapCacheSize; ++i) {
+  for (i = 0; i < unicodeMapCacheSize; ++i) {
     if (cache[i]) {
       cache[i]->decRefCnt();
     }
@@ -242,7 +242,7 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) {
     cache[0]->incRefCnt();
     return cache[0];
   }
-  for (i = 1; i < tqunicodeMapCacheSize; ++i) {
+  for (i = 1; i < unicodeMapCacheSize; ++i) {
     if (cache[i] && cache[i]->match(encodingName)) {
       map = cache[i];
       for (j = i; j >= 1; --j) {
@@ -254,10 +254,10 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) {
     }
   }
   if ((map = UnicodeMap::parse(encodingName))) {
-    if (cache[tqunicodeMapCacheSize - 1]) {
-      cache[tqunicodeMapCacheSize - 1]->decRefCnt();
+    if (cache[unicodeMapCacheSize - 1]) {
+      cache[unicodeMapCacheSize - 1]->decRefCnt();
     }
-    for (j = tqunicodeMapCacheSize - 1; j >= 1; --j) {
+    for (j = unicodeMapCacheSize - 1; j >= 1; --j) {
       cache[j] = cache[j - 1];
     }
     cache[0] = map;
diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h
index 35506aab..189f3154 100644
--- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h
+++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h
@@ -25,9 +25,9 @@ class GString;
 //------------------------------------------------------------------------
 
 enum UnicodeMapKind {
-  tqunicodeMapUser,		// read from a file
-  tqunicodeMapResident,		// static list of ranges
-  tqunicodeMapFunc		// function pointer
+  unicodeMapUser,		// read from a file
+  unicodeMapResident,		// static list of ranges
+  unicodeMapFunc		// function pointer
 };
 
 typedef int (*UnicodeMapFunc)(Unicode u, char *buf, int bufSize);
@@ -49,12 +49,12 @@ public:
   static UnicodeMap *parse(GString *encodingNameA);
 
   // Create a resident UnicodeMap.
-  UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
+  UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 	     UnicodeMapRange *rangesA, int lenA);
 
   // Create a resident UnicodeMap that uses a function instead of a
   // list of ranges.
-  UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
+  UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 	     UnicodeMapFunc funcA);
 
   ~UnicodeMap();
@@ -64,7 +64,7 @@ public:
 
   GString *getEncodingName() { return encodingName; }
 
-  GBool isUnicode() { return tqunicodeOut; }
+  GBool isUnicode() { return unicodeOut; }
 
   // Return true if this UnicodeMap matches the specified
   // <encodingNameA>.
@@ -82,7 +82,7 @@ private:
 
   GString *encodingName;
   UnicodeMapKind kind;
-  GBool tqunicodeOut;
+  GBool unicodeOut;
   union {
     UnicodeMapRange *ranges;	// (user, resident)
     UnicodeMapFunc func;	// (func)
@@ -95,7 +95,7 @@ private:
 
 //------------------------------------------------------------------------
 
-#define tqunicodeMapCacheSize 4
+#define unicodeMapCacheSize 4
 
 class UnicodeMapCache {
 public:
@@ -110,7 +110,7 @@ public:
 
 private:
 
-  UnicodeMap *cache[tqunicodeMapCacheSize];
+  UnicodeMap *cache[unicodeMapCacheSize];
 };
 
 #endif
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
index 69a173af..8f5baeb5 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
@@ -56,7 +56,7 @@ static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead);
 static void deleteChildFromList(XPDFTreeEntry *e, XPDFTreeEntry **listHead);
 static void createGC(Widget widget);
 static void destroyGC(Widget widget);
-static void tqlayout(Widget widget, Widget instigator);
+static void layout(Widget widget, Widget instigator);
 static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
 			 XPDFTreeEntry *e, Position x, Position y,
 			 Boolean visible);
@@ -66,7 +66,7 @@ static void calcSize(Widget widget, Widget instigator,
 static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
 			    XPDFTreeEntry *e,
 			    Dimension *width, Dimension *height);
-static Boolean needRetqlayout(Widget oldWidget, Widget newWidget);
+static Boolean needRelayout(Widget oldWidget, Widget newWidget);
 static void click(Widget widget, XEvent *event,
 		  String *params, Cardinal *numParams);
 static Boolean findPosition(XPDFTreeWidget w, int x, int y,
@@ -195,9 +195,9 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
   { // XPDFTree
     &createGC,					// createGC
     &destroyGC,					// destroyGC
-    &tqlayout,					// tqlayout
+    &layout,					// layout
     &calcSize,					// calcSize
-    &needRetqlayout,				// needRetqlayout
+    &needRelayout,				// needRelayout
     NULL					// extension
   }
 };
@@ -218,14 +218,14 @@ static void classPartInitialize(WidgetClass widgetCls) {
   if (wc->treeClass.destroyGC == XPDFInheritDestroyGC) {
     wc->treeClass.destroyGC = sc->treeClass.destroyGC;
   }
-  if (wc->treeClass.tqlayout == XPDFInheritLayout) {
-    wc->treeClass.tqlayout = sc->treeClass.tqlayout;
+  if (wc->treeClass.layout == XPDFInheritLayout) {
+    wc->treeClass.layout = sc->treeClass.layout;
   }
   if (wc->treeClass.calcSize == XPDFInheritCalcSize) {
     wc->treeClass.calcSize = sc->treeClass.calcSize;
   }
-  if (wc->treeClass.needRetqlayout == XPDFInheritNeedRetqlayout) {
-    wc->treeClass.needRetqlayout = sc->treeClass.needRetqlayout;
+  if (wc->treeClass.needRelayout == XPDFInheritNeedRelayout) {
+    wc->treeClass.needRelayout = sc->treeClass.needRelayout;
   }
 }
 
@@ -270,10 +270,10 @@ static void destroySubtree(XPDFTreeEntry *e) {
 static void resize(Widget widget) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(widget);
 
-  if (cls->treeClass.tqlayout) {
-    (*cls->treeClass.tqlayout)(widget, NULL);
+  if (cls->treeClass.layout) {
+    (*cls->treeClass.layout)(widget, NULL);
   } else {
-    tqlayout(widget, NULL);
+    layout(widget, NULL);
   }
 }
 
@@ -346,16 +346,16 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget,
   XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget;
   XPDFTreeWidget nw = (XPDFTreeWidget)newWidget;
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(nw);
-  Boolean retqlayout, redisp;
+  Boolean relayout, redisp;
 
-  // check to see if tqlayout-affecting resources have changed
-  if (cls->treeClass.needRetqlayout) {
-    retqlayout = (*cls->treeClass.needRetqlayout)((Widget)ow, (Widget)nw);
+  // check to see if layout-affecting resources have changed
+  if (cls->treeClass.needRelayout) {
+    relayout = (*cls->treeClass.needRelayout)((Widget)ow, (Widget)nw);
   } else {
-    retqlayout = needRetqlayout((Widget)ow, (Widget)nw);
+    relayout = needRelayout((Widget)ow, (Widget)nw);
   }
   redisp = False;
-  if (retqlayout) {
+  if (relayout) {
 
     // calculate a new ideal size (reset the widget size first so
     // calcSize will compute a new one)
@@ -372,14 +372,14 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget,
       calcSize((Widget)nw, NULL, &nw->core.width, &nw->core.height);
     }
 
-    // if resources have changed but size hasn't, tqlayout manually
+    // if resources have changed but size hasn't, layout manually
     // (because Xt just looks at the size)
     if (nw->core.width == ow->core.width &&
 	nw->core.height == ow->core.height) {
-      if (cls->treeClass.tqlayout) {
-	(*cls->treeClass.tqlayout)((Widget)nw, NULL);
+      if (cls->treeClass.layout) {
+	(*cls->treeClass.layout)((Widget)nw, NULL);
       } else {
-	tqlayout((Widget)nw, NULL);
+	layout((Widget)nw, NULL);
       }
       redisp = True;
     }
@@ -394,12 +394,12 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget,
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget);
 
   // our parent rejected a geometry request, so accept the compromise
-  // and retqlayout
+  // and relayout
   if (!reply->request_mode) {
-    if (cls->treeClass.tqlayout) {
-      (*cls->treeClass.tqlayout)(newWidget, NULL);
+    if (cls->treeClass.layout) {
+      (*cls->treeClass.layout)(newWidget, NULL);
     } else {
-      tqlayout(newWidget, NULL);
+      layout(newWidget, NULL);
     }
   }
   *request = *reply;
@@ -496,10 +496,10 @@ static XtGeometryResult geometryManager(Widget widget,
     w->core.height = curHeight;
     w->core.border_width = curBW;
   } else {
-    if (cls->treeClass.tqlayout) {
-      (*cls->treeClass.tqlayout)((Widget)w, widget);
+    if (cls->treeClass.layout) {
+      (*cls->treeClass.layout)((Widget)w, widget);
     } else {
-      tqlayout((Widget)w, widget);
+      layout((Widget)w, widget);
     }
   }
 
@@ -529,11 +529,11 @@ static void changeManaged(Widget widget) {
   while (XtMakeResizeRequest(widget, width, height, &width, &height)
 	 == XtGeometryAlmost) ;
 
-  // retqlayout
-  if (cls->treeClass.tqlayout) {
-    (*cls->treeClass.tqlayout)(widget, NULL);
+  // relayout
+  if (cls->treeClass.layout) {
+    (*cls->treeClass.layout)(widget, NULL);
   } else {
-    tqlayout(widget, NULL);
+    layout(widget, NULL);
   }
 
 #if XmVERSION > 1
@@ -591,7 +591,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
   XPDFTreeWidget w = (XPDFTreeWidget)XtParent(newWidget);
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass((Widget)w);
   XPDFTreeConstraint oc, nc;
-  Boolean retqlayout;
+  Boolean relayout;
   Dimension width, height;
 
   if (!XtIsManaged(newWidget)) {
@@ -599,7 +599,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
   }
   oc = XPDFTreeCPart(oldWidget);
   nc = XPDFTreeCPart(newWidget);
-  retqlayout = False;
+  relayout = False;
   if (nc->entryParent != oc->entryParent ||
       nc->entryPosition != oc->entryPosition) {
     if (oc->entryParent) {
@@ -612,12 +612,12 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
     } else {
       insertChildOnList(nc->e, &w->tree.root);
     }
-    retqlayout = True;
+    relayout = True;
   } else if (nc->entryExpanded != oc->entryExpanded) {
-    retqlayout = True;
+    relayout = True;
   }
 
-  if (retqlayout) {
+  if (relayout) {
 
     // calculate a new ideal size (reset the widget size first so
     // calcSize will compute a new one)
@@ -634,15 +634,15 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
     while (XtMakeResizeRequest((Widget)w, width, height, &width, &height)
 	   == XtGeometryAlmost) ;
 
-    // retqlayout the widget
-    if (cls->treeClass.tqlayout) {
-      (*cls->treeClass.tqlayout)((Widget)w, NULL);
+    // relayout the widget
+    if (cls->treeClass.layout) {
+      (*cls->treeClass.layout)((Widget)w, NULL);
     } else {
-      tqlayout((Widget)w, NULL);
+      layout((Widget)w, NULL);
     }
   }
 
-  return retqlayout;
+  return relayout;
 }
 
 static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead) {
@@ -701,7 +701,7 @@ static void destroyGC(Widget widget) {
   XtReleaseGC(widget, w->tree.dottedGC);
 }
 
-static void tqlayout(Widget widget, Widget instigator) {
+static void layout(Widget widget, Widget instigator) {
   XPDFTreeWidget w = (XPDFTreeWidget)widget;
   XPDFTreeEntry *e;
   Position x, y;
@@ -836,7 +836,7 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
   *height = h1;
 }
 
-static Boolean needRetqlayout(Widget oldWidget, Widget newWidget) {
+static Boolean needRelayout(Widget oldWidget, Widget newWidget) {
   XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget;
   XPDFTreeWidget nw = (XPDFTreeWidget)newWidget;
 
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
index 9f31f9e2..16ab137a 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
@@ -22,14 +22,14 @@ typedef Boolean (*XPDFNeedRelayoutProc)(Widget oldWidget, Widget newWidget);
 #define XPDFInheritDestroyGC ((XtWidgetProc)_XtInherit)
 #define XPDFInheritLayout ((XPDFLayoutProc)_XtInherit)
 #define XPDFInheritCalcSize ((XPDFCalcSizeProc)_XtInherit)
-#define XPDFInheritNeedRetqlayout ((XPDFNeedRelayoutProc)_XtInherit)
+#define XPDFInheritNeedRelayout ((XPDFNeedRelayoutProc)_XtInherit)
 
 typedef struct {
   XtWidgetProc createGC;
   XtWidgetProc destroyGC;
-  XPDFLayoutProc tqlayout;
+  XPDFLayoutProc layout;
   XPDFCalcSizeProc calcSize;
-  XPDFNeedRelayoutProc needRetqlayout;
+  XPDFNeedRelayoutProc needRelayout;
   XtPointer extension;
 } XPDFTreeClassPart;
 
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 12719f4a..f4f8d894 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -174,7 +174,7 @@ TQString RTFWorker::makeTable(const FrameAnchor& anchor)
         for (it=paraList->begin();it!=end;++it)
         {
             rowText += endOfParagraph;
-            rowText += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
+            rowText += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList);
             rowText += m_eol;
             endOfParagraph = "\\par"; // The problem is that the last paragraph ends with \cell not with \par
         }
@@ -362,7 +362,7 @@ TQString RTFWorker::formatTextParagraph(const TQString& strText,
 }
 
 TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
-    const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList)
+    const LayoutData& layout, const ValueListFormatData &paraFormatDataList)
 {
     TQString str;
     TQString content;
@@ -374,40 +374,40 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         markup += "\\intbl";
 
 //lists
-    if (tqlayout.counter.style)
+    if (layout.counter.style)
         {
         markup += "{\\pntext\\pard\\plain";
-        if( tqlayout.formatData.text.fontSize >= 0)
+        if( layout.formatData.text.fontSize >= 0)
         {
                 markup += "\\fs";
-                markup += TQString::number((2 * tqlayout.formatData.text.fontSize));
-                markup += lookupFont("\\f",tqlayout.formatData.text.fontName);
+                markup += TQString::number((2 * layout.formatData.text.fontSize));
+                markup += lookupFont("\\f",layout.formatData.text.fontName);
         }
         markup += " ";
-        markup += tqlayout.counter.text;
+        markup += layout.counter.text;
         markup += "\\tab}{\\*\\pn";
-        if (tqlayout.counter.style > 5)
+        if (layout.counter.style > 5)
         {
         markup += "\\pnlvlblt ";
         markup += "{\\pntxtb ";
-        if (!tqlayout.counter.lefttext.isEmpty() && tqlayout.counter.lefttext != "{" && tqlayout.counter.lefttext != "}")
+        if (!layout.counter.lefttext.isEmpty() && layout.counter.lefttext != "{" && layout.counter.lefttext != "}")
         {
-                markup += tqlayout.counter.lefttext;
+                markup += layout.counter.lefttext;
         }
-        switch (tqlayout.counter.style)
+        switch (layout.counter.style)
         {
         case 6:
         {
                 //custom bullets (one char)
                 //TODO: use correct character/sign for bullet
 
-            markup += tqlayout.counter.customCharacter;
+            markup += layout.counter.customCharacter;
             break;
         }
         case 7:
         {
                 //custom bullets (complex)
-            markup += tqlayout.counter.text;
+            markup += layout.counter.text;
             break;
         }
         case 8:
@@ -435,7 +435,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         {
                 //disc bullets
                 //TODO: use correct character/sign for bullet
-            markup += tqlayout.counter.text;
+            markup += layout.counter.text;
             break;
         }
         default:
@@ -445,23 +445,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
         else
         {
-            if (tqlayout.counter.numbering!=0)
+            if (layout.counter.numbering!=0)
 		{
         	    markup += "\\pnlvl";
-        	    markup += TQString::number(tqlayout.counter.depth + 1);
+        	    markup += TQString::number(layout.counter.depth + 1);
         	    markup += "\\pnprev1";
 		}
-        else if (tqlayout.counter.style==1)
+        else if (layout.counter.style==1)
         {
         markup += "\\pnlvlbody";
         }
         else
         {
         markup += "\\pnlvl";
-        markup += TQString::number(11 - tqlayout.counter.style);
+        markup += TQString::number(11 - layout.counter.style);
         }
 
-        switch (tqlayout.counter.style)
+        switch (layout.counter.style)
         {
         case 1:
         {
@@ -492,18 +492,18 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         markup += "\\pndec";
         }
         markup += "{\\pntxtb ";
-        markup += tqlayout.counter.lefttext;
+        markup += layout.counter.lefttext;
         markup += " }";
     }
         markup += "{\\pntxta ";
-        markup += tqlayout.counter.righttext;
+        markup += layout.counter.righttext;
         markup += " }";
 
         // ### FIXME: that is too late! And why at every list paragraph? (See bug #88241)
-        if (tqlayout.counter.start!=0)
+        if (layout.counter.start!=0)
         {
         markup += "\\pnstart";
-        markup += TQString::number(tqlayout.counter.start);
+        markup += TQString::number(layout.counter.start);
         }
         else
         {
@@ -511,15 +511,15 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
         markup += "\\pnindent0\\pnhang";
 
-        if( tqlayout.formatData.text.fontSize > 0 )
+        if( layout.formatData.text.fontSize > 0 )
         {
         markup += "\\pnfs";
-        markup += TQString::number((2 * tqlayout.formatData.text.fontSize));
+        markup += TQString::number((2 * layout.formatData.text.fontSize));
         }
 
-        if( !tqlayout.formatData.text.fontName.isEmpty() )
+        if( !layout.formatData.text.fontName.isEmpty() )
         {
-            markup += lookupFont("\\pnf", tqlayout.formatData.text.fontName);
+            markup += lookupFont("\\pnf", layout.formatData.text.fontName);
         }
 
         markup += "}";
@@ -527,20 +527,20 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 
 
     LayoutData styleLayout;
-    markup += lookupStyle(tqlayout.styleName, styleLayout);
-    markup += layoutToRtf(styleLayout,tqlayout,true);
+    markup += lookupStyle(layout.styleName, styleLayout);
+    markup += layoutToRtf(styleLayout,layout,true);
 
-    if ( 1==tqlayout.formatData.text.verticalAlignment )
+    if ( 1==layout.formatData.text.verticalAlignment )
     {
         markup += "\\sub"; //Subscript
     }
-    else if ( 2==tqlayout.formatData.text.verticalAlignment )
+    else if ( 2==layout.formatData.text.verticalAlignment )
     {
         markup += "\\super"; //Superscript
     }
 
 
-    if (tqlayout.pageBreakBefore)
+    if (layout.pageBreakBefore)
         content += "\\page ";
 
 
@@ -554,7 +554,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 
         TQString partialText;
 
-        FormatData formatRef = tqlayout.formatData;
+        FormatData formatRef = layout.formatData;
 
         for ( paraFormatDataIt = paraFormatDataList.begin ();
               paraFormatDataIt != paraFormatDataList.end ();
@@ -728,7 +728,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
                         const TQString prefixSaved = m_prefix;
                         m_prefix = TQString();
                         for (it=paraList->begin();it!=end;++it)
-                            fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList);
+                            fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList);
                         m_prefix = prefixSaved;
                         content += "{\\super ";
                         content += automatic ? "\\chftn " : value;
@@ -779,7 +779,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
     }
 
-    if (tqlayout.pageBreakAfter)
+    if (layout.pageBreakAfter)
         content += "\\page";
 
     if (!content.isEmpty())
@@ -807,10 +807,10 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 }
 
 bool RTFWorker::doFullParagraph(const TQString& paraText,
-    const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
+    const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30515) << "Entering RTFWorker::doFullParagraph" << endl << paraText << endl;
-    TQString par = ProcessParagraphData( paraText, tqlayout, paraFormatDataList);
+    TQString par = ProcessParagraphData( paraText, layout, paraFormatDataList);
     m_textBody += par;
     kdDebug(30515) << "Quiting RTFWorker::doFullParagraph" << endl;
     return true;
@@ -836,7 +836,7 @@ bool RTFWorker::doHeader(const HeaderData& header)
     TQValueList<ParaData>::ConstIterator it;
 	TQValueList<ParaData>::ConstIterator end(header.para.end());
     for (it=header.para.begin();it!=end;++it)
-        content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
+        content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList);
 
     if (content!="\\par\\pard\\plain")
     {
@@ -871,7 +871,7 @@ bool RTFWorker::doFooter(const FooterData& footer)
     TQValueList<ParaData>::ConstIterator it;
 	TQValueList<ParaData>::ConstIterator end(footer.para.end());
     for (it=footer.para.begin();it!=end;++it)
-        content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
+        content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList);
 
     if (content!="\\par\\pard\\plain")
     {
@@ -1182,7 +1182,7 @@ TQString RTFWorker::closeSpan(const FormatData& , const FormatData& )
     return result;
 }
 
-// The following function encodes the kword tqunicode characters into
+// The following function encodes the kword unicode characters into
 // RTF seven bit ASCII. This affects any 8 bit characters.
 // They are encoded either with \' or with \u
 TQString RTFWorker::escapeRtfText ( const TQString& text ) const
@@ -1192,8 +1192,8 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const
     const uint length = text.length();
     for ( uint i = 0; i < length; i++ )
     {
-        TQChar TQCh ( text.at( i ) );  // get out one tqunicode char from the string
-        const ushort ch = TQCh.tqunicode();  // take tqunicode value of the char
+        TQChar TQCh ( text.at( i ) );  // get out one unicode char from the string
+        const ushort ch = TQCh.unicode();  // take unicode value of the char
 
         if ( TQCh == '\\' )  escapedText += "\\\\"; // back-slash
         else if ( TQCh == '{' )   escapedText += "\\{";
@@ -1226,7 +1226,7 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const
         }
         else if ( ch >= 256) // check for a higher code non-ASCII character
         {
-            // encode this as decimal tqunicode with a replacement character.
+            // encode this as decimal unicode with a replacement character.
             escapedText += "\\u";
             escapedText += TQString::number ( ch, 10 );
             // We decompose the character. If it works, the first character is whitout any accent.
@@ -1270,15 +1270,15 @@ bool RTFWorker::doFullPaperBorders (const double top, const double left,
     return true;
 }
 
-bool RTFWorker::doFullDefineStyle(LayoutData& tqlayout)
+bool RTFWorker::doFullDefineStyle(LayoutData& layout)
 {
     //Register the new style in the style list
-    m_styleList << tqlayout;
+    m_styleList << layout;
 
     // Now we must register a few things (with help of the lookup methods.)
-    lookupFont("\\f", tqlayout.formatData.text.fontName);
-    lookupColor(TQString(), tqlayout.formatData.text.fgColor);
-    lookupColor(TQString(), tqlayout.formatData.text.bgColor);
+    lookupFont("\\f", layout.formatData.text.fontName);
+    lookupColor(TQString(), layout.formatData.text.fgColor);
+    lookupColor(TQString(), layout.formatData.text.bgColor);
 
     return true;
 }
@@ -1459,121 +1459,121 @@ TQString RTFWorker::textFormatToRtf(const TextFormatting& formatOrigin,
 }
 
 TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
-    const LayoutData& tqlayout, const bool force)
+    const LayoutData& layout, const bool force)
 {
     TQString strLayout;
 
 
-    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
+    if (force || (layoutOrigin.alignment!=layout.alignment))
     {
-        if (tqlayout.alignment=="left")
+        if (layout.alignment=="left")
             strLayout += "\\ql";
-        else if (tqlayout.alignment== "right")
+        else if (layout.alignment== "right")
             strLayout += "\\qr";
-        else if (tqlayout.alignment=="center")
+        else if (layout.alignment=="center")
             strLayout += "\\qc";
-        else if (tqlayout.alignment=="justify")
+        else if (layout.alignment=="justify")
             strLayout += "\\qj";
-        else if ( tqlayout.alignment=="auto")
+        else if ( layout.alignment=="auto")
         {
             // ### TODO: what for BIDI?
             //strLayout += "\\ql";
         }
         else
         {
-            kdWarning(30515) << "Unknown alignment: " << tqlayout.alignment << endl;
+            kdWarning(30515) << "Unknown alignment: " << layout.alignment << endl;
         }
     }
 
-    if ((tqlayout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
+    if ((layout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
     {
        strLayout += "\\li";
-       strLayout += TQString::number(int(tqlayout.indentLeft)*20, 10);
+       strLayout += TQString::number(int(layout.indentLeft)*20, 10);
     }
 
-    if ((tqlayout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
+    if ((layout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
     {
        strLayout += "\\ri";
-       strLayout += TQString::number(int(tqlayout.indentRight)*20, 10);
+       strLayout += TQString::number(int(layout.indentRight)*20, 10);
     }
 
-    if (force || (layoutOrigin.indentFirst!=tqlayout.indentFirst))
+    if (force || (layoutOrigin.indentFirst!=layout.indentFirst))
     {
        strLayout += "\\fi";
-       strLayout += TQString::number(int(tqlayout.indentFirst)*20, 10);
+       strLayout += TQString::number(int(layout.indentFirst)*20, 10);
     }
 
-    if ((tqlayout.marginBottom>=0.0)
-        && (force || (layoutOrigin.marginBottom!=tqlayout.marginBottom)))
+    if ((layout.marginBottom>=0.0)
+        && (force || (layoutOrigin.marginBottom!=layout.marginBottom)))
     {
        strLayout += "\\sa";
-       strLayout += TQString::number(int(tqlayout.marginBottom)*20 ,10);
+       strLayout += TQString::number(int(layout.marginBottom)*20 ,10);
     }
 
-    if ((tqlayout.marginTop>=0.0)
-        && (force || (layoutOrigin.marginTop!=tqlayout.marginTop)))
+    if ((layout.marginTop>=0.0)
+        && (force || (layoutOrigin.marginTop!=layout.marginTop)))
     {
        strLayout += "\\sb";
-       strLayout += TQString::number(int(tqlayout.marginTop)*20, 10);
+       strLayout += TQString::number(int(layout.marginTop)*20, 10);
     }
 
-    if (force || (layoutOrigin.keepLinesTogether!=tqlayout.keepLinesTogether))
+    if (force || (layoutOrigin.keepLinesTogether!=layout.keepLinesTogether))
     {
-       if(tqlayout.keepLinesTogether) strLayout += "\\keep";
+       if(layout.keepLinesTogether) strLayout += "\\keep";
     }
 
-    // Note: there seems to be too many problems of using a page break in a tqlayout
+    // Note: there seems to be too many problems of using a page break in a layout
     // - KWord's RTF import filter makes the page break immediately (also in styles)
     // - AbiWord's RTF import does not like \*\pgbrk
     // ### TODO: decide if we really remove this code
 #if 0
-    if (force || (layoutOrigin.pageBreakBefore!=tqlayout.pageBreakBefore))
+    if (force || (layoutOrigin.pageBreakBefore!=layout.pageBreakBefore))
     {
-       if(tqlayout.pageBreakBefore) strLayout += "\\pagebb";
+       if(layout.pageBreakBefore) strLayout += "\\pagebb";
     }
 
     // Note: RTF doesn't specify "page break after"
     // \*\pgbrk0 is used after OpenOffice.org Writer
-    if (force || (layoutOrigin.pageBreakAfter!=tqlayout.pageBreakAfter))
+    if (force || (layoutOrigin.pageBreakAfter!=layout.pageBreakAfter))
     {
-       if(tqlayout.pageBreakAfter) strLayout += "\\*\\pgbrk0";
+       if(layout.pageBreakAfter) strLayout += "\\*\\pgbrk0";
     }
 #endif
 
     if (force
-        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
     {
-        if ( tqlayout.lineSpacingType==LayoutData::LS_SINGLE  )
+        if ( layout.lineSpacingType==LayoutData::LS_SINGLE  )
            ;// do nothing, single linespace is default in RTF
 
-        else if ( tqlayout.lineSpacingType==LayoutData::LS_ONEANDHALF  )
+        else if ( layout.lineSpacingType==LayoutData::LS_ONEANDHALF  )
            strLayout += "\\sl360\\slmult1"; // one-and-half linespace
 
-        else if ( tqlayout.lineSpacingType==LayoutData::LS_DOUBLE  )
+        else if ( layout.lineSpacingType==LayoutData::LS_DOUBLE  )
            strLayout += "\\sl480\\slmult1"; // double linespace
 
-        else if ( tqlayout.lineSpacingType==LayoutData::LS_ATLEAST  )
-           strLayout += TQString("\\sl%1\\slmult0").arg(int(tqlayout.lineSpacing)*20);
+        else if ( layout.lineSpacingType==LayoutData::LS_ATLEAST  )
+           strLayout += TQString("\\sl%1\\slmult0").arg(int(layout.lineSpacing)*20);
 
-        else if ( tqlayout.lineSpacingType==LayoutData::LS_MULTIPLE  )
-           strLayout += TQString("\\sl%1\\slmult1").arg( int(tqlayout.lineSpacing)*240 );
+        else if ( layout.lineSpacingType==LayoutData::LS_MULTIPLE  )
+           strLayout += TQString("\\sl%1\\slmult1").arg( int(layout.lineSpacing)*240 );
 
-        else if ( tqlayout.lineSpacingType==LayoutData::LS_CUSTOM )
+        else if ( layout.lineSpacingType==LayoutData::LS_CUSTOM )
            // "Custom" in KWord is like "Exactly" in MS Word
-           strLayout += TQString("\\sl-%1\\slmult0").arg(int(tqlayout.lineSpacing)*20);
+           strLayout += TQString("\\sl-%1\\slmult0").arg(int(layout.lineSpacing)*20);
 
         else
-            kdWarning(30515) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
+            kdWarning(30515) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
     }
 
-    if (!tqlayout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
+    if (!layout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
     {
         TabulatorList::ConstIterator it;
-        for (it=tqlayout.tabulatorList.begin();it!=tqlayout.tabulatorList.end();++it)
+        for (it=layout.tabulatorList.begin();it!=layout.tabulatorList.end();++it)
         {
             switch ((*it).m_type)
             {
@@ -1606,7 +1606,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
     // shadow support
     // note shadow in KWord is more full-feature/sophisticated than RTF
     // here we just treat KWord's shadow as simple \shad mark-up
-    if( tqlayout.shadowDistance > 0 )
+    if( layout.shadowDistance > 0 )
     {
        strLayout += "\\shad";
     }
@@ -1615,7 +1615,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
 
     // This must remain last, as it adds a terminating space.
     strLayout+=textFormatToRtf(layoutOrigin.formatData.text,
-        tqlayout.formatData.text,force);
+        layout.formatData.text,force);
 
     return strLayout;
 }
@@ -1708,9 +1708,9 @@ TQString RTFWorker::lookupStyle(const TQString& styleName, LayoutData& returnLay
     }
 
     kdDebug(30515) << "New style: " << styleName << " count: " << counter << endl;
-    LayoutData tqlayout;
-    m_styleList << tqlayout;
-    returnLayout=tqlayout;
+    LayoutData layout;
+    m_styleList << layout;
+    returnLayout=layout;
 
     strMarkup += TQString::number(counter);
     return strMarkup;
diff --git a/filters/kword/rtf/export/ExportFilter.h b/filters/kword/rtf/export/ExportFilter.h
index 88158efe..f5707680 100644
--- a/filters/kword/rtf/export/ExportFilter.h
+++ b/filters/kword/rtf/export/ExportFilter.h
@@ -44,7 +44,7 @@ public:
     virtual bool doCloseFile(void); ///< Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
     virtual bool doOpenTextFrameSet(void);
@@ -53,7 +53,7 @@ public:
         const double width, const double height, const int orientation);
     virtual bool doFullPaperBorders (const double top, const double left,
         const double bottom, const double right);
-    virtual bool doFullDefineStyle(LayoutData& tqlayout);
+    virtual bool doFullDefineStyle(LayoutData& layout);
     virtual bool doHeader(const HeaderData& header);
     virtual bool doFooter(const FooterData& footer);
     virtual bool doVariableSettings(const VariableSettingsData& vs);
@@ -69,7 +69,7 @@ private:
      */
     TQString escapeRtfText ( const TQString& text ) const;
     TQString ProcessParagraphData ( const TQString &paraText,
-        const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList);
+        const LayoutData& layout, const ValueListFormatData &paraFormatDataList);
     TQString formatTextParagraph(const TQString& strText,
         const FormatData& formatOrigin, const FormatData& format);
     TQString makeTable(const FrameAnchor& anchor);
@@ -81,7 +81,7 @@ private:
     TQString textFormatToRtf(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force);
     TQString layoutToRtf(const LayoutData& layoutOrigin,
-        const LayoutData& tqlayout, const bool force);
+        const LayoutData& layout, const bool force);
     TQString lookupFont(const TQString& markup, const TQString& fontName);
     TQString lookupColor(const TQString& markup, const TQColor& color);
     TQString lookupStyle(const TQString& styleName, LayoutData& returnLayout);
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index 465a7478..eb8c467d 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -98,7 +98,7 @@ static RTFProperty propertyTable[] =
 	MEMBER(	0L,		"b",		setToggleProperty,	state.format.bold, 0 ),
         // \bin is handled in the tokenizer
 	MEMBER(	"@colortbl",	"blue",		setNumericProperty,	blue, 0 ),
-	MEMBER(	0L,		"box",		setEnumProperty,	state.tqlayout.border, 0 ),
+	MEMBER(	0L,		"box",		setEnumProperty,	state.layout.border, 0 ),
 	PROP(	0L,		"brdrb",	selectLayoutBorder,	0L, 3 ),
 	PROP(	0L,		"brdrcf",	setBorderColor,           0L, 0 ),
 	PROP(	0L,		"brdrdash",	setBorderStyle,		0L, RTFBorder::Dashes ),
@@ -148,7 +148,7 @@ static RTFProperty propertyTable[] =
 	MEMBER(	"@rtf",		"facingp",	setFlagProperty,	facingPages, true ),
 	PROP(	0L,		"fcharset",	setCharset,		0L, 0 ), // Not needed with TQt
 	PROP(	"@fonttbl",	"fdecor",	setFontStyleHint,	0L, TQFont::Decorative ),
-	MEMBER(	0L,		"fi",		setNumericProperty,	state.tqlayout.firstIndent, 0 ),
+	MEMBER(	0L,		"fi",		setNumericProperty,	state.layout.firstIndent, 0 ),
 	PROP(	"@fonttbl",	"fmodern",	setFontStyleHint,	0L, TQFont::TypeWriter ),
 	PROP(	"@fonttbl",	"fnil",		setFontStyleHint,	0L, TQFont::AnyStyle ),
 	MEMBER(	0L,		"footery",	setNumericProperty,	state.section.footerMargin, 0 ),
@@ -162,13 +162,13 @@ static RTFProperty propertyTable[] =
 	MEMBER(	"@colortbl",	"green",	setNumericProperty,	green, 0 ),
 	MEMBER(	0L,		"headery",	setNumericProperty,	state.section.headerMargin, 0 ),
 	MEMBER(	0L,		"i",		setToggleProperty,	state.format.italic, 0 ),
-	MEMBER(	0L,		"intbl",	setFlagProperty,	state.tqlayout.inTable, true ),
+	MEMBER(	0L,		"intbl",	setFlagProperty,	state.layout.inTable, true ),
 	PROP(	"@pict",	"jpegblip",	setPictureType,	        0L, RTFPicture::JPEG ),
-	MEMBER(	0L,		"keep",		setFlagProperty,	state.tqlayout.keep, true ),
-	MEMBER(	0L,		"keepn",	setFlagProperty,	state.tqlayout.keepNext, true ),
+	MEMBER(	0L,		"keep",		setFlagProperty,	state.layout.keep, true ),
+	MEMBER(	0L,		"keepn",	setFlagProperty,	state.layout.keepNext, true ),
 	MEMBER(	"@rtf",		"landscape",	setFlagProperty,	landscape, true ),
 	PROP(	0L,		"ldblquote",	insertSymbol,		0L, 0x201c ),
-	MEMBER(	0L,		"li",		setNumericProperty,	state.tqlayout.leftIndent, 0 ),
+	MEMBER(	0L,		"li",		setNumericProperty,	state.layout.leftIndent, 0 ),
 	PROP(	0L,		"line",		insertSymbol,		0L, 0x000a ),
 	PROP(	0L,		"lquote",	insertSymbol,		0L, 0x2018 ),
 	PROP(	0L,		"ltrmark",	insertSymbol,		0L, 0x200e ),
@@ -180,14 +180,14 @@ static RTFProperty propertyTable[] =
 	MEMBER(	"@rtf",		"margt",	setNumericProperty,	topMargin, 0 ),
 	MEMBER(	0L,		"nosupersub",	setEnumProperty,	state.format.vertAlign, RTFFormat::Normal ),
 	PROP(	"Text",		"page",		insertPageBreak,	0L, 0 ),
-	MEMBER(	0L,		"pagebb",	setFlagProperty,	state.tqlayout.pageBB, true ),
+	MEMBER(	0L,		"pagebb",	setFlagProperty,	state.layout.pageBB, true ),
 	MEMBER(	"@rtf",		"paperh",	setNumericProperty,	paperHeight, 0 ),
 	MEMBER(	"@rtf",		"paperw",	setNumericProperty,	paperWidth, 0 ),
 	PROP(	"Text",		"par",		insertParagraph,	0L, 0 ),
 	PROP(	0L,		"pard",		setParagraphDefaults,	0L, 0 ),
 	PROP(	0L,		"pc",	setPcCodepage,		0L, 0 ),
 	PROP(	0L,		"pca",	setPcaCodepage,		0L, 0 ),
-	MEMBER(	0L,		"pgbrk",	setToggleProperty,	state.tqlayout.pageBA, true ),
+	MEMBER(	0L,		"pgbrk",	setToggleProperty,	state.layout.pageBA, true ),
 	MEMBER(	"@pict",	"piccropb",	setNumericProperty,	picture.cropBottom, 0 ),
 	MEMBER(	"@pict",	"piccropl",	setNumericProperty,	picture.cropLeft, 0 ),
 	MEMBER(	"@pict",	"piccropr",	setNumericProperty,	picture.cropRight, 0 ),
@@ -202,25 +202,25 @@ static RTFProperty propertyTable[] =
 	PROP(	0L,		"plain",	setPlainFormatting,	0L, 0 ),
 	PROP(	"@pict",	"pmmetafile",	setPictureType,	        0L, RTFPicture::WMF ),
 	PROP(	"@pict",	"pngblip",	setPictureType,	        0L, RTFPicture::PNG ),
-	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Justified ),
-	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Left ),
+	MEMBER(	0L,		"qc",		setEnumProperty,	state.layout.alignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"qj",		setEnumProperty,	state.layout.alignment, RTFLayout::Justified ),
+	MEMBER(	0L,		"ql",		setEnumProperty,	state.layout.alignment, RTFLayout::Left ),
 	PROP(	0L,		"qmspace",	insertSymbol,		0L, 0x2004 ),
-	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Right ),
+	MEMBER(	0L,		"qr",		setEnumProperty,	state.layout.alignment, RTFLayout::Right ),
 	PROP(	0L,		"rdblquote",	insertSymbol,		0L, 0x201d ),
 	MEMBER(	"@colortbl",	"red",		setNumericProperty,	red, 0 ),
-	MEMBER(	0L,		"ri",		setNumericProperty,	state.tqlayout.rightIndent, 0 ),
+	MEMBER(	0L,		"ri",		setNumericProperty,	state.layout.rightIndent, 0 ),
 	PROP(	"Text",		"row",		insertTableRow,		0L, 0 ),
 	PROP(	0L,		"rquote",	insertSymbol,		0L, 0x2019 ),
 	PROP(	0L,		"rtlmark",	insertSymbol,		0L, 0x200f ),
-	MEMBER(	0L,		"s",		setNumericProperty,	state.tqlayout.style, 0 ),
-	MEMBER(	0L,		"sa",		setNumericProperty,	state.tqlayout.spaceAfter, 0 ),
-	MEMBER(	0L,		"sb",		setNumericProperty,	state.tqlayout.spaceBefore, 0 ),
+	MEMBER(	0L,		"s",		setNumericProperty,	state.layout.style, 0 ),
+	MEMBER(	0L,		"sa",		setNumericProperty,	state.layout.spaceAfter, 0 ),
+	MEMBER(	0L,		"sb",		setNumericProperty,	state.layout.spaceBefore, 0 ),
 	MEMBER(	0L,		"scaps",		setToggleProperty,	state.format.smallCaps, 0 ),
 	PROP(	"Text",		"sect",		insertPageBreak,	0L, 0 ),
 	PROP(	0L,		"sectd",	setSectionDefaults,	0L, 0 ),
-	MEMBER(	0L,		"sl",		setNumericProperty,	state.tqlayout.spaceBetween, 0 ),
-	MEMBER(	0L,		"slmult",	setToggleProperty,	state.tqlayout.spaceBetweenMultiple, 0 ),
+	MEMBER(	0L,		"sl",		setNumericProperty,	state.layout.spaceBetween, 0 ),
+	MEMBER(	0L,		"slmult",	setToggleProperty,	state.layout.spaceBetweenMultiple, 0 ),
 	MEMBER(	"@stylesheet",	"snext",	setNumericProperty,	style.next, 0 ),
 	MEMBER(	0L,		"strike",	setToggleProperty,	state.format.strike, 0 ),
 	MEMBER(	0L,		"striked",	setToggleProperty,	state.format.striked, 0 ),
@@ -228,13 +228,13 @@ static RTFProperty propertyTable[] =
 	MEMBER(	0L,		"super",	setEnumProperty,	state.format.vertAlign, RTFFormat::SuperScript ),
 	PROP(	0L,		"tab",		insertSymbol,		0L, 0x0009 ),
 	MEMBER(	0L,		"titlepg",	setFlagProperty,	state.section.titlePage, true ),
-	MEMBER(	0L,		"tldot",	setEnumProperty,	state.tqlayout.tab.leader, RTFTab::Dots ),
-	MEMBER(	0L,		"tlhyph",	setEnumProperty,	state.tqlayout.tab.leader, RTFTab::Hyphens ),
-	MEMBER(	0L,		"tlth",		setEnumProperty,	state.tqlayout.tab.leader, RTFTab::ThickLine ),
-	MEMBER(	0L,		"tlul",		setEnumProperty,	state.tqlayout.tab.leader, RTFTab::Underline ),
-	MEMBER(	0L,		"tqc",		setEnumProperty,	state.tqlayout.tab.type, RTFTab::Centered ),
-	MEMBER(	0L,		"tqdec",	setEnumProperty,	state.tqlayout.tab.type, RTFTab::Decimal ),
-	MEMBER(	0L,		"tqr",		setEnumProperty,	state.tqlayout.tab.type, RTFTab::FlushRight ),
+	MEMBER(	0L,		"tldot",	setEnumProperty,	state.layout.tab.leader, RTFTab::Dots ),
+	MEMBER(	0L,		"tlhyph",	setEnumProperty,	state.layout.tab.leader, RTFTab::Hyphens ),
+	MEMBER(	0L,		"tlth",		setEnumProperty,	state.layout.tab.leader, RTFTab::ThickLine ),
+	MEMBER(	0L,		"tlul",		setEnumProperty,	state.layout.tab.leader, RTFTab::Underline ),
+	MEMBER(	0L,		"tqc",		setEnumProperty,	state.layout.tab.type, RTFTab::Centered ),
+	MEMBER(	0L,		"tqdec",	setEnumProperty,	state.layout.tab.type, RTFTab::Decimal ),
+	MEMBER(	0L,		"tqr",		setEnumProperty,	state.layout.tab.type, RTFTab::FlushRight ),
 	MEMBER(	0L,		"trleft",	setNumericProperty,	state.tableRow.left, 0 ),
 	MEMBER(	0L,		"trowd",	setTableRowDefaults,	state.tableRow, 0 ),
 	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Centered ),
@@ -731,7 +731,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 	    // Search for 'following' style
             for (TQValueList<RTFStyle>::ConstIterator it2=styleSheet.begin();it2!=endStyleSheet;++it2)
 	    {
-		if ((*it2).tqlayout.style == (*it).next)
+		if ((*it2).layout.style == (*it).next)
 		{
                     mainDoc.addNode( "FOLLOWING" );
                     mainDoc.setAttribute( "name", CheckAndEscapeXmlText( (*it2).name ));
@@ -739,7 +739,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 		    break;
 		}
 	    }
-	    addLayout( mainDoc, (*it).name, (*it).tqlayout, false );
+	    addLayout( mainDoc, (*it).name, (*it).layout, false );
 	    addFormat( mainDoc, kwFormat, 0L );
 	    mainDoc.closeNode( "STYLE" );
 	}
@@ -933,15 +933,15 @@ void RTFImport::setUnderlineProperty( RTFProperty* property )
 
 void RTFImport::setBorderStyle( RTFProperty *property )
 {
-    if (state.tqlayout.border)
+    if (state.layout.border)
     {
-        state.tqlayout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value );
+        state.layout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value );
     }
     else
     {
         for (uint i=0; i < 4; i++)
         {
-            state.tqlayout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value );
+            state.layout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value );
         }
     }
 }
@@ -949,30 +949,30 @@ void RTFImport::setBorderStyle( RTFProperty *property )
 void RTFImport::setBorderProperty( RTFProperty *property )
 {
     //kdDebug() << "setBorderProperty: " << endl;
-    if (state.tqlayout.border)
+    if (state.layout.border)
     {
-        state.tqlayout.border->width = token.value;
+        state.layout.border->width = token.value;
     }
     else
     {
 	for (uint i=0; i < 4; i++)
 	{
-            state.tqlayout.borders[i].width = token.value;
+            state.layout.borders[i].width = token.value;
 	}
     }
 }
 
 void RTFImport::setBorderColor( RTFProperty * )
 {
-    if (state.tqlayout.border)
+    if (state.layout.border)
     {
-        state.tqlayout.border->color = token.value;
+        state.layout.border->color = token.value;
     }
     else
     {
 	for (uint i=0; i < 4; i++)
 	{
-	    state.tqlayout.borders[i].color = token.value;
+	    state.layout.borders[i].color = token.value;
 	}
     }
 }
@@ -1008,34 +1008,34 @@ void RTFImport::setPlainFormatting( RTFProperty * )
 
 void RTFImport::setParagraphDefaults( RTFProperty * )
 {
-    RTFLayout &tqlayout = state.tqlayout;
+    RTFLayout &layout = state.layout;
 
-    tqlayout.tablist.clear();
-    tqlayout.tab.type	= RTFTab::Left;
-    tqlayout.tab.leader	= RTFTab::None;
+    layout.tablist.clear();
+    layout.tab.type	= RTFTab::Left;
+    layout.tab.leader	= RTFTab::None;
 
     for (uint i=0; i < 4; i++)
     {
-	RTFBorder &border = tqlayout.borders[i];
+	RTFBorder &border = layout.borders[i];
 	border.color = -1;
 	border.width = 0;
 	border.style = RTFBorder::None;
     }
-    tqlayout.firstIndent	= 0;
-    tqlayout.leftIndent	= 0;
-    tqlayout.rightIndent	= 0;
-    tqlayout.spaceBefore	= 0;
-    tqlayout.spaceAfter	= 0;
-    tqlayout.spaceBetween	= 0;
-    tqlayout.spaceBetweenMultiple = false;
-    tqlayout.style	= 0;
-    tqlayout.alignment	= RTFLayout::Left;
-    tqlayout.border	= 0L;
-    tqlayout.inTable	= false;
-    tqlayout.keep		= false;
-    tqlayout.keepNext	= false;
-    tqlayout.pageBB	= false;
-    tqlayout.pageBA	= false;
+    layout.firstIndent	= 0;
+    layout.leftIndent	= 0;
+    layout.rightIndent	= 0;
+    layout.spaceBefore	= 0;
+    layout.spaceAfter	= 0;
+    layout.spaceBetween	= 0;
+    layout.spaceBetweenMultiple = false;
+    layout.style	= 0;
+    layout.alignment	= RTFLayout::Left;
+    layout.border	= 0L;
+    layout.inTable	= false;
+    layout.keep		= false;
+    layout.keepNext	= false;
+    layout.pageBB	= false;
+    layout.pageBA	= false;
 }
 
 void RTFImport::setSectionDefaults( RTFProperty * )
@@ -1069,17 +1069,17 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
 void RTFImport::selectLayoutBorder( RTFProperty * property )
 {
-    state.tqlayout.border = & state.tqlayout.borders [ property->value ];
+    state.layout.border = & state.layout.borders [ property->value ];
 }
 
 void RTFImport::selectLayoutBorderFromCell( RTFProperty * property )
 {
-    state.tqlayout.border = & state.tableCell.borders [ property->value ];
+    state.layout.border = & state.tableCell.borders [ property->value ];
 }
 
 void RTFImport::insertParagraph( RTFProperty * )
 {
-    if (state.tqlayout.inTable)
+    if (state.layout.inTable)
     {
 	if (textState->table == 0)
 	{
@@ -1110,10 +1110,10 @@ void RTFImport::insertPageBreak( RTFProperty * )
 void RTFImport::insertTableCell( RTFProperty * )
 {
     //{{
-    bool b = state.tqlayout.inTable;
-    state.tqlayout.inTable = true;
+    bool b = state.layout.inTable;
+    state.layout.inTable = true;
     insertParagraph();
-    state.tqlayout.inTable = b;
+    state.layout.inTable = b;
     //}}
     textState->frameSets << textState->cell.toString();
     textState->cell.clear( 3 );
@@ -1135,9 +1135,9 @@ void RTFImport::insertTableRow( RTFProperty * )
 	    // Store the current state on the stack
 	    stateStack.push( state );
 	    resetState();
-	    state.tqlayout.alignment = align;	// table alignment
+	    state.layout.alignment = align;	// table alignment
 
-	    // Add anchor for new table (default tqlayout)
+	    // Add anchor for new table (default layout)
 	    addAnchor( buf );
 	    addParagraph( textState->node, false );
 
@@ -1202,9 +1202,9 @@ void RTFImport::insertCellDef( RTFProperty * )
 
 void RTFImport::insertTabDef( RTFProperty * )
 {
-    RTFTab tab = state.tqlayout.tab;
+    RTFTab tab = state.layout.tab;
     tab.position	= token.value;
-    state.tqlayout.tablist.push( tab );
+    state.layout.tablist.push( tab );
     tab.type		= RTFTab::Left;
     tab.leader		= RTFTab::None;
 }
@@ -1386,8 +1386,8 @@ void RTFImport::parseStyleSheet( RTFProperty * )
 	    *strchr( token.text, ';' ) = 0; // ### TODO: is this allowed with multi-byte Asian characters?
 	    style.name  += textCodec->toUnicode( token.text );
 	    style.format = state.format;
-	    style.tqlayout = state.tqlayout;
-	    style.next   = (style.next == -1) ? style.tqlayout.style : style.next;
+	    style.layout = state.layout;
+	    style.next   = (style.next == -1) ? style.layout.style : style.next;
 	    styleSheet << style;
 	    style.name.truncate( 0 );
 	    style.next   = -1;
@@ -2261,40 +2261,40 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
     node.closeNode( "FORMAT" );
 }
 
-void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak )
+void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak )
 {
     // Style name and alignment
     node.addNode( "NAME" );
       node.setAttribute( "value", CheckAndEscapeXmlText(name) );
     node.closeNode( "NAME" );
     node.addNode( "FLOW" );
-      node.setAttribute( "align", alignN[tqlayout.alignment] );
+      node.setAttribute( "align", alignN[layout.alignment] );
     node.closeNode( "FLOW" );
 
     // Indents
-    if (tqlayout.firstIndent || tqlayout.leftIndent || tqlayout.rightIndent)
+    if (layout.firstIndent || layout.leftIndent || layout.rightIndent)
     {
 	node.addNode( "INDENTS" );
 
-	if (tqlayout.firstIndent)
-	    node.setAttribute( "first", .05*tqlayout.firstIndent );
-	if (tqlayout.leftIndent)
-	    node.setAttribute( "left", .05*tqlayout.leftIndent );
-	if (tqlayout.rightIndent)
-	    node.setAttribute( "right", .05*tqlayout.rightIndent );
+	if (layout.firstIndent)
+	    node.setAttribute( "first", .05*layout.firstIndent );
+	if (layout.leftIndent)
+	    node.setAttribute( "left", .05*layout.leftIndent );
+	if (layout.rightIndent)
+	    node.setAttribute( "right", .05*layout.rightIndent );
 
 	node.closeNode( "INDENTS" );
     }
 
     // Offets
-    if (tqlayout.spaceBefore || tqlayout.spaceAfter)
+    if (layout.spaceBefore || layout.spaceAfter)
     {
 	node.addNode( "OFFSETS" );
 
-	if (tqlayout.spaceBefore)
-	    node.setAttribute( "before", .05*tqlayout.spaceBefore );
-	if (tqlayout.spaceAfter)
-	    node.setAttribute( "after", .05*tqlayout.spaceAfter );
+	if (layout.spaceBefore)
+	    node.setAttribute( "before", .05*layout.spaceBefore );
+	if (layout.spaceAfter)
+	    node.setAttribute( "after", .05*layout.spaceAfter );
 
 	node.closeNode( "OFFSETS" );
     }
@@ -2304,10 +2304,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
 
     TQString lineSpacingType;
     TQString lineSpacingValue;  
-    if ( tqlayout.spaceBetweenMultiple )
+    if ( layout.spaceBetweenMultiple )
     {
         // Note: 240 is a sort of magic value for one line (Once upon a time, it meant 12pt for a single line)
-        switch (tqlayout.spaceBetween )
+        switch (layout.spaceBetween )
         {
         case 240:
             {
@@ -2326,10 +2326,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
             }
         default:
             {    
-                if ( tqlayout.spaceBetween > 0 )
+                if ( layout.spaceBetween > 0 )
                 {
                     lineSpacingType = "multiple";
-                    lineSpacingValue.setNum( tqlayout.spaceBetween / 240.0 );
+                    lineSpacingValue.setNum( layout.spaceBetween / 240.0 );
                 }
                 break;
             }
@@ -2337,16 +2337,16 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
     }
     else
     {
-        if (tqlayout.spaceBetween > 0)
+        if (layout.spaceBetween > 0)
         {
             lineSpacingType = "atleast";
-            lineSpacingValue.setNum( 0.05*tqlayout.spaceBetween );
+            lineSpacingValue.setNum( 0.05*layout.spaceBetween );
         }
-        if (tqlayout.spaceBetween < 0)
+        if (layout.spaceBetween < 0)
         {
             // negative linespace means "exact"
             lineSpacingType = "fixed" ;
-            lineSpacingValue.setNum( -0.05*tqlayout.spaceBetween );
+            lineSpacingValue.setNum( -0.05*layout.spaceBetween );
         }
     }
     
@@ -2359,20 +2359,20 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
         node.closeNode( "LINESPACING" );
     }
 
-    if (tqlayout.keep || tqlayout.pageBB || tqlayout.pageBA || frameBreak || tqlayout.keepNext)
+    if (layout.keep || layout.pageBB || layout.pageBA || frameBreak || layout.keepNext)
     {
 	node.addNode( "PAGEBREAKING" );
-	  node.setAttribute( "linesTogether", boolN[tqlayout.keep] );
-	  node.setAttribute( "hardFrameBreak", boolN[tqlayout.pageBB] );
-	  node.setAttribute( "hardFrameBreakAfter", boolN[tqlayout.pageBA || frameBreak] );
-	  node.setAttribute( "keepWithNext", boolN[tqlayout.keepNext] );
+	  node.setAttribute( "linesTogether", boolN[layout.keep] );
+	  node.setAttribute( "hardFrameBreak", boolN[layout.pageBB] );
+	  node.setAttribute( "hardFrameBreakAfter", boolN[layout.pageBA || frameBreak] );
+	  node.setAttribute( "keepWithNext", boolN[layout.keepNext] );
 	node.closeNode( "PAGEBREAKING" );
     }
 
     // Paragraph borders
     for (uint i=0; i < 4; i++)
     {
-	const RTFBorder &border = tqlayout.borders[i];
+	const RTFBorder &border = layout.borders[i];
 
 	if (border.style != RTFBorder::None || border.width > 0)
 	{
@@ -2386,21 +2386,21 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
     }
 
     // Add automatic tab stop for hanging indent
-    if (tqlayout.firstIndent < 0 && tqlayout.leftIndent > 0)
+    if (layout.firstIndent < 0 && layout.leftIndent > 0)
     {
 	node.addNode( "TABULATOR" );
 	  node.setAttribute( "type", 0 );
-	  node.setAttribute( "ptpos", .05*tqlayout.leftIndent );
+	  node.setAttribute( "ptpos", .05*layout.leftIndent );
 	node.closeNode( "TABULATOR" );
     }
 
     // Tabulators
-    if (!tqlayout.tablist.isEmpty())
+    if (!layout.tablist.isEmpty())
     {
         // ### TODO: use ConstIterator
-	for (uint i=0; i < tqlayout.tablist.count(); i++)
+	for (uint i=0; i < layout.tablist.count(); i++)
 	{
-	    const RTFTab &tab = tqlayout.tablist[i];
+	    const RTFTab &tab = layout.tablist[i];
 	    int l = (int)tab.leader;
 	    node.addNode( "TABULATOR" );
 	      node.setAttribute( "type", tab.type );
@@ -2422,12 +2422,12 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak )
     // Search for style in style sheet
     TQString name;
     const RTFFormat* format = &state.format;
-    const int styleNum = state.tqlayout.style;
+    const int styleNum = state.layout.style;
 
     const TQValueList<RTFStyle>::ConstIterator endStyleSheet = styleSheet.end();
     for ( TQValueList<RTFStyle>::ConstIterator it=styleSheet.begin(); it!=endStyleSheet; ++it )
     {
-	if ( (*it).tqlayout.style == styleNum )
+	if ( (*it).layout.style == styleNum )
 	{
 	    if ( textState->length > 0 )
 	    {
@@ -2468,9 +2468,9 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak )
 	node.closeNode( "FORMATS" );
     }
 
-    // Write out tqlayout and format
+    // Write out layout and format
       node.addNode( "LAYOUT" );
-	addLayout( node, name, state.tqlayout, frameBreak );
+	addLayout( node, name, state.layout, frameBreak );
 	addFormat( node, kwFormat, 0L );
       node.closeNode( "LAYOUT" );
     node.closeNode( "PARAGRAPH" );
diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h
index bdf6f940..044a6095 100644
--- a/filters/kword/rtf/import/rtfimport.h
+++ b/filters/kword/rtf/import/rtfimport.h
@@ -173,7 +173,7 @@ struct RTFStyle
 {
     TQString name;
     RTFFormat format;
-    RTFLayout tqlayout;
+    RTFLayout layout;
     int next;
 };
 
@@ -232,7 +232,7 @@ struct RTFGroupState
     RTFTableRow tableRow;
     RTFTableCell tableCell;
     RTFFormat format;
-    RTFLayout tqlayout;
+    RTFLayout layout;
     RTFSectionLayout section;
     /// '}' will close the current destination
     bool brace0;
@@ -408,7 +408,7 @@ public:
     void insertSymbol( RTFProperty *property );
     /// Insert special character (hexadecimal escape value).
     void insertHexSymbol( RTFProperty * );
-    /// Insert tqunicode character (keyword \\u).
+    /// Insert unicode character (keyword \\u).
     void insertUnicodeSymbol( RTFProperty * );
     /**
      * Insert a date or time field
@@ -489,13 +489,13 @@ public:
      */
     void addFormat( DomNode &node, const KWFormat& format, const RTFFormat* baseFormat );
     /**
-     * Add tqlayout information to document node.
+     * Add layout information to document node.
      * @param node the document node (destination)
      * @param name the name of the current style
-     * @param tqlayout the paragraph tqlayout information
+     * @param layout the paragraph layout information
      * @param frameBreak paragraph is always the last in a frame if true
      */
-    void addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak );
+    void addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak );
     /**
      * Add paragraph information to document node.
      * @param node the document node (destination)
diff --git a/filters/kword/rtf/import/rtfimport_dom.cpp b/filters/kword/rtf/import/rtfimport_dom.cpp
index 95fa43fc..98911415 100644
--- a/filters/kword/rtf/import/rtfimport_dom.cpp
+++ b/filters/kword/rtf/import/rtfimport_dom.cpp
@@ -30,7 +30,7 @@ TQString CheckAndEscapeXmlText(const TQString& strText)
     for (uint i=0; i<strReturn.length(); i++)
     {
         ch = strReturn[i];
-        const int test = ch.tqunicode();
+        const int test = ch.unicode();
 
         // The i+= is for the additional characters
         if (test == 38) { strReturn.replace(i, 1, "&amp;"); i+=4; } // &
diff --git a/filters/kword/rtf/status.html b/filters/kword/rtf/status.html
index 4642bf83..904da9db 100644
--- a/filters/kword/rtf/status.html
+++ b/filters/kword/rtf/status.html
@@ -59,7 +59,7 @@
        - Style sheet.<br>
        - Character formatting (size, color, bold, italic, underline, strikeout, subscript, superscript...).<br>
        - Font mapping (using TQFont/TQFontInfo).<br>
-       - Paragraph tqlayout (horizontal alignment, indents, space before/after, frame break).<br>
+       - Paragraph layout (horizontal alignment, indents, space before/after, frame break).<br>
        - Paragraph borders (style, color, width).<br>
        - Tabulators, automatic tabulator for hanging indent.<br>
        - Unicode and codepages support.<br>
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc
index f18a3a7b..3f4712b9 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cc
@@ -51,7 +51,7 @@ class WMLWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
@@ -97,7 +97,7 @@ bool WMLWorker::doCloseDocument(void)
 }
 
 bool WMLWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
 {
   TQString wmlText;
   TQString text = paraText;
@@ -131,7 +131,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText,
   }
 
   // sentinel check
-  TQString align = tqlayout.alignment.lower();
+  TQString align = layout.alignment.lower();
   if( ( align!="left" ) && ( align!="right" ) && ( align!="center" ) )
     align = "left"; 
 
diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc
index a92290d9..83e14d9f 100644
--- a/filters/kword/wml/wmlimport.cc
+++ b/filters/kword/wml/wmlimport.cc
@@ -54,7 +54,7 @@ class WMLConverter: public WMLParser
     virtual bool doOpenCard( TQString, TQString );
     virtual bool doCloseCard();
     virtual bool doParagraph( TQString text, WMLFormatList formatList,
-      WMLLayout tqlayout );
+      WMLLayout layout );
   private:
     TQString m_title;
 };
@@ -105,13 +105,13 @@ static TQString WMLFormatAsXML( WMLFormat format )
   return result;
 }
 
-static TQString WMLLayoutAsXML( WMLLayout tqlayout )
+static TQString WMLLayoutAsXML( WMLLayout layout )
 {
   TQString result;
 
   TQString align = "left";
-  if( tqlayout.align == WMLLayout::Center ) align = "center";
-  if( tqlayout.align == WMLLayout::Right ) align = "right";
+  if( layout.align == WMLLayout::Center ) align = "center";
+  if( layout.align == WMLLayout::Right ) align = "right";
 
   TQFont font = KoGlobal::defaultFont();
   TQString fontFamily = font.family();
@@ -161,7 +161,7 @@ bool WMLConverter::doCloseCard()
 }
 
 bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList,
-  WMLLayout tqlayout  )
+  WMLLayout layout  )
 {
   TQString text, formats;
 
@@ -183,7 +183,7 @@ bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList,
   root.append( "<PARAGRAPH>\n" );
   root.append( "<TEXT>" + text + "</TEXT>\n" );
   root.append( "<FORMATS>" + formats + "</FORMATS>\n" );
-  root.append( WMLLayoutAsXML( tqlayout) );
+  root.append( WMLLayoutAsXML( layout) );
   root.append( "</PARAGRAPH>\n" );
 
   return TRUE;
diff --git a/filters/kword/wml/wmlparser.cpp b/filters/kword/wml/wmlparser.cpp
index ecbb235c..81ccbd24 100644
--- a/filters/kword/wml/wmlparser.cpp
+++ b/filters/kword/wml/wmlparser.cpp
@@ -403,7 +403,7 @@ WMLFormat& WMLFormat::operator=( const WMLFormat& f )
   return *this;
 }
 
-// paragraph tqlayout info
+// paragraph layout info
 WMLLayout::WMLLayout()
 {
   align = Left;
diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cc
index b3bb7d17..96575353 100644
--- a/filters/kword/wordperfect/export/wp5.cc
+++ b/filters/kword/wordperfect/export/wp5.cc
@@ -143,7 +143,7 @@ static TQCString WPFiveEscape( const TQString& text )
 
   for( unsigned int i=0; i < text.length(); i++ )
   {
-    int c = text[i].tqunicode();
+    int c = text[i].unicode();
     if( c < 32 ) result += '.';
     else if ( c == 32 ) result += 0x20 ; // hard space
     else if ( c < 128 ) result += text[i].latin1();
@@ -155,7 +155,7 @@ static TQCString WPFiveEscape( const TQString& text )
 
 
 bool WPFiveWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList)
 {
   ValueListFormatData::ConstIterator it;
   for( it = paraFormatDataList.begin(); it!=paraFormatDataList.end(); ++it )
diff --git a/filters/kword/wordperfect/export/wp5.h b/filters/kword/wordperfect/export/wp5.h
index 0791459b..dc75e2f7 100644
--- a/filters/kword/wordperfect/export/wp5.h
+++ b/filters/kword/wordperfect/export/wp5.h
@@ -36,7 +36,7 @@ class WPFiveWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cc
index 9db2f1e1..5d0079b4 100644
--- a/filters/kword/wordperfect/export/wp6.cc
+++ b/filters/kword/wordperfect/export/wp6.cc
@@ -144,7 +144,7 @@ static TQCString WPSixEscape( const TQString& text )
 
   for( unsigned int i=0; i < text.length(); i++ )
   {
-    int c = text[i].tqunicode();
+    int c = text[i].unicode();
     if( c < 32 ) result += '.'; 
     else if ( c == 32 ) result += 0x80 ; // hard space
     else if ( c < 128 ) result += text[i].latin1();
@@ -155,14 +155,14 @@ static TQCString WPSixEscape( const TQString& text )
 }
 
 bool WPSixWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
 {
   // handle paragraph alignment/justification (default to left)
   unsigned char wp_align[] = { 0xd3, 5, 12, 0, 0, 1, 0, 0, 2, 12, 0, 0xd3 };
-  if( tqlayout.alignment == "left" ) wp_align[7] = 0;
-  if( tqlayout.alignment == "justify" ) wp_align[7] = 1;
-  if( tqlayout.alignment == "center" ) wp_align[7] = 2;
-  if( tqlayout.alignment == "right" ) wp_align[7] = 3;
+  if( layout.alignment == "left" ) wp_align[7] = 0;
+  if( layout.alignment == "justify" ) wp_align[7] = 1;
+  if( layout.alignment == "center" ) wp_align[7] = 2;
+  if( layout.alignment == "right" ) wp_align[7] = 3;
   output.writeRawBytes( (const char*)wp_align, 12 );
 
   ValueListFormatData::ConstIterator it;
diff --git a/filters/kword/wordperfect/export/wp6.h b/filters/kword/wordperfect/export/wp6.h
index 73397338..05abb60f 100644
--- a/filters/kword/wordperfect/export/wp6.h
+++ b/filters/kword/wordperfect/export/wp6.h
@@ -36,7 +36,7 @@ class WPSixWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp
index de9246cc..1b3b83df 100644
--- a/filters/kword/wordperfect/import/kwordfilter.cpp
+++ b/filters/kword/wordperfect/import/kwordfilter.cpp
@@ -128,7 +128,7 @@ KWordFilter::parse (const TQString & filename)
   tokens.append( new Token( Token::HardReturn ) );
 
   TQString text;
-  TQString tqlayout;
+  TQString layout;
   TQString formats;
   int LeftMargin = 0;
   int TopMargin = 36;
@@ -253,32 +253,32 @@ KWordFilter::parse (const TQString & filename)
           formats.append( "  " + fmt );
           formats.append ( "  </FORMAT>\n" );
 
-          tqlayout = "";
-          tqlayout.append( "<LAYOUT>\n" );
-          tqlayout.append( "  <NAME value=\"Standard\" />\n" );
-          tqlayout.append( "  <FLOW align=\"" + mapAlign( align ) + "\" />\n" );
-          tqlayout.append( "  <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" );
-          tqlayout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
-          tqlayout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
-          tqlayout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
-          tqlayout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
+          layout = "";
+          layout.append( "<LAYOUT>\n" );
+          layout.append( "  <NAME value=\"Standard\" />\n" );
+          layout.append( "  <FLOW align=\"" + mapAlign( align ) + "\" />\n" );
+          layout.append( "  <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" );
+          layout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
+          layout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
+          layout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
+          layout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
           lm = LeftMargin + LeftMarginAdjust - frameLeftMargin;
           rm = RightMargin + RightMarginAdjust - frameRightMargin;
-          tqlayout.append( "  <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + 
+          layout.append( "  <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + 
                          " right=\"" + TQString::number( TQMAX( 0 , rm ) ) + "\"" +
                          " first=\"0\" />\n" );
-          tqlayout.append( "  <OFFSETS />\n" );
-          tqlayout.append( "  <PAGEBREAKING />\n" );
-          tqlayout.append( "  <COUNTER />\n" );
-          tqlayout.append( "  <FORMAT id=\"1\">\n" );
-          tqlayout.append( "    <WEIGHT value=\"50\" />\n" );
-          tqlayout.append( "    <ITALIC value=\"0\" />\n" );
-          tqlayout.append( "    <UNDERLINE value=\"0\" />\n" );
-          tqlayout.append( "    <STRIKEOUT value=\"0\" />\n" );
-          tqlayout.append( "    <CHARSET value=\"0\" />\n" );
-          tqlayout.append( "    <VERTALIGN value=\"0\" />\n" );
-          tqlayout.append( "  </FORMAT>\n" );
-          tqlayout.append( "</LAYOUT>\n" );
+          layout.append( "  <OFFSETS />\n" );
+          layout.append( "  <PAGEBREAKING />\n" );
+          layout.append( "  <COUNTER />\n" );
+          layout.append( "  <FORMAT id=\"1\">\n" );
+          layout.append( "    <WEIGHT value=\"50\" />\n" );
+          layout.append( "    <ITALIC value=\"0\" />\n" );
+          layout.append( "    <UNDERLINE value=\"0\" />\n" );
+          layout.append( "    <STRIKEOUT value=\"0\" />\n" );
+          layout.append( "    <CHARSET value=\"0\" />\n" );
+          layout.append( "    <VERTALIGN value=\"0\" />\n" );
+          layout.append( "  </FORMAT>\n" );
+          layout.append( "</LAYOUT>\n" );
 
           // encode text for XML-ness
           // FIXME could be faster without TQRegExp
@@ -294,7 +294,7 @@ KWordFilter::parse (const TQString & filename)
           root.append( "<FORMATS>\n");
           root.append( formats );
           root.append( "</FORMATS>\n");
-          root.append( tqlayout );
+          root.append( layout );
           root.append( "</PARAGRAPH>\n" );
 
           // for the next paragraph
diff --git a/filters/kword/wordperfect/import/parser.cpp b/filters/kword/wordperfect/import/parser.cpp
index 7b87e5a6..96a2559c 100644
--- a/filters/kword/wordperfect/import/parser.cpp
+++ b/filters/kword/wordperfect/import/parser.cpp
@@ -1002,7 +1002,7 @@ Parser::handleTab (TQMemArray < TQ_UINT8 > data)
 
 }
 
-// the following tables maps WP charset/charcode to tqunicode character
+// the following tables maps WP charset/charcode to unicode character
 
 // WP multinational characters (charset 1)
 static unsigned multinational_map[] = {
diff --git a/filters/kword/wordperfect/status_old.html b/filters/kword/wordperfect/status_old.html
index 1db3dc09..5465048d 100644
--- a/filters/kword/wordperfect/status_old.html
+++ b/filters/kword/wordperfect/status_old.html
@@ -55,7 +55,7 @@
        <li>font information: size, typeface, color</li>
        <li>WP extended character converted to Unicode</li>
        <li>character formatting: bold, italics, underline, double underline, strikeout, superscript, subscript</li>
-       <li>paragraph tqlayout: linespacing, justification</li>
+       <li>paragraph layout: linespacing, justification</li>
        <li>page settings: margins</li>
        <li>document summary: title, author, abstract</li>
      </ul>
diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp
index f079e2a5..a5f76d32 100644
--- a/filters/libdialogfilter/exportsizedia.cpp
+++ b/filters/libdialogfilter/exportsizedia.cpp
@@ -107,7 +107,7 @@ void ExportSizeDia::setupGUI()
     mainLayout->addWidget( percentHeight,  4, 0 );
     mainLayout->addWidget( m_percWidthEdit,  4, 1 );
 
-    /* Display the main tqlayout */
+    /* Display the main layout */
     //mainLayout->addStretch( 5 );
     mainLayout->activate();
 }
diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc
index 9c65ddd9..a04633fe 100644
--- a/filters/liboofilter/ooutils.cc
+++ b/filters/liboofilter/ooutils.cc
@@ -209,7 +209,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
     if ( !styleStack.hasChildNodeNS( ooNS::style, "tab-stops" ) ) // 3.11.10
         return;
     TQDomElement tabStops = styleStack.childNodeNS( ooNS::style, "tab-stops" );
-    //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl;
+    //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl;
     for ( TQDomNode it = tabStops.firstChild(); !it.isNull(); it = it.nextSibling() )
     {
         TQDomElement tabStop = it.toElement();
@@ -235,7 +235,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
         double pos = KoUnit::parseValue( tabStop.attributeNS( ooNS::style, "position", TQString() ) );
         elem.setAttribute( "ptpos", pos );
 
-        // TODO Convert leaderChar's tqunicode value to the KOffice enum
+        // TODO Convert leaderChar's unicode value to the KOffice enum
         // (blank/dots/line/dash/dash-dot/dash-dot-dot, 0 to 5)
         TQString leaderChar = tabStop.attributeNS( ooNS::style, "leader-char", TQString() ); // single character
         if ( !leaderChar.isEmpty() )
diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc
index bb85f84d..d28430dd 100644
--- a/filters/olefilters/powerpoint97/powerpoint.cc
+++ b/filters/olefilters/powerpoint97/powerpoint.cc
@@ -782,7 +782,7 @@ void Powerpoint::opSlideAtom(
 {
     struct
     {
-        TQ_UINT8 tqlayout[12];  // Slide tqlayout descriptor.
+        TQ_UINT8 layout[12];  // Slide layout descriptor.
         TQ_INT32 masterId;   // Id of the master of the slide. Zero for a master slide.
         TQ_INT32 notesId;    // Id for the corresponding notes slide. Zero if slide has no notes.
         TQ_UINT16 flags;
@@ -790,7 +790,7 @@ void Powerpoint::opSlideAtom(
 
     Header tmp;
     tmp.type = 1015;
-    tmp.length = sizeof(data.tqlayout);
+    tmp.length = sizeof(data.layout);
     invokeHandler(tmp, tmp.length, operands);
     operands >> data.masterId >> data.notesId >> data.flags;
 
diff --git a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
index b8bb24de..e619bf21 100644
--- a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
+++ b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
@@ -39,7 +39,7 @@
 	<xsl:value-of select="@editor"/>
 	</xsl:comment>
 	<fo:root>
-	<fo:tqlayout-master-set>
+	<fo:layout-master-set>
         <fo:simple-page-master
 		margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm"
 		page-width="21cm" page-height="29.7cm" master-name="first">
@@ -61,7 +61,7 @@
 				<fo:conditional-page-master-reference master-name="rest" />
 			</fo:repeatable-page-master-alternatives>
 		</fo:page-sequence-master>
-    </fo:tqlayout-master-set>
+    </fo:layout-master-set>
 	<xsl:apply-templates select="FRAMESETS"/> 
 	</fo:root>
 </xsl:template>
diff --git a/filters/xsltfilter/kword2xslfo.xsl b/filters/xsltfilter/kword2xslfo.xsl
index ea36238b..4268afba 100644
--- a/filters/xsltfilter/kword2xslfo.xsl
+++ b/filters/xsltfilter/kword2xslfo.xsl
@@ -36,7 +36,7 @@
 	<xsl:value-of select="@editor"/>
 	</xsl:comment>
 	<fo:root>
-	<fo:tqlayout-master-set>
+	<fo:layout-master-set>
         <fo:simple-page-master
 		margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm"
 		page-width="21cm" page-height="29.7cm" master-name="first">
@@ -58,7 +58,7 @@
 				<fo:conditional-page-master-reference master-name="rest" />
 			</fo:repeatable-page-master-alternatives>
 		</fo:page-sequence-master>
-    </fo:tqlayout-master-set>
+    </fo:layout-master-set>
 	<xsl:apply-templates select="FRAMESETS"/> 
 	</fo:root>
 </xsl:template>