From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:56:31 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.
---
 filters/kword/abiword/ImportField.cc               |   2 +-
 filters/kword/abiword/ImportFormatting.cc          |   2 +-
 filters/kword/abiword/ImportStyle.cc               |   2 +-
 filters/kword/abiword/abiwordexport.cc             | 124 +++++-----
 filters/kword/abiword/abiwordexport.h              |   2 +-
 filters/kword/abiword/abiwordimport.cc             |  22 +-
 filters/kword/abiword/abiwordimport.h              |   2 +-
 filters/kword/amipro/FileFormat.txt                |  10 +-
 filters/kword/amipro/amiproexport.cc               |  14 +-
 filters/kword/amipro/amiproexport.h                |   2 +-
 filters/kword/amipro/amiproimport.cc               |  60 ++---
 filters/kword/amipro/amiproimport.h                |   2 +-
 filters/kword/amipro/amiproparser.cpp              |  10 +-
 filters/kword/amipro/amiproparser.h                |   4 +-
 filters/kword/applixword/applixwordimport.cc       |   6 +-
 filters/kword/applixword/applixwordimport.h        |   4 +-
 filters/kword/ascii/ExportDialog.cc                |  14 +-
 filters/kword/ascii/ExportDialogUI.ui              |   6 +-
 filters/kword/ascii/ImportDialog.cc                |  14 +-
 filters/kword/ascii/ImportDialogUI.ui              |   6 +-
 filters/kword/ascii/asciiexport.cc                 |  36 +--
 filters/kword/ascii/asciiexport.h                  |   2 +-
 filters/kword/ascii/asciiimport.cc                 |  10 +-
 filters/kword/ascii/asciiimport.h                  |   2 +-
 filters/kword/docbook/docbookexport.cc             |  20 +-
 filters/kword/docbook/docbookexport.h              |   2 +-
 filters/kword/hancomword/hancomwordimport.cpp      |   4 +-
 filters/kword/hancomword/hancomwordimport.h        |   2 +-
 filters/kword/hancomword/pole.cpp                  |  24 +-
 filters/kword/html/export/ExportBasic.cc           |  20 +-
 filters/kword/html/export/ExportBasic.h            |   4 +-
 filters/kword/html/export/ExportCss.cc             | 114 +++++-----
 filters/kword/html/export/ExportCss.h              |   8 +-
 filters/kword/html/export/ExportDialog.cc          |  10 +-
 filters/kword/html/export/ExportDialogUI.ui        |  12 +-
 filters/kword/html/export/ExportDocStruct.cc       |  10 +-
 filters/kword/html/export/ExportDocStruct.h        |   4 +-
 filters/kword/html/export/ExportFilter.cc          |  44 ++--
 filters/kword/html/export/ExportFilter.h           |   8 +-
 filters/kword/html/export/htmlexport.cc            |   6 +-
 filters/kword/html/export/htmlexport.h             |   4 +-
 filters/kword/html/import/htmlimport.cpp           |   2 +-
 filters/kword/html/import/htmlimport.h             |   2 +-
 filters/kword/html/import/khtmlreader.cpp          |  60 ++---
 filters/kword/html/import/khtmlreader.h            |   6 +-
 filters/kword/html/import/kwdwriter.cpp            |  34 +--
 filters/kword/html/import/kwdwriter.h              |  12 +-
 filters/kword/kword1.3/import/kword13formatone.cpp |   2 +-
 filters/kword/kword1.3/import/kword13formatone.h   |   6 +-
 filters/kword/kword1.3/import/kword13import.cpp    |   4 +-
 filters/kword/kword1.3/import/kword13import.h      |   2 +-
 filters/kword/kword1.3/import/kword13layout.cpp    |   6 +-
 .../kword1.3/import/kword13oasisgenerator.cpp      |  50 ++---
 .../kword/kword1.3/import/kword13oasisgenerator.h  |   8 +-
 filters/kword/kword1.3/import/kword13parser.cpp    |  12 +-
 filters/kword/kword1.3/import/kword13parser.h      |   8 +-
 filters/kword/kword1.3/import/kword13utils.cpp     |   2 +-
 filters/kword/latex/export/config.h                |   6 +-
 filters/kword/latex/export/document.h              |   2 +-
 filters/kword/latex/export/element.h               |   2 +-
 filters/kword/latex/export/fileheader.cc           |   4 +-
 filters/kword/latex/export/fileheader.h            |   2 +-
 filters/kword/latex/export/format.h                |   2 +-
 filters/kword/latex/export/formula.h               |   2 +-
 filters/kword/latex/export/kwordlatexexportdia.cc  |   4 +-
 filters/kword/latex/export/latexexport.cc          |   4 +-
 filters/kword/latex/export/latexexport.h           |   4 +-
 filters/kword/latex/export/latexexportdia.ui       |   2 +-
 filters/kword/latex/export/layout.cc               |   4 +-
 filters/kword/latex/export/layout.h                |   4 +-
 filters/kword/latex/export/para.cc                 |   6 +-
 filters/kword/latex/export/para.h                  |   2 +-
 filters/kword/latex/export/texlauncher.cc          |   2 +-
 filters/kword/latex/export/textFrame.cc            |   2 +-
 filters/kword/latex/export/textzone.cc             |  14 +-
 filters/kword/latex/export/textzone.h              |   4 +-
 filters/kword/latex/export/variablezone.cc         |   2 +-
 filters/kword/latex/export/variablezone.h          |   2 +-
 filters/kword/latex/export/xml2latexparser.h       |   2 +-
 filters/kword/latex/export/xmlparser.cc            |  12 +-
 filters/kword/latex/import/generator/document.cc   |   2 +-
 filters/kword/latex/import/lateximport.cc          |   4 +-
 filters/kword/latex/import/lateximport.h           |   4 +-
 filters/kword/latex/import/lateximportdia.cc       |   8 +-
 filters/kword/latex/import/lateximportdia.h        |   4 +-
 filters/kword/latex/import/parser/env.cc           |   8 +-
 filters/kword/latex/import/parser/env.h            |   2 +-
 filters/kword/latex/status.html                    |   8 +-
 filters/kword/libexport/KWEFBaseWorker.cc          |   2 +-
 filters/kword/libexport/KWEFBaseWorker.h           |   4 +-
 filters/kword/libexport/KWEFKWordLeader.cc         |  22 +-
 filters/kword/libexport/KWEFKWordLeader.h          |   4 +-
 filters/kword/libexport/KWEFStructures.h           |   6 +-
 filters/kword/libexport/KWEFUtil.cc                |   6 +-
 filters/kword/libexport/ProcessDocument.cc         | 130 +++++------
 filters/kword/msword/conversion.cpp                |   2 +-
 filters/kword/msword/conversion.h                  |   4 +-
 filters/kword/msword/document.cpp                  |   6 +-
 filters/kword/msword/mswordimport.cpp              |   2 +-
 filters/kword/msword/mswordimport.h                |   2 +-
 filters/kword/msword/texthandler.cpp               |  22 +-
 filters/kword/msword/texthandler.h                 |   2 +-
 filters/kword/mswrite/ImportDialog.cc              |   4 +-
 filters/kword/mswrite/ImportDialogUI.ui            |  10 +-
 filters/kword/mswrite/mswriteexport.cc             |  68 +++---
 filters/kword/mswrite/mswriteexport.h              |   2 +-
 filters/kword/mswrite/mswriteimport.cc             |   6 +-
 filters/kword/mswrite/mswriteimport.h              |   2 +-
 filters/kword/mswrite/status.html                  |   4 +-
 filters/kword/mswrite/structures.h                 |   2 +-
 filters/kword/mswrite/structures_generated.cpp     |  14 +-
 filters/kword/mswrite/structures_generated.h       |   8 +-
 filters/kword/oowriter/ExportFilter.cc             | 130 +++++------
 filters/kword/oowriter/ExportFilter.h              |   6 +-
 filters/kword/oowriter/conversion.cc               |   8 +-
 filters/kword/oowriter/conversion.h                |   2 +-
 filters/kword/oowriter/oowriterexport.cc           |   4 +-
 filters/kword/oowriter/oowriterexport.h            |   2 +-
 filters/kword/oowriter/oowriterimport.cc           |  50 ++---
 filters/kword/oowriter/oowriterimport.h            |   6 +-
 filters/kword/palmdoc/palmdb.cpp                   |  20 +-
 filters/kword/palmdoc/palmdoc.cpp                  |   4 +-
 filters/kword/palmdoc/palmdocexport.cc             |  10 +-
 filters/kword/palmdoc/palmdocexport.h              |   2 +-
 filters/kword/palmdoc/palmdocimport.cc             |  52 ++---
 filters/kword/palmdoc/palmdocimport.h              |   2 +-
 filters/kword/pdf/FilterDevice.cpp                 |   4 +-
 filters/kword/pdf/FilterPage.cpp                   |  22 +-
 filters/kword/pdf/data.cpp                         |  12 +-
 filters/kword/pdf/dialog.cpp                       |  10 +-
 filters/kword/pdf/fstring.cpp                      |   4 +-
 filters/kword/pdf/fstring.h                        |   4 +-
 filters/kword/pdf/misc.cpp                         |   6 +-
 filters/kword/pdf/pdfdocument.cpp                  |   2 +-
 filters/kword/pdf/pdfdocument.h                    |   2 +-
 filters/kword/pdf/pdfimport.cpp                    |   6 +-
 filters/kword/pdf/pdfimport.h                      |   2 +-
 filters/kword/pdf/xpdf/xpdf/FTFont.cc              |  10 +-
 filters/kword/pdf/xpdf/xpdf/FontFile.cc            |  10 +-
 filters/kword/pdf/xpdf/xpdf/GlobalParams.cc        |  20 +-
 filters/kword/pdf/xpdf/xpdf/GlobalParams.h         |   6 +-
 filters/kword/pdf/xpdf/xpdf/TTFont.cc              |  10 +-
 filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc          |  38 ++--
 filters/kword/pdf/xpdf/xpdf/UnicodeMap.h           |  18 +-
 filters/kword/pdf/xpdf/xpdf/XPDFApp.cc             |  14 +-
 filters/kword/pdf/xpdf/xpdf/XPDFApp.h              |   4 +-
 filters/kword/pdf/xpdf/xpdf/XPDFTree.cc            | 134 +++++------
 filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h            |   6 +-
 filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc          |   8 +-
 filters/kword/pdf/xpdf/xpdf/xpdf.cc                |   6 +-
 filters/kword/rtf/export/ExportFilter.cc           | 202 ++++++++---------
 filters/kword/rtf/export/ExportFilter.h            |   8 +-
 filters/kword/rtf/export/rtfexport.cc              |   4 +-
 filters/kword/rtf/export/rtfexport.h               |   4 +-
 filters/kword/rtf/import/rtfimport.cpp             | 250 ++++++++++-----------
 filters/kword/rtf/import/rtfimport.h               |  22 +-
 filters/kword/rtf/import/rtfimport_dom.cpp         |   4 +-
 filters/kword/rtf/status.html                      |   8 +-
 filters/kword/starwriter/pole.cpp                  |  24 +-
 filters/kword/starwriter/starwriterimport.cc       |  10 +-
 filters/kword/starwriter/starwriterimport.h        |   2 +-
 filters/kword/starwriter/status.html               |   2 +-
 filters/kword/wml/wmlexport.cc                     |  14 +-
 filters/kword/wml/wmlexport.h                      |   2 +-
 filters/kword/wml/wmlimport.cc                     |  14 +-
 filters/kword/wml/wmlimport.h                      |   2 +-
 filters/kword/wml/wmlparser.cpp                    |   2 +-
 filters/kword/wordperfect/export/wp5.cc            |  10 +-
 filters/kword/wordperfect/export/wp5.h             |   2 +-
 filters/kword/wordperfect/export/wp6.cc            |  20 +-
 filters/kword/wordperfect/export/wp6.h             |   2 +-
 filters/kword/wordperfect/export/wpexport.cc       |   8 +-
 filters/kword/wordperfect/export/wpexport.h        |   2 +-
 filters/kword/wordperfect/import/kwordfilter.cpp   |  48 ++--
 filters/kword/wordperfect/import/parser.cpp        |   2 +-
 filters/kword/wordperfect/import/wpimport.cc       |   2 +-
 filters/kword/wordperfect/import/wpimport.h        |   2 +-
 filters/kword/wordperfect/status_old.html          |   2 +-
 178 files changed, 1332 insertions(+), 1332 deletions(-)

(limited to 'filters/kword')

diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc
index 5e875ecd..dfba826d 100644
--- a/filters/kword/abiword/ImportField.cc
+++ b/filters/kword/abiword/ImportField.cc
@@ -26,7 +26,7 @@
 
 TQString getFootnoteFramesetName(const TQString& id)
 {
-    return i18n("Frameset name","Footnote %1").arg(id);
+    return i18n("Frameset name","Footnote %1").tqarg(id);
 }
 
 static void InsertTimeVariable(TQDomDocument& mainDocument,
diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc
index 7c45f07a..1687e958 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 layout, so we leave the work to KWord (from the style)
+        // Else: we are a tqlayout, so we leave the work to KWord (from the style)
     }
     else
     {
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index 5a08cf0d..4f84a8e4 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cc
@@ -121,7 +121,7 @@ void StyleDataMap::defineDefaultStyles(void)
     defineNewStyle("Block Text",-1,"margin-left: 1in; margin-right: 1in; margin-bottom: 6pt");
     TQFontInfo fixedInfo(KGlobalSettings::fixedFont());
     TQString strPlainText=TQString("font-family: %1")
-        .arg(fixedInfo.family()); // TODO: should be "Courier New"
+        .tqarg(fixedInfo.family()); // TODO: should be "Courier New"
     kdDebug(30506) << "Plain Text: " << strPlainText << endl;
     defineNewStyle("Plain Text",-1,strPlainText);
     // TODO: all list and numbered types
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index d52fa1c8..717611cd 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -32,7 +32,7 @@
 
 #include <tqmap.h>
 #include <tqiodevice.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 
 #include <kdebug.h>
@@ -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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         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& layout); // AbiWord's <s></s>
+    virtual bool doFullDefineStyle(LayoutData& tqlayout); // 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& layout, const bool force) const;
+        const LayoutData& tqlayout, 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).layout,(*it).formattingList);
+                            fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*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& layout, const bool force) const
+    const LayoutData& tqlayout, const bool force) const
 {
     TQString props;
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
-        // Check if the current alignment is a valid one for AbiWord.
-        if ((layout.alignment == "left") || (layout.alignment == "right")
-            || (layout.alignment == "center")  || (layout.alignment == "justify"))
+        // Check if the current tqalignment is a valid one for AbiWord.
+        if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right")
+            || (tqlayout.tqalignment == "center")  || (tqlayout.tqalignment == "justify"))
         {
             props += "text-align:";
-            props += layout.alignment;
+            props += tqlayout.tqalignment;
             props += "; ";
         }
-        else if (layout.alignment == "auto")
+        else if (tqlayout.tqalignment == "auto")
         {
-            // We assume a left alignment as AbiWord is not really bi-di (and this filter even less.)
+            // We assume a left tqalignment as AbiWord is not really bi-di (and this filter even less.)
             props += "text-align:left; ";
         }
         else
         {
-            kdWarning(30506) << "Unknown alignment: " << layout.alignment << endl;
+            kdWarning(30506) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
     // TODO/FIXME: what if all tabulators must be erased?
 #if 0
     // DEPRECATED!
-    if (!layout.tabulator.isEmpty()
-        && (force || (layoutOrigin.tabulator!=layout.tabulator)))
+    if (!tqlayout.tabulator.isEmpty()
+        && (force || (layoutOrigin.tabulator!=tqlayout.tabulator)))
     {
         props += "tabstops:";
-        props += layout.tabulator;
+        props += tqlayout.tabulator;
         props += "; ";
     }
 #endif
-    if (!layout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
+    if (!tqlayout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         props += "tabstops:";
         bool first=true;
         TabulatorList::ConstIterator it;
-		TabulatorList::ConstIterator end(layout.tabulatorList.end());
-        for (it=layout.tabulatorList.begin();it!=end;++it)
+		TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
+        for (it=tqlayout.tabulatorList.begin();it!=end;++it)
         {
             if (first)
             {
@@ -789,48 +789,48 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
         props += "; ";
     }
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
+        props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
     }
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("margin-right:%1pt; ").arg(layout.indentRight);
+        props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
     }
 
-    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         props += "text-indent: ";
-        props += TQString::number(layout.indentFirst);
+        props += TQString::number(tqlayout.indentFirst);
         props += "pt; ";
     }
 
-    if ((layout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
+    if ((tqlayout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
+       props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
     }
 
-    if ((layout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
+    if ((tqlayout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("margin-top:%1pt; ").arg(layout.marginTop);
+       props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
     }
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        switch ( layout.lineSpacingType )
+        switch ( tqlayout.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( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.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( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.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( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.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( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
                 props += "pt+; "; // The + makes the difference
                 break;
             }
         default:
             {
-                kdWarning(30506) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30506) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
     }
 
     // Add all AbiWord properties collected in the <FORMAT> element
-    props += textFormatToAbiProps(layoutOrigin.formatData.text,layout.formatData.text,force);
+    props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force);
 
     return props;
 }
 
-bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
+bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
     const ValueListFormatData& paraFormatDataList)
 {
-    TQString style=layout.styleName;
+    TQString style=tqlayout.styleName;
 
     const LayoutData& styleLayout=m_styleMap[style];
 
-    TQString props=layoutToCss(styleLayout,layout,false);
+    TQString props=layoutToCss(styleLayout,tqlayout,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 (layout.pageBreakBefore)
+    if (tqlayout.pageBreakBefore)
     {
         // We have a page break before the paragraph
         *m_streamOut << "<pbr/>";
     }
 
-    processParagraphData(paraText, layout.formatData.text, paraFormatDataList);
+    processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
 
     // Before closing the paragraph, test if we have a page break
-    if (layout.pageBreakAfter)
+    if (tqlayout.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& layout)
+bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register style in the style map
-    m_styleMap[layout.styleName]=layout;
+    m_styleMap[tqlayout.styleName]=tqlayout;
 
     *m_streamOut << "<s";
 
     // TODO: cook the style name to the standard style names in AbiWord
-    *m_streamOut << " name=\"" << EscapeXmlText(layout.styleName,true,true) << "\"";
-    *m_streamOut << " followedby=\"" << EscapeXmlText(layout.styleFollowing,true,true) << "\"";
+    *m_streamOut << " name=\"" << EscapeXmlText(tqlayout.styleName,true,true) << "\"";
+    *m_streamOut << " followedby=\"" << EscapeXmlText(tqlayout.styleFollowing,true,true) << "\"";
 
-    if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
-        && (layout.counter.depth<10) )
+    if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
+        && (tqlayout.counter.depth<10) )
     {
         *m_streamOut << " level=\"";
-        *m_streamOut << TQString::number(layout.counter.depth+1,10);
+        *m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
         *m_streamOut << "\"";
     }
 
-    TQString abiprops=layoutToCss(layout,layout,true);
+    TQString abiprops=layoutToCss(tqlayout,tqlayout,true);
 
     const int result=abiprops.findRev(";");
     if (result>=0)
@@ -1041,7 +1041,7 @@ bool AbiWordWorker::doFullPaperFormat(const int format,
             }
             else
             {   // We prefer to use inches, as to limit rounding errors (page size is in points!)
-                outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").arg(width/72.0).arg(height/72.0);
+                outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").tqarg(width/72.0).tqarg(height/72.0);
             }
             break;
         }
@@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo)
 
     *m_streamOut << "</m>\n";
 
-    TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC
+    TQDateTime now (TQDateTime::tqcurrentDateTime(Qt::UTC)); // current time in UTC
     *m_streamOut << "<m key=\"abiword.date_last_changed\">"
          << escapeAbiWordText(transformToTextDate(now))
          << "</m>\n";
@@ -1225,7 +1225,7 @@ ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const T
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/x-abiword" || from != "application/x-kword" )
     {
@@ -1252,7 +1252,7 @@ KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h
index 656283f8..550b7682 100644
--- a/filters/kword/abiword/abiwordexport.h
+++ b/filters/kword/abiword/abiwordexport.h
@@ -47,6 +47,6 @@ public:
     ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~ABIWORDExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // ABIWORDEXPORT_H
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 2c7e4d3f..4815d02c 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler
 public:
     StructureParser(KoFilterChain* chain)
         :  m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0),
-        m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false)
+        m_timepoint(TQDateTime::tqcurrentDateTime(Qt::UTC)), m_fatalerror(false)
     {
         createDocument();
         structureStack.setAutoDelete(true);
@@ -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 layout
+    // Now we populate the tqlayout
     TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
     paragraphElementOut.appendChild(layoutElement);
 
@@ -527,7 +527,7 @@ bool StructureParser::StartElementImage(StackItem* stackItem, StackItem* stackCu
         kdDebug(30506) << "Image: " << strDataId << endl;
     }
 
-    TQString strPictureFrameName(i18n("Frameset name","Picture %1").arg(++m_pictureFrameNumber));
+    TQString strPictureFrameName(i18n("Frameset name","Picture %1").tqarg(++m_pictureFrameNumber));
 
     // Create the frame set of the image
 
@@ -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 layout of elementText.
+    // We must now copy/clone the tqlayout of elementText.
 
     TQDomNodeList nodeList=stackCurrent->stackElementParagraph.elementsByTagName("LAYOUT");
 
@@ -1127,7 +1127,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
     // ### TODO: in case of automatic column widths, we have not any width given by AbiWord
 
     const uint tableNumber(++m_tableGroupNumber);
-    const TQString tableName(i18n("Table %1").arg(tableNumber));
+    const TQString tableName(i18n("Table %1").tqarg(tableNumber));
 
     TQDomElement elementText=stackCurrent->stackElementText;
     TQDomElement paragraphElementOut=mainDocument.createElement("PARAGRAPH");
@@ -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 layout
+    // Now we populate the tqlayout
     TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
     paragraphElementOut.appendChild(layoutElement);
 
@@ -1211,7 +1211,7 @@ bool StructureParser::StartElementCell(StackItem* stackItem, StackItem* stackCur
     }
 
     const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2")
-        .arg(row).arg(col).arg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last!
+        .tqarg(row).tqarg(col).tqarg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last!
 
     // We need to create a frameset for the cell
     TQDomElement framesetElement(mainDocument.createElement("FRAMESET"));
@@ -1638,8 +1638,8 @@ bool StructureParser::fatalError (const TQXmlParseException& exception)
         << " col " << exception.columnNumber() << " message: " << exception.message() << endl;
     m_fatalerror=true;
     KMessageBox::error(NULL, i18n("An error has occurred while parsing the AbiWord file.\nAt line: %1, column %2\nError message: %3")
-        .arg(exception.lineNumber()).arg(exception.columnNumber())
-        .arg( i18n( "TQXml", exception.message().utf8() ) ),
+        .tqarg(exception.lineNumber()).tqarg(exception.columnNumber())
+        .tqarg( i18n( "TQXml", exception.message().utf8() ) ),
         i18n("AbiWord Import Filter"),0);
     return false; // Stop parsing now, we do not need further errors.
 }
@@ -1757,7 +1757,7 @@ ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const T
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to )
 {
     if ((to != "application/x-kword") || (from != "application/x-abiword"))
         return KoFilter::NotImplemented;
@@ -1825,7 +1825,7 @@ KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const
         if (!handler.wasFatalError())
         {
             // As the parsing was stopped for something else than a fatal error, we have not yet get an error message. (Can it really happen?)
-            KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").arg(from.data()),
+            KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").tqarg(from.data()),
                 i18n("AbiWord Import Filter"),0);
         }
         return KoFilter::ParsingError;
diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h
index 8b8349b7..9ff4d764 100644
--- a/filters/kword/abiword/abiwordimport.h
+++ b/filters/kword/abiword/abiwordimport.h
@@ -50,6 +50,6 @@ public:
     ABIWORDImport();
     virtual ~ABIWORDImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // ABIWORDIMPORT_H
diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt
index 15f20037..f795b56c 100644
--- a/filters/kword/amipro/FileFormat.txt
+++ b/filters/kword/amipro/FileFormat.txt
@@ -43,9 +43,9 @@ Note: Word underline is just like underline, except that
 spaces between words are not underlined.
 
 Paragraph align is also encoded using tag, here it the list:
-  <+@> left alignment
-  <+A> right alignment
-  <+B> center alignment
+  <+@> left tqalignment
+  <+A> right tqalignment
+  <+B> center tqalignment
   <+C> justified
 
 Linespacing is encoded using tag:
@@ -81,7 +81,7 @@ example below:
          0          font color (see below)
          16385      formatting flag (see below)
      [algn]
-         4          alignment flag (see below)
+         4          tqalignment flag (see below)
          1
          216        indent, 216/20 = 10.8 pt 
          144        first line indent, 144/20 = 7.2 pt
@@ -185,7 +185,7 @@ Normally this appears in beginning of paragraph.
 
 5  Page Layout
 -------------
-Page layout is defined in section [lay]. Here is the format,
+Page tqlayout 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 22bc741e..dd4550b8 100644
--- a/filters/kword/amipro/amiproexport.cc
+++ b/filters/kword/amipro/amiproexport.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         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.unicode() )
+    switch( ch.tqunicode() )
     {
       case '<': result += "<<"; break;
       case '>': result += "<;>"; break;
@@ -131,7 +131,7 @@ static TQString AmiProEscape( const TQString& text )
 }
 
 bool AmiProWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList)
 {
   TQString amiproText = "";
   TQString text = paraText;
@@ -180,7 +180,7 @@ AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus 
+KoFilter::ConversiontqStatus 
 AmiProExport::convert( const TQCString& from, 
   const TQCString& to )
 {
@@ -191,7 +191,7 @@ AmiProExport::convert( const TQCString& from,
   AmiProWorker* worker = new AmiProWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h
index bffb4362..c9e1f5d9 100644
--- a/filters/kword/amipro/amiproexport.h
+++ b/filters/kword/amipro/amiproexport.h
@@ -35,7 +35,7 @@ class AmiProExport : public KoFilter
 
     virtual ~AmiProExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __AMIPROEXPORT_H
diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc
index fe45ca18..7f37746c 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 layout to KWord's LAYOUT
-static TQString AmiProLayoutAsXML( const AmiProLayout& layout )
+// helper function to convert AmiPro paragraph tqlayout to KWord's LAYOUT
+static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout )
 {
   TQString result;
 
-  TQString referredStyle = layout.name;
+  TQString referredStyle = tqlayout.name;
   if( referredStyle.isEmpty() ) referredStyle = "Standard";
 
-  TQString fontname = layout.fontFamily;
+  TQString fontname = tqlayout.fontFamily;
   if( fontname.isEmpty() ) fontname = KoGlobal::defaultFont().family();
-  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 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 align;
-  align = layout.align==TQt::AlignLeft ? "left" :
-          layout.align==TQt::AlignRight ? "right" :
-          layout.align==TQt::AlignCenter ? "center" :
-          layout.align==TQt::AlignJustify ? "justify" :
+  align = tqlayout.align==TQt::AlignLeft ? "left" :
+          tqlayout.align==TQt::AlignRight ? "right" :
+          tqlayout.align==TQt::AlignCenter ? "center" :
+          tqlayout.align==TQt::AlignJustify ? "justify" :
           "left";
 
   TQString offsets;
-  offsets = "before=\"" + TQString::number(layout.spaceBefore) +
-            "\" after=\"" + TQString::number(layout.spaceAfter) + "\"";
+  offsets = "before=\"" + TQString::number(tqlayout.spaceBefore) +
+            "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\"";
 
   TQString linespacing;
-  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 );
+  linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) :
+                tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) :
+                tqlayout.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) :
+                  TQString::number( tqlayout.linespace );
 
   result.append( "<LAYOUT>\n" );
   result.append( "  <NAME value=\"" + XMLEscape( referredStyle ) + "\" />\n" );
@@ -213,9 +213,9 @@ static TQString AmiProStyleAsXML( const AmiProStyle& style )
           "left";
 
   TQString linespacing;
-  linespacing = style.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
-                style.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
-                style.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
+  linespacing = style.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) :
+                style.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) :
+                style.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) :
                   TQString::number( style.linespace );
 
   TQString offsets;
@@ -308,18 +308,18 @@ bool AmiProConverter::doDefineStyle( const AmiProStyle& style )
 }
 
 bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList formatList,
-  AmiProLayout& layout )
+  AmiProLayout& tqlayout )
 {
   root.append( "<PARAGRAPH>\n" );
   root.append( "<TEXT>" + XMLEscape( text ) + "</TEXT>\n" );
   root.append( AmiProFormatListAsXML( formatList ) );
-  root.append( AmiProLayoutAsXML( layout ) );
+  root.append( AmiProLayoutAsXML( tqlayout ) );
   root.append( "</PARAGRAPH>\n" );
 
   return true;
 }
 
-KoFilter::ConversionStatus AmiProImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus AmiProImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "application/x-amipro" )
diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h
index 45c8cc2b..ad078543 100644
--- a/filters/kword/amipro/amiproimport.h
+++ b/filters/kword/amipro/amiproimport.h
@@ -37,7 +37,7 @@ class AmiProImport : public KoFilter
 
     virtual ~AmiProImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __AMIPROIMPORT_H
diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp
index 14a0084b..fdae97e6 100644
--- a/filters/kword/amipro/amiproparser.cpp
+++ b/filters/kword/amipro/amiproparser.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 const float AmiPro::LS_Single = -1;
 const float AmiPro::LS_OneAndHalf = -1.5;
@@ -83,7 +83,7 @@ static TQString AmiProUnescape( const TQString& str )
         else
         {
           result.truncate( result.length() - 1 ); // remove the '<'
-          result.append( TQChar(str[i+2].unicode() + 0x40 ) );
+          result.append( TQChar(str[i+2].tqunicode() + 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].unicode() | 0x80 ) );
+        result.append( TQChar(str[i+2].tqunicode() | 0x80 ) );
         i += 3;
       }
 
@@ -344,7 +344,7 @@ bool AmiProParser::parseStyle( const TQStringList& lines )
   style.word_underline = flag & 8;
   style.double_underline = flag & 64;
 
-  // alignment
+  // tqalignment
   if( lines[7].stripWhiteSpace() != "[algn]" ) return true;
   unsigned align_flag = lines[8].stripWhiteSpace().toUInt();
   if( align_flag & 1 ) style.align = TQt::AlignLeft;
@@ -628,7 +628,7 @@ void AmiProFormat::applyStyle( const AmiProStyle& style )
   strikethrough = style.strikethrough;
 }
 
-// paragraph layout
+// paragraph tqlayout
 AmiProLayout::AmiProLayout()
 {
   name = "";
diff --git a/filters/kword/amipro/amiproparser.h b/filters/kword/amipro/amiproparser.h
index b6f07753..40a8f82b 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& layout );
+      AmiProLayout& tqlayout );
 };
 
 class AmiProParser
@@ -144,7 +144,7 @@ class AmiProParser
     bool processOpenDocument();
     bool processCloseDocument();
     bool processParagraph( const TQString& text, AmiProFormatList formatList,
-      AmiProLayout& layout );
+      AmiProLayout& tqlayout );
 
 };
 
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc
index 89bf5541..d7acc7ed 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cc
@@ -85,7 +85,7 @@ APPLIXWORDImport::nextLine (TQTextStream & stream)
  *                                                                            *
  *                                                                            *
  ******************************************************************************/
-KoFilter::ConversionStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to )
 {
 
     if (to!="application/x-kword" || from!="application/x-applixword")
@@ -780,10 +780,10 @@ APPLIXWORDImport::readHeader (TQTextStream &stream, TQFile &in)
       TQMessageBox::critical (0L, "Applixword header problem",
                                   TQString ("The Applixword header is not correct. "
                                            "May be it is not an applixword file! <BR>"
-                                           "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
 				    "Okay");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
       return false;
     }
     else return true;
diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h
index 957e4058..ccd80df7 100644
--- a/filters/kword/applixword/applixwordimport.h
+++ b/filters/kword/applixword/applixwordimport.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqfile.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <KoFilter.h>
 #include <KoStore.h>
@@ -50,7 +50,7 @@ public:
     APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~APPLIXWORDImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     TQChar   specCharfind     (TQChar , TQChar );
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index f4bddc03..138618b2 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
@@ -41,14 +41,14 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.arg("Apple Roman"); // Apple 
-    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
-    encodings << description.arg("CP 1258"); // Windows
+    encodings << description.tqarg("Apple Roman"); // Apple 
+    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
+    encodings << description.tqarg("CP 1258"); // Windows
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -85,7 +85,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui
index 9345a64c..8f66942c 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>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index c11753bc..adb345b1 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
@@ -41,14 +41,14 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.arg("Apple Roman"); // Apple 
-    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
-    encodings << description.arg("CP 1258"); // Windows
+    encodings << description.tqarg("Apple Roman"); // Apple 
+    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
+    encodings << description.tqarg("CP 1258"); // Windows
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -84,7 +84,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui
index 4b32a441..fd124062 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>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc
index 3748e8e7..4f4fbb06 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cc
@@ -28,8 +28,8 @@
 #include <tqfile.h>
 #include <tqiodevice.h>
 #include <tqstring.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -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& layout,
+        const LayoutData& tqlayout,
         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.layout, para.formattingList);
+    return doFullParagraph(para.text, para.tqlayout, para.formattingList);
 }
 
-bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
+bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
     const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30502) << "Entering ASCIIWorker::doFullParagraph" << endl;
@@ -216,15 +216,15 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& la
     // As KWord has only one depth of lists, we can process lists very simply.
     // --
     // Not anymore - Clarence
-    if ( layout.counter.numbering == CounterData::NUM_LIST )
+    if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
     {
         // Are we still in a list of the right type?
-        if (!m_inList || (layout.counter.style!=m_typeList))
+        if (!m_inList || (tqlayout.counter.style!=m_typeList))
         {
             // We are not yet part of a list
             m_inList=true;
             m_counterList=1; // Start numbering
-            m_typeList=layout.counter.style;
+            m_typeList=tqlayout.counter.style;
         }
 
         switch (m_typeList)
@@ -307,26 +307,26 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& la
     else
     {
         m_inList=false; // Close an eventual list
-        if ( layout.counter.numbering == CounterData::NUM_CHAPTER )
+        if ( tqlayout.counter.numbering == CounterData::NUM_CHAPTER )
         {
-            if (!layout.counter.depth)
+            if (!tqlayout.counter.depth)
             {   // HEAD 1
                 *m_streamOut << "###################################" << m_eol;
                 *m_streamOut << "# ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
                 *m_streamOut << "###################################" << m_eol;
             }
-            else if (layout.counter.depth==1)
+            else if (tqlayout.counter.depth==1)
             {   // HEAD 2
                 *m_streamOut << "#### ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
             }
-            else if (layout.counter.depth==2)
+            else if (tqlayout.counter.depth==2)
             {   // HEAD 3
                 *m_streamOut << "## ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
             }
-            else if (layout.counter.depth==3)
+            else if (tqlayout.counter.depth==3)
             {   // HEAD 4
                 *m_streamOut << "# ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
@@ -342,8 +342,8 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& la
         }
     }
 #else
-    if (!layout.counter.text.isEmpty())
-        *m_streamOut << layout.counter.text << " ";
+    if (!tqlayout.counter.text.isEmpty())
+        *m_streamOut << tqlayout.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 layout for now)
+    // just dump the table out (no tqlayout for now)
     for (TQValueList<TableCell>::ConstIterator it = table.cellList.begin();
          it != table.cellList.end();
          it++)
@@ -474,7 +474,7 @@ ASCIIExport::ASCIIExport(KoFilter*, const char*, const TQStringList&)
 {
 }
 
-KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const TQCString& to)
 {
     if (to != "text/plain" || from != "application/x-kword")
     {
@@ -534,7 +534,7 @@ KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQC
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversionStatus result = leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result = leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h
index 429ad6c8..af1e2e04 100644
--- a/filters/kword/ascii/asciiexport.h
+++ b/filters/kword/ascii/asciiexport.h
@@ -31,7 +31,7 @@ public:
     ASCIIExport(KoFilter* parent, const char* name, const TQStringList&);
     virtual ~ASCIIExport() {}
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // ASCIIEXPORT_H
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index 52c5c4d9..f2a6e039 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -28,9 +28,9 @@
 #include <tqobject.h>
 #include <tqstring.h>
 // #include <tqregexp.h> // Currently not needed (due to disabled code)
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 #include <tqfontinfo.h>
 
@@ -195,7 +195,7 @@ void ASCIIImport::prepareDocument(TQDomDocument& mainDocument, TQDomElement& mai
 
 }
 
-KoFilter::ConversionStatus ASCIIImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ASCIIImport::convert( const TQCString& from, const TQCString& to )
 {
     if (to!="application/x-kword" || from!="text/plain")
         return KoFilter::NotImplemented;
@@ -310,9 +310,9 @@ void ASCIIImport::oldWayConvert(TQTextStream& stream, TQDomDocument& mainDocumen
             }
 
             const int length = strLine.length();
-            if (strLine.at(length-1) == '-')
+            if (strLine.tqat(length-1) == '-')
                 // replace the hard hyphen - at line end by a soft hyphen
-                strLine.at(length-1)=TQChar(173);
+                strLine.tqat(length-1)=TQChar(173);
             else
                 strLine += ' '; // add space to end of line
 
diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h
index b2cfcbdd..4d332776 100644
--- a/filters/kword/ascii/asciiimport.h
+++ b/filters/kword/ascii/asciiimport.h
@@ -65,7 +65,7 @@ public:
     ASCIIImport();
     virtual ~ASCIIImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 private: // not yet changed
 #if 0
     void WriteOutTableCell( int table_no, int row, int col, Position *pos,
diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc
index f54bec6b..db9c754a 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.layout.formatData.text.italic )
+                    if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic )
                     {
                         outputText += "<EMPHASIS>";
                     }
 
-                    if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
+                    if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
                     {
                         outputText += "<EMPHASIS ROLE=bold>";
                     }
@@ -318,12 +318,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData &para,
                         outputText += "</LITERAL>";
                     }
 
-                    if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
+                    if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
                     {
                         outputText += "</EMPHASIS>";
                     }
 
-                    if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic )
+                    if ( (*formattingIt).text.italic && !para.tqlayout.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).layout.counter.numbering )
+        switch ( (*paraIt).tqlayout.counter.numbering )
         {
             case CounterData::NUM_LIST:
-                switch ( (*paraIt).layout.counter.style )
+                switch ( (*paraIt).tqlayout.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).layout.counter.style << "!" << endl;
+                        kdError (30507) << "Unknown counter style " << (*paraIt).tqlayout.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).layout.counter.depth )
+                switch ( (*paraIt).tqlayout.counter.depth )
                 {
                     case 0:
                         CloseHead1AndArticle ();
@@ -629,7 +629,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
                         break;
 
                     default:
-                        kdError (30507) << "Unexpected chapter depth " << (*paraIt).layout.counter.depth << "!" << endl;
+                        kdError (30507) << "Unexpected chapter depth " << (*paraIt).tqlayout.counter.depth << "!" << endl;
                         CloseLists ();
                         OpenArticleUnlessHead1 ();
                         ProcessParagraphData (*paraIt, "PARA" );
@@ -782,7 +782,7 @@ bool DocBookWorker::doFullDocumentInfo ( const KWEFDocumentInfo &docInfo )
 }
 
 
-KoFilter::ConversionStatus DocBookExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus DocBookExport::convert( const TQCString& from, const TQCString& to )
 {
 #if 0
     kdError (30507) << "to = " << to << ", from = " << from << endl;
diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h
index 29362aaa..cf7ec804 100644
--- a/filters/kword/docbook/docbookexport.h
+++ b/filters/kword/docbook/docbookexport.h
@@ -38,6 +38,6 @@ public:
     DocBookExport (KoFilter *parent, const char *name, const TQStringList & );
     virtual ~DocBookExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // DOCBOOKEXPORT_H
diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp
index 47191bc7..6fc353e5 100644
--- a/filters/kword/hancomword/hancomwordimport.cpp
+++ b/filters/kword/hancomword/hancomwordimport.cpp
@@ -31,7 +31,7 @@
 #include <tqfile.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -82,7 +82,7 @@ static inline unsigned long readU16( const void* p )
 
 }
 
-KoFilter::ConversionStatus HancomWordImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HancomWordImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/x-hancomword" )
     return KoFilter::NotImplemented; 
diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h
index f78c3a47..64d279a8 100644
--- a/filters/kword/hancomword/hancomwordimport.h
+++ b/filters/kword/hancomword/hancomwordimport.h
@@ -35,7 +35,7 @@ public:
     HancomWordImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~HancomWordImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
   class Private;
diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp
index cb3771f5..f712f0e1 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 unicode anymore 
+    std::string name;      // the name, not in tqunicode anymore 
     bool dir;              // true if directory   
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
@@ -117,7 +117,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> children( unsigned index );
+    std::vector<unsigned> tqchildren( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -507,11 +507,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its children
-  // and check if one of the children is 'index'
+  // brute-force, basically we iterate for each entries, find its tqchildren
+  // and check if one of the tqchildren is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = children( j );
+    std::vector<unsigned> chi = tqchildren( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -575,8 +575,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the children of index
-     std::vector<unsigned> chi = children( index );
+     // find among the tqchildren of index
+     std::vector<unsigned> chi = tqchildren( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -591,7 +591,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among children
+       // not found among tqchildren
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
@@ -648,7 +648,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::children( unsigned index )
+std::vector<unsigned> DirTree::tqchildren( unsigned index )
 {
   std::vector<unsigned> result;
   
@@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> children = dt->children( parent );
-    for( unsigned i = 0; i < children.size(); i++ )
-      result.push_back( dt->entry( children[i] )->name );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
+    for( unsigned i = 0; i < tqchildren.size(); i++ )
+      result.push_back( dt->entry( tqchildren[i] )->name );
   }
   
   return result;
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc
index 673b035a..13864d7a 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 #include <klocale.h>
@@ -308,37 +308,37 @@ void HtmlBasicWorker::closeFormatData(const FormatData& formatOrigin,
 }
 
 void HtmlBasicWorker::openParagraph(const TQString& strTag,
-    const LayoutData& layout, TQChar::Direction direction)
+    const LayoutData& tqlayout, TQChar::Direction direction)
 {
     *m_streamOut << '<' << strTag;
 
-    if ( (layout.alignment=="left") || (layout.alignment== "right")
-        || (layout.alignment=="center") || (layout.alignment=="justify"))
+    if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
+        || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
     {
-        *m_streamOut << " align=\"" << layout.alignment << "\"";
+        *m_streamOut << " align=\"" << tqlayout.tqalignment << "\"";
         if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) )
           *m_streamOut << " dir=\"rtl\"";
     }
-    else if ( layout.alignment=="auto")
+    else if ( tqlayout.tqalignment=="auto")
     {
         // Do nothing, the user-agent should be more intelligent than us.
     }
     else
     {
-        kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
+        kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
     }
 
     *m_streamOut << ">";
 
     // Allow bold only if tag is not a heading!
-    openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
 }
 
 void HtmlBasicWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& layout)
+    const LayoutData& tqlayout)
 {
      // Allow bold only if tag is not a heading!
-    closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    closeFormatData(tqlayout.formatData,tqlayout.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 c8f2864c..a6de0082 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& layout,TQChar::Direction direction=TQChar::DirL);
+        const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& layout);
+        const LayoutData& tqlayout);
     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 58f2860e..49abcf79 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 #include <klocale.h>
@@ -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.unicode();
+        const ushort ch=qch.tqunicode();
 
         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& layout, const bool force) const
+    const LayoutData& tqlayout, const bool force) const
 {
     TQString strLayout;
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
-        if ( (layout.alignment=="left") || (layout.alignment== "right")
-            || (layout.alignment=="center") || (layout.alignment=="justify"))
+        if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
+            || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
         {
-            strLayout += TQString("text-align:%1; ").arg(layout.alignment);
+            strLayout += TQString("text-align:%1; ").tqarg(tqlayout.tqalignment);
         }
-        else if ( layout.alignment=="auto")
+        else if ( tqlayout.tqalignment=="auto")
         {
             // Do nothing, the user-agent should be more intelligent than us.
         }
         else
         {
-            kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
+            kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-            strLayout += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
+            strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
     }
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        strLayout += TQString("margin-right:%1pt; ").arg(layout.indentRight);
+        strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
     }
 
-    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
-        strLayout += TQString("text-indent:%1pt; ").arg(layout.indentFirst);
+        strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst);
     }
 
-    if ((layout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
+    if ((tqlayout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       strLayout += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
+       strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
     }
 
-    if ((layout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
+    if ((tqlayout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       strLayout += TQString("margin-top:%1pt; ").arg(layout.marginTop);
+       strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
     }
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        switch ( layout.lineSpacingType )
+        switch ( tqlayout.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(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.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( layout.lineSpacing * 100 ) ) );
+                const TQString mult ( TQString::number( tqRound( tqlayout.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(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.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(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.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: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30503) << "Unsupported lineSpacingType: " << tqlayout.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 == layout.shadowDirection )
-        && ( layoutOrigin.shadowDistance == layout.shadowDistance ) )
+        && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection )
+        && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
     {
         // Do nothing!
     }
-    else if ((!layout.shadowDirection) || (!layout.shadowDistance))
+    else if ((!tqlayout.shadowDirection) || (!tqlayout.shadowDistance))
     {
         strLayout += "text-shadow:";
         strLayout+="none; ";
@@ -443,8 +443,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
     else
     {
         double xDistance,yDistance;
-        const double distance=layout.shadowDistance;
-        switch (layout.shadowDirection)
+        const double distance=tqlayout.shadowDistance;
+        switch (tqlayout.shadowDirection)
         {
         case 1: // SD_LEFT_UP
             {
@@ -509,8 +509,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
         else
         {
             strLayout += "text-shadow:";
-            strLayout+=TQString("%1 %2pt %3pt; ").arg(layout.shadowColor.name())
-                .arg(xDistance,0,'f',0).arg(yDistance,0,'f',0);
+            strLayout+=TQString("%1 %2pt %3pt; ").tqarg(tqlayout.shadowColor.name())
+                .tqarg(xDistance,0,'f',0).tqarg(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,
-        layout.formatData.text,force);
+        tqlayout.formatData.text,force);
 
     return strLayout;
 }
 
 void HtmlCssWorker::openParagraph(const TQString& strTag,
-    const LayoutData& layout, TQChar::Direction direction)
+    const LayoutData& tqlayout, TQChar::Direction direction)
 {
-    const LayoutData& styleLayout=m_styleMap[layout.styleName];
+    const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
 
     *m_streamOut << '<' << strTag;
 
     // Opening elements
-    *m_streamOut << " class=\"" << escapeCssIdentifier(layout.styleName);
+    *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName);
     *m_streamOut << "\"";
 
-    TQString strStyle=layoutToCss(styleLayout,layout,false);
+    TQString strStyle=layoutToCss(styleLayout,tqlayout,false);
     if (!strStyle.isEmpty())
     {
         *m_streamOut << " style=\"" << strStyle;
         if (direction == TQChar::DirRLE) {
-            *m_streamOut << "direction: rtl; unicode-bidi: embed; ";
+            *m_streamOut << "direction: rtl; tqunicode-bidi: embed; ";
         } else if (direction == TQChar::DirRLO) {
-            *m_streamOut << "direction: rtl; unicode-bidi: override; ";
+            *m_streamOut << "direction: rtl; tqunicode-bidi: override; ";
         }
         *m_streamOut<< "\"";
     }
 
     *m_streamOut << ">";
 
-    if ( 1==layout.formatData.text.verticalAlignment )
+    if ( 1==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "<sub>"; //Subscript
     }
-    else if ( 2==layout.formatData.text.verticalAlignment )
+    else if ( 2==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "<sup>"; //Superscript
     }
-    if ( layout.alignment == "center" ) *m_streamOut << "<center>";
+    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "<center>";
 }
 
 void HtmlCssWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& layout)
+    const LayoutData& tqlayout)
 {
-    if ( 2==layout.formatData.text.verticalAlignment )
+    if ( 2==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "</sup>"; //Superscript
     }
-    else if ( 1==layout.formatData.text.verticalAlignment )
+    else if ( 1==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "</sub>"; //Subscript
     }
 
-    if ( layout.alignment == "center" ) *m_streamOut << "</center>";
+    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "</center>";
     *m_streamOut << "</" << strTag << ">\n";
 }
 
@@ -680,16 +680,16 @@ bool HtmlCssWorker::doOpenStyles(void)
     return true;
 }
 
-bool HtmlCssWorker::doFullDefineStyle(LayoutData& layout)
+bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register style in the style map
-    m_styleMap[layout.styleName]=layout;
+    m_styleMap[tqlayout.styleName]=tqlayout;
 
     // We do not limit (anymore) any style to <h1> ... <h6>, because
-    //   the style could be forced on <p> by the layout.
+    //   the style could be forced on <p> by the tqlayout.
 
-    *m_streamOut << "." << escapeCssIdentifier(layout.styleName);
-    *m_streamOut << "\n{\n  " << layoutToCss(layout,layout,true) << "\n}\n";
+    *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName);
+    *m_streamOut << "\n{\n  " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n";
 
     return true;
 }
diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h
index a33a0049..358ea688 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& layout);
+    virtual bool doFullDefineStyle(LayoutData& tqlayout);
     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& layout,
+    virtual void openParagraph(const TQString& strTag, const LayoutData& tqlayout,
                                TQChar::Direction direction=TQChar::DirL);
-    virtual void closeParagraph(const TQString& strTag, const LayoutData& layout);
+    virtual void closeParagraph(const TQString& strTag, const LayoutData& tqlayout);
     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& layout,
+    TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout,
         const bool force) const;
     TQString escapeCssIdentifier(const TQString& strText) const;
     TQString textFormatToCss(const TextFormatting& formatOrigin,
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index 7e005538..20c7069b 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <klocale.h>
 #include <kcharsets.h>
@@ -28,7 +28,7 @@
 #include <kcombobox.h>
 #include <kmessagebox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <tqcheckbox.h>
@@ -46,8 +46,8 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
 
     TQStringList encodingList;
 
-    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
     encodingList += KGlobal::charsets()->descriptiveEncodingNames();
 
     m_dialog->comboBoxEncoding->insertStringList( encodingList );
@@ -106,7 +106,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30503) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui
index a6683c04..cbdc4fc2 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>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -196,7 +196,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -212,7 +212,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -221,7 +221,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -262,7 +262,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc
index 0cb6339e..f0e4b3aa 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 #include <klocale.h>
@@ -140,16 +140,16 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin,
 }
 
 void HtmlDocStructWorker::openParagraph(const TQString& strTag,
-    const LayoutData& layout,TQChar::Direction /*direction*/)
+    const LayoutData& tqlayout,TQChar::Direction /*direction*/)
 {
     *m_streamOut << '<' << strTag << ">";
-    openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
 }
 
 void HtmlDocStructWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& layout)
+    const LayoutData& tqlayout)
 {
-    closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    closeFormatData(tqlayout.formatData,tqlayout.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 6e963183..43b1e76a 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& layout,TQChar::Direction direction=TQChar::DirL);
+        const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& layout);
+        const LayoutData& tqlayout);
     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 ecaba65c..aa1b1817 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
@@ -275,13 +275,13 @@ void HtmlWorker::formatTextParagraph(const TQString& strText,
 }
 
 void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &paraText,
-    const LayoutData& layout, const ValueListFormatData &paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList)
 {
     if (paraText.isEmpty() && paraFormatDataList.first().id != 6)
     {
-        openParagraph(strTag,layout);
+        openParagraph(strTag,tqlayout);
         *m_streamOut << "&nbsp;" ; // A paragraph can never be empty in HTML
-        closeParagraph(strTag,layout);
+        closeParagraph(strTag,tqlayout);
     }
     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,layout,partialText.ref(0).direction());
+                    openParagraph(strTag,tqlayout,partialText.ref(0).direction());
                     paragraphNotOpened=false;
                 }
-                formatTextParagraph(partialText,layout.formatData,*paraFormatDataIt);
+                formatTextParagraph(partialText,tqlayout.formatData,*paraFormatDataIt);
             }
             else if (4==(*paraFormatDataIt).id)
             {
                 // For variables, we need an opened paragraph
                 if (paragraphNotOpened)
                 {
-                    openParagraph(strTag,layout);
+                    openParagraph(strTag,tqlayout);
                     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,layout);
+                        closeParagraph(strTag,tqlayout);
                     }
                     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, layout,partialText.ref(0). direction() );
+                        openParagraph( strTag, tqlayout,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,layout);
+            closeParagraph(strTag,tqlayout);
         }
     }
 }
 
 bool HtmlWorker::doFullParagraph(const TQString& paraText,
-    const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30503) << "Entering HtmlWorker::doFullParagraph" << endl << paraText << endl;
     TQString strParaText=paraText;
     TQString strTag; // Tag that will be written.
 
-    if ( layout.counter.numbering == CounterData::NUM_LIST )
+    if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
     {
-        const uint layoutDepth=layout.counter.depth+1; // Word's depth starts at 0!
+        const uint layoutDepth=tqlayout.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=layout.counter.style;
+            newList.m_typeList=tqlayout.counter.style;
             for (uint i=listDepth; i<layoutDepth; i++)
             {
-                *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList);
+                *m_streamOut << getStartOfListOpeningTag(tqlayout.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 ( layout.counter.style!=m_listStack.top().m_typeList)
+        if ( tqlayout.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(layout.counter.style,newList.m_orderedList);
-            newList.m_typeList=layout.counter.style;
+            *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
+            newList.m_typeList=tqlayout.counter.style;
             m_listStack.push(newList);
         }
 
@@ -453,10 +453,10 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
                 }
             }
         }
-        if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
-            && (layout.counter.depth<6) )
+        if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
+            && (tqlayout.counter.depth<6) )
         {
-            strTag=TQString("h%1").arg(layout.counter.depth + 1); // H1 ... H6
+            strTag=TQString("h%1").tqarg(tqlayout.counter.depth + 1); // H1 ... H6
         }
         else
         {
@@ -464,7 +464,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
         }
     }
 
-    ProcessParagraphData(strTag, strParaText, layout, paraFormatDataList);
+    ProcessParagraphData(strTag, strParaText, tqlayout, 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 04d3129f..f8446c1b 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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         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& layout, TQChar::Direction direction=TQChar::DirL)=0;
+        const LayoutData& tqlayout, TQChar::Direction direction=TQChar::DirL)=0;
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& layout)=0;
+        const LayoutData& tqlayout)=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& layout, const ValueListFormatData &paraFormatDataList);
+        const LayoutData& tqlayout, 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/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cc
index 013fb7ff..f8af8e3e 100644
--- a/filters/kword/html/export/htmlexport.cc
+++ b/filters/kword/html/export/htmlexport.cc
@@ -31,7 +31,7 @@
    License version 2.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -61,7 +61,7 @@ HTMLExport::HTMLExport(KoFilter *, const char *, const TQStringList &) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if ((from != "application/x-kword") || (to != "text/html"))
     {
@@ -118,7 +118,7 @@ KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQC
         delete worker;
         return KoFilter::StupidError;
     }
-    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h
index 5b62781a..5de5ef6a 100644
--- a/filters/kword/html/export/htmlexport.h
+++ b/filters/kword/html/export/htmlexport.h
@@ -22,7 +22,7 @@
 #define HTMLEXPORT_H
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -39,7 +39,7 @@ public:
     HTMLExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // HTMLEXPORT_H
diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp
index 9b29320d..2c403b2f 100644
--- a/filters/kword/html/import/htmlimport.cpp
+++ b/filters/kword/html/import/htmlimport.cpp
@@ -39,7 +39,7 @@ HTMLImport::HTMLImport(KoFilter *, const char*, const TQStringList &) :
 // 123
 }
 
-KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HTMLImport::convert( const TQCString& from, const TQCString& to )
 {
 	if(to!="application/x-kword" || from!="text/html")
 		return KoFilter::NotImplemented;
diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h
index ab2a293c..f7c61a41 100644
--- a/filters/kword/html/import/htmlimport.h
+++ b/filters/kword/html/import/htmlimport.h
@@ -37,7 +37,7 @@ public:
     HTMLImport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // HTMLIMPORT_H
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 8545fb0d..6e134e38 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->layout=_writer->currentLayout(s->paragraph);
+		s->tqlayout=_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->layout=state()->layout;
+        s->tqlayout=state()->tqlayout;
 	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()->layout != s->layout)) 
+		if ((state()->tqlayout != s->tqlayout)) 
                 {
-                  if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout);
+                  if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->tqlayout);
 		}
 		state()->format=_writer->startFormat(state()->paragraph, state()->format);
 	}
@@ -129,15 +129,15 @@ void KHTMLReader::popState()
 
 void KHTMLReader::startNewLayout(bool startNewFormat) 
 {
-	TQDomElement layout;
-	startNewLayout(startNewFormat,layout);
+	TQDomElement tqlayout;
+	startNewLayout(startNewFormat,tqlayout);
 }
 
-void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout) 
+void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement tqlayout) 
 {
         kdDebug() << "entering startNewLayout" << endl;
 	startNewParagraph(startNewFormat,true);
-	state()->layout=_writer->setLayout(state()->paragraph,layout);
+	state()->tqlayout=_writer->setLayout(state()->paragraph,tqlayout);
 }
 
 void KHTMLReader::completed() 
@@ -178,12 +178,12 @@ void KHTMLReader::parseNode(DOM::Node node)
 	if (!t.isNull()) 
         {
 	   _writer->addText(state()->paragraph,t.data().string(),1,state()->in_pre_mode);
-	   return; // no children anymore...
+	   return; // no tqchildren anymore...
 	}
 
 	// is this really needed ? it can't do harm anyway.
 	state()->format=_writer->currentFormat(state()->paragraph,true);
-	state()->layout=_writer->currentLayout(state()->paragraph);
+	state()->tqlayout=_writer->currentLayout(state()->paragraph);
 	pushNewState();
 
 	DOM::Element e=node;
@@ -227,13 +227,13 @@ void KHTMLReader::parse_head(DOM::Element e)
 		} \
 	}
 
-// 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.
+// 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.
 
 #define _PL(x,a,b,c) { \
 		if (e.tagName().lower() == #x) \
 			{ \
-				state()->layout=_writer->setLayout(state()->paragraph,state()->layout);\
+				state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\
 				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 startnewlayout) 
+void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) 
 {
         kdDebug() << "Entering startNewParagraph" << endl;
 
 	TQDomElement qf=state()->format;
-	TQDomElement ql=state()->layout;
+	TQDomElement ql=state()->tqlayout;
 
 	_writer->cleanUpParagraph(state()->paragraph);
 
-        if ((startnewlayout==true) || ql.isNull())
+        if ((startnewtqlayout==true) || ql.isNull())
         	{state()->paragraph=_writer->addParagraph(state()->frameset);}
         else
 	        {state()->paragraph=
-	        	_writer->addParagraph(state()->frameset,state()->layout);}
+	        	_writer->addParagraph(state()->frameset,state()->tqlayout);}
 
 
 
@@ -321,7 +321,7 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout)
 		_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
 		_writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
 		int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt();
-		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(currdepth+1));
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
 	}
 }
 
@@ -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 layout
+	startNewParagraph(false,false); //keep the current format and tqlayout
 	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()->layout=_writer->setLayout(state()->paragraph,state()->layout);
+      state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);
       _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
     }
   // done
@@ -520,11 +520,11 @@ void KHTMLReader::parseStyle(DOM::Element e)
      // debugging code.
      kdDebug(30503) << "e.style()" << endl;
      for (unsigned int i=0;i<s1.length();i++) {
-        kdDebug(30503) << TQString("%1: %2").arg(s1.item(i).string()).arg(s1.getPropertyValue(s1.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").tqarg(s1.item(i).string()).tqarg(s1.getPropertyValue(s1.item(i)).string()) << endl;
      }
      kdDebug(30503) << "override style" << endl;
      for (unsigned int i=0;i<s2.length();i++) {
-        kdDebug(30503) << TQString("%1: %2").arg(s2.item(i).string()).arg(s2.getPropertyValue(s2.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").tqarg(s2.item(i).string()).tqarg(s2.getPropertyValue(s2.item(i)).string()) << endl;
      }
 */
 }
@@ -628,7 +628,7 @@ bool KHTMLReader::parse_pre(DOM::Element e)
 		_writer->addText(state()->paragraph,htmlelement.innerHTML().string(),1);
 	startNewParagraph();
 	//popState();
-	return false; // children are already handled.
+	return false; // tqchildren are already handled.
 #else
 	pushNewState();
 	state()->in_pre_mode=true;
@@ -640,7 +640,7 @@ bool KHTMLReader::parse_pre(DOM::Element e)
 	}
 	popState();
         _writer->formatAttribute(state()->paragraph,"FONT","name",face);
-	return false; // children are already handled.
+	return false; // tqchildren are already handled.
 #endif
 }
 
@@ -668,11 +668,11 @@ bool KHTMLReader::parse_font(DOM::Element e)
 
   _writer->formatAttribute(state()->paragraph,"FONT","name",face);
   if ((isize>=0) && (isize != 12))
-    _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").arg(isize));
+    _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").tqarg(isize));
 
-  _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").arg(color.red()));
-  _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").arg(color.green()));
-  _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").arg(color.blue()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").tqarg(color.red()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").tqarg(color.green()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").tqarg(color.blue()));
   return true;
 }
 
@@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
   _list_depth++;
   if (e.firstChild().nodeName().string().lower() == "#text")  // e.g. <ul>this is indented<li>first listitem</li></ul>
   {
-    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent
+    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
     startNewLayout();
   }
   for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) 
@@ -706,7 +706,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
 	_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
         _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
       }
-      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
     }
     parseNode(items);
   }
diff --git a/filters/kword/html/import/khtmlreader.h b/filters/kword/html/import/khtmlreader.h
index db93531a..9987a589 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 layout;
+  TQDomElement tqlayout;
   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 layout);
-        void startNewParagraph(bool startnewformat=true, bool startnewlayout=true);
+	void startNewLayout(bool startNewFormat, TQDomElement tqlayout);
+        void startNewParagraph(bool startnewformat=true, bool startnewtqlayout=true);
         bool _it_worked;
 // -----------------------------------------------------
         int _list_depth;
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index a194b219..56568be9 100644
--- a/filters/kword/html/import/kwdwriter.cpp
+++ b/filters/kword/html/import/kwdwriter.cpp
@@ -173,9 +173,9 @@ TQDomElement KWDWriter::createTableCell(int tableno, int nrow,
 	TQDomElement parent=docroot().elementsByTagName("FRAMESETS").item(0).toElement();
 
 	TQDomElement fs=addFrameSet(parent,1,0,
-			TQString("Table %1 - %2,%3").arg(tableno).arg(nrow).arg(ncol),
+			TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol),
 			1);
-	fs.setAttribute("grpMgr",TQString("Table %1").arg(tableno));
+	fs.setAttribute("grpMgr",TQString("Table %1").tqarg(tableno));
 	fs.setAttribute("row",nrow);
 	fs.setAttribute("col",ncol);
 	fs.setAttribute("cols",colspan); // FIXME do colspan in finishTable
@@ -189,9 +189,9 @@ TQDomElement KWDWriter::fetchTableCell(int tableno, int rowno, int colno) {
 	TQDomNodeList e=docroot().elementsByTagName("FRAMESET");
 	for (unsigned int i=0;i<e.count();i++) {
 	     TQDomElement k=e.item(i).toElement();
-	     if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno))
-		     if (k.attribute("row") == TQString("%1").arg(rowno))
-		     	if (k.attribute("col") == TQString("%1").arg(colno))
+	     if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno))
+		     if (k.attribute("row") == TQString("%1").tqarg(rowno))
+		     	if (k.attribute("col") == TQString("%1").tqarg(colno))
 		     		return k;
 	}
 	TQDomElement dummy;
@@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) {
 
 
 void KWDWriter::createHR(TQDomElement paragraph, int width) {
-	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").arg(width));
+	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width));
 }
 
 void KWDWriter::finishTable(int tableno,TQRect rect) {
@@ -227,7 +227,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) {
 	// first, see how big the table is (cols & rows)
 	for (unsigned i=0;i<nl.count();i++) {
 	    TQDomElement k=nl.item(i).toElement();
-	    	if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno)) {
+	    	if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno)) {
 	    	  ncols=MAX(ncols,k.attribute("col").toInt()+1);
 	    	  nrows=MAX(nrows,k.attribute("row").toInt()+1);	    	
 	    	}
@@ -251,7 +251,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) {
 	      TQDomElement e=fetchTableCell(tableno,currow,curcol);
 	      if (e.isNull()) {
 	              // a missing cell !
-	              kdDebug(30503) << TQString("creating %1 %2").arg(currow).arg(curcol).latin1() << endl;
+	              kdDebug(30503) << TQString("creating %1 %2").tqarg(currow).tqarg(curcol).latin1() << endl;
 	              createTableCell(tableno,currow,curcol,1,
 		      			TQRect(x+step_x*curcol,y+step_y*currow,step_x,step_y)
 				);
@@ -328,12 +328,12 @@ TQDomElement KWDWriter::createLink(TQDomElement paragraph, TQString linkName, TQ
 }
 
 
-TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement layout) {
+TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement tqlayout) {
 	TQDomElement theLayout;
-	if (layout.isNull())
+	if (tqlayout.isNull())
 		theLayout=_doc->createElement("LAYOUT");
 	else
-		theLayout=layout.cloneNode().toElement();
+		theLayout=tqlayout.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 layout;
+	TQDomElement tqlayout;
 	if (layoutToClone.isNull()) {
-		layout=_doc->createElement("LAYOUT");
+		tqlayout=_doc->createElement("LAYOUT");
 	}
 	else {
-		layout=layoutToClone.cloneNode().toElement();
+		tqlayout=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(layout);
+	paragraph.appendChild(tqlayout);
 	layoutAttribute(paragraph,"NAME","value","Standard");
 	return paragraph;
 }
@@ -460,8 +460,8 @@ void KWDWriter::addText(TQDomElement paragraph, TQString text, int format_id, bo
 	TQDomElement lastformat=currentFormat(paragraph,true);
 	if (lastformat.attribute("id").isEmpty()) // keep old id value, e.g. for LINK URL
 		lastformat.setAttribute("id",format_id);
-	lastformat.setAttribute("pos",TQString("%1").arg(oldLength));
-	lastformat.setAttribute("len",TQString("%1").arg(newLength));
+	lastformat.setAttribute("pos",TQString("%1").tqarg(oldLength));
+	lastformat.setAttribute("len",TQString("%1").tqarg(newLength));
 }
 
 TQString KWDWriter::getText(TQDomElement paragraph) {
diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h
index 2942f22a..542a1748 100644
--- a/filters/kword/html/import/kwdwriter.h
+++ b/filters/kword/html/import/kwdwriter.h
@@ -93,7 +93,7 @@ public:
 
 
 	/**
-	 * create a horizontal ruler layout
+	 * create a horizontal ruler tqlayout
 	 **/
 	void createHR(TQDomElement paragraph, int width=1);
 
@@ -115,7 +115,7 @@ public:
 	 * adds a paragraph
 	 **/
 	TQDomElement addParagraph(TQDomElement parent);
-	TQDomElement addParagraph(TQDomElement parent, TQDomElement layout);
+	TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout);
 
 	/**
 	 * 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 layout attribute
+         * get a tqlayout attribute
          **/
 	TQString getLayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName);
 
 
         /**
-         * adds/changes an attribute to/of the current layout
+         * adds/changes an attribute to/of the current tqlayout
          **/
         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 layout, and set it as layout of the given paragraph
+	 * copy the given tqlayout, and set it as tqlayout of the given paragraph
 	 **/
-	TQDomElement setLayout(TQDomElement paragraph, TQDomElement layout);
+	TQDomElement setLayout(TQDomElement paragraph, TQDomElement tqlayout);
 
 	/**
 	 * returns the text of this paragraph.
diff --git a/filters/kword/kword1.3/import/kword13formatone.cpp b/filters/kword/kword1.3/import/kword13formatone.cpp
index 5d1d2fe3..9a658e41 100644
--- a/filters/kword/kword1.3/import/kword13formatone.cpp
+++ b/filters/kword/kword1.3/import/kword13formatone.cpp
@@ -1,4 +1,4 @@
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "kword13utils.h"
 #include "kword13formatone.h"
diff --git a/filters/kword/kword1.3/import/kword13formatone.h b/filters/kword/kword1.3/import/kword13formatone.h
index 682ef887..e4cc7f38 100644
--- a/filters/kword/kword1.3/import/kword13formatone.h
+++ b/filters/kword/kword1.3/import/kword13formatone.h
@@ -29,8 +29,8 @@ class TQTextStream;
 #include "kword13format.h"
 
 /**
- * Contains the data of the \<FORMAT id="1"\> children
- * also the grand-children of \<STYLE\> and \<LAYOUT\>
+ * Contains the data of the \<FORMAT id="1"\> tqchildren
+ * also the grand-tqchildren of \<STYLE\> and \<LAYOUT\>
  */
 class KWord13FormatOneData
 {
@@ -75,7 +75,7 @@ public:
     virtual KWord13FormatOneData* getFormatOneData(void);
 public:
     int m_length; ///< Length of format
-    KWord13FormatOneData m_formatOne; ///< Data of children of \<FORMAT id="1"\>
+    KWord13FormatOneData m_formatOne; ///< Data of tqchildren of \<FORMAT id="1"\>
 };
 
 #endif // KWORD_1_3_FORMAT_ONE
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index 47eed1e7..ebcf3f6a 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -59,7 +59,7 @@ bool KWord13Import::parseInfo( TQIODevice* io, KWord13Document& kwordDocument )
         return false;
     }
     TQDomElement docElement( doc.documentElement() );
-    // In documentinfo.xml, the text data is in the grand-children of the document element
+    // In documentinfo.xml, the text data is in the grand-tqchildren of the document element
     for ( TQDomNode node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() )
     {
         kdDebug(30520) << "Child " << node.nodeName() << endl;
@@ -104,7 +104,7 @@ bool KWord13Import::postParse( KoStore* store, KWord13Document& doc )
     return post.postParse( store, doc );
 }
 
-KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus KWord13Import::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/vnd.oasis.opendocument.text"
         || from != "application/x-kword" )
diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h
index 77c05c23..7d60dd89 100644
--- a/filters/kword/kword1.3/import/kword13import.h
+++ b/filters/kword/kword1.3/import/kword13import.h
@@ -39,7 +39,7 @@ public:
     KWord13Import(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~KWord13Import() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 protected:
     bool parseInfo( TQIODevice* io, KWord13Document& kwordDocument );
     bool parseRoot( TQIODevice* io, KWord13Document& kwordDocument );
diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp
index f72dd5f8..cc8a7046 100644
--- a/filters/kword/kword1.3/import/kword13layout.cpp
+++ b/filters/kword/kword1.3/import/kword13layout.cpp
@@ -1,4 +1,4 @@
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "kword13utils.h"
 #include "kword13layout.h"
@@ -13,7 +13,7 @@ KWord13Layout::~KWord13Layout( void )
 
 void KWord13Layout::xmldump( TQTextStream& iostream )
 {
-    iostream << "    <layout name=\"" << EscapeXmlDump( m_name )
+    iostream << "    <tqlayout 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 << "    </layout>\n";
+    iostream << "    </tqlayout>\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 7f246cad..00b899f9 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& layout )
+void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout )
 {
-    KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", layout.m_name );
+    KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", tqlayout.m_name );
 
-    // ### TODO: any display name? gs.addAttribute( "style:display-name", layout.m_name );
+    // ### TODO: any display name? gs.addAttribute( "style:display-name", tqlayout.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& layout )
             gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
     }
 #endif
-    fillGenStyleWithLayout( layout, gs, false );
-    fillGenStyleWithFormatOne( layout.m_format , gs, false );
+    fillGenStyleWithLayout( tqlayout, gs, false );
+    fillGenStyleWithFormatOne( tqlayout.m_format , gs, false );
 
-    layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
+    tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
 
-    kdDebug(30520) << "Layout: Parent " << layout.m_name << " => " << layout.m_autoStyleName << endl;
+    kdDebug(30520) << "Layout: Parent " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl;
 }
 
 
 // Inspired by KoParagStyle::saveStyle
-void KWord13OasisGenerator::declareStyle( KWord13Layout& layout )
+void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout )
 {
     KoGenStyle gs( KoGenStyle::STYLE_USER, "paragraph", TQString() );
 
-    gs.addAttribute( "style:display-name", layout.m_name );
+    gs.addAttribute( "style:display-name", tqlayout.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& layout )
             gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
     }
 #endif
-    fillGenStyleWithLayout( layout, gs, true );
-    fillGenStyleWithFormatOne( layout.m_format , gs, true );
+    fillGenStyleWithLayout( tqlayout, gs, true );
+    fillGenStyleWithFormatOne( tqlayout.m_format , gs, true );
 
-    layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, layout.m_name, false );
+    tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, tqlayout.m_name, false );
 
-    kdDebug(30520) << "Style: " << layout.m_name << " => " << layout.m_autoStyleName << endl;
+    kdDebug(30520) << "Style: " << tqlayout.m_name << " => " << tqlayout.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& layout, KoGenStyle& gs, const bool style ) const
+void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const
 {
     // ### TODO syntaxVersion < 3
 
-    TQString str; // Help string to store each KWord 1.3 layout property
+    TQString str; // Help string to store each KWord 1.3 tqlayout property
 
-    str = layout.getProperty( "FLOW:align" );
+    str = tqlayout.getProperty( "FLOW:align" );
     if ( str.isEmpty() && ! style)
     {
         // Nothing to do!
@@ -361,7 +361,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout,
         gs.addProperty( "fo:text-align", "start" ); // i.e. direction-dependent
     }
 
-    str = layout.getProperty( "FLOW:dir" );
+    str = tqlayout.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& layout,
     }
 
     // ### TODO: do not define if it does not exist and ! style
-    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" ) ) );
+    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" ) ) );
 
 #if 0
     switch ( lineSpacingType ) {
@@ -425,7 +425,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout,
         case T_RIGHT:
             tabsWriter.addAttribute( "style:type", "right" );
             break;
-        case T_DEC_PNT:  // "alignment on decimal point"
+        case T_DEC_PNT:  // "tqalignment on decimal point"
             tabsWriter.addAttribute( "style:type", "char" );
             tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) );
             break;
@@ -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-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
+        (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-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-layout-name", pageLayoutName );
+    stylesWriter->addAttribute( "style:page-tqlayout-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 3db989f2..39bc232a 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 layout
+    /// Preparing page tqlayout
     void preparePageLayout( void );
     void prepareTextFrameset( KWordTextFrameset* frameset );
     /// Also sets the name of the automatical style
-    void declareLayout( KWord13Layout& layout );
+    void declareLayout( KWord13Layout& tqlayout );
     /// Also sets the name of the automatical style
-    void declareStyle( KWord13Layout& layout );
+    void declareStyle( KWord13Layout& tqlayout );
     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& layout, KoGenStyle& gs, const bool style ) const;
+    void fillGenStyleWithLayout( const KWord13Layout& tqlayout, 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 a3e22290..e3958b45 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 layout for storing property: " << name << endl;
+        kdError(30520) << "No current tqlayout 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 layout
+        return true; // Everything is done directly on the tqlayout
     }
     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 layout already defined!" << endl;
+        kdWarning(30520) << "Current tqlayout already defined!" << endl;
         delete m_currentLayout;
     }
         
@@ -625,13 +625,13 @@ bool KWord13Parser::startElement( const TQString&, const TQString&, const TQStri
     }
     else if ( name == "FRAMESTYLE" )
     {
-        // ### TODO, but some of the <STYLE> children are also children of <FRAMESTYLE>, so we have to set it to "ignore"
+        // ### TODO, but some of the <STYLE> tqchildren are also tqchildren of <FRAMESTYLE>, so we have to set it to "ignore"
         stackItem->elementType = KWord13TypeIgnore;
         success = true;
     }
     else if ( name == "PICTURES" || name == "PIXMAPS" || name == "CLIPARTS" )
     {
-        // We just need a separate "type" for the <KEY> children
+        // We just need a separate "type" for the <KEY> tqchildren
         stackItem->elementType = KWord13TypePicturesPlural;
         success = true;
     }
@@ -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).unicode();
+                const ushort uni = ch.tqat(i).tqunicode();
                 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 754a618e..7dc81d42 100644
--- a/filters/kword/kword1.3/import/kword13parser.h
+++ b/filters/kword/kword1.3/import/kword13parser.h
@@ -92,9 +92,9 @@ protected: //TQXml
     virtual bool error(const TQXmlParseException& exception);
     virtual bool fatalError(const TQXmlParseException& exception);
 protected:
-    /// Process children of \<FORMAT id="1"\>
+    /// Process tqchildren of \<FORMAT id="1"\>
     bool startElementFormatOneProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem);
-    /// Process children of \<LAYOUT\> (with exceptions)
+    /// Process tqchildren of \<LAYOUT\> (with exceptions)
     bool startElementLayoutProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem);
     /// Process \<NAME\>
     bool startElementName( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
@@ -108,7 +108,7 @@ protected:
     bool startElementFrame( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
     /// Process \<FRAMESET\>
     bool startElementFrameset( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
-    /// Process opening tag of some elements that are children of \<DOC\> and which only define document properties
+    /// Process opening tag of some elements that are tqchildren of \<DOC\> and which only define document properties
     bool startElementDocumentAttributes( const TQString& name, const TQXmlAttributes& attributes,
         KWord13StackItem *stackItem, const KWord13StackItemType& allowedParentType, const KWord13StackItemType& newType );
     /// Process \<KEY\>
@@ -129,7 +129,7 @@ protected:
     KWord13StackItemStack parserStack;
     KWord13Document* m_kwordDocument;
     KWord13Paragraph* m_currentParagraph; ///< Current paragraph
-    KWord13Layout* m_currentLayout; ///< Current layout (or style)
+    KWord13Layout* m_currentLayout; ///< Current tqlayout (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 0caf48a7..d870f484 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.unicode())
+        switch (ch.tqunicode())
         {
         case 38: // &
             {
diff --git a/filters/kword/latex/export/config.h b/filters/kword/latex/export/config.h
index 26d954ea..7a81b168 100644
--- a/filters/kword/latex/export/config.h
+++ b/filters/kword/latex/export/config.h
@@ -22,7 +22,7 @@
 #ifndef __LATEX_CONFIG_H__
 #define __LATEX_CONFIG_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstringlist.h>
 
 /***********************************************************************/
@@ -84,8 +84,8 @@ class Config
 		bool convertPictures() const { return _convertPictures; }
 		TQString getPicturesDir() const { return _picturesDir; }
 		
-		bool mustUseUnicode() const { return (_encoding == "unicode"); }
-		bool mustUseLatin1() const { return (_encoding != "unicode"); }
+		bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
+		bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
 		TQString getEncoding() const { return _encoding; }
 		TQStringList getLanguagesList() const { return _languagesList; }
 		TQString getDefaultLanguage() const { return _defaultLanguage; }
diff --git a/filters/kword/latex/export/document.h b/filters/kword/latex/export/document.h
index d6a96459..b2844127 100644
--- a/filters/kword/latex/export/document.h
+++ b/filters/kword/latex/export/document.h
@@ -23,7 +23,7 @@
 #define __KWORD_LATEX_DOCUMENT_H__
 
 #include <tqptrlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "listtable.h"		/* list of tables (another kind of list of elements). */
 #include "key.h"
diff --git a/filters/kword/latex/export/element.h b/filters/kword/latex/export/element.h
index 0db14ace..9374620d 100644
--- a/filters/kword/latex/export/element.h
+++ b/filters/kword/latex/export/element.h
@@ -23,7 +23,7 @@
 #ifndef __KWORD_ELEMENT_H__
 #define __KWORD_ELEMENT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include "xmlparser.h"
 #include "border.h"
 
diff --git a/filters/kword/latex/export/fileheader.cc b/filters/kword/latex/export/fileheader.cc
index 8da25a16..96b4be4e 100644
--- a/filters/kword/latex/export/fileheader.cc
+++ b/filters/kword/latex/export/fileheader.cc
@@ -78,7 +78,7 @@ void FileHeader::analysePaper(const TQDomNode balise)
 	analysePaperParam(balise);
 
 	//setTokenCurrent(balise_initiale->pContent);
-	// Analyse children markups --> PAPERBORDERS
+	// Analyse tqchildren markups --> PAPERBORDERS
 	TQDomNode fils = getChild(balise, "PAPERSBORDERS");
 	_leftBorder = getAttr(fils, "left").toInt();
 	_rightBorder = getAttr(fils, "right").toInt();
@@ -287,7 +287,7 @@ void FileHeader::generatePackage(TQTextStream &out)
 	if(Config::instance()->mustUseUnicode())
 		out << "\\usepackage{omega}" << endl;
 	if(getFormat() == TF_A4)
-		out << "\\usepackage[a4paper]{geometry}" << endl;
+		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kword/latex/export/fileheader.h b/filters/kword/latex/export/fileheader.h
index d6843c26..d837c828 100644
--- a/filters/kword/latex/export/fileheader.h
+++ b/filters/kword/latex/export/fileheader.h
@@ -22,7 +22,7 @@
 #ifndef __KWORD_FILEHEADER_H__
 #define __KWORD_FILEHEADER_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "xmlparser.h"
 
diff --git a/filters/kword/latex/export/format.h b/filters/kword/latex/export/format.h
index cd82b36a..c4c3e37a 100644
--- a/filters/kword/latex/export/format.h
+++ b/filters/kword/latex/export/format.h
@@ -23,7 +23,7 @@
 #ifndef __KWORD_FORMAT_H__
 #define __KWORD_FORMAT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kword/latex/export/formula.h b/filters/kword/latex/export/formula.h
index b023cdf6..03ba4bd6 100644
--- a/filters/kword/latex/export/formula.h
+++ b/filters/kword/latex/export/formula.h
@@ -25,7 +25,7 @@
 
 #include "element.h"
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 /***********************************************************************/
 /* Class: Formula                                                      */
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index 145b30ed..079b38d3 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -71,7 +71,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
 	TQString value;
 	while(i < 10)
 	{
-		/*value = _config->readPathEntry( TQString("Recent%1").arg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -101,7 +101,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
   classComboBox->insertItem("report");
   classComboBox->insertItem("slides");
 
-	encodingComboBox->insertItem("unicode");
+	encodingComboBox->insertItem("tqunicode");
   encodingComboBox->insertItem("ansinew");
   encodingComboBox->insertItem("applemac");
   encodingComboBox->insertItem("ascii");
diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc
index a72d8c52..f521ec9d 100644
--- a/filters/kword/latex/export/latexexport.cc
+++ b/filters/kword/latex/export/latexexport.cc
@@ -25,7 +25,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "kwordlatexexportdia.h"
 
 typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory;
@@ -36,7 +36,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h
index 4d34e0f0..e7c0312b 100644
--- a/filters/kword/latex/export/latexexport.h
+++ b/filters/kword/latex/export/latexexport.h
@@ -21,7 +21,7 @@
 #define __LATEXEXPORT_H__
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -38,7 +38,7 @@ class LATEXExport : public KoFilter
 		LATEXExport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXExport() {}
 
-		virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* __LATEXExport_H__ */
diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui
index 741a9c7e..8c3835ed 100644
--- a/filters/kword/latex/export/latexexportdia.ui
+++ b/filters/kword/latex/export/latexexportdia.ui
@@ -593,7 +593,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/filters/kword/latex/export/layout.cc b/filters/kword/latex/export/layout.cc
index 05ad3405..f75ac651 100644
--- a/filters/kword/latex/export/layout.cc
+++ b/filters/kword/latex/export/layout.cc
@@ -24,7 +24,7 @@
 #include <kdebug.h>	/* for kdDebug() stream */
 
 #include "fileheader.h"	/* for _header use */
-#include "layout.h"
+#include "tqlayout.h"
 #include "layout.h"
 
 /* Static Datas */
@@ -59,7 +59,7 @@ void Layout::analyseLayout(const TQDomNode balise)
 	/* No parameters for this markup */
 	kdDebug(30522) << "ANALYSE OF THE BEGINING OF A LAYOUT" << endl;
 	
-	/* Analyse children markups */
+	/* Analyse tqchildren markups */
 	for(int index= 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("NAME")== 0)
diff --git a/filters/kword/latex/export/layout.h b/filters/kword/latex/export/layout.h
index 04096c77..298b08ff 100644
--- a/filters/kword/latex/export/layout.h
+++ b/filters/kword/latex/export/layout.h
@@ -23,7 +23,7 @@
 #ifndef __KWORD_LAYOUT_H__
 #define __KWORD_LAYOUT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <kdebug.h>
 #include "textformat.h"
@@ -93,7 +93,7 @@ class Layout: public TextFormat
 		 * Nothing to do.
 		 */
 		virtual ~Layout() {
-			kdDebug(30522) << "Destruction of a layout." << endl;
+			kdDebug(30522) << "Destruction of a tqlayout." << endl;
 		}
 
 		/**
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc
index 9cc829b5..6003a075 100644
--- a/filters/kword/latex/export/para.cc
+++ b/filters/kword/latex/export/para.cc
@@ -23,7 +23,7 @@
 #include <kdebug.h>		/* for kdDebug() stream */
 #include "para.h"
 #include "textFrame.h"		/* father class.        */
-#include "format.h"		/* children classes.    */
+#include "format.h"		/* tqchildren classes.    */
 //#include "picturezone.h"
 #include "fileheader.h"
 #include "textzone.h"
@@ -132,7 +132,7 @@ void Para::analyse(const TQDomNode balise)
 
 	kdDebug(30522) << "**** PARAGRAPH ****" << endl;
 
-	/* Analyse of the children markups */
+	/* Analyse of the tqchildren markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("TEXT")== 0)
@@ -210,7 +210,7 @@ void Para::analyseInfo(const TQDomNode balise)
 /*******************************************/
 /* AnalyseLayoutPara                       */
 /*******************************************/
-/* Analyse the layout of a para.           */
+/* Analyse the tqlayout 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/para.h b/filters/kword/latex/export/para.h
index 7d1c0af1..75c41b3a 100644
--- a/filters/kword/latex/export/para.h
+++ b/filters/kword/latex/export/para.h
@@ -26,7 +26,7 @@
 #include <tqptrstack.h>		/* historic list */
 #include <tqptrlist.h>		/* for list of format */
 
-/*#include "listeformat.h"*/	/* children class contents the zone (italic, footnote,
+/*#include "listeformat.h"*/	/* tqchildren class contents the zone (italic, footnote,
 				   variable. */
 #include "layout.h"		/* set of informations about the paragraph style. */
 #include "element.h"		/* to use the father class. */
diff --git a/filters/kword/latex/export/texlauncher.cc b/filters/kword/latex/export/texlauncher.cc
index 5b254f87..b67a7385 100644
--- a/filters/kword/latex/export/texlauncher.cc
+++ b/filters/kword/latex/export/texlauncher.cc
@@ -6,7 +6,7 @@
 #include <klocale.h>
 #include <KoFilter.h>
 #include <KoStore.h>
-#include<textstream.h>
+#include<tqtextstream.h>
 
 
 int main(int argc, char* argv[])
diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cc
index d6141e96..cdcbba6a 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;
 		}
-		/* layout management (left, center, justify, right) */
+		/* tqlayout 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 0bf4e436..a4beb875 100644
--- a/filters/kword/latex/export/textzone.cc
+++ b/filters/kword/latex/export/textzone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the unicode table
+/* MEMO: to see the tqunicode 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 (unicode) in  */
+/* Convert special caracters (tqunicode) in  */
 /* latex usable caracters.                 */
 /*******************************************/
 TQString TextZone::escapeLatin1(TQString text)
@@ -114,7 +114,7 @@ TQString TextZone::escapeLatin1(TQString text)
 	};
 
 	TQString escapedText;
-	int unicode;         /* the character to be escaped */
+	int tqunicode;         /* 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++)
 	{
-		unicode = CSTART + index;
-		convert(escapedText, unicode, escapes[index]);
+		tqunicode = CSTART + index;
+		convert(escapedText, tqunicode, 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 unicode, const char* escape)
+void TextZone::convert(TQString& text, int tqunicode, const char* escape)
 {
 	TQString expression;
 	TQString value;
 
-	expression = TQString("\\x") + value.setNum(unicode, 16);
+	expression = TQString("\\x") + value.setNum(tqunicode, 16);
 
 	if( !TQString(escape).isEmpty() )
 	{
diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h
index 848b276a..fbc09280 100644
--- a/filters/kword/latex/export/textzone.h
+++ b/filters/kword/latex/export/textzone.h
@@ -26,7 +26,7 @@
 #ifndef __KWORD_LATEX_TEXTZONE_H__
 #define __KWORD_LATEX_TEXTZONE_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include "textformat.h"
 
@@ -81,7 +81,7 @@ class TextZone: public TextFormat
 		/* ==== Helpfull functions ==== */
 
 		/**
-		 * convert a unicode text in latin1 enconding ala latex.
+		 * convert a tqunicode 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 b73788b3..09a16635 100644
--- a/filters/kword/latex/export/variablezone.cc
+++ b/filters/kword/latex/export/variablezone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the unicode table
+/* MEMO: to see the tqunicode 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/export/variablezone.h b/filters/kword/latex/export/variablezone.h
index acdf06e5..a428984a 100644
--- a/filters/kword/latex/export/variablezone.h
+++ b/filters/kword/latex/export/variablezone.h
@@ -26,7 +26,7 @@
 #ifndef __KWORD_VARIABLEZONE_H__
 #define __KWORD_VARIABLEZONE_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include "variableformat.h"
 
diff --git a/filters/kword/latex/export/xml2latexparser.h b/filters/kword/latex/export/xml2latexparser.h
index 914cf3a2..38adc123 100644
--- a/filters/kword/latex/export/xml2latexparser.h
+++ b/filters/kword/latex/export/xml2latexparser.h
@@ -23,7 +23,7 @@
 #define __XML2LATEXPARSER_H__
 
 #include <tqfile.h>			/* for TQFile class */
-#include <textstream.h>	/* for TQTextStream class */
+#include <tqtextstream.h>	/* for TQTextStream class */
 #include <tqstring.h>		/* for TQString class */
 #include "fileheader.h"
 #include "document.h"
diff --git a/filters/kword/latex/export/xmlparser.cc b/filters/kword/latex/export/xmlparser.cc
index 9d83bedb..9c4c07e4 100644
--- a/filters/kword/latex/export/xmlparser.cc
+++ b/filters/kword/latex/export/xmlparser.cc
@@ -104,18 +104,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name)
 TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index)
 {
 	if(balise.isElement()) {
-		TQDomNodeList children = balise.toElement().elementsByTagName(name);
-		if ( children.count() )
-			return children.item(index);
+		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
+		if ( tqchildren.count() )
+			return tqchildren.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList children = balise.childNodes();
-	if ( children.count() )
-		return children.item(index);
+	TQDomNodeList tqchildren = balise.childNodes();
+	if ( tqchildren.count() )
+		return tqchildren.item(index);
 	return TQDomNode();
 }
 
diff --git a/filters/kword/latex/import/generator/document.cc b/filters/kword/latex/import/generator/document.cc
index aad270d8..13685e02 100644
--- a/filters/kword/latex/import/generator/document.cc
+++ b/filters/kword/latex/import/generator/document.cc
@@ -18,7 +18,7 @@
  */
 
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "kdebug.h"
 #include <KoStore.h>
diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc
index c1cd74c9..f644910a 100644
--- a/filters/kword/latex/import/lateximport.cc
+++ b/filters/kword/latex/import/lateximport.cc
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "lateximportdia.h"
 
 typedef KGenericFactory<LATEXImport, KoFilter> LATEXImportFactory;
@@ -35,7 +35,7 @@ LATEXImport::LATEXImport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus LATEXImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus LATEXImport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h
index 0451ce78..949d7163 100644
--- a/filters/kword/latex/import/lateximport.h
+++ b/filters/kword/latex/import/lateximport.h
@@ -21,7 +21,7 @@
 #define __LATEXIMPORT_H__
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -38,7 +38,7 @@ class LATEXImport : public KoFilter
 		LATEXImport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXImport() {}
 
-		virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* __LATEXIMPORT_H__ */
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc
index 8354b9ab..9489d491 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);
 
-	unicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
-	langLayout->addWidget(unicodeRBtn);
+	tqunicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
+	langLayout->addWidget(tqunicodeRBtn);
 
 	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 layout */
+	/* Display the main tqlayout */
 	mainLayout->addStretch(5);
 	mainLayout->activate();
 }
@@ -138,7 +138,7 @@ void LATEXImportDia::state()
 	else if(embededRBtn == docBox->selected())
 		config.setType(TYPE_EMBEDED);
 
-	if(unicodeRBtn == langBox->selected())
+	if(tqunicodeRBtn == 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 237b84b9..b6f83baa 100644
--- a/filters/kword/latex/import/lateximportdia.h
+++ b/filters/kword/latex/import/lateximportdia.h
@@ -37,7 +37,7 @@
 
 #include <tqwidget.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 
@@ -72,7 +72,7 @@ class LATEXImportDia : public KDialogBase, public DCOPObject
 	private:
 		TQVButtonGroup* styleBox,       *langBox,        *docBox;
 		TQRadioButton*  latexStyleRBtn, *kwordStyleRBtn;	/* Document style */
-		TQRadioButton*  unicodeRBtn,    *latin1RBtn;		/* Language       */
+		TQRadioButton*  tqunicodeRBtn,    *latin1RBtn;		/* Language       */
 		TQRadioButton*  newDocRBtn,     *embededRBtn;	/* Latex file     */
 	
 	k_dcop:
diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cc
index 14abad37..e25e95ab 100644
--- a/filters/kword/latex/import/parser/env.cc
+++ b/filters/kword/latex/import/parser/env.cc
@@ -47,10 +47,10 @@ Env::~Env()
 {
 }
 
-void Env::setChildren(TQPtrList<Element>* children)
+void Env::setChildren(TQPtrList<Element>* tqchildren)
 {
-	if(children != NULL)
-		_children = *children;
+	if(tqchildren != NULL)
+		_tqchildren = *tqchildren;
 }
 
 void Env::print(int tab)
@@ -58,7 +58,7 @@ void Env::print(int tab)
 	cout << "ENV " << getName().latin1() << "{" << endl;
 	
 	Element* elt;
-	for ( elt = _children.first(); elt; elt = _children.next() )
+	for ( elt = _tqchildren.first(); elt; elt = _tqchildren.next() )
 	{
 		elt->print(tab);
 	}
diff --git a/filters/kword/latex/import/parser/env.h b/filters/kword/latex/import/parser/env.h
index 191c0dd6..cef56b29 100644
--- a/filters/kword/latex/import/parser/env.h
+++ b/filters/kword/latex/import/parser/env.h
@@ -27,7 +27,7 @@
 
 class Env: public Element
 {
-	TQPtrList<Element> _children;
+	TQPtrList<Element> _tqchildren;
 	TQString _name;
 
 	public:
diff --git a/filters/kword/latex/status.html b/filters/kword/latex/status.html
index 0b78eac2..ea2a527c 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 unicode)!</td></tr>
-<tr><td>layout</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>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>unicode support</td>			<td>DONE (omega package)</td></tr>
+<tr><td>tqunicode 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 unicode with omega</li>
+			<li>support of tqunicode with omega</li>
 		</ul>
 		</li>
 	</ul>
diff --git a/filters/kword/libexport/KWEFBaseWorker.cc b/filters/kword/libexport/KWEFBaseWorker.cc
index a47f647d..d3d41ff3 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).layout,(*it).formattingList))
+        if (!doFullParagraph((*it).text,(*it).tqlayout,(*it).formattingList))
             return false;
     }
     return true;
diff --git a/filters/kword/libexport/KWEFBaseWorker.h b/filters/kword/libexport/KWEFBaseWorker.h
index 67cdb691..e2046913 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& layout,
+        virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
             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& layout); ///< Defines a single style
+        virtual bool doFullDefineStyle (LayoutData& tqlayout); ///< 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 a3fca243..3e9a724e 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.layout         );
+                      << TagProcessing ( "LAYOUT",  ProcessLayoutTag,   &paraData.tqlayout         );
     
     if ( leader->m_oldSyntax )
     {
-        tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.layout.pageBreakBefore ) );
+        tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.tqlayout.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.layout.formatData.id == 1 )
+        if ( paraData.tqlayout.formatData.id == 1 )
         {
-            paraData.formattingList << paraData.layout.formatData;
+            paraData.formattingList << paraData.tqlayout.formatData;
         }
         else
         {
@@ -591,11 +591,11 @@ static void ProcessFramesetsTag ( TQDomNode        myNode,
 
 static void ProcessStyleTag (TQDomNode myNode, void *, KWEFKWordLeader *leader )
 {
-    LayoutData layout;
+    LayoutData tqlayout;
 
-    ProcessLayoutTag (myNode, &layout, leader);
+    ProcessLayoutTag (myNode, &tqlayout, leader);
 
-    leader->doFullDefineStyle (layout);
+    leader->doFullDefineStyle (tqlayout);
 }
 
 
@@ -1227,10 +1227,10 @@ bool KWEFKWordLeader::doFullPaperFormatOther ( const int columns, const double c
     return false;
 }
 
-bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &layout )
+bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &tqlayout )
 {
     if ( m_worker )
-        return m_worker->doFullDefineStyle (layout);
+        return m_worker->doFullDefineStyle (tqlayout);
 
     return false;
 }
@@ -1280,7 +1280,7 @@ static bool ParseFile ( TQIODevice* subFile, TQDomDocument& doc)
             << "  Message: " << errorMsg << endl;
         // ### TODO: the error is in which sub-file?
         KMessageBox::error( 0L, i18n("An error has occurred while parsing the KWord file.\nAt line: %1, column %2\nError message: %3")
-            .arg( errorLine ).arg( errorColumn ).arg(i18n( "TQXml", errorMsg.utf8() ) ),
+            .tqarg( errorLine ).tqarg( errorColumn ).tqarg(i18n( "TQXml", errorMsg.utf8() ) ),
             i18n("KWord Export Filter Library"), 0 );
         return false;
     }
@@ -1361,7 +1361,7 @@ bool KWEFKWordLeader::loadSubFile(const TQString& fileName, TQByteArray& array)
     return true;
 }
 
-KoFilter::ConversionStatus KWEFKWordLeader::convert( KoFilterChain* chain,
+KoFilter::ConversiontqStatus KWEFKWordLeader::convert( KoFilterChain* chain,
     const TQCString& from, const TQCString& to)
 {
     if ( from != "application/x-kword" )
diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h
index fc7e787a..78ce1348 100644
--- a/filters/kword/libexport/KWEFKWordLeader.h
+++ b/filters/kword/libexport/KWEFKWordLeader.h
@@ -38,7 +38,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader
     public:
         void setWorker ( KWEFBaseWorker *newWorker );
         KWEFBaseWorker *getWorker(void) const;
-        KoFilter::ConversionStatus convert( KoFilterChain* chain,
+        KoFilter::ConversiontqStatus convert( KoFilterChain* chain,
             const TQCString& from, const TQCString& to);
     public: // ### TODO: where to put in the end?
         void createBookmarkFormatData( ParaData& paraData );
@@ -63,7 +63,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader
         bool doCloseBody (void);
         bool doOpenStyles (void);
         bool doCloseStyles (void);
-        bool doFullDefineStyle (LayoutData& layout);
+        bool doFullDefineStyle (LayoutData& tqlayout);
         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 682606fe..dbee22d0 100644
--- a/filters/kword/libexport/KWEFStructures.h
+++ b/filters/kword/libexport/KWEFStructures.h
@@ -412,7 +412,7 @@ public:
     virtual ~TabulatorList(void) {}
 };
 
-/// Paragraph layout
+/// Paragraph tqlayout
 class LayoutData
 {
 public:
@@ -428,7 +428,7 @@ public:
 
     TQString     styleName;
     TQString     styleFollowing;
-    TQString     alignment;      ///< left, right, center, justify
+    TQString     tqalignment;      ///< left, right, center, justify
     CounterData counter;
     FormatData  formatData;
     double      indentFirst;    ///< indentation correction of first line (can be negative!)
@@ -459,7 +459,7 @@ struct ParaData
 {
     TQString                    text;
     ValueListFormatData        formattingList;
-    LayoutData                 layout;
+    LayoutData                 tqlayout;
 };
 
 struct HeaderFooterData
diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cc
index 32b5eac2..56e2b669 100644
--- a/filters/kword/libexport/KWEFUtil.cc
+++ b/filters/kword/libexport/KWEFUtil.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <KoPageLayout.h>
 
@@ -36,7 +36,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.unicode())
+        switch (ch.tqunicode())
         {
         case 38: // &
             {
@@ -78,7 +78,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
                 {
                     if (!codec->canEncode(ch))
                     {
-                        strReturn+=TQString("&#%1;").arg(ch.unicode());
+                        strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
                         break;
                     }
                 }
diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cc
index 3a626f7f..ed5a7bfc 100644
--- a/filters/kword/libexport/ProcessDocument.cc
+++ b/filters/kword/libexport/ProcessDocument.cc
@@ -438,7 +438,7 @@ static void ProcessNoteTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *le
     variable->setGenericData( "note", note );
 }
 
-// ### TODO: some files have not a <VARIABLE> tag but its supposed children are directly children of <FORMAT id="4">
+// ### TODO: some files have not a <VARIABLE> tag but its supposed tqchildren are directly tqchildren of <FORMAT id="4">
 static void ProcessVariableTag (TQDomNode myNode, void* tagData, KWEFKWordLeader* leader)
 {
     VariableData *variable = (VariableData *) tagData;
@@ -607,7 +607,7 @@ static void SubProcessFormatSixTag(TQDomNode myNode,
         TQString instance;
 
         TQValueList<TagProcessing> tagProcessingList;
-        // TODO: We can have all layout information as in regular texts
+        // TODO: We can have all tqlayout 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 *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ("first" , layout->indentFirst );
-    attrProcessingList << AttrProcessing ("left"  , layout->indentLeft  );
-    attrProcessingList << AttrProcessing ("right" , layout->indentRight );
+    attrProcessingList << AttrProcessing ("first" , tqlayout->indentFirst );
+    attrProcessingList << AttrProcessing ("left"  , tqlayout->indentLeft  );
+    attrProcessingList << AttrProcessing ("right" , tqlayout->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 *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ("after" ,  layout->marginBottom );
-    attrProcessingList << AttrProcessing ("before" , layout->marginTop    );
+    attrProcessingList << AttrProcessing ("after" ,  tqlayout->marginBottom );
+    attrProcessingList << AttrProcessing ("before" , tqlayout->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 *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQString strBefore, strAfter;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ( "linesTogether",       layout->keepLinesTogether  );
-    attrProcessingList << AttrProcessing ( "hardFrameBreak",      layout->pageBreakBefore );
-    attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", layout->pageBreakAfter  );
+    attrProcessingList << AttrProcessing ( "linesTogether",       tqlayout->keepLinesTogether  );
+    attrProcessingList << AttrProcessing ( "hardFrameBreak",      tqlayout->pageBreakBefore );
+    attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", tqlayout->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 *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     int red=0;
     int green=0;
     int blue=0;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ( "distance", layout->shadowDistance );
-    attrProcessingList << AttrProcessing ( "direction", layout->shadowDirection );
+    attrProcessingList << AttrProcessing ( "distance", tqlayout->shadowDistance );
+    attrProcessingList << AttrProcessing ( "direction", tqlayout->shadowDirection );
     attrProcessingList << AttrProcessing ( "red",      red   );
     attrProcessingList << AttrProcessing ( "green",    green );
     attrProcessingList << AttrProcessing ( "blue",     blue  );
     ProcessAttributes (myNode, attrProcessingList);
 
-    layout->shadowColor.setRgb(red,green,blue);
+    tqlayout->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 *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (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" )
-            layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
+            tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
         else if ( oldValue == "double" )
-            layout->lineSpacingType = LayoutData::LS_DOUBLE;
+            tqlayout->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
-                layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
-                layout->lineSpacing     = size;
+                tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
+                tqlayout->lineSpacing     = size;
             }
             else
-               layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
+               tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
          }
     }
     else
     {
         // for new format
         if( spacingType == "oneandhalf" )
-            layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
+            tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
         else if ( spacingType == "double" )
-            layout->lineSpacingType = LayoutData::LS_DOUBLE;
+            tqlayout->lineSpacingType = LayoutData::LS_DOUBLE;
         else if ( spacingType == "custom" )
-            layout->lineSpacingType = LayoutData::LS_CUSTOM;
+            tqlayout->lineSpacingType = LayoutData::LS_CUSTOM;
         else if ( spacingType == "atleast" )
-            layout->lineSpacingType = LayoutData::LS_ATLEAST;
+            tqlayout->lineSpacingType = LayoutData::LS_ATLEAST;
         else if ( spacingType == "multiple" )
-            layout->lineSpacingType = LayoutData::LS_MULTIPLE;
+            tqlayout->lineSpacingType = LayoutData::LS_MULTIPLE;
         else if ( spacingType == "fixed" )
-            layout->lineSpacingType = LayoutData::LS_FIXED;
+            tqlayout->lineSpacingType = LayoutData::LS_FIXED;
         else
-             layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
-        layout->lineSpacing = spacingValue;
+             tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
+        tqlayout->lineSpacing = spacingValue;
     }
 }
 
 static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
 {
     // <LINESPACE> is an old tag, of before syntax 1
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (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);
 
-    layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
-    layout->lineSpacing     = spacingValue;
+    tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
+    tqlayout->lineSpacing     = spacingValue;
 }
 
 static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQString oldAlign, normalAlign;
 
@@ -948,7 +948,7 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
     {
         if ( oldAlign.isEmpty() )
         {
-            layout->alignment = "left"; // KWord 0.8 did not support right-to-left
+            tqlayout->tqalignment = "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;
-                layout->alignment = "left"; // Unknown, so assume left
+                tqlayout->tqalignment = "left"; // Unknown, so assume left
             }
             else
             {
                 const char* flows[]={"left", "right", "center", "justify" };
-                layout->alignment = flows[ align ];
+                tqlayout->tqalignment = flows[ align ];
             }
         }
-        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << layout->alignment << endl;
+        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->tqalignment << endl;
     }
     else
     {
-        layout->alignment = normalAlign;
+        tqlayout->tqalignment = normalAlign;
     }
 
 }
@@ -981,36 +981,36 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
     attrProcessingList << AttrProcessing ( "outline" ); // Only in <STYLE>
     ProcessAttributes (myNode, attrProcessingList);
 
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     ValueListFormatData formatDataList;
 
     TQValueList<TagProcessing> tagProcessingList;
-    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 ( "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 ( "FORMAT",       ProcessFormatTag,            &formatDataList     );
-    tagProcessingList << TagProcessing ( "TABULATOR",    ProcessLayoutTabulatorTag,   &layout->tabulatorList       );
-    tagProcessingList << TagProcessing ( "SHADOW",       ProcessShadowTag,            layout                       );
+    tagProcessingList << TagProcessing ( "TABULATOR",    ProcessLayoutTabulatorTag,   &tqlayout->tabulatorList       );
+    tagProcessingList << TagProcessing ( "SHADOW",       ProcessShadowTag,            tqlayout                       );
 
     if ( leader->m_oldSyntax )
     {
-        layout->indentLeft = 0.0; // ### TODO: needed or not?
+        tqlayout->indentLeft = 0.0; // ### TODO: needed or not?
         tagProcessingList
-            << TagProcessing ( "OHEAD",  ProcessOldLayoutChildTag, &layout->marginTop )
-            << TagProcessing ( "OFOOT",  ProcessOldLayoutChildTag, &layout->marginBottom )
-            << TagProcessing ( "ILEFT",  ProcessOldLayoutChildTag, &layout->indentLeft )
-            << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &layout->indentFirst )
-            << TagProcessing ( "LINESPACE", ProcessLineSpaceTag,   layout )
+            << TagProcessing ( "OHEAD",  ProcessOldLayoutChildTag, &tqlayout->marginTop )
+            << TagProcessing ( "OFOOT",  ProcessOldLayoutChildTag, &tqlayout->marginBottom )
+            << TagProcessing ( "ILEFT",  ProcessOldLayoutChildTag, &tqlayout->indentLeft )
+            << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &tqlayout->indentFirst )
+            << TagProcessing ( "LINESPACE", ProcessLineSpaceTag,   tqlayout )
             ;
     }
 
@@ -1023,7 +1023,7 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
     }
     else
     {
-        layout->formatData = formatDataList.first ();
+        tqlayout->formatData = formatDataList.first ();
 
         if ( formatDataList.count () > 1 )
         {
@@ -1031,10 +1031,10 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
         }
     }
 
-    if ( layout->styleName.isEmpty () )
+    if ( tqlayout->styleName.isEmpty () )
     {
-        layout->styleName = "Standard";
-        kdWarning (30508) << "Empty layout name!" << endl;
+        tqlayout->styleName = "Standard";
+        kdWarning (30508) << "Empty tqlayout name!" << endl;
     }
 
 }
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 595c026c..6bd895b9 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -246,7 +246,7 @@ int Conversion::ditheringToGray( int ipat, bool* ok )
     }
 }
 
-TQString Conversion::alignment( int jc ) {
+TQString Conversion::tqalignment( int jc ) {
     TQString value( "left" );
     if ( jc == 1 )
         value = "center";
diff --git a/filters/kword/msword/conversion.h b/filters/kword/msword/conversion.h
index f8610415..fd30c69f 100644
--- a/filters/kword/msword/conversion.h
+++ b/filters/kword/msword/conversion.h
@@ -57,8 +57,8 @@ namespace Conversion
     // Hackery for gray levels
     int ditheringToGray( int ipat, bool* ok );
 
-    // Convert alignment code to string
-    TQString alignment( int jc );
+    // Convert tqalignment code to string
+    TQString tqalignment( int jc );
 
     // Convert linespacing struct to string
     TQString lineSpacing( const wvWare::Word97::LSPD& lspd );
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index ab70c79a..5044f023 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -328,10 +328,10 @@ void Document::footnoteStart()
     framesetElement.setAttribute( "frameInfo", 7 /* footnote/endnote */ );
     if ( type == wvWare::FootnoteData::Endnote )
         // Keep name in sync with KWordTextHandler::footnoteFound
-        framesetElement.setAttribute("name", i18n("Endnote %1").arg( ++m_endNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with KWordTextHandler::footnoteFound
-        framesetElement.setAttribute("name", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) );
     m_framesetsElement.appendChild(framesetElement);
 
     createInitialFrame( framesetElement, 29, 798, 567, 567+41, true, NoFollowup );
@@ -352,7 +352,7 @@ void Document::slotTableCellStart( int row, int column, int rowSpan, int columnS
     framesetElement.setAttribute( "frameType", 1 /* text */ );
     framesetElement.setAttribute( "frameInfo", 0 /* normal text */ );
     framesetElement.setAttribute( "grpMgr", tableName );
-    TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").arg(tableName).arg(row).arg(column);
+    TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column);
     framesetElement.setAttribute( "name", name );
     framesetElement.setAttribute( "row", row );
     framesetElement.setAttribute( "col", column );
diff --git a/filters/kword/msword/mswordimport.cpp b/filters/kword/msword/mswordimport.cpp
index 714db274..3be95f7a 100644
--- a/filters/kword/msword/mswordimport.cpp
+++ b/filters/kword/msword/mswordimport.cpp
@@ -41,7 +41,7 @@ MSWordImport::~MSWordImport()
 {
 }
 
-KoFilter::ConversionStatus MSWordImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus MSWordImport::convert( const TQCString& from, const TQCString& to )
 {
     // check for proper conversion
     if ( to != "application/x-kword" || from != "application/msword" )
diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h
index ae348fc7..73a568ff 100644
--- a/filters/kword/msword/mswordimport.h
+++ b/filters/kword/msword/mswordimport.h
@@ -33,7 +33,7 @@ public:
     MSWordImport( KoFilter* parent, const char* name, const TQStringList& );
     virtual ~MSWordImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
     void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem );
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 242a6d39..07eb3da7 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -123,10 +123,10 @@ void KWordTextHandler::footnoteFound( wvWare::FootnoteData::Type type,
     footnoteElem.setAttribute( "numberingtype", autoNumbered ? "auto" : "manual" );
     if ( type == wvWare::FootnoteData::Endnote )
         // Keep name in sync with Document::startFootnote
-        footnoteElem.setAttribute( "frameset", i18n("Endnote %1").arg( ++m_endNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with Document::startFootnote
-        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) );
     varElem.appendChild( footnoteElem );
 
     // Remember to parse the footnote text later
@@ -160,7 +160,7 @@ void KWordTextHandler::tableRowFound( const wvWare::TableRowFunctor& functor, wv
         paragraphStart( 0L );
         static int s_tableNumber = 0;
         m_currentTable = new KWord::Table();
-        m_currentTable->name = i18n("Table %1").arg( ++s_tableNumber );
+        m_currentTable->name = i18n("Table %1").tqarg( ++s_tableNumber );
         insertAnchor( m_currentTable->name );
     }
 
@@ -181,7 +181,7 @@ void KWordTextHandler::pictureFound( const wvWare::PictureFunctor& pictureFuncto
     TQString pictureName = "pictures/picture";
     pictureName += TQString::number( s_pictureNumber ); // filenames start at 0
     // looks better to the user if frame names start at 1
-    TQString frameName = i18n("Picture %1").arg( ++s_pictureNumber );
+    TQString frameName = i18n("Picture %1").tqarg( ++s_pictureNumber );
     insertAnchor( frameName );
 
     switch ( picf->mfp.mm ) {
@@ -464,7 +464,7 @@ void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::W
             int dist = fontSize > 20 ? 2 : 1;
             if (chp->fImprint) // ## no real support for imprint, we use a topleft shadow
                 dist = -dist;
-            css = TQString::fromLatin1("#bebebe %1pt %1pt").arg(dist).arg(dist);
+            css = TQString::tqfromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist);
         }
         shadowElem.setAttribute( "text-shadow", css );
         format.appendChild( shadowElem );
@@ -568,16 +568,16 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr
 
     m_paragraph = TQString( "" );
     m_index = 0;
-    m_oldLayout = layoutElement; // Keep a reference to the old layout for some hacks
+    m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks
 }
 
 void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
 {
     const wvWare::Word97::PAP& pap = paragraphProperties.pap();
-    // Always write out the alignment, it's required
+    // Always write out the tqalignment, it's required
     TQDomElement flowElement = mainDocument().createElement("FLOW");
-    TQString alignment = Conversion::alignment( pap.jc );
-    flowElement.setAttribute( "align", alignment );
+    TQString tqalignment = Conversion::tqalignment( pap.jc );
+    flowElement.setAttribute( "align", tqalignment );
     parentElement.appendChild( flowElement );
 
     //kdDebug(30513) << k_funcinfo << " dxaLeft1=" << pap.dxaLeft1 << " dxaLeft=" << pap.dxaLeft << " dxaRight=" << pap.dxaRight << " dyaBefore=" << pap.dyaBefore << " dyaAfter=" << pap.dyaAfter << " lspd=" << pap.lspd.dyaLine << "/" << pap.lspd.fMultLinespace << endl;
@@ -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 koparaglayout.cc
+            double width = 0.5; // default kword value, see koparagtqlayout.cc
             switch ( td.tbd.tlc ) {
             case 1: // dots
             case 2: // hyphenated
@@ -810,7 +810,7 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::
              ( numberingType == 0 &&m_previousEnumLSID != 0 && m_previousEnumLSID != listInfo->lsid() ) )
             counterElement.setAttribute( "restart", "true" );
 
-        // listInfo->alignment() is not supported in KWord
+        // listInfo->tqalignment() is not supported in KWord
         // listInfo->isLegal() hmm
         // listInfo->notRestarted() [by higher level of lists] not supported
         // listInfo->followingchar() ignored, it's always a space in KWord currently
diff --git a/filters/kword/msword/texthandler.h b/filters/kword/msword/texthandler.h
index c75cfd4e..ebea5202 100644
--- a/filters/kword/msword/texthandler.h
+++ b/filters/kword/msword/texthandler.h
@@ -88,7 +88,7 @@ public:
     // Returns that element into pChildElement if set (in that case even an empty FORMAT can be appended)
     void writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement );
 
-    // Write the _contents_ (children) of a <LAYOUT> or <STYLE> tag, from the given parag props
+    // Write the _contents_ (tqchildren) of a <LAYOUT> or <STYLE> tag, from the given parag props
     void writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style );
 
     // Communication with Document, without having to know about Document
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc
index bf9c0668..460677cb 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <klocale.h>
 #include <kcharsets.h>
@@ -29,7 +29,7 @@
 #include <ImportDialogUI.h>
 #include <ImportDialog.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <tqcombobox.h>
diff --git a/filters/kword/mswrite/ImportDialogUI.ui b/filters/kword/mswrite/ImportDialogUI.ui
index bed2bad1..db7dcc20 100644
--- a/filters/kword/mswrite/ImportDialogUI.ui
+++ b/filters/kword/mswrite/ImportDialogUI.ui
@@ -92,7 +92,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -218,7 +218,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -237,7 +237,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index b645649b..02d980ef 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqfont.h>
 #include <tqimage.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqvaluelist.h>
 #include <tqvaluestack.h>
 
@@ -1286,7 +1286,7 @@ public:
 
 	bool processTable (const Table &table)
 	{
-		// just dump the table out for now (no layout)
+		// just dump the table out for now (no tqlayout)
 		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.layout,
+							 			paraData.tqlayout,
 										paraData.formattingList);
 	}
 
 	bool doFullParagraph (const TQString &paraText,
-						 			const LayoutData &layout,
+						 			const LayoutData &tqlayout,
 									const ValueListFormatData &paraFormatDataList)
 	{
 		MSWrite::FormatParaProperty paraProp;
@@ -1446,34 +1446,34 @@ public:
 		paraProp.setIsText (true);
 
 		// Alignment
-		if (!layout.alignment.isEmpty ())
+		if (!tqlayout.tqalignment.isEmpty ())
 		{
-			if (layout.alignment == "left")
+			if (tqlayout.tqalignment == "left")
 				// quite useless since MSWrite::Alignment::Left is the default anyway
-				paraProp.setAlignment (MSWrite::Alignment::Left);
-			else if (layout.alignment == "right")
-				paraProp.setAlignment (MSWrite::Alignment::Right);
-			else if (layout.alignment == "center")
-				paraProp.setAlignment (MSWrite::Alignment::Center);
-			else if (layout.alignment == "justify")
-				paraProp.setAlignment (MSWrite::Alignment::Justify);
+				paraProp.tqsetAlignment (MSWrite::Alignment::Left);
+			else if (tqlayout.tqalignment == "right")
+				paraProp.tqsetAlignment (MSWrite::Alignment::Right);
+			else if (tqlayout.tqalignment == "center")
+				paraProp.tqsetAlignment (MSWrite::Alignment::Center);
+			else if (tqlayout.tqalignment == "justify")
+				paraProp.tqsetAlignment (MSWrite::Alignment::Justify);
 			else
-				kdWarning (30509) << "Unknown Alignment: " << layout.alignment << endl;
+				kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl;
 		}
 
 		// Indentation
-		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 (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 0
-		kdDebug (30509) << "Indent: " << Point2Twip (layout.indentFirst) << " "
-												<< Point2Twip (layout.indentLeft) << " "
-												<< Point2Twip (layout.indentRight) << endl;
+		kdDebug (30509) << "Indent: " << Point2Twip (tqlayout.indentFirst) << " "
+												<< Point2Twip (tqlayout.indentLeft) << " "
+												<< Point2Twip (tqlayout.indentRight) << endl;
 	#endif
 
 		// Line Spacing
 		MSWrite::Word lineSpacing = MSWrite::LineSpacing::Normal;
-		switch (layout.lineSpacingType)
+		switch (tqlayout.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 (layout.lineSpacing);
+			lineSpacing = getClosestLineSpacing (tqlayout.lineSpacing);
 			break;
 		case LayoutData::LS_MULTIPLE:
 			break;
 		default:
-			kdWarning (30509) << "unknown lineSpacingType \'" << layout.lineSpacingType << "\'" << endl;
+			kdWarning (30509) << "unknown lineSpacingType \'" << tqlayout.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 = layout.tabulatorList.begin ();
-				tabIt != layout.tabulatorList.end ();
+		for (TabulatorList::ConstIterator tabIt = tqlayout.tabulatorList.begin ();
+				tabIt != tqlayout.tabulatorList.end ();
 				tabIt++)
 		{
 			MSWrite::FormatParaPropertyTabulator tab;
@@ -1544,7 +1544,7 @@ public:
 
 		// get this paragraph's "default formatting"
 		MSWrite::FormatCharProperty charPropDefault;
-		processFormatData (charPropDefault, layout.formatData.text);
+		processFormatData (charPropDefault, tqlayout.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 (layout.pageBreakBefore)
+			if (tqlayout.pageBreakBefore)
 				if (!m_generator->writePageBreak ()) return false;
 
 			// counter data
-			processCounter (layout.counter);
+			processCounter (tqlayout.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 (layout.pageBreakAfter)
+			if (tqlayout.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 (layout.pageBreakBefore)
+					if (tqlayout.pageBreakBefore)
 						if (!m_generator->writePageBreak ()) return false;
 
 					// counter data
-					processCounter (layout.counter);
+					processCounter (tqlayout.counter);
 				}
 
 				// yes, this is slightly premature but it doesn't matter
@@ -1733,7 +1733,7 @@ public:
 					}
 
 					// page break at end of paragraph?
-					if (layout.pageBreakAfter)
+					if (tqlayout.pageBreakAfter)
 						if (!m_generator->writePageBreak ()) return false;
 				}
 
@@ -1903,7 +1903,7 @@ MSWriteExport::~MSWriteExport ()
 {
 }
 
-KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const TQCString &to)
+KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, const TQCString &to)
 {
 	kdDebug (30509) << "MSWriteExport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite "
 			  				<< MSWrite::Version << endl;
@@ -1929,7 +1929,7 @@ KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const
 		return KoFilter::OutOfMemory;
 	}
 
-	KoFilter::ConversionStatus ret = leader->convert (m_chain, from, to);
+	KoFilter::ConversiontqStatus ret = leader->convert (m_chain, from, to);
 	int errorCode = worker->getError ();
 
 	delete leader;
diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h
index adfbc4ba..796ce705 100644
--- a/filters/kword/mswrite/mswriteexport.h
+++ b/filters/kword/mswrite/mswriteexport.h
@@ -31,7 +31,7 @@ public:
 	MSWriteExport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteExport ();
 
-	KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to);
+	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
 };
 
 #endif // MSWRITEEXPORT_H
diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc
index a1ccc150..379d3c01 100644
--- a/filters/kword/mswrite/mswriteimport.cc
+++ b/filters/kword/mswrite/mswriteimport.cc
@@ -27,8 +27,8 @@
 #include <tqfile.h>
 #include <tqobject.h>
 #include <tqstring.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -1345,7 +1345,7 @@ MSWriteImport::~MSWriteImport ()
 	delete m_device;
 }
 
-KoFilter::ConversionStatus MSWriteImport::convert (const TQCString &from, const TQCString &to)
+KoFilter::ConversiontqStatus MSWriteImport::convert (const TQCString &from, const TQCString &to)
 {
 	kdDebug (30509) << "MSWriteImport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite "
 			  				<< MSWrite::Version << endl;
diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h
index 8d59fe38..65be7e7a 100644
--- a/filters/kword/mswrite/mswriteimport.h
+++ b/filters/kword/mswrite/mswriteimport.h
@@ -40,7 +40,7 @@ public:
 	MSWriteImport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteImport ();
 
-	KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to);
+	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
 	
 	void sigProgress (const int value)
 	{
diff --git a/filters/kword/mswrite/status.html b/filters/kword/mswrite/status.html
index 5a8bddd1..6ede1caf 100644
--- a/filters/kword/mswrite/status.html
+++ b/filters/kword/mswrite/status.html
@@ -51,7 +51,7 @@
 		<td><b>Imports almost everything except OLE from MS WinWrite (3.0 &amp; 3.1) documents</b> <br>
 			- Character formatting (fonts, bold, italic, underline, superscript, subscript, &quot;(page)&quot; numbering) <br>
 			- Optional/Soft Hyphenation <br>
-			- Paragraph formatting (alignment, linespacing, indentation, tabulation) <br>
+			- Paragraph formatting (tqalignment, linespacing, indentation, tabulation) <br>
 			- Paragraphs with multiple newlines <br>
 			- Pagebreaking (at the start or end of the line and on the next line) <br>
 			- Images (Standard WMFs, monochrome BMPs, position from left margin) <br>
@@ -126,7 +126,7 @@
 		<br>
 
 		<b> Version 0.1 (7 Oct 2001): Initial release </b> <br>
-		- the underlying code to read in the format is there but the filter can only do plain text with alignment
+		- the underlying code to read in the format is there but the filter can only do plain text with tqalignment
 		<br>
 	</td>
     </tr>
diff --git a/filters/kword/mswrite/structures.h b/filters/kword/mswrite/structures.h
index 5aa4f6a3..af687b3a 100644
--- a/filters/kword/mswrite/structures.h
+++ b/filters/kword/mswrite/structures.h
@@ -378,7 +378,7 @@ namespace MSWrite
 		
 		// convenience functions
 		Byte getAlign (void) const	{	return getAlignment ();	}
-		void setAlign (const Byte val)	{	setAlignment (val);	}
+		void setAlign (const Byte val)	{	tqsetAlignment (val);	}
 		
 		Short getLeftIndentFirstLine (const bool purist = false) const
 		{
diff --git a/filters/kword/mswrite/structures_generated.cpp b/filters/kword/mswrite/structures_generated.cpp
index c443f252..6b6e5575 100644
--- a/filters/kword/mswrite/structures_generated.cpp
+++ b/filters/kword/mswrite/structures_generated.cpp
@@ -1166,7 +1166,7 @@ namespace MSWrite
 		
 		// --- set defaults in raw array (needed because it's a useThisMuch structure) ---
 		WriteByte ((Byte) (60), m_data + 1);// magic0_60_or_61
-		m_data [2] = 0;						// alignment
+		m_data [2] = 0;						// tqalignment
 		WriteWord ((Word) (30), m_data + 3);// magic30
 		memset (m_data + 5, 0, 6);			// rightIndent, leftIndent, leftIndentFirstLine
 		WriteWord ((Word) (240), m_data + 11);// lineSpacing
@@ -1176,7 +1176,7 @@ namespace MSWrite
 		// --- set defaults for variables --
 		m_numDataBytes = (Byte) (0);
 		m_magic0_60_or_61 = (Byte) (60);
-		m_alignment = (Byte) (0);
+		m_tqalignment = (Byte) (0);
 		m_magic30 = (Word) (30);
 		m_rightIndent = (Word) (0);
 		m_leftIndent = (Word) (0);
@@ -1210,7 +1210,7 @@ namespace MSWrite
 		
 		m_numDataBytes = rhs.m_numDataBytes;
 		m_magic0_60_or_61 = rhs.m_magic0_60_or_61;
-		m_alignment = rhs.m_alignment;
+		m_tqalignment = rhs.m_tqalignment;
 		m_magic30 = rhs.m_magic30;
 		m_rightIndent = rhs.m_rightIndent;
 		m_leftIndent = rhs.m_leftIndent;
@@ -1235,7 +1235,7 @@ namespace MSWrite
 	
 		if (!Verify (Error::InvalidFormat, m_numDataBytes >= 1 && m_numDataBytes <= s_size - sizeof (Byte), DWord (m_numDataBytes))) return false;
 		if (!Verify (Error::Warn, m_magic0_60_or_61 == 0 || m_magic0_60_or_61 == 60 || m_magic0_60_or_61 == 61, DWord (m_magic0_60_or_61))) return false;
-		// m_alignment will not be checked
+		// m_tqalignment will not be checked
 		if (!Verify (Error::Warn, m_magic30 == 30, DWord (m_magic30))) return false;
 		// m_rightIndent will not be checked
 		// m_leftIndent will not be checked
@@ -1275,8 +1275,8 @@ namespace MSWrite
 		
 		ReadByte (m_magic0_60_or_61, m_data + 1);
 		signalHaveSetData (m_magic0_60_or_61 == Byte (60), 0/*offset*/ + 8/*size*/);
-		ReadByte (m_alignment, m_data + 2);
-		signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);
+		ReadByte (m_tqalignment, m_data + 2);
+		signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);
 		ReadWord (m_magic30, m_data + 3);
 		signalHaveSetData (m_magic30 == Word (30), 16/*offset*/ + 16/*size*/);
 		ReadWord (m_rightIndent, m_data + 5);
@@ -1323,7 +1323,7 @@ namespace MSWrite
 		
 		WriteByte (m_numDataBytes, m_data + 0);
 		WriteByte (m_magic0_60_or_61, m_data + 1);
-		WriteByte (m_alignment, m_data + 2);
+		WriteByte (m_tqalignment, m_data + 2);
 		WriteWord (m_magic30, m_data + 3);
 		WriteWord (m_rightIndent, m_data + 5);
 		WriteWord (m_leftIndent, m_data + 7);
diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h
index feb0f563..0ee985ce 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 layout information (margins, dimensions, ...)
+	// Page tqlayout information (margins, dimensions, ...)
 	class PageLayoutGenerated : public NeedsDevice
 	{
 	public:
@@ -701,7 +701,7 @@ namespace MSWrite
 		
 		Byte m_numDataBytes;					// number of bytes that follow
 		Byte m_magic0_60_or_61;				// =0? =60? =61? 60 is the most common
-		Byte m_alignment;
+		Byte m_tqalignment;
 		Word m_magic30;						// =30?
 		Word m_rightIndent;					// indent from right margin + right margin (if in header/footer)
 		Word m_leftIndent;					// indent from left margin + left margin (if in header/footer)
@@ -758,8 +758,8 @@ namespace MSWrite
 		// get and set functions
 		//
 		
-		Byte getAlignment (void) const	{	return m_alignment;	}
-		void setAlignment (const Byte val)	{	m_alignment = val;	signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
+		Byte getAlignment (void) const	{	return m_tqalignment;	}
+		void tqsetAlignment (const Byte val)	{	m_tqalignment = val;	signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
 		
 		Word getRightIndent (void) const	{	return m_rightIndent;	}
 		void setRightIndent (const Word val)	{	m_rightIndent = val;	signalHaveSetData (m_rightIndent == Word (0), 32/*offset*/ + 16/*size*/);	}
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 2e6e515e..ff9c8276 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -33,7 +33,7 @@
 #include <tqmap.h>
 #include <tqiodevice.h>
 #include <tqbuffer.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 
 #include <kdebug.h>
@@ -96,7 +96,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const
         }
 
         // ### TODO: would be switch/case or if/elseif the best?
-        switch (ch.unicode())
+        switch (ch.tqunicode())
         {
         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.unicode() << endl;
+                kdWarning(30518) << "Not allowed XML character: " << ch.tqunicode() << endl;
                 strReturn += '?';
                 break;
             }
@@ -1206,9 +1206,9 @@ bool OOWriterWorker::makeTable( const FrameAnchor& anchor, const AnchorType anch
     // Be careful that while being similar the following 5 strings have different purposes
     const TQString automaticTableStyle ( makeAutomaticStyleName( "Table", m_tableNumber ) ); // It also increases m_tableNumber
     const TQString tableName( TQString( "Table" ) + TQString::number( m_tableNumber ) ); // m_tableNumber was already increased
-    const TQString translatedName( i18n( "Object name", "Table %1").arg( m_tableNumber ) );
+    const TQString translatedName( i18n( "Object name", "Table %1").tqarg( m_tableNumber ) );
     const TQString automaticFrameStyle ( makeAutomaticStyleName( "TableFrame", m_textBoxNumber ) ); // It also increases m_textBoxNumber
-    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").arg( m_textBoxNumber ) );
+    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").tqarg( m_textBoxNumber ) );
 
     kdDebug(30518) << "Processing table " << anchor.key.toString() << " => " << tableName << endl;
 
@@ -1729,38 +1729,38 @@ void OOWriterWorker::processParagraphData ( const TQString &paraText,
 }
 
 TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
-    const LayoutData& layout, const bool force, TQString& styleKey)
+    const LayoutData& tqlayout, const bool force, TQString& styleKey)
 {
     TQString props; // Props has to remain empty, if there is no difference.
 
-    styleKey += layout.styleName;
+    styleKey += tqlayout.styleName;
     styleKey += ',';
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
         // 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 (layout.alignment == "left")
+        if (tqlayout.tqalignment == "left")
         {
             props += "fo:text-align=\"start\" ";
             styleKey += 'L';
         }
-        else if (layout.alignment == "right")
+        else if (tqlayout.tqalignment == "right")
         {
             props += "fo:text-align=\"end\" ";
             styleKey += 'R';
         }
-        else if (layout.alignment == "center")
+        else if (tqlayout.tqalignment == "center")
         {
             props += "fo:text-align=\"center\" ";
             styleKey += 'C';
         }
-        else if (layout.alignment == "justify")
+        else if (tqlayout.tqalignment == "justify")
         {
             props += "fo:text-align=\"justify\" ";
             styleKey += 'J';
         }
-        else if (layout.alignment == "auto")
+        else if (tqlayout.tqalignment == "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: " << layout.alignment << endl;
+            kdWarning(30518) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
     styleKey += ',';
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("fo:margin-left=\"%1pt\" ").arg(layout.indentLeft);
-        styleKey += TQString::number(layout.indentLeft);
+        props += TQString("fo:margin-left=\"%1pt\" ").tqarg(tqlayout.indentLeft);
+        styleKey += TQString::number(tqlayout.indentLeft);
     }
 
     styleKey += ',';
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("fo:margin-right=\"%1pt\" ").arg(layout.indentRight);
-        styleKey += TQString::number(layout.indentRight);
+        props += TQString("fo:margin-right=\"%1pt\" ").tqarg(tqlayout.indentRight);
+        styleKey += TQString::number(tqlayout.indentRight);
     }
 
     styleKey += ',';
 
-    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         props += "fo:text-indent=\"";
-        props += TQString::number(layout.indentFirst);
+        props += TQString::number(tqlayout.indentFirst);
         props += "\" ";
-        styleKey += TQString::number(layout.indentFirst);
+        styleKey += TQString::number(tqlayout.indentFirst);
     }
 
     styleKey += ',';
 
-    if ((layout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
+    if ((tqlayout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("fo:margin-bottom=\"%1pt\" ").arg(layout.marginBottom);
-       styleKey += TQString::number(layout.marginBottom);
+       props += TQString("fo:margin-bottom=\"%1pt\" ").tqarg(tqlayout.marginBottom);
+       styleKey += TQString::number(tqlayout.marginBottom);
     }
 
     styleKey += ',';
 
-    if ((layout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
+    if ((tqlayout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("fo:margin-top=\"%1pt\" ").arg(layout.marginTop);
-       styleKey += TQString::number(layout.marginTop);
+       props += TQString("fo:margin-top=\"%1pt\" ").tqarg(tqlayout.marginTop);
+       styleKey += TQString::number(tqlayout.marginTop);
     }
 
     styleKey += ',';
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        switch ( layout.lineSpacingType )
+        switch ( tqlayout.lineSpacingType )
         {
         case LayoutData::LS_CUSTOM:
             {
                 // We have a custom line spacing (in points)
-                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.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( layout.lineSpacing * 100 ) ) );
+                const TQString mult ( TQString::number( tqRound( tqlayout.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(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.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(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.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: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30518) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
@@ -1900,7 +1900,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     
     styleKey += ',';
 
-    if ( layout.pageBreakBefore )
+    if ( tqlayout.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 ( layout.pageBreakAfter )
+    if ( tqlayout.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,layout.formatData.text,force,styleKey);
+    props += textFormatToStyle(layoutOrigin.formatData.text,tqlayout.formatData.text,force,styleKey);
 
     props += ">";
 
     styleKey += '@'; // A more visible seperator
 
     // ### TODO/FIXME: what if all tabulators must be erased?
-    if (!layout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
+    if (!tqlayout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         props += "\n    <style:tab-stops>\n";
         TabulatorList::ConstIterator it;
-		TabulatorList::ConstIterator end(layout.tabulatorList.end());
-        for (it=layout.tabulatorList.begin();it!=end;++it)
+		TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
+        for (it=tqlayout.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& layout,
+bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
     const ValueListFormatData& paraFormatDataList)
 {
-    const bool header = ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
-        && (layout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
+    const bool header = ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
+        && (tqlayout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
 
     if (header)
     {
         *m_streamOut << "  <text:h text:level=\"";
-        *m_streamOut << TQString::number(layout.counter.depth+1,10);
+        *m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
         *m_streamOut << "\" ";
     }
     else
         *m_streamOut << "  <text:p ";
 
-    const LayoutData& styleLayout=m_styleMap[layout.styleName];
+    const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
 
     TQString styleKey;
-    const TQString props(layoutToParagraphStyle(styleLayout,layout,false,styleKey));
+    const TQString props(layoutToParagraphStyle(styleLayout,tqlayout,false,styleKey));
 
-    TQString actualStyle(layout.styleName);
+    TQString actualStyle(tqlayout.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(layout.styleName) + "\"";
+            m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(tqlayout.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, layout.formatData.text, paraFormatDataList);
+    processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
 
     if (header)
         *m_streamOut << "</text:h>\n";
@@ -2054,21 +2054,21 @@ bool OOWriterWorker::doOpenStyles(void)
     return true;
 }
 
-bool OOWriterWorker::doFullDefineStyle(LayoutData& layout)
+bool OOWriterWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register style in the style map
-    m_styleMap[layout.styleName]=layout;
+    m_styleMap[tqlayout.styleName]=tqlayout;
 
     m_styles += "  <style:style";
 
-    m_styles += " style:name=\"" + escapeOOText( layout.styleName ) + "\"";
-    m_styles += " style:next-style-name=\"" + escapeOOText( layout.styleFollowing ) + "\"";
+    m_styles += " style:name=\"" + escapeOOText( tqlayout.styleName ) + "\"";
+    m_styles += " style:next-style-name=\"" + escapeOOText( tqlayout.styleFollowing ) + "\"";
     m_styles += " style:family=\"paragraph\" style:class=\"text\"";
     m_styles += ">\n";
     m_styles += "   <style:properties ";
 
     TQString debugKey; // Not needed
-    m_styles += layoutToParagraphStyle(layout,layout,true,debugKey);
+    m_styles += layoutToParagraphStyle(tqlayout,tqlayout,true,debugKey);
     kdDebug(30518) << "Defining style: " << debugKey << endl;
 
     m_styles += "</style:properties>\n";
@@ -2160,12 +2160,12 @@ void OOWriterWorker::declareFont(const TQString& fontName)
     {
         TQString props;
 
-        // Disabled, as TQFontInfo::styleHint() cannot guess
+        // Disabled, as TQFontInfo::tqstyleHint() cannot guess
 #if 0
         TQFont font(fontName);
         TQFontInfo info(font);
         props+="style:font-family-generic=\""
-        switch (info.styleHint())
+        switch (info.tqstyleHint())
         {
         case TQFont::SansSerif:
         default:
@@ -2217,7 +2217,7 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c
         return str2;
 
     // If it is still not unique, try a time stamp.
-    const TQDateTime dt(TQDateTime::currentDateTime(Qt::UTC));
+    const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC));
 
     str2 = str + "_" + TQString::number(dt.toTime_t(),16);
     if (m_styleMap.find(str2)==m_styleMap.end())
diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h
index c89e15ac..0a898227 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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         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& layout);
+    virtual bool doFullDefineStyle(LayoutData& tqlayout);
     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& layout, const bool force, TQString& styleKey);
+        const LayoutData& tqlayout, 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/conversion.cc b/filters/kword/oowriter/conversion.cc
index 22d9fed5..209b2bec 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cc
@@ -10,7 +10,7 @@ TQString Conversion::importAlignment( const TQString& align )
         return "left";
     if ( align == "end" )
         return "right";
-    kdWarning(30518) << "Conversion::importAlignment unknown alignment " << align << endl;
+    kdWarning(30518) << "Conversion::importAlignment unknown tqalignment " << align << endl;
     return "auto";
 }
 
@@ -22,7 +22,7 @@ TQString Conversion::exportAlignment( const TQString& align )
         return "start";
     if ( align == "right" )
         return "end";
-    kdWarning(30518) << "Conversion::exportAlignment unknown alignment " << align << endl;
+    kdWarning(30518) << "Conversion::exportAlignment unknown tqalignment " << align << endl;
     return "auto";
 }
 
@@ -37,13 +37,13 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap )
     if ( oowrap == "run-through" )
         return tqMakePair( 0, TQString() );
     if ( oowrap == "biggest" ) // OASIS extension
-        return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
+        return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) );
 
     ////if ( oowrap == "parallel" || oowrap == "dynamic" )
     // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel.
 
     // Those are not supported in KWord, let's use biggest instead
-    return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
+    return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) );
 }
 
 TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs )
diff --git a/filters/kword/oowriter/conversion.h b/filters/kword/oowriter/conversion.h
index ee6b41f6..d9388268 100644
--- a/filters/kword/oowriter/conversion.h
+++ b/filters/kword/oowriter/conversion.h
@@ -32,7 +32,7 @@
 
 namespace Conversion
 {
-    // Convert paragraph alignment value
+    // Convert paragraph tqalignment value
     TQString importAlignment( const TQString& );
     TQString exportAlignment( const TQString& );
 
diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc
index aba0ee9f..426105e8 100644
--- a/filters/kword/oowriter/oowriterexport.cc
+++ b/filters/kword/oowriter/oowriterexport.cc
@@ -52,7 +52,7 @@ OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/vnd.sun.xml.writer" || from != "application/x-kword" )
     {
@@ -79,7 +79,7 @@ KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h
index bd1a0f40..8f4695b8 100644
--- a/filters/kword/oowriter/oowriterexport.h
+++ b/filters/kword/oowriter/oowriterexport.h
@@ -47,6 +47,6 @@ public:
     OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~OOWRITERExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // OOWRITEREXPORT_H
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 07262c86..5fd196f8 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -69,7 +69,7 @@ OoWriterImport::~OoWriterImport()
 {
 }
 
-KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug(30518) << "Entering Oowriter Import filter: " << from << " - " << to << endl;
 
@@ -99,20 +99,20 @@ KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCS
     }
 
 
-    KoFilter::ConversionStatus preStatus = openFile();
+    KoFilter::ConversiontqStatus pretqStatus = openFile();
 
     TQImage thumbnail;
-    if ( preStatus == KoFilter::OK )
+    if ( pretqStatus == KoFilter::OK )
     {
         // We do not care about the failure
         OoUtils::loadThumbnail( thumbnail, m_zip );
     }
 
-    if ( preStatus != KoFilter::OK )
+    if ( pretqStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return preStatus;
+        return pretqStatus;
     }
 
     m_currentMasterPage = TQString();
@@ -535,14 +535,14 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetEle
     return frameElementOut;
 }
 
-KoFilter::ConversionStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversiontqStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
     return OoUtils::loadAndParse( filename, doc, m_zip);
 }
 
-KoFilter::ConversionStatus OoWriterImport::openFile()
+KoFilter::ConversiontqStatus OoWriterImport::openFile()
 {
-    KoFilter::ConversionStatus status=loadAndParse("content.xml", m_content);
+    KoFilter::ConversiontqStatus status=loadAndParse("content.xml", m_content);
     if ( status != KoFilter::OK )
     {
         kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl;
@@ -596,7 +596,7 @@ bool OoWriterImport::createStyleMap( const TQDomDocument & styles, TQDomDocument
       if ( d > 1.0 )
       {
         TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") );
-        message = message.arg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
+        message = message.tqarg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
@@ -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].unicode() );
-            kdDebug(30518) << "bullet code " << bulletChar[0].unicode() << endl;
+            counter.setAttribute( "bullet", bulletChar[0].tqunicode() );
+            kdDebug(30518) << "bullet code " << bulletChar[0].tqunicode() << endl;
             TQString fontName = listStyleProperties.attributeNS( ooNS::style, "font-name", TQString() );
             counter.setAttribute( "bulletfont", fontName );
 #endif
             // Reverse engineering, I found those codes:
-            switch( bulletChar[0].unicode() ) {
+            switch( bulletChar[0].tqunicode() ) {
             case 0x2022: // small disc
                 counter.setAttribute( "type", 10 ); // a disc bullet
                 break;
@@ -992,11 +992,11 @@ void OoWriterImport::parseList( TQDomDocument& doc, const TQDomElement& list, TQ
 
 static int numberOfParagraphs( const TQDomElement& frameset )
 {
-    const TQDomNodeList children = frameset.childNodes();
+    const TQDomNodeList tqchildren = frameset.childNodes();
     const TQString paragStr = "PARAGRAPH";
     int paragCount = 0;
-    for ( unsigned int i = 0 ; i < children.length() ; ++i ) {
-        if ( children.item( i ).toElement().tagName() == paragStr )
+    for ( unsigned int i = 0 ; i < tqchildren.length() ; ++i ) {
+        if ( tqchildren.item( i ).toElement().tagName() == paragStr )
             ++paragCount;
     }
     return paragCount;
@@ -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 layout...
+        masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout...
     if ( masterPageName != m_currentMasterPage )
     {
-        // Detected a change in the master page -> this means we have to use a new page layout
+        // Detected a change in the master page -> this means we have to use a new page tqlayout
         // 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 layout.
+        // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout.
         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 layout, KWord doesn't have sections.
+            // We have no way to store the new page tqlayout, KWord doesn't have sections.
         }
     }
 
@@ -1458,7 +1458,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen
 {
     Q_ASSERT( layoutElement.ownerDocument() == doc );
 
-    // Always write out the alignment, it's required
+    // Always write out the tqalignment, it's required
     TQDomElement flowElement = doc.createElement("FLOW");
 
     /* This was only an intermediate OASIS decision. The final decision is:
@@ -1563,7 +1563,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen
     style:background-image
     line numbering
     punctuation wrap, 3.10.36
-    vertical alignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
+    vertical tqalignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
   Michael said those are in fact parag properties:
     style:text-autospace, 3.10.32 - not implemented in kotext
     style:line-break, 3.10.37 - apparently that's for some Asian languages
@@ -1817,7 +1817,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href.mid(1));
-        KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
+        KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
         picture.setKey(key);
 
         if (!m_zip)
@@ -1966,7 +1966,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats
             bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
             if (!dt.isValid())
             {
-                dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+                dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
                 fixed = false;
             }
             const TQDate date(dt.date());
@@ -1995,7 +1995,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats
             bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
             if (!dt.isValid()) {
-                dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+                dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
                 fixed = false;
             }
 
@@ -2303,7 +2303,7 @@ void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement&
         if ( localName == "table-cell" ) // OOo SPEC 4.8.1 p267
         {
             const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2")
-                .arg(row).arg(column).arg(tableName)); // The table name could have a % sequence, so use the table name as last!
+                .tqarg(row).tqarg(column).tqarg(tableName)); // The table name could have a % sequence, so use the table name as last!
             kdDebug(30518) << "Trying to create " << frameName << endl;
 
             // We need to create a frameset for the cell
diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h
index 4de60534..80586a31 100644
--- a/filters/kword/oowriter/oowriterimport.h
+++ b/filters/kword/oowriter/oowriterimport.h
@@ -38,7 +38,7 @@ public:
     OoWriterImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoWriterImport();
 
-    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
 
 private:
     void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem );
@@ -61,8 +61,8 @@ private:
     void createDocumentInfo( TQDomDocument &docinfo );
     void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement );
     void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement );
-    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
-    KoFilter::ConversionStatus openFile();
+    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+    KoFilter::ConversiontqStatus openFile();
     bool createStyleMap( const TQDomDocument & styles, TQDomDocument& doc );
     void insertStyles( const TQDomElement& element, TQDomDocument& doc );
     void importDateTimeStyle( const TQDomElement& parent );
diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp
index b7155fa8..65a83518 100644
--- a/filters/kword/palmdoc/palmdb.cpp
+++ b/filters/kword/palmdoc/palmdb.cpp
@@ -18,7 +18,7 @@
 */
 
 /*
-   The database layout for PalmDB files is described in 
+   The database tqlayout for PalmDB files is described in 
    http://www.palmos.com/dev/support/docs/protein_books/FileFormats/Intro.html
 */
 
@@ -38,9 +38,9 @@ PalmDB::PalmDB()
   setName( "Unnamed" );
   setAttributes( 0 );
   setVersion( 0 );
-  setCreationDate( TQDateTime::currentDateTime() );
-  setModificationDate( TQDateTime::currentDateTime() );
-  setLastBackupDate( TQDateTime::currentDateTime() );
+  setCreationDate( TQDateTime::tqcurrentDateTime() );
+  setModificationDate( TQDateTime::tqcurrentDateTime() );
+  setLastBackupDate( TQDateTime::tqcurrentDateTime() );
   setType( TQString() );
   setCreator( TQString() );
 
@@ -73,11 +73,11 @@ bool PalmDB::load( const char* filename )
 
   // read and encode database name
   // The name field is 32 bytes long, and is NUL terminated.
-  // Use the length parameter of fromLatin1() anyway.
+  // Use the length parameter of tqfromLatin1() anyway.
   TQ_UINT8 name[32];
   for(int k = 0; k < 32; k++)
     stream >> name[k];
-  m_name = TQString::fromLatin1( (char*) name, 31 );
+  m_name = TQString::tqfromLatin1( (char*) name, 31 );
 
   // read database attribute
   TQ_UINT16 attr;
@@ -121,12 +121,12 @@ bool PalmDB::load( const char* filename )
   // read and encode database type
   TQ_UINT8 dbt[4];
   stream >> dbt[0] >> dbt[1] >> dbt[2] >> dbt[3];
-  m_type = TQString::fromLatin1( (char*) dbt, 4 );
+  m_type = TQString::tqfromLatin1( (char*) dbt, 4 );
 
   // read and encode database creator
   TQ_UINT8 dbc[4];
   stream >> dbc[0] >> dbc[1] >> dbc[2] >> dbc[3];
-  m_creator = TQString::fromLatin1( (char*) dbc, 4 );
+  m_creator = TQString::tqfromLatin1( (char*) dbc, 4 );
 
   // read unique id seed
   TQ_UINT32 idseed;
@@ -184,9 +184,9 @@ bool PalmDB::load( const char* filename )
       if( recsize[r] >= 0 )
         {
           data->resize( recsize[r] );
-          stream.device()->at( recpos[r] );
+          stream.tqdevice()->at( recpos[r] );
           for( int q = 0; q < recsize[r]; q++ )
-            { TQ_UINT8 c; stream >> c; data->at(q) = c; }
+            { TQ_UINT8 c; stream >> c; data->tqat(q) = c; }
         }
     records.append( data );
   }
diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp
index 72bb0434..791fa356 100644
--- a/filters/kword/palmdoc/palmdoc.cpp
+++ b/filters/kword/palmdoc/palmdoc.cpp
@@ -106,7 +106,7 @@ bool PalmDoc::load( const char* filename )
 
   // if the text is not compressed, simply append as string
   if( format == 1 )
-      setText( TQString::fromLatin1( rec.data(),rec.count() ) );
+      setText( TQString::tqfromLatin1( rec.data(),rec.count() ) );
 
   // done
   m_result = OK;
@@ -120,7 +120,7 @@ bool PalmDoc::save( const char* filename )
   setCreator( "REAd" );
 
   // "touch" the database :-)
-  setModificationDate( TQDateTime::currentDateTime() ); 
+  setModificationDate( TQDateTime::tqcurrentDateTime() ); 
 
   // Palm record size is always 4 KB
   unsigned recsize = 4096;
diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc
index 9bbb980f..5e18ff6f 100644
--- a/filters/kword/palmdoc/palmdocexport.cc
+++ b/filters/kword/palmdoc/palmdocexport.cc
@@ -25,7 +25,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
 private:
     TQString title;
@@ -101,7 +101,7 @@ bool PalmDocWorker::doFullDocumentInfo( const KWEFDocumentInfo& docInfo )
 }
 
 bool PalmDocWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*layout*/, const ValueListFormatData& /*paraFormatDataList*/)
+  const LayoutData& /*tqlayout*/, const ValueListFormatData& /*paraFormatDataList*/)
 {
   kdDebug(30525) << "Entering ::doFullParagraph" << endl;
   text.append( paraText );
@@ -115,7 +115,7 @@ PalmDocExport::PalmDocExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from, 
+KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, 
   const TQCString& to )
 {
   // check for proper conversion
@@ -125,7 +125,7 @@ KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from,
   PalmDocWorker* worker = new PalmDocWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h
index 4c09946b..fd2a1140 100644
--- a/filters/kword/palmdoc/palmdocexport.h
+++ b/filters/kword/palmdoc/palmdocexport.h
@@ -35,7 +35,7 @@ class PalmDocExport : public KoFilter
 
     virtual ~PalmDocExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __PALMDOCEXPORT_H
diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc
index a1e8107b..98cd7629 100644
--- a/filters/kword/palmdoc/palmdocimport.cc
+++ b/filters/kword/palmdoc/palmdocimport.cc
@@ -46,7 +46,7 @@ PalmDocImport::PalmDocImport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus PalmDocImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "application/vnd.palm" )
@@ -96,7 +96,7 @@ KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const
 
 TQString PalmDocImport::processPlainParagraph( TQString text )
 {
-  TQString formats, layout, result;
+  TQString formats, tqlayout, 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
-  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" );
+  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" );
 
   // 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( layout );
+  result.append( tqlayout );
   result.append( "</PARAGRAPH>\n" );
 
   return result;
diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h
index 77b4cc73..a97f9729 100644
--- a/filters/kword/palmdoc/palmdocimport.h
+++ b/filters/kword/palmdoc/palmdocimport.h
@@ -37,7 +37,7 @@ class PalmDocImport : public KoFilter
 
     virtual ~PalmDocImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
   private:
     
diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp
index 8a08c95c..5182f188 100644
--- a/filters/kword/pdf/FilterDevice.cpp
+++ b/filters/kword/pdf/FilterDevice.cpp
@@ -196,7 +196,7 @@ void Device::addImage()
     }
 
     // add image
-    TQString name = TQString("pictures/picture%1.png").arg(_data.imageIndex());
+    TQString name = TQString("pictures/picture%1.png").tqarg(_data.imageIndex());
     TQDomElement frameset = _data.pictureFrameset(_currentImage.rect);
     current()->pictures.append(frameset);
     TQDomElement picture = _data.createElement("PICTURE");
@@ -253,7 +253,7 @@ void Device::computeGeometry(GfxState *state, Image &image)
 uint Device::initImage(GfxState *state, int width, int height,
                        bool withMask)
 {
-    // get image geometry
+    // get image tqgeometry
     Image image;
     image.mask = withMask;
     computeGeometry(state, image);
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index 14d3d384..5391cb24 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].unicode() : 0) << ")" << endl;
+//                   << (str->len>0 ? s[0].tqunicode() : 0) << ")" << endl;
     TextPage::addString(str);
 //    kdDebug(30516) << " ...addString done" << endl;
 }
@@ -245,9 +245,9 @@ void Page::initParagraph(Paragraph &par) const
             if ( res==-1 ) {
                 tab.pos = dx;
                 if (tabRightAligned) {
-                    tab.alignment = Tabulator::Right;
+                    tab.tqalignment = Tabulator::Right;
                     kdDebug(30516) << "tabulated text right aligned.." << endl;
-                } else tab.alignment = Tabulator::Left;
+                } else tab.tqalignment = Tabulator::Left;
                 par.tabs.push_back(tab);
             }
         }
@@ -262,7 +262,7 @@ void Page::initParagraph(Paragraph &par) const
         else par.leftIndent = kMin(par.leftIndent, left);
     }
 
-    // compute alignment
+    // compute tqalignment
     for (it = par.lines().begin(); it!=par.lines().end(); ++it) {
         double left = (*it)->blocks->xMin;
         double right = block(*it, -1)->xMax;
@@ -287,7 +287,7 @@ void Page::initParagraph(Paragraph &par) const
         }
     }
 
-    // finalize alignment
+    // finalize tqalignment
     if (rightAligned) par.align = (leftAligned ? AlignBlock : AlignRight);
     else if (centered) par.align = AlignCenter;
 }
@@ -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.unicode())==Hyphen )
+                if ( !prev.isNull() && type(c.tqunicode())==Hyphen )
                     kdDebug(30516) << "hyphen ? " << TQString(prev)
-                                   << " type=" << type(prev.unicode())
+                                   << " type=" << type(prev.tqunicode())
                                    << endl;
                 TextString *next =
                     ((*it)->next ? (*it)->next->blocks->strings : 0);
-                if ( !prev.isNull() && type(c.unicode())==Hyphen
-                     && isLetter( type(prev.unicode()) )
+                if ( !prev.isNull() && type(c.tqunicode())==Hyphen
+                     && isLetter( type(prev.tqunicode()) )
                      && 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.unicode(), res) ) {
+    switch ( PDFImport::checkSpecial(c.tqunicode(), 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.unicode() << endl;
+        kdDebug(30516) << "found symbol=" << c.tqunicode() << endl;
         return Times;
         //return Symbol;
     default:
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index 3236aa39..a6abf929 100644
--- a/filters/kword/pdf/data.cpp
+++ b/filters/kword/pdf/data.cpp
@@ -117,7 +117,7 @@ TQDomElement Data::createFrameset(FramesetType type, const TQString &n)
     TQString name = n;
     if ( name.isNull() )
         name = (text ? i18n("Text Frameset %1")
-                : i18n("Picture %1")).arg(index);
+                : i18n("Picture %1")).tqarg(index);
     frameset.setAttribute("name", name);
     frameset.setAttribute("frameInfo", 0);
 
@@ -154,7 +154,7 @@ void Data::initPage(const TQValueVector<DRect> &rects,
 //        kdDebug(30516) << "page #" << pageIndex << " rect #" << i
 //                       << ": " << rects[i].toString() << endl;
         if ( !rects[i].isValid() ) continue;
-        TQString name = i18n(TEXT_FRAMESET_NAMES[i]).arg(pageIndex);
+        TQString name = i18n(TEXT_FRAMESET_NAMES[i]).tqarg(pageIndex);
         _textFramesets[i] = createFrameset(Text, name);
         _framesets.appendChild(_textFramesets[i]);
         TQDomElement frame = createFrame(Text, rects[i], true);
@@ -189,13 +189,13 @@ void Data::createParagraph(const TQString &text, ParagraphType type,
     textElement.appendChild( _document.createTextNode(text) );
     paragraph.appendChild(textElement);
 
-    TQDomElement layout = _document.createElement("LAYOUT");
-    paragraph.appendChild(layout);
+    TQDomElement tqlayout = _document.createElement("LAYOUT");
+    paragraph.appendChild(tqlayout);
     TQDomElement element = _document.createElement("NAME");
     element.setAttribute("value", "Standard");
-    layout.appendChild(element);
+    tqlayout.appendChild(element);
     for (uint i=0; i<layouts.size(); i++)
-        layout.appendChild(layouts[i]);
+        tqlayout.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 74aa89e2..29e0eabc 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -26,7 +26,7 @@
 #include <tqapplication.h>
 #include <tqgrid.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
@@ -128,7 +128,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget)
     gbox->setInsideSpacing(KDialogBase::spacingHint());
     top->addWidget(gbox);
     _group = new TQButtonGroup;
-    _allButton = new TQRadioButton(i18n("All (%1 pages)").arg(nbPages), gbox);
+    _allButton = new TQRadioButton(i18n("All (%1 pages)").tqarg(nbPages), gbox);
     _allButton->setChecked(true);
     _group->insert(_allButton);
     TQHBox *hbox = new TQHBox(gbox);
@@ -147,8 +147,8 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget)
     _smart->setChecked(true);
     TQWhatsThis::add(_smart,
                     i18n("Removes returns and hyphens at end of line. "
-                         "Also tries to compute the paragraph alignment. "
-                         "Note that the layout of some pages can "
+                         "Also tries to compute the paragraph tqalignment. "
+                         "Note that the tqlayout of some pages can "
                          "get messed up."));
     top->addWidget(_smart);
 
@@ -181,7 +181,7 @@ Options Dialog::options() const
 {
     Options o;
     o.range = SelectionRange( (_allButton->isChecked() ?
-                             TQString("1-%1").arg(_nbPages) : _range->text()) );
+                             TQString("1-%1").tqarg(_nbPages) : _range->text()) );
     o.ownerPassword = _owner->text();
     o.userPassword = _user->text();
     o.importImages = _images->isChecked();
diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp
index c8ecabcb..1dd953aa 100644
--- a/filters/kword/pdf/fstring.cpp
+++ b/filters/kword/pdf/fstring.cpp
@@ -32,10 +32,10 @@ namespace PDFImport {
 TQDomElement Tabulator::createElement(Data &data) const
 {
     TQDomElement element = data.createElement("TABULATOR");
-    element.setAttribute("type", alignment);
+    element.setAttribute("type", tqalignment);
     element.setAttribute("ptpos", pos);
     element.setAttribute("filling", filling);
-    if ( alignment==Character )
+    if ( tqalignment==Character )
         element.setAttribute("alignchar", TQString(alignmentChar));
     return element;
 }
diff --git a/filters/kword/pdf/fstring.h b/filters/kword/pdf/fstring.h
index 644c9398..6e4d0b6a 100644
--- a/filters/kword/pdf/fstring.h
+++ b/filters/kword/pdf/fstring.h
@@ -39,13 +39,13 @@ public:
     enum Alignment { Left = 0, Center, Right, Character };
     enum Filling { Blank = 0, Dots, Line, Dash, DashDot, DashDotDot };
 
-    Tabulator() : alignment(Left) {}
+    Tabulator() : tqalignment(Left) {}
 
     TQDomElement createElement(Data &data) const;
 
 public:
     double    pos;
-    Alignment alignment;
+    Alignment tqalignment;
     Filling   filling;
     TQChar     alignmentChar;
 };
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 3cd0e1bf..0ffc9dba 100644
--- a/filters/kword/pdf/misc.cpp
+++ b/filters/kword/pdf/misc.cpp
@@ -70,8 +70,8 @@ void DRect::unite(const DRect &r)
 TQString DRect::toString() const
 {
     if ( !isValid() ) return "invalid rect";
-    return TQString("left=%1 right=%2 top=%3 bottom=%4").arg(_left).arg(_right)
-        .arg(_top).arg(_bottom);
+    return TQString("left=%1 right=%2 top=%3 bottom=%4").tqarg(_left).tqarg(_right)
+        .tqarg(_top).tqarg(_bottom);
 }
 
 bool DPath::isRectangle() const
@@ -211,7 +211,7 @@ void Font::init(const TQString &n)
                 _data->family = FAMILY_DATA[Symbol];
             else { // with TQt
                 TQFontDatabase fdb;
-                TQStringList list = fdb.families();
+                TQStringList list = fdb.tqfamilies();
                 list = list.grep(name, false);
                 if ( !list.isEmpty() ) {
                     _data->family = list[0];
diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp
index 80ec92d0..ffe27e1c 100644
--- a/filters/kword/pdf/pdfdocument.cpp
+++ b/filters/kword/pdf/pdfdocument.cpp
@@ -38,7 +38,7 @@ Document::Document()
     : _file(0), _object(0), _fileStream(0), _document(0), _device(0)
 {}
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 Document::init(const TQString &name, const TQString &ownerPassword,
                const TQString &userPassword)
 {
diff --git a/filters/kword/pdf/pdfdocument.h b/filters/kword/pdf/pdfdocument.h
index b2da781f..c54606f4 100644
--- a/filters/kword/pdf/pdfdocument.h
+++ b/filters/kword/pdf/pdfdocument.h
@@ -43,7 +43,7 @@ class Document
     Document();
     ~Document() { clear(); }
 
-    KoFilter::ConversionStatus init(const TQString &name,
+    KoFilter::ConversiontqStatus init(const TQString &name,
                     const TQString &ownerPassword, const TQString &userPassword);
     void clear();
 
diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp
index dfc56703..bee3e39a 100644
--- a/filters/kword/pdf/pdfimport.cpp
+++ b/filters/kword/pdf/pdfimport.cpp
@@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY(libpdfimport, PdfImportFactory())
 PdfImport::PdfImport(KoFilter *, const char *, const TQStringList&)
 {}
 
-KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
+KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from,
                                               const TQCString& to)
 {
     // check for proper conversion
@@ -63,7 +63,7 @@ KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
         return KoFilter::NotImplemented;
 
     // read file
-    KoFilter::ConversionStatus result
+    KoFilter::ConversiontqStatus result
         = _doc.init(m_chain->inputFile(), TQString(), TQString());
     if ( result!=KoFilter::OK ) return result;
 
@@ -111,7 +111,7 @@ KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
         for (it.toFirst(); it.current()!=it.end(); it.next()) {
             TQString s = (first ? i18n("First pass: page #%1...")
                          : i18n("Second pass: page #%1..."));
-            pd.setLabel( s.arg(it.current()) );
+            pd.setLabel( s.tqarg(it.current()) );
             tqApp->processEvents();
             if (pd.wasCancelled()) return KoFilter::UserCancelled;
             kdDebug(30516) << "-- " << "pass #" << k
diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h
index 53ca8f97..9686714e 100644
--- a/filters/kword/pdf/pdfimport.h
+++ b/filters/kword/pdf/pdfimport.h
@@ -33,7 +33,7 @@ class PdfImport : public KoFilter
 public:
     PdfImport(KoFilter *parent, const char *name, const TQStringList&);
 
-    KoFilter::ConversionStatus
+    KoFilter::ConversiontqStatus
     convert(const TQCString& from, const TQCString& to);
 
 private:
diff --git a/filters/kword/pdf/xpdf/xpdf/FTFont.cc b/filters/kword/pdf/xpdf/xpdf/FTFont.cc
index 8de09e0e..ebbbff40 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 unicodeCmap, macRomanCmap, msSymbolCmap;
+  int tqunicodeCmap, 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).
-    unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
+    tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
     for (i = 0; i < face->num_charmaps; ++i) {
       if (face->charmaps[i]->platform_id == 3 &&
 	  face->charmaps[i]->encoding_id == 1) {
-	unicodeCmap = i;
+	tqunicodeCmap = 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 (unicodeCmap != 0xffff) {
-	i = unicodeCmap;
+      if (tqunicodeCmap != 0xffff) {
+	i = tqunicodeCmap;
 	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 ccb880bf..73a7f1d3 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 unicodeCmap, macRomanCmap, msSymbolCmap;
+  int tqunicodeCmap, 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);
-  unicodeCmap = macRomanCmap = msSymbolCmap = -1;
+  tqunicodeCmap = 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) {
-      unicodeCmap = i;
+      tqunicodeCmap = 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 (unicodeCmap >= 0) {
-      i = unicodeCmap;
+    if (tqunicodeCmap >= 0) {
+      i = tqunicodeCmap;
       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 8a7b36de..d25970de 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();
-  unicodeMaps = new GHash(gTrue);
+  tqunicodeMaps = 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();
-  unicodeMapCache = new UnicodeMapCache();
+  tqunicodeMapCache = 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("unicodeMap")) {
+      } else if (!cmd->cmp("tqunicodeMap")) {
 	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 'unicodeMap' config file command (%s:%d)",
+    error(-1, "Bad 'tqunicodeMap' config file command (%s:%d)",
 	  fileName->getCString(), line);
     return;
   }
   encodingName = (GString *)tokens->get(1);
   name = (GString *)tokens->get(2);
-  if ((old = (GString *)unicodeMaps->remove(encodingName))) {
+  if ((old = (GString *)tqunicodeMaps->remove(encodingName))) {
     delete old;
   }
-  unicodeMaps->add(encodingName->copy(), name->copy());
+  tqunicodeMaps->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(unicodeMaps, GString);
+  deleteGHash(tqunicodeMaps, GString);
   deleteGList(toUnicodeDirs, GString);
   deleteGHash(displayFonts, DisplayFontParam);
   deleteGHash(displayCIDFonts, DisplayFontParam);
@@ -793,7 +793,7 @@ GlobalParams::~GlobalParams() {
   delete cMapDirs;
 
   delete cidToUnicodeCache;
-  delete unicodeMapCache;
+  delete tqunicodeMapCache;
   delete cMapCache;
 }
 
@@ -825,7 +825,7 @@ UnicodeMap *GlobalParams::getResidentUnicodeMap(const GString *encodingName) {
 FILE *GlobalParams::getUnicodeMapFile(const GString *encodingName) {
   GString *fileName;
 
-  if (!(fileName = (GString *)unicodeMaps->lookup(encodingName))) {
+  if (!(fileName = (GString *)tqunicodeMaps->lookup(encodingName))) {
     return NULL;
   }
   return fopen(fileName->getCString(), "r");
@@ -959,7 +959,7 @@ UnicodeMap *GlobalParams::getUnicodeMap(GString *encodingName) {
     map->incRefCnt();
     return map;
   }
-  return unicodeMapCache->getUnicodeMap(encodingName);
+  return tqunicodeMapCache->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 86114a15..1f3e4c53 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 *unicodeMaps;		// files for mappings from Unicode to char
+  GHash *tqunicodeMaps;		// 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 (unicodeMap) to use for text
+  GString *textEncoding;	// encoding (tqunicodeMap) 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 *unicodeMapCache;
+  UnicodeMapCache *tqunicodeMapCache;
   CMapCache *cMapCache;
 };
 
diff --git a/filters/kword/pdf/xpdf/xpdf/TTFont.cc b/filters/kword/pdf/xpdf/xpdf/TTFont.cc
index 6107fd43..6077f3c0 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 unicodeCmap, macRomanCmap, msSymbolCmap;
+  TT_UShort tqunicodeCmap, 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).
-  unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
+  tqunicodeCmap = 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) {
-	unicodeCmap = i;
+	tqunicodeCmap = 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 (unicodeCmap != 0xffff) {
-      i = unicodeCmap;
+    if (tqunicodeCmap != 0xffff) {
+      i = tqunicodeCmap;
       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 fe1185d7..d197e5cf 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 unicodeMap file for the '%s' encoding",
+    error(-1, "Couldn't find tqunicodeMap 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 unicodeMap file for the '%s' encoding",
+	error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
 	      line, encodingNameA->getCString());
       }
     } else {
-      error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding",
+      error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
 	    line, encodingNameA->getCString());
     }
     ++line;
@@ -110,8 +110,8 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
 
 UnicodeMap::UnicodeMap(GString *encodingNameA) {
   encodingName = encodingNameA;
-  unicodeOut = gFalse;
-  kind = unicodeMapUser;
+  tqunicodeOut = gFalse;
+  kind = tqunicodeMapUser;
   ranges = NULL;
   len = 0;
   eMaps = NULL;
@@ -119,11 +119,11 @@ UnicodeMap::UnicodeMap(GString *encodingNameA) {
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 		       UnicodeMapRange *rangesA, int lenA) {
   encodingName = new GString(encodingNameA);
-  unicodeOut = unicodeOutA;
-  kind = unicodeMapResident;
+  tqunicodeOut = tqunicodeOutA;
+  kind = tqunicodeMapResident;
   ranges = rangesA;
   len = lenA;
   eMaps = NULL;
@@ -131,11 +131,11 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 		       UnicodeMapFunc funcA) {
   encodingName = new GString(encodingNameA);
-  unicodeOut = unicodeOutA;
-  kind = unicodeMapFunc;
+  tqunicodeOut = tqunicodeOutA;
+  kind = tqunicodeMapFunc;
   func = funcA;
   eMaps = NULL;
   eMapsLen = 0;
@@ -144,7 +144,7 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 
 UnicodeMap::~UnicodeMap() {
   delete encodingName;
-  if (kind == unicodeMapUser && ranges) {
+  if (kind == tqunicodeMapUser && 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 == unicodeMapFunc) {
+  if (kind == tqunicodeMapFunc) {
     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 < unicodeMapCacheSize; ++i) {
+  for (i = 0; i < tqunicodeMapCacheSize; ++i) {
     cache[i] = NULL;
   }
 }
@@ -227,7 +227,7 @@ UnicodeMapCache::UnicodeMapCache() {
 UnicodeMapCache::~UnicodeMapCache() {
   int i;
 
-  for (i = 0; i < unicodeMapCacheSize; ++i) {
+  for (i = 0; i < tqunicodeMapCacheSize; ++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 < unicodeMapCacheSize; ++i) {
+  for (i = 1; i < tqunicodeMapCacheSize; ++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[unicodeMapCacheSize - 1]) {
-      cache[unicodeMapCacheSize - 1]->decRefCnt();
+    if (cache[tqunicodeMapCacheSize - 1]) {
+      cache[tqunicodeMapCacheSize - 1]->decRefCnt();
     }
-    for (j = unicodeMapCacheSize - 1; j >= 1; --j) {
+    for (j = tqunicodeMapCacheSize - 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 189f3154..35506aab 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 {
-  unicodeMapUser,		// read from a file
-  unicodeMapResident,		// static list of ranges
-  unicodeMapFunc		// function pointer
+  tqunicodeMapUser,		// read from a file
+  tqunicodeMapResident,		// static list of ranges
+  tqunicodeMapFunc		// 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 unicodeOutA,
+  UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 	     UnicodeMapRange *rangesA, int lenA);
 
   // Create a resident UnicodeMap that uses a function instead of a
   // list of ranges.
-  UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+  UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 	     UnicodeMapFunc funcA);
 
   ~UnicodeMap();
@@ -64,7 +64,7 @@ public:
 
   GString *getEncodingName() { return encodingName; }
 
-  GBool isUnicode() { return unicodeOut; }
+  GBool isUnicode() { return tqunicodeOut; }
 
   // Return true if this UnicodeMap matches the specified
   // <encodingNameA>.
@@ -82,7 +82,7 @@ private:
 
   GString *encodingName;
   UnicodeMapKind kind;
-  GBool unicodeOut;
+  GBool tqunicodeOut;
   union {
     UnicodeMapRange *ranges;	// (user, resident)
     UnicodeMapFunc func;	// (func)
@@ -95,7 +95,7 @@ private:
 
 //------------------------------------------------------------------------
 
-#define unicodeMapCacheSize 4
+#define tqunicodeMapCacheSize 4
 
 class UnicodeMapCache {
 public:
@@ -110,7 +110,7 @@ public:
 
 private:
 
-  UnicodeMap *cache[unicodeMapCacheSize];
+  UnicodeMap *cache[tqunicodeMapCacheSize];
 };
 
 #endif
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
index e456310b..d0bda665 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
@@ -54,8 +54,8 @@ static XrmOptionDescRec xOpts[] = {
   {"-fg",            "*Foreground",      XrmoptionSepArg,  NULL},
   {"-background",    "*Background",      XrmoptionSepArg,  NULL},
   {"-bg",            "*Background",      XrmoptionSepArg,  NULL},
-  {"-geometry",      ".geometry",        XrmoptionSepArg,  NULL},
-  {"-g",             ".geometry",        XrmoptionSepArg,  NULL},
+  {"-tqgeometry",      ".tqgeometry",        XrmoptionSepArg,  NULL},
+  {"-g",             ".tqgeometry",        XrmoptionSepArg,  NULL},
   {"-font",          "*.fontList",       XrmoptionSepArg,  NULL},
   {"-fn",            "*.fontList",       XrmoptionSepArg,  NULL},
   {"-title",         ".title",           XrmoptionSepArg,  NULL},
@@ -69,7 +69,7 @@ static XrmOptionDescRec xOpts[] = {
 #define nXOpts (sizeof(xOpts) / sizeof(XrmOptionDescRec))
 
 struct XPDFAppResources {
-  String geometry;
+  String tqgeometry;
   String title;
   Bool installCmap;
   int rgbCubeSize;
@@ -85,7 +85,7 @@ static Bool defReverseVideo = False;
 static Bool defViKeys = False;
 
 static XtResource xResources[] = {
-  { "geometry",     "Geometry",     XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, geometry),     XtRString, (XtPointer)NULL             },
+  { "geometry",     "Geometry",     XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, tqgeometry),     XtRString, (XtPointer)NULL             },
   { "title",        "Title",        XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, title),        XtRString, (XtPointer)NULL             },
   { "installCmap",  "InstallCmap",  XtRBool,   sizeof(Bool),   XtOffsetOf(XPDFAppResources, installCmap),  XtRBool,   (XtPointer)&defInstallCmap  },
   { "rgbCubeSize",  "RgbCubeSize",  XtRInt,    sizeof(int),    XtOffsetOf(XPDFAppResources, rgbCubeSize),  XtRInt,    (XtPointer)&defRGBCubeSize  },
@@ -156,7 +156,7 @@ void XPDFApp::getResources() {
   
   XtGetApplicationResources(appShell, &resources, xResources, nXResources,
 			    NULL, 0);
-  geometry = resources.geometry ? new GString(resources.geometry)
+  tqgeometry = resources.tqgeometry ? new GString(resources.tqgeometry)
                                 : (GString *)NULL;
   title = resources.title ? new GString(resources.title) : (GString *)NULL;
   installCmap = (GBool)resources.installCmap;
@@ -180,8 +180,8 @@ void XPDFApp::getResources() {
 
 XPDFApp::~XPDFApp() {
   deleteGList(viewers, XPDFViewer);
-  if (geometry) {
-    delete geometry;
+  if (tqgeometry) {
+    delete tqgeometry;
   }
   if (title) {
     delete title;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
index 4875456e..46aa28dc 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
@@ -58,7 +58,7 @@ public:
   void remoteQuit();
 
   //----- resource/option values
-  GString *getGeometry() { return geometry; }
+  GString *getGeometry() { return tqgeometry; }
   GString *getTitle() { return title; }
   GBool getInstallCmap() { return installCmap; }
   int getRGBCubeSize() { return rgbCubeSize; }
@@ -90,7 +90,7 @@ private:
   Widget remoteWin;
 
   //----- resource/option values
-  GString *geometry;
+  GString *tqgeometry;
   GString *title;
   GBool installCmap;
   int rgbCubeSize;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
index 8f5baeb5..290861b9 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
@@ -16,7 +16,7 @@
 
 struct _XPDFTreeEntry {
   Widget widget;
-  XPDFTreeEntry *children;
+  XPDFTreeEntry *tqchildren;
   XPDFTreeEntry *next;
 };
 
@@ -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 layout(Widget widget, Widget instigator);
+static void tqlayout(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 needRelayout(Widget oldWidget, Widget newWidget);
+static Boolean needRetqlayout(Widget oldWidget, Widget newWidget);
 static void click(Widget widget, XEvent *event,
 		  String *params, Cardinal *numParams);
 static Boolean findPosition(XPDFTreeWidget w, int x, int y,
@@ -158,7 +158,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
     XtVersion,					// version
     NULL,					// callback_private
     defaultTranslations,			// tm_table
-    &queryGeometry,				// query_geometry
+    &queryGeometry,				// query_tqgeometry
     NULL,					// display_accelerator
     NULL					// extension
   },
@@ -195,9 +195,9 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
   { // XPDFTree
     &createGC,					// createGC
     &destroyGC,					// destroyGC
-    &layout,					// layout
+    &tqlayout,					// tqlayout
     &calcSize,					// calcSize
-    &needRelayout,				// needRelayout
+    &needRetqlayout,				// needRetqlayout
     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.layout == XPDFInheritLayout) {
-    wc->treeClass.layout = sc->treeClass.layout;
+  if (wc->treeClass.tqlayout == XPDFInheritLayout) {
+    wc->treeClass.tqlayout = sc->treeClass.tqlayout;
   }
   if (wc->treeClass.calcSize == XPDFInheritCalcSize) {
     wc->treeClass.calcSize = sc->treeClass.calcSize;
   }
-  if (wc->treeClass.needRelayout == XPDFInheritNeedRelayout) {
-    wc->treeClass.needRelayout = sc->treeClass.needRelayout;
+  if (wc->treeClass.needRetqlayout == XPDFInheritNeedRetqlayout) {
+    wc->treeClass.needRetqlayout = sc->treeClass.needRetqlayout;
   }
 }
 
@@ -259,8 +259,8 @@ static void destroy(Widget widget) {
 }
 
 static void destroySubtree(XPDFTreeEntry *e) {
-  if (e->children) {
-    destroySubtree(e->children);
+  if (e->tqchildren) {
+    destroySubtree(e->tqchildren);
   }
   if (e->next) {
     destroySubtree(e->next);
@@ -270,10 +270,10 @@ static void destroySubtree(XPDFTreeEntry *e) {
 static void resize(Widget widget) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(widget);
 
-  if (cls->treeClass.layout) {
-    (*cls->treeClass.layout)(widget, NULL);
+  if (cls->treeClass.tqlayout) {
+    (*cls->treeClass.tqlayout)(widget, NULL);
   } else {
-    layout(widget, NULL);
+    tqlayout(widget, NULL);
   }
 }
 
@@ -301,11 +301,11 @@ static void redisplaySubtree(XPDFTreeWidget w, XPDFTreeEntry *e,
   c = XPDFTreeCPart(e->widget);
   x = e->widget->core.x;
   y = e->widget->core.y + e->widget->core.height / 2;
-  if (e->children) {
+  if (e->tqchildren) {
     if (c->entryExpanded) {
       drawExpandedIcon(w, x - 8, y);
       y2 = y; // make gcc happy
-      for (child = e->children; child; child = child->next) {
+      for (child = e->tqchildren; child; child = child->next) {
 	y2 = child->widget->core.y + child->widget->core.height / 2;
 	XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w), w->tree.dottedGC,
 		  x - 8, y2, x + 6, y2);
@@ -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 relayout, redisp;
+  Boolean retqlayout, redisp;
 
-  // check to see if layout-affecting resources have changed
-  if (cls->treeClass.needRelayout) {
-    relayout = (*cls->treeClass.needRelayout)((Widget)ow, (Widget)nw);
+  // check to see if tqlayout-affecting resources have changed
+  if (cls->treeClass.needRetqlayout) {
+    retqlayout = (*cls->treeClass.needRetqlayout)((Widget)ow, (Widget)nw);
   } else {
-    relayout = needRelayout((Widget)ow, (Widget)nw);
+    retqlayout = needRetqlayout((Widget)ow, (Widget)nw);
   }
   redisp = False;
-  if (relayout) {
+  if (retqlayout) {
 
     // 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, layout manually
+    // if resources have changed but size hasn't, tqlayout manually
     // (because Xt just looks at the size)
     if (nw->core.width == ow->core.width &&
 	nw->core.height == ow->core.height) {
-      if (cls->treeClass.layout) {
-	(*cls->treeClass.layout)((Widget)nw, NULL);
+      if (cls->treeClass.tqlayout) {
+	(*cls->treeClass.tqlayout)((Widget)nw, NULL);
       } else {
-	layout((Widget)nw, NULL);
+	tqlayout((Widget)nw, NULL);
       }
       redisp = True;
     }
@@ -393,13 +393,13 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget,
 			    XtWidgetGeometry *reply) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget);
 
-  // our parent rejected a geometry request, so accept the compromise
-  // and relayout
+  // our parent rejected a tqgeometry request, so accept the compromise
+  // and retqlayout
   if (!reply->request_mode) {
-    if (cls->treeClass.layout) {
-      (*cls->treeClass.layout)(newWidget, NULL);
+    if (cls->treeClass.tqlayout) {
+      (*cls->treeClass.tqlayout)(newWidget, NULL);
     } else {
-      layout(newWidget, NULL);
+      tqlayout(newWidget, NULL);
     }
   }
   *request = *reply;
@@ -454,7 +454,7 @@ static XtGeometryResult geometryManager(Widget widget,
     return XtGeometryNo;
   }
 
-  // save the current geometry
+  // save the current tqgeometry
   curWidth = w->core.width;
   curHeight = w->core.height;
   curBW = w->core.border_width;
@@ -480,7 +480,7 @@ static XtGeometryResult geometryManager(Widget widget,
     calcSize((Widget)w, widget, &parentReq.width, &reply->height);
   }
 
-  // send geometry request to our parent
+  // send tqgeometry request to our parent
   parentReq.request_mode = CWWidth | CWHeight;
   if (request->request_mode & XtCWQueryOnly) {
     parentReq.request_mode |= XtCWQueryOnly;
@@ -491,15 +491,15 @@ static XtGeometryResult geometryManager(Widget widget,
   }
 
   if (result == XtGeometryNo || (request->request_mode & XtCWQueryOnly)) {
-    // restore the original geometry
+    // restore the original tqgeometry
     w->core.width = curWidth;
     w->core.height = curHeight;
     w->core.border_width = curBW;
   } else {
-    if (cls->treeClass.layout) {
-      (*cls->treeClass.layout)((Widget)w, widget);
+    if (cls->treeClass.tqlayout) {
+      (*cls->treeClass.tqlayout)((Widget)w, widget);
     } else {
-      layout((Widget)w, widget);
+      tqlayout((Widget)w, widget);
     }
   }
 
@@ -529,11 +529,11 @@ static void changeManaged(Widget widget) {
   while (XtMakeResizeRequest(widget, width, height, &width, &height)
 	 == XtGeometryAlmost) ;
 
-  // relayout
-  if (cls->treeClass.layout) {
-    (*cls->treeClass.layout)(widget, NULL);
+  // retqlayout
+  if (cls->treeClass.tqlayout) {
+    (*cls->treeClass.tqlayout)(widget, NULL);
   } else {
-    layout(widget, NULL);
+    tqlayout(widget, NULL);
   }
 
 #if XmVERSION > 1
@@ -552,10 +552,10 @@ static void initConstraint(Widget requestWidget, Widget newWidget,
   c = XPDFTreeCPart(newWidget);
   c->e = (XPDFTreeEntry *)gmalloc(sizeof(XPDFTreeEntry));
   c->e->widget = newWidget;
-  c->e->children = NULL;
+  c->e->tqchildren = NULL;
   c->e->next = NULL;
   if (c->entryParent) {
-    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
+    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
   } else {
     insertChildOnList(c->e, &w->tree.root);
   }
@@ -573,11 +573,11 @@ static void deleteSubtree(Widget widget) {
   if (!c->e) {
     return;
   }
-  while (c->e->children) {
-    deleteSubtree(c->e->children->widget);
+  while (c->e->tqchildren) {
+    deleteSubtree(c->e->tqchildren->widget);
   }
   if (c->entryParent) {
-    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
+    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
   } else {
     deleteChildFromList(c->e, &w->tree.root);
   }
@@ -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 relayout;
+  Boolean retqlayout;
   Dimension width, height;
 
   if (!XtIsManaged(newWidget)) {
@@ -599,25 +599,25 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
   }
   oc = XPDFTreeCPart(oldWidget);
   nc = XPDFTreeCPart(newWidget);
-  relayout = False;
+  retqlayout = False;
   if (nc->entryParent != oc->entryParent ||
       nc->entryPosition != oc->entryPosition) {
     if (oc->entryParent) {
-      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->children);
+      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->tqchildren);
     } else {
       deleteChildFromList(oc->e, &w->tree.root);
     }
     if (nc->entryParent) {
-      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->children);
+      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->tqchildren);
     } else {
       insertChildOnList(nc->e, &w->tree.root);
     }
-    relayout = True;
+    retqlayout = True;
   } else if (nc->entryExpanded != oc->entryExpanded) {
-    relayout = True;
+    retqlayout = True;
   }
 
-  if (relayout) {
+  if (retqlayout) {
 
     // 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) ;
 
-    // relayout the widget
-    if (cls->treeClass.layout) {
-      (*cls->treeClass.layout)((Widget)w, NULL);
+    // retqlayout the widget
+    if (cls->treeClass.tqlayout) {
+      (*cls->treeClass.tqlayout)((Widget)w, NULL);
     } else {
-      layout((Widget)w, NULL);
+      tqlayout((Widget)w, NULL);
     }
   }
 
-  return relayout;
+  return retqlayout;
 }
 
 static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead) {
@@ -701,7 +701,7 @@ static void destroyGC(Widget widget) {
   XtReleaseGC(widget, w->tree.dottedGC);
 }
 
-static void layout(Widget widget, Widget instigator) {
+static void tqlayout(Widget widget, Widget instigator) {
   XPDFTreeWidget w = (XPDFTreeWidget)widget;
   XPDFTreeEntry *e;
   Position x, y;
@@ -745,9 +745,9 @@ static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
     }
   }
 
-  // place this entry's children
+  // place this entry's tqchildren
   x += xpdfTreeIndent;
-  for (child = e->children; child; child = child->next) {
+  for (child = e->tqchildren; child; child = child->next) {
     y = layoutSubtree(w, instigator, child, x, y,
 		      visible && (!c || c->entryExpanded));
   }
@@ -820,9 +820,9 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
     h1 = 0;
   }
 
-  // if this entry is expanded, get size of all of its children
+  // if this entry is expanded, get size of all of its tqchildren
   if (c->entryExpanded) {
-    for (child = e->children; child; child = child->next) {
+    for (child = e->tqchildren; child; child = child->next) {
       calcSubtreeSize(w, instigator, child, &w2, &h2);
       w2 += xpdfTreeIndent;
       if (w2 > w1) {
@@ -836,7 +836,7 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
   *height = h1;
 }
 
-static Boolean needRelayout(Widget oldWidget, Widget newWidget) {
+static Boolean needRetqlayout(Widget oldWidget, Widget newWidget) {
   XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget;
   XPDFTreeWidget nw = (XPDFTreeWidget)newWidget;
 
@@ -907,13 +907,13 @@ static Boolean findPositionInSubtree(XPDFTreeWidget w, int x, int y,
     return True;
   } else if (x >= child->core.x - 16 && x < child->core.x - 4 &&
 	     y >= y1 - 6 && y < y1 + 6 &&
-	     (*e)->children) {
+	     (*e)->tqchildren) {
     *onExpandIcon = True;
     return True;
   }
   c = XPDFTreeCPart(child);
   if (!c || c->entryExpanded) {
-    for (e2 = (*e)->children; e2; e2 = e2->next) {
+    for (e2 = (*e)->tqchildren; e2; e2 = e2->next) {
       *e = e2;
       if (findPositionInSubtree(w, x, y, e, onExpandIcon)) {
 	return True;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
index 16ab137a..9f31f9e2 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 XPDFInheritNeedRelayout ((XPDFNeedRelayoutProc)_XtInherit)
+#define XPDFInheritNeedRetqlayout ((XPDFNeedRelayoutProc)_XtInherit)
 
 typedef struct {
   XtWidgetProc createGC;
   XtWidgetProc destroyGC;
-  XPDFLayoutProc layout;
+  XPDFLayoutProc tqlayout;
   XPDFCalcSizeProc calcSize;
-  XPDFNeedRelayoutProc needRelayout;
+  XPDFNeedRelayoutProc needRetqlayout;
   XtPointer extension;
 } XPDFTreeClassPart;
 
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index a8c8f8f0..de691914 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
@@ -501,9 +501,9 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING); ++n;
   if (app->getFullScreen()) {
     XtSetArg(args[n], XmNmwmDecorations, 0); ++n;
-    XtSetArg(args[n], XmNgeometry, "+0+0"); ++n;
+    XtSetArg(args[n], XmNtqgeometry, "+0+0"); ++n;
   } else if (app->getGeometry()) {
-    XtSetArg(args[n], XmNgeometry, app->getGeometry()->getCString()); ++n;
+    XtSetArg(args[n], XmNtqgeometry, app->getGeometry()->getCString()); ++n;
   }
   win = XtCreatePopupShell("win", topLevelShellWidgetClass,
 			   app->getAppShell(), args, n);
@@ -633,7 +633,7 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n;
   s = XmStringCreateLocalized(" of 00000");
   XtSetArg(args[n], XmNlabelString, s); ++n;
-  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
   XtSetArg(args[n], XmNrecomputeSize, False); ++n;
   pageCountLabel = XmCreateLabel(toolBar, "pageCountLabel", args, n);
   XmStringFree(s);
@@ -751,7 +751,7 @@ void XPDFViewer::initWindow() {
   s = XmStringCreateLocalized("");
   XtSetArg(args[n], XmNlabelString, s); ++n;
   XtSetArg(args[n], XmNrecomputeSize, True); ++n;
-  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
   linkLabel = XmCreateLabel(toolBar, "linkLabel", args, n);
   XmStringFree(s);
   XtManageChild(linkLabel);
diff --git a/filters/kword/pdf/xpdf/xpdf/xpdf.cc b/filters/kword/pdf/xpdf/xpdf/xpdf.cc
index ef47fb6e..d4103df2 100644
--- a/filters/kword/pdf/xpdf/xpdf/xpdf.cc
+++ b/filters/kword/pdf/xpdf/xpdf/xpdf.cc
@@ -44,9 +44,9 @@ static GBool printHelp = gFalse;
 
 static ArgDesc argDesc[] = {
   {"-g",          argStringDummy, NULL,           0,
-   "initial window geometry"},
-  {"-geometry",   argStringDummy, NULL,           0,
-   "initial window geometry"},
+   "initial window tqgeometry"},
+  {"-tqgeometry",   argStringDummy, NULL,           0,
+   "initial window tqgeometry"},
   {"-title",      argStringDummy, NULL,           0,
    "window title"},
   {"-cmap",       argFlagDummy,   NULL,           0,
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 8d160b57..2fa566fa 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -21,7 +21,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqfontinfo.h>
@@ -174,7 +174,7 @@ TQString RTFWorker::makeTable(const FrameAnchor& anchor)
         for (it=paraList->begin();it!=end;++it)
         {
             rowText += endOfParagraph;
-            rowText += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList);
+            rowText += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
             rowText += m_eol;
             endOfParagraph = "\\par"; // The problem is that the last paragraph ends with \cell not with \par
         }
@@ -264,7 +264,7 @@ TQString RTFWorker::makeImage(const FrameAnchor& anchor)
 
             // throw away WMF metaheader (22 bytes)
             for( uint i=0; i<image.size()-22; i++)
-                image.at(i) = image.at(i+22); // As we use uint, we need at()  ( [] uses int only .)
+                image.tqat(i) = image.tqat(i+22); // As we use uint, we need at()  ( [] uses int only .)
             image.resize( image.size()-22 );
         }
     }
@@ -362,7 +362,7 @@ TQString RTFWorker::formatTextParagraph(const TQString& strText,
 }
 
 TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
-    const LayoutData& layout, const ValueListFormatData &paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList)
 {
     TQString str;
     TQString content;
@@ -374,40 +374,40 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         markup += "\\intbl";
 
 //lists
-    if (layout.counter.style)
+    if (tqlayout.counter.style)
         {
         markup += "{\\pntext\\pard\\plain";
-        if( layout.formatData.text.fontSize >= 0)
+        if( tqlayout.formatData.text.fontSize >= 0)
         {
                 markup += "\\fs";
-                markup += TQString::number((2 * layout.formatData.text.fontSize));
-                markup += lookupFont("\\f",layout.formatData.text.fontName);
+                markup += TQString::number((2 * tqlayout.formatData.text.fontSize));
+                markup += lookupFont("\\f",tqlayout.formatData.text.fontName);
         }
         markup += " ";
-        markup += layout.counter.text;
+        markup += tqlayout.counter.text;
         markup += "\\tab}{\\*\\pn";
-        if (layout.counter.style > 5)
+        if (tqlayout.counter.style > 5)
         {
         markup += "\\pnlvlblt ";
         markup += "{\\pntxtb ";
-        if (!layout.counter.lefttext.isEmpty() && layout.counter.lefttext != "{" && layout.counter.lefttext != "}")
+        if (!tqlayout.counter.lefttext.isEmpty() && tqlayout.counter.lefttext != "{" && tqlayout.counter.lefttext != "}")
         {
-                markup += layout.counter.lefttext;
+                markup += tqlayout.counter.lefttext;
         }
-        switch (layout.counter.style)
+        switch (tqlayout.counter.style)
         {
         case 6:
         {
                 //custom bullets (one char)
                 //TODO: use correct character/sign for bullet
 
-            markup += layout.counter.customCharacter;
+            markup += tqlayout.counter.customCharacter;
             break;
         }
         case 7:
         {
                 //custom bullets (complex)
-            markup += layout.counter.text;
+            markup += tqlayout.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 += layout.counter.text;
+            markup += tqlayout.counter.text;
             break;
         }
         default:
@@ -445,23 +445,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
         else
         {
-            if (layout.counter.numbering!=0)
+            if (tqlayout.counter.numbering!=0)
 		{
         	    markup += "\\pnlvl";
-        	    markup += TQString::number(layout.counter.depth + 1);
+        	    markup += TQString::number(tqlayout.counter.depth + 1);
         	    markup += "\\pnprev1";
 		}
-        else if (layout.counter.style==1)
+        else if (tqlayout.counter.style==1)
         {
         markup += "\\pnlvlbody";
         }
         else
         {
         markup += "\\pnlvl";
-        markup += TQString::number(11 - layout.counter.style);
+        markup += TQString::number(11 - tqlayout.counter.style);
         }
 
-        switch (layout.counter.style)
+        switch (tqlayout.counter.style)
         {
         case 1:
         {
@@ -492,18 +492,18 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         markup += "\\pndec";
         }
         markup += "{\\pntxtb ";
-        markup += layout.counter.lefttext;
+        markup += tqlayout.counter.lefttext;
         markup += " }";
     }
         markup += "{\\pntxta ";
-        markup += layout.counter.righttext;
+        markup += tqlayout.counter.righttext;
         markup += " }";
 
         // ### FIXME: that is too late! And why at every list paragraph? (See bug #88241)
-        if (layout.counter.start!=0)
+        if (tqlayout.counter.start!=0)
         {
         markup += "\\pnstart";
-        markup += TQString::number(layout.counter.start);
+        markup += TQString::number(tqlayout.counter.start);
         }
         else
         {
@@ -511,15 +511,15 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
         markup += "\\pnindent0\\pnhang";
 
-        if( layout.formatData.text.fontSize > 0 )
+        if( tqlayout.formatData.text.fontSize > 0 )
         {
         markup += "\\pnfs";
-        markup += TQString::number((2 * layout.formatData.text.fontSize));
+        markup += TQString::number((2 * tqlayout.formatData.text.fontSize));
         }
 
-        if( !layout.formatData.text.fontName.isEmpty() )
+        if( !tqlayout.formatData.text.fontName.isEmpty() )
         {
-            markup += lookupFont("\\pnf", layout.formatData.text.fontName);
+            markup += lookupFont("\\pnf", tqlayout.formatData.text.fontName);
         }
 
         markup += "}";
@@ -527,20 +527,20 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 
 
     LayoutData styleLayout;
-    markup += lookupStyle(layout.styleName, styleLayout);
-    markup += layoutToRtf(styleLayout,layout,true);
+    markup += lookupStyle(tqlayout.styleName, styleLayout);
+    markup += layoutToRtf(styleLayout,tqlayout,true);
 
-    if ( 1==layout.formatData.text.verticalAlignment )
+    if ( 1==tqlayout.formatData.text.verticalAlignment )
     {
         markup += "\\sub"; //Subscript
     }
-    else if ( 2==layout.formatData.text.verticalAlignment )
+    else if ( 2==tqlayout.formatData.text.verticalAlignment )
     {
         markup += "\\super"; //Superscript
     }
 
 
-    if (layout.pageBreakBefore)
+    if (tqlayout.pageBreakBefore)
         content += "\\page ";
 
 
@@ -554,7 +554,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 
         TQString partialText;
 
-        FormatData formatRef = layout.formatData;
+        FormatData formatRef = tqlayout.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).layout,(*it).formattingList);
+                            fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList);
                         m_prefix = prefixSaved;
                         content += "{\\super ";
                         content += automatic ? "\\chftn " : value;
@@ -779,7 +779,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
     }
 
-    if (layout.pageBreakAfter)
+    if (tqlayout.pageBreakAfter)
         content += "\\page";
 
     if (!content.isEmpty())
@@ -807,10 +807,10 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 }
 
 bool RTFWorker::doFullParagraph(const TQString& paraText,
-    const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30515) << "Entering RTFWorker::doFullParagraph" << endl << paraText << endl;
-    TQString par = ProcessParagraphData( paraText, layout, paraFormatDataList);
+    TQString par = ProcessParagraphData( paraText, tqlayout, 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).layout,(*it).formattingList);
+        content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*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).layout,(*it).formattingList);
+        content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
 
     if (content!="\\par\\pard\\plain")
     {
@@ -967,10 +967,10 @@ void RTFWorker::writeFontData(void)
         }
 #else
         else
-        // TQFontInfo:styleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out.
+        // TQFontInfo:tqstyleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out.
         {
             TQFontInfo info(*it);
-            switch (info.styleHint())
+            switch (info.tqstyleHint())
             {
             case TQFont::SansSerif:
             default:
@@ -1182,7 +1182,7 @@ TQString RTFWorker::closeSpan(const FormatData& , const FormatData& )
     return result;
 }
 
-// The following function encodes the kword unicode characters into
+// The following function encodes the kword tqunicode 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 unicode char from the string
-        const ushort ch = TQCh.unicode();  // take unicode value of the char
+        TQChar TQCh ( text.at( i ) );  // get out one tqunicode char from the string
+        const ushort ch = TQCh.tqunicode();  // take tqunicode 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 unicode with a replacement character.
+            // encode this as decimal tqunicode 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& layout)
+bool RTFWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register the new style in the style list
-    m_styleList << layout;
+    m_styleList << tqlayout;
 
     // Now we must register a few things (with help of the lookup methods.)
-    lookupFont("\\f", layout.formatData.text.fontName);
-    lookupColor(TQString(), layout.formatData.text.fgColor);
-    lookupColor(TQString(), layout.formatData.text.bgColor);
+    lookupFont("\\f", tqlayout.formatData.text.fontName);
+    lookupColor(TQString(), tqlayout.formatData.text.fgColor);
+    lookupColor(TQString(), tqlayout.formatData.text.bgColor);
 
     return true;
 }
@@ -1459,121 +1459,121 @@ TQString RTFWorker::textFormatToRtf(const TextFormatting& formatOrigin,
 }
 
 TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
-    const LayoutData& layout, const bool force)
+    const LayoutData& tqlayout, const bool force)
 {
     TQString strLayout;
 
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
-        if (layout.alignment=="left")
+        if (tqlayout.tqalignment=="left")
             strLayout += "\\ql";
-        else if (layout.alignment== "right")
+        else if (tqlayout.tqalignment== "right")
             strLayout += "\\qr";
-        else if (layout.alignment=="center")
+        else if (tqlayout.tqalignment=="center")
             strLayout += "\\qc";
-        else if (layout.alignment=="justify")
+        else if (tqlayout.tqalignment=="justify")
             strLayout += "\\qj";
-        else if ( layout.alignment=="auto")
+        else if ( tqlayout.tqalignment=="auto")
         {
             // ### TODO: what for BIDI?
             //strLayout += "\\ql";
         }
         else
         {
-            kdWarning(30515) << "Unknown alignment: " << layout.alignment << endl;
+            kdWarning(30515) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
        strLayout += "\\li";
-       strLayout += TQString::number(int(layout.indentLeft)*20, 10);
+       strLayout += TQString::number(int(tqlayout.indentLeft)*20, 10);
     }
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
        strLayout += "\\ri";
-       strLayout += TQString::number(int(layout.indentRight)*20, 10);
+       strLayout += TQString::number(int(tqlayout.indentRight)*20, 10);
     }
 
-    if (force || (layoutOrigin.indentFirst!=layout.indentFirst))
+    if (force || (layoutOrigin.indentFirst!=tqlayout.indentFirst))
     {
        strLayout += "\\fi";
-       strLayout += TQString::number(int(layout.indentFirst)*20, 10);
+       strLayout += TQString::number(int(tqlayout.indentFirst)*20, 10);
     }
 
-    if ((layout.marginBottom>=0.0)
-        && (force || (layoutOrigin.marginBottom!=layout.marginBottom)))
+    if ((tqlayout.marginBottom>=0.0)
+        && (force || (layoutOrigin.marginBottom!=tqlayout.marginBottom)))
     {
        strLayout += "\\sa";
-       strLayout += TQString::number(int(layout.marginBottom)*20 ,10);
+       strLayout += TQString::number(int(tqlayout.marginBottom)*20 ,10);
     }
 
-    if ((layout.marginTop>=0.0)
-        && (force || (layoutOrigin.marginTop!=layout.marginTop)))
+    if ((tqlayout.marginTop>=0.0)
+        && (force || (layoutOrigin.marginTop!=tqlayout.marginTop)))
     {
        strLayout += "\\sb";
-       strLayout += TQString::number(int(layout.marginTop)*20, 10);
+       strLayout += TQString::number(int(tqlayout.marginTop)*20, 10);
     }
 
-    if (force || (layoutOrigin.keepLinesTogether!=layout.keepLinesTogether))
+    if (force || (layoutOrigin.keepLinesTogether!=tqlayout.keepLinesTogether))
     {
-       if(layout.keepLinesTogether) strLayout += "\\keep";
+       if(tqlayout.keepLinesTogether) strLayout += "\\keep";
     }
 
-    // Note: there seems to be too many problems of using a page break in a layout
+    // Note: there seems to be too many problems of using a page break in a tqlayout
     // - 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!=layout.pageBreakBefore))
+    if (force || (layoutOrigin.pageBreakBefore!=tqlayout.pageBreakBefore))
     {
-       if(layout.pageBreakBefore) strLayout += "\\pagebb";
+       if(tqlayout.pageBreakBefore) strLayout += "\\pagebb";
     }
 
     // Note: RTF doesn't specify "page break after"
     // \*\pgbrk0 is used after OpenOffice.org Writer
-    if (force || (layoutOrigin.pageBreakAfter!=layout.pageBreakAfter))
+    if (force || (layoutOrigin.pageBreakAfter!=tqlayout.pageBreakAfter))
     {
-       if(layout.pageBreakAfter) strLayout += "\\*\\pgbrk0";
+       if(tqlayout.pageBreakAfter) strLayout += "\\*\\pgbrk0";
     }
 #endif
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        if ( layout.lineSpacingType==LayoutData::LS_SINGLE  )
+        if ( tqlayout.lineSpacingType==LayoutData::LS_SINGLE  )
            ;// do nothing, single linespace is default in RTF
 
-        else if ( layout.lineSpacingType==LayoutData::LS_ONEANDHALF  )
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_ONEANDHALF  )
            strLayout += "\\sl360\\slmult1"; // one-and-half linespace
 
-        else if ( layout.lineSpacingType==LayoutData::LS_DOUBLE  )
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_DOUBLE  )
            strLayout += "\\sl480\\slmult1"; // double linespace
 
-        else if ( layout.lineSpacingType==LayoutData::LS_ATLEAST  )
-           strLayout += TQString("\\sl%1\\slmult0").arg(int(layout.lineSpacing)*20);
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_ATLEAST  )
+           strLayout += TQString("\\sl%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
 
-        else if ( layout.lineSpacingType==LayoutData::LS_MULTIPLE  )
-           strLayout += TQString("\\sl%1\\slmult1").arg( int(layout.lineSpacing)*240 );
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_MULTIPLE  )
+           strLayout += TQString("\\sl%1\\slmult1").tqarg( int(tqlayout.lineSpacing)*240 );
 
-        else if ( layout.lineSpacingType==LayoutData::LS_CUSTOM )
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_CUSTOM )
            // "Custom" in KWord is like "Exactly" in MS Word
-           strLayout += TQString("\\sl-%1\\slmult0").arg(int(layout.lineSpacing)*20);
+           strLayout += TQString("\\sl-%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
 
         else
-            kdWarning(30515) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+            kdWarning(30515) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
     }
 
-    if (!layout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
+    if (!tqlayout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         TabulatorList::ConstIterator it;
-        for (it=layout.tabulatorList.begin();it!=layout.tabulatorList.end();++it)
+        for (it=tqlayout.tabulatorList.begin();it!=tqlayout.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( layout.shadowDistance > 0 )
+    if( tqlayout.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,
-        layout.formatData.text,force);
+        tqlayout.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 layout;
-    m_styleList << layout;
-    returnLayout=layout;
+    LayoutData tqlayout;
+    m_styleList << tqlayout;
+    returnLayout=tqlayout;
 
     strMarkup += TQString::number(counter);
     return strMarkup;
diff --git a/filters/kword/rtf/export/ExportFilter.h b/filters/kword/rtf/export/ExportFilter.h
index f5707680..88158efe 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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         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& layout);
+    virtual bool doFullDefineStyle(LayoutData& tqlayout);
     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& layout, const ValueListFormatData &paraFormatDataList);
+        const LayoutData& tqlayout, 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& layout, const bool force);
+        const LayoutData& tqlayout, 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/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cc
index 6f23530b..15ff976b 100644
--- a/filters/kword/rtf/export/rtfexport.cc
+++ b/filters/kword/rtf/export/rtfexport.cc
@@ -57,7 +57,7 @@ RTFExport::RTFExport(KoFilter *, const char *, const TQStringList &) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQCString& to )
 {
     if ((from != "application/x-kword") || (to != "text/rtf" && to != "application/msword" ))
     {
@@ -77,7 +77,7 @@ KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCS
         return KoFilter::StupidError;
     }
     
-    KoFilter::ConversionStatus result=leader->convert(m_chain, from,to );
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain, from,to );
 
     delete leader;
     delete worker;
diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h
index f43f6a07..060139ed 100644
--- a/filters/kword/rtf/export/rtfexport.h
+++ b/filters/kword/rtf/export/rtfexport.h
@@ -22,7 +22,7 @@
 #define RTFEXPORT_H
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -39,7 +39,7 @@ public:
     RTFExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~RTFExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // RTFEXPORT_H
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index eb8c467d..94fad697 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.layout.border, 0 ),
+	MEMBER(	0L,		"box",		setEnumProperty,	state.tqlayout.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.layout.firstIndent, 0 ),
+	MEMBER(	0L,		"fi",		setNumericProperty,	state.tqlayout.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.layout.inTable, true ),
+	MEMBER(	0L,		"intbl",	setFlagProperty,	state.tqlayout.inTable, true ),
 	PROP(	"@pict",	"jpegblip",	setPictureType,	        0L, RTFPicture::JPEG ),
-	MEMBER(	0L,		"keep",		setFlagProperty,	state.layout.keep, true ),
-	MEMBER(	0L,		"keepn",	setFlagProperty,	state.layout.keepNext, true ),
+	MEMBER(	0L,		"keep",		setFlagProperty,	state.tqlayout.keep, true ),
+	MEMBER(	0L,		"keepn",	setFlagProperty,	state.tqlayout.keepNext, true ),
 	MEMBER(	"@rtf",		"landscape",	setFlagProperty,	landscape, true ),
 	PROP(	0L,		"ldblquote",	insertSymbol,		0L, 0x201c ),
-	MEMBER(	0L,		"li",		setNumericProperty,	state.layout.leftIndent, 0 ),
+	MEMBER(	0L,		"li",		setNumericProperty,	state.tqlayout.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.layout.pageBB, true ),
+	MEMBER(	0L,		"pagebb",	setFlagProperty,	state.tqlayout.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.layout.pageBA, true ),
+	MEMBER(	0L,		"pgbrk",	setToggleProperty,	state.tqlayout.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.layout.alignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"qj",		setEnumProperty,	state.layout.alignment, RTFLayout::Justified ),
-	MEMBER(	0L,		"ql",		setEnumProperty,	state.layout.alignment, RTFLayout::Left ),
+	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Justified ),
+	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Left ),
 	PROP(	0L,		"qmspace",	insertSymbol,		0L, 0x2004 ),
-	MEMBER(	0L,		"qr",		setEnumProperty,	state.layout.alignment, RTFLayout::Right ),
+	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Right ),
 	PROP(	0L,		"rdblquote",	insertSymbol,		0L, 0x201d ),
 	MEMBER(	"@colortbl",	"red",		setNumericProperty,	red, 0 ),
-	MEMBER(	0L,		"ri",		setNumericProperty,	state.layout.rightIndent, 0 ),
+	MEMBER(	0L,		"ri",		setNumericProperty,	state.tqlayout.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.layout.style, 0 ),
-	MEMBER(	0L,		"sa",		setNumericProperty,	state.layout.spaceAfter, 0 ),
-	MEMBER(	0L,		"sb",		setNumericProperty,	state.layout.spaceBefore, 0 ),
+	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,		"scaps",		setToggleProperty,	state.format.smallCaps, 0 ),
 	PROP(	"Text",		"sect",		insertPageBreak,	0L, 0 ),
 	PROP(	0L,		"sectd",	setSectionDefaults,	0L, 0 ),
-	MEMBER(	0L,		"sl",		setNumericProperty,	state.layout.spaceBetween, 0 ),
-	MEMBER(	0L,		"slmult",	setToggleProperty,	state.layout.spaceBetweenMultiple, 0 ),
+	MEMBER(	0L,		"sl",		setNumericProperty,	state.tqlayout.spaceBetween, 0 ),
+	MEMBER(	0L,		"slmult",	setToggleProperty,	state.tqlayout.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,18 +228,18 @@ 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.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,		"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,		"trleft",	setNumericProperty,	state.tableRow.left, 0 ),
 	MEMBER(	0L,		"trowd",	setTableRowDefaults,	state.tableRow, 0 ),
-	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Left ),
-	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Right ),
+	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Left ),
+	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Right ),
 	MEMBER(	0L,		"trrh",		setNumericProperty,	state.tableRow.height, 0 ),
 	PROP(	0L,		"tx",		insertTabDef,		0L, 0 ),
 	MEMBER(	0L,		"u",		insertUnicodeSymbol,	state.format.uc, 0 ),
@@ -309,7 +309,7 @@ RTFImport::RTFImport( KoFilter *, const char *, const TQStringList& )
     fnnum=0;
 }
 
-KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQCString& to )
 {
     // This filter only supports RTF to KWord conversion
     if ((from != "text/rtf") || (to != "application/x-kword"))
@@ -384,7 +384,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
+                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -403,7 +403,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
+                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -422,7 +422,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
+                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -439,7 +439,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
         if ( !m_batch )
         {
             KMessageBox::error( 0L,
-                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").arg( token.text ),
+                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").tqarg( token.text ),
                 i18n("KWord's RTF Import Filter"), 0 );
         }
         return KoFilter::WrongFormat;
@@ -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).layout.style == (*it).next)
+		if ((*it2).tqlayout.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).layout, false );
+	    addLayout( mainDoc, (*it).name, (*it).tqlayout, false );
 	    addFormat( mainDoc, kwFormat, 0L );
 	    mainDoc.closeNode( "STYLE" );
 	}
@@ -793,7 +793,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 
     for (TQMap<TQString,int>::ConstIterator it=debugUnknownKeywords.begin();
         it!=debugUnknownKeywords.end();it++)
-        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).arg( it.data(), 4 )  << " * " << it.key() << endl;
+        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).tqarg( it.data(), 4 )  << " * " << it.key() << endl;
 
     return KoFilter::OK;
 }
@@ -911,7 +911,7 @@ void RTFImport::setEnumProperty( RTFProperty *property )
 
 void RTFImport::setFontStyleHint( RTFProperty* property )
 {
-    font.styleHint = TQFont::StyleHint( property->value );
+    font.tqstyleHint = TQFont::StyleHint( property->value );
 }
 
 void RTFImport::setPictureType( RTFProperty* property )
@@ -933,15 +933,15 @@ void RTFImport::setUnderlineProperty( RTFProperty* property )
 
 void RTFImport::setBorderStyle( RTFProperty *property )
 {
-    if (state.layout.border)
+    if (state.tqlayout.border)
     {
-        state.layout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value );
+        state.tqlayout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value );
     }
     else
     {
         for (uint i=0; i < 4; i++)
         {
-            state.layout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value );
+            state.tqlayout.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.layout.border)
+    if (state.tqlayout.border)
     {
-        state.layout.border->width = token.value;
+        state.tqlayout.border->width = token.value;
     }
     else
     {
 	for (uint i=0; i < 4; i++)
 	{
-            state.layout.borders[i].width = token.value;
+            state.tqlayout.borders[i].width = token.value;
 	}
     }
 }
 
 void RTFImport::setBorderColor( RTFProperty * )
 {
-    if (state.layout.border)
+    if (state.tqlayout.border)
     {
-        state.layout.border->color = token.value;
+        state.tqlayout.border->color = token.value;
     }
     else
     {
 	for (uint i=0; i < 4; i++)
 	{
-	    state.layout.borders[i].color = token.value;
+	    state.tqlayout.borders[i].color = token.value;
 	}
     }
 }
@@ -1008,34 +1008,34 @@ void RTFImport::setPlainFormatting( RTFProperty * )
 
 void RTFImport::setParagraphDefaults( RTFProperty * )
 {
-    RTFLayout &layout = state.layout;
+    RTFLayout &tqlayout = state.tqlayout;
 
-    layout.tablist.clear();
-    layout.tab.type	= RTFTab::Left;
-    layout.tab.leader	= RTFTab::None;
+    tqlayout.tablist.clear();
+    tqlayout.tab.type	= RTFTab::Left;
+    tqlayout.tab.leader	= RTFTab::None;
 
     for (uint i=0; i < 4; i++)
     {
-	RTFBorder &border = layout.borders[i];
+	RTFBorder &border = tqlayout.borders[i];
 	border.color = -1;
 	border.width = 0;
 	border.style = RTFBorder::None;
     }
-    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;
+    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.tqalignment	= RTFLayout::Left;
+    tqlayout.border	= 0L;
+    tqlayout.inTable	= false;
+    tqlayout.keep		= false;
+    tqlayout.keepNext	= false;
+    tqlayout.pageBB	= false;
+    tqlayout.pageBA	= false;
 }
 
 void RTFImport::setSectionDefaults( RTFProperty * )
@@ -1054,7 +1054,7 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
     tableRow.height	= 0;
     tableRow.left	= 0;
-    tableRow.alignment	= RTFLayout::Left;
+    tableRow.tqalignment	= RTFLayout::Left;
     tableRow.cells.clear();
     tableCell.bgcolor	= -1;
 
@@ -1069,17 +1069,17 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
 void RTFImport::selectLayoutBorder( RTFProperty * property )
 {
-    state.layout.border = & state.layout.borders [ property->value ];
+    state.tqlayout.border = & state.tqlayout.borders [ property->value ];
 }
 
 void RTFImport::selectLayoutBorderFromCell( RTFProperty * property )
 {
-    state.layout.border = & state.tableCell.borders [ property->value ];
+    state.tqlayout.border = & state.tableCell.borders [ property->value ];
 }
 
 void RTFImport::insertParagraph( RTFProperty * )
 {
-    if (state.layout.inTable)
+    if (state.tqlayout.inTable)
     {
 	if (textState->table == 0)
 	{
@@ -1110,10 +1110,10 @@ void RTFImport::insertPageBreak( RTFProperty * )
 void RTFImport::insertTableCell( RTFProperty * )
 {
     //{{
-    bool b = state.layout.inTable;
-    state.layout.inTable = true;
+    bool b = state.tqlayout.inTable;
+    state.tqlayout.inTable = true;
     insertParagraph();
-    state.layout.inTable = b;
+    state.tqlayout.inTable = b;
     //}}
     textState->frameSets << textState->cell.toString();
     textState->cell.clear( 3 );
@@ -1130,14 +1130,14 @@ void RTFImport::insertTableRow( RTFProperty * )
 	{
 	    char buf[64];
 	    sprintf( buf, "Table %d", textState->table );
-	    RTFLayout::Alignment align = row.alignment;
+	    RTFLayout::Alignment align = row.tqalignment;
 
 	    // Store the current state on the stack
 	    stateStack.push( state );
 	    resetState();
-	    state.layout.alignment = align;	// table alignment
+	    state.tqlayout.tqalignment = align;	// table tqalignment
 
-	    // Add anchor for new table (default layout)
+	    // Add anchor for new table (default tqlayout)
 	    addAnchor( buf );
 	    addParagraph( textState->node, false );
 
@@ -1202,9 +1202,9 @@ void RTFImport::insertCellDef( RTFProperty * )
 
 void RTFImport::insertTabDef( RTFProperty * )
 {
-    RTFTab tab = state.layout.tab;
+    RTFTab tab = state.tqlayout.tab;
     tab.position	= token.value;
-    state.layout.tablist.push( tab );
+    state.tqlayout.tablist.push( tab );
     tab.type		= RTFTab::Left;
     tab.leader		= RTFTab::None;
 }
@@ -1321,7 +1321,7 @@ void RTFImport::parseFontTable( RTFProperty * )
     if (token.type == RTFTokenizer::OpenGroup)
     {
 	font.name = TQString();
-	font.styleHint = TQFont::AnyStyle;
+	font.tqstyleHint = TQFont::AnyStyle;
 	font.fixedPitch = 0;
     }
     else if (token.type == RTFTokenizer::PlainText)
@@ -1344,7 +1344,7 @@ void RTFImport::parseFontTable( RTFProperty * )
 	    // Use TQt to look up the closest matching installed font
 	    TQFont qFont( font.name );
 	    qFont.setFixedPitch( (font.fixedPitch == 1) );
-	    qFont.setStyleHint( font.styleHint );
+	    qFont.setStyleHint( font.tqstyleHint );
 	    for(;!qFont.exactMatch();)
 	    {
 		int space=font.name.findRev(' ', font.name.length());
@@ -1362,7 +1362,7 @@ void RTFImport::parseFontTable( RTFProperty * )
             else
                fontTable.insert( state.format.font, newFontName );
 	    font.name.truncate( 0 );
-	    font.styleHint = TQFont::AnyStyle;
+	    font.tqstyleHint = TQFont::AnyStyle;
 	    font.fixedPitch = 0;
 	}
     }
@@ -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.layout = state.layout;
-	    style.next   = (style.next == -1) ? style.layout.style : style.next;
+	    style.tqlayout = state.tqlayout;
+	    style.next   = (style.next == -1) ? style.tqlayout.style : style.next;
 	    styleSheet << style;
 	    style.name.truncate( 0 );
 	    style.next   = -1;
@@ -1538,8 +1538,8 @@ void RTFImport::parsePicture( RTFProperty * )
         // Add anchor to rich text destination
         addAnchor( frameName );
 
-        // It is safe, as we call currentDateTime only once for each picture
-        const TQDateTime dt(TQDateTime::currentDateTime());
+        // It is safe, as we call tqcurrentDateTime only once for each picture
+        const TQDateTime dt(TQDateTime::tqcurrentDateTime());
 
         // Add pixmap or clipart (key)
         pictures.addKey( dt, idStr, pictName );
@@ -1614,7 +1614,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName )
     // Add anchor to rich text destination
     addAnchor( frameName );
 
-    // It is safe, as we call currentDateTime only once for each picture
+    // It is safe, as we call tqcurrentDateTime only once for each picture
     const TQDateTime dt( pic.getKey().lastModified() );
 
     // Add picture key
@@ -2055,7 +2055,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
     int vertAlign0 = ~vertAlign;
     int fontSize0  = ~fontSize;
 
-    // Adjust vertical alignment and font size if (\dn, \up) are used
+    // Adjust vertical tqalignment and font size if (\dn, \up) are used
     if (format.fmt.vertAlign == RTFFormat::Normal && format.fmt.baseline)
     {
 	if (format.fmt.baseline < 0)
@@ -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 &layout, bool frameBreak )
+void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak )
 {
-    // Style name and alignment
+    // Style name and tqalignment
     node.addNode( "NAME" );
       node.setAttribute( "value", CheckAndEscapeXmlText(name) );
     node.closeNode( "NAME" );
     node.addNode( "FLOW" );
-      node.setAttribute( "align", alignN[layout.alignment] );
+      node.setAttribute( "align", alignN[tqlayout.tqalignment] );
     node.closeNode( "FLOW" );
 
     // Indents
-    if (layout.firstIndent || layout.leftIndent || layout.rightIndent)
+    if (tqlayout.firstIndent || tqlayout.leftIndent || tqlayout.rightIndent)
     {
 	node.addNode( "INDENTS" );
 
-	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 );
+	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 );
 
 	node.closeNode( "INDENTS" );
     }
 
     // Offets
-    if (layout.spaceBefore || layout.spaceAfter)
+    if (tqlayout.spaceBefore || tqlayout.spaceAfter)
     {
 	node.addNode( "OFFSETS" );
 
-	if (layout.spaceBefore)
-	    node.setAttribute( "before", .05*layout.spaceBefore );
-	if (layout.spaceAfter)
-	    node.setAttribute( "after", .05*layout.spaceAfter );
+	if (tqlayout.spaceBefore)
+	    node.setAttribute( "before", .05*tqlayout.spaceBefore );
+	if (tqlayout.spaceAfter)
+	    node.setAttribute( "after", .05*tqlayout.spaceAfter );
 
 	node.closeNode( "OFFSETS" );
     }
@@ -2304,10 +2304,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
 
     TQString lineSpacingType;
     TQString lineSpacingValue;  
-    if ( layout.spaceBetweenMultiple )
+    if ( tqlayout.spaceBetweenMultiple )
     {
         // Note: 240 is a sort of magic value for one line (Once upon a time, it meant 12pt for a single line)
-        switch (layout.spaceBetween )
+        switch (tqlayout.spaceBetween )
         {
         case 240:
             {
@@ -2326,10 +2326,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
             }
         default:
             {    
-                if ( layout.spaceBetween > 0 )
+                if ( tqlayout.spaceBetween > 0 )
                 {
                     lineSpacingType = "multiple";
-                    lineSpacingValue.setNum( layout.spaceBetween / 240.0 );
+                    lineSpacingValue.setNum( tqlayout.spaceBetween / 240.0 );
                 }
                 break;
             }
@@ -2337,16 +2337,16 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
     }
     else
     {
-        if (layout.spaceBetween > 0)
+        if (tqlayout.spaceBetween > 0)
         {
             lineSpacingType = "atleast";
-            lineSpacingValue.setNum( 0.05*layout.spaceBetween );
+            lineSpacingValue.setNum( 0.05*tqlayout.spaceBetween );
         }
-        if (layout.spaceBetween < 0)
+        if (tqlayout.spaceBetween < 0)
         {
             // negative linespace means "exact"
             lineSpacingType = "fixed" ;
-            lineSpacingValue.setNum( -0.05*layout.spaceBetween );
+            lineSpacingValue.setNum( -0.05*tqlayout.spaceBetween );
         }
     }
     
@@ -2359,20 +2359,20 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
         node.closeNode( "LINESPACING" );
     }
 
-    if (layout.keep || layout.pageBB || layout.pageBA || frameBreak || layout.keepNext)
+    if (tqlayout.keep || tqlayout.pageBB || tqlayout.pageBA || frameBreak || tqlayout.keepNext)
     {
 	node.addNode( "PAGEBREAKING" );
-	  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.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.closeNode( "PAGEBREAKING" );
     }
 
     // Paragraph borders
     for (uint i=0; i < 4; i++)
     {
-	const RTFBorder &border = layout.borders[i];
+	const RTFBorder &border = tqlayout.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 (layout.firstIndent < 0 && layout.leftIndent > 0)
+    if (tqlayout.firstIndent < 0 && tqlayout.leftIndent > 0)
     {
 	node.addNode( "TABULATOR" );
 	  node.setAttribute( "type", 0 );
-	  node.setAttribute( "ptpos", .05*layout.leftIndent );
+	  node.setAttribute( "ptpos", .05*tqlayout.leftIndent );
 	node.closeNode( "TABULATOR" );
     }
 
     // Tabulators
-    if (!layout.tablist.isEmpty())
+    if (!tqlayout.tablist.isEmpty())
     {
         // ### TODO: use ConstIterator
-	for (uint i=0; i < layout.tablist.count(); i++)
+	for (uint i=0; i < tqlayout.tablist.count(); i++)
 	{
-	    const RTFTab &tab = layout.tablist[i];
+	    const RTFTab &tab = tqlayout.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.layout.style;
+    const int styleNum = state.tqlayout.style;
 
     const TQValueList<RTFStyle>::ConstIterator endStyleSheet = styleSheet.end();
     for ( TQValueList<RTFStyle>::ConstIterator it=styleSheet.begin(); it!=endStyleSheet; ++it )
     {
-	if ( (*it).layout.style == styleNum )
+	if ( (*it).tqlayout.style == styleNum )
 	{
 	    if ( textState->length > 0 )
 	    {
@@ -2468,9 +2468,9 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak )
 	node.closeNode( "FORMATS" );
     }
 
-    // Write out layout and format
+    // Write out tqlayout and format
       node.addNode( "LAYOUT" );
-	addLayout( node, name, state.layout, frameBreak );
+	addLayout( node, name, state.tqlayout, 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 37ecfce6..bf4f20b7 100644
--- a/filters/kword/rtf/import/rtfimport.h
+++ b/filters/kword/rtf/import/rtfimport.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqvaluestack.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "rtfimport_dom.h"
 #include "rtfimport_tokenizer.h"
 #include <tqptrlist.h>
@@ -93,7 +93,7 @@ struct RTFTab
 struct RTFFont
 {
     TQString name;
-    TQFont::StyleHint styleHint;
+    TQFont::StyleHint tqstyleHint;
     int fixedPitch;
     int number;
 };
@@ -124,7 +124,7 @@ struct RTFLayout
     RTFTab tab;
     RTFBorder borders[4];
     RTFBorder *border;
-    Alignment alignment;
+    Alignment tqalignment;
     int style;
     int firstIndent, leftIndent, rightIndent;
     int spaceBefore, spaceAfter;
@@ -173,7 +173,7 @@ struct RTFStyle
 {
     TQString name;
     RTFFormat format;
-    RTFLayout layout;
+    RTFLayout tqlayout;
     int next;
 };
 
@@ -198,7 +198,7 @@ struct RTFTableRow
 {
     TQValueList<RTFTableCell> cells;
     TQStringList frameSets;
-    RTFLayout::Alignment alignment;
+    RTFLayout::Alignment tqalignment;
     int height;
     int left;
 };
@@ -232,7 +232,7 @@ struct RTFGroupState
     RTFTableRow tableRow;
     RTFTableCell tableCell;
     RTFFormat format;
-    RTFLayout layout;
+    RTFLayout tqlayout;
     RTFSectionLayout section;
     /// '}' will close the current destination
     bool brace0;
@@ -255,7 +255,7 @@ public:
      * @param to the mimetype for KWord
      * @return true if the document was successfully converted
      */
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
     /**
      * Skip the keyword, as we do not need to do anything with it
@@ -408,7 +408,7 @@ public:
     void insertSymbol( RTFProperty *property );
     /// Insert special character (hexadecimal escape value).
     void insertHexSymbol( RTFProperty * );
-    /// Insert unicode character (keyword \\u).
+    /// Insert tqunicode 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 layout information to document node.
+     * Add tqlayout information to document node.
      * @param node the document node (destination)
      * @param name the name of the current style
-     * @param layout the paragraph layout information
+     * @param tqlayout the paragraph tqlayout information
      * @param frameBreak paragraph is always the last in a frame if true
      */
-    void addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak );
+    void addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, 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 75855dbf..95fa43fc 100644
--- a/filters/kword/rtf/import/rtfimport_dom.cpp
+++ b/filters/kword/rtf/import/rtfimport_dom.cpp
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include <tqdatetime.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqcolor.h>
 
 #include <kdebug.h>
@@ -30,7 +30,7 @@ TQString CheckAndEscapeXmlText(const TQString& strText)
     for (uint i=0; i<strReturn.length(); i++)
     {
         ch = strReturn[i];
-        const int test = ch.unicode();
+        const int test = ch.tqunicode();
 
         // 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 904da9db..27239e52 100644
--- a/filters/kword/rtf/status.html
+++ b/filters/kword/rtf/status.html
@@ -52,14 +52,14 @@
        - Document information (author, title, comments, company).<br>
        - Page size and margins.<br>
        - Headers and footers (with margins).<br>
-       - Tables (including non-rectangular), horizontal alignment.<br>
+       - Tables (including non-rectangular), horizontal tqalignment.<br>
        - Table cell background color and borders (style, color, width).<br>
        - Embedded pictures (JPEG/PNG/BMP) and clipart (EMF/WMF).<br>
        - Word 97-2000 picture support.<br>
        - Style sheet.<br>
        - Character formatting (size, color, bold, italic, underline, strikeout, subscript, superscript...).<br>
        - Font mapping (using TQFont/TQFontInfo).<br>
-       - Paragraph layout (horizontal alignment, indents, space before/after, frame break).<br>
+       - Paragraph tqlayout (horizontal tqalignment, 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>
@@ -76,7 +76,7 @@
        - Fix line spacing.<br>
        - Columns.<br>
        - Improve list handling.<br>
-       - Shaps, especially picture that are in shapes<br>
+       - Shaps, especially picture that are in tqshapes<br>
      </td>
     </tr>
 
@@ -85,7 +85,7 @@
      <td>
        15 July 2001: First useful version (rewritten for TQDom).<br>
        18 July 2001: Fixed function <code>finishTable()</code> (some tables crashed KWord).<br>
-       23 July 2001: Added table alignment, background color and cell borders.<br>
+       23 July 2001: Added table tqalignment, background color and cell borders.<br>
        31 August 2001: Faster version, uses read buffers and optimized XML output.<br>
        2 October 2001: Clipart import fixed (requires libwmf).<br>
        23 July 2002: Added field and hyperlink support, fixed embedded pictures.<br>
diff --git a/filters/kword/starwriter/pole.cpp b/filters/kword/starwriter/pole.cpp
index 9323cdbc..d9751e15 100644
--- a/filters/kword/starwriter/pole.cpp
+++ b/filters/kword/starwriter/pole.cpp
@@ -36,7 +36,7 @@ class Entry
     unsigned long size;
     unsigned start;
     bool dir;
-    std::vector<Entry*> children;
+    std::vector<Entry*> tqchildren;
     Entry();
     ~Entry();
   private:
@@ -257,9 +257,9 @@ Entry::Entry()
 
 Entry::~Entry()
 { 
-  for( unsigned i=0; i<children.size(); i++ )
+  for( unsigned i=0; i<tqchildren.size(); i++ )
   {
-    Entry* entry = children[ i ];
+    Entry* entry = tqchildren[ i ];
     delete entry;
   }
 }
@@ -657,7 +657,7 @@ Entry* StorageIO::buildTree( Entry* parent, int index, const unsigned char* dire
 
   // append as another child
   entry->parent = parent;
-  if( parent ) parent->children.push_back( entry );
+  if( parent ) parent->tqchildren.push_back( entry );
 
   // check previous
   int prev  = readU32( dirent + 0x44+p );
@@ -725,9 +725,9 @@ Entry* StorageIO::entry( const std::string& name )
      std::string entryname = *it;
      Entry *child = (Entry*) 0L;
      if( entry->dir )
-       for( unsigned j=0; j < entry->children.size(); j++ )
-         if( entry->children[j]->name == entryname )
-           child = entry->children[j];
+       for( unsigned j=0; j < entry->tqchildren.size(); j++ )
+         if( entry->tqchildren[j]->name == entryname )
+           child = entry->tqchildren[j];
      if( !child ) return (Entry*) 0L;
       entry = child;
    }
@@ -912,10 +912,10 @@ std::list<std::string> Storage::listDirectory()
   // sentinel: do nothing if not a directory
   if( !io->current_dir->dir ) return entries;
 
-  // find all children belongs to this directory
-  for( unsigned i = 0; i<io->current_dir->children.size(); i++ )
+  // find all tqchildren belongs to this directory
+  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
   {
-    Entry* e = io->current_dir->children[i];
+    Entry* e = io->current_dir->tqchildren[i];
     if( e ) entries.push_back( e->name );
   }
 
@@ -930,9 +930,9 @@ bool Storage::enterDirectory( const std::string& directory )
   if( !io->current_dir ) return false;
 
   // look for the specified sub-dir
-  for( unsigned i = 0; i<io->current_dir->children.size(); i++ )
+  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
   {
-    Entry* e = io->current_dir->children[i];
+    Entry* e = io->current_dir->tqchildren[i];
     if( e ) if( e->name == directory ) 
       if ( e->dir )
       {
diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cc
index 43dc1b62..a9bd80d3 100644
--- a/filters/kword/starwriter/starwriterimport.cc
+++ b/filters/kword/starwriter/starwriterimport.cc
@@ -58,7 +58,7 @@ StarWriterImport::~StarWriterImport()
 {
 }
 
-KoFilter::ConversionStatus StarWriterImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus StarWriterImport::convert(const TQCString& from, const TQCString& to)
 {
     // Check for proper conversion
     // When 4.x is supported, use also: || (from != "application/x-starwriter")
@@ -345,7 +345,7 @@ bool StarWriterImport::parseTable(TQByteArray n)
     TQ_UINT8 row, column;
 
     // Set table name
-    tableName = TQString("Table %1").arg(tablesNumber);
+    tableName = TQString("Table %1").tqarg(tablesNumber);
     tablesNumber++;
 
     // Skip useless sections and retrieve the right point
@@ -381,8 +381,8 @@ bool StarWriterImport::parseTable(TQByteArray n)
             text = convertToKWordString(s);
 
             // FIXME: check this stuff
-            TQString frameName = TQString("%1 Cell %2,%3").arg(tableName).arg(row).arg(column);
-            tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").arg(frameName).arg(tableName).arg(row).arg(column));
+            TQString frameName = TQString("%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column);
+            tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").tqarg(frameName).tqarg(tableName).tqarg(row).tqarg(column));
             tableText.append(" <FRAME runaround=\"1\" copy=\"0\" newFrameBehavior=\"1\" runaroundSide=\"biggest\" autoCreateNewFrame=\"0\" bleftpt=\"2.8\" brightpt=\"2.8\" btoppt=\"2.8\" bbottompt=\"2.8\" runaroundGap=\"2.8\" />\n");
             tableText.append("  <PARAGRAPH>\n");
             tableText.append("   <TEXT xml:space=\"preserve\">" + text + "</TEXT>\n");
@@ -408,7 +408,7 @@ bool StarWriterImport::parseTable(TQByteArray n)
     bodyStuff.append("   <TEXT xml:space=\"preserve\">#</TEXT>\n");
     bodyStuff.append("   <FORMATS>\n");
     bodyStuff.append("    <FORMAT id=\"6\" pos=\"0\" len=\"1\">\n");
-    bodyStuff.append(TQString("    <ANCHOR type=\"frameset\" instance=\"%1\" />\n").arg(tableName));
+    bodyStuff.append(TQString("    <ANCHOR type=\"frameset\" instance=\"%1\" />\n").tqarg(tableName));
     bodyStuff.append("    </FORMAT>\n");
     bodyStuff.append("   </FORMATS>\n");
     bodyStuff.append("  </PARAGRAPH>\n");
diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h
index f71a71ed..b030c2ba 100644
--- a/filters/kword/starwriter/starwriterimport.h
+++ b/filters/kword/starwriter/starwriterimport.h
@@ -34,7 +34,7 @@ class StarWriterImport: public KoFilter
 public:
     StarWriterImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~StarWriterImport();
-    KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
 private:
     // most important OLE streams
diff --git a/filters/kword/starwriter/status.html b/filters/kword/starwriter/status.html
index d7667e6c..6919c589 100644
--- a/filters/kword/starwriter/status.html
+++ b/filters/kword/starwriter/status.html
@@ -7,7 +7,7 @@
   <META NAME="GENERATOR" CONTENT="Quanta Plus">
 </HEAD>
 <BODY>
-  <H2 align="center">Status of the</H2>
+  <H2 align="center">tqStatus of the</H2>
   <H1 align="center">StarWriter 5.x filter for KWord</H1>
 
   <P>Author: <A HREF="mailto:info@marcozanon.com">Marco Zanon</A>
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc
index 36d267be..92908c57 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
@@ -97,7 +97,7 @@ bool WMLWorker::doCloseDocument(void)
 }
 
 bool WMLWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
   TQString wmlText;
   TQString text = paraText;
@@ -131,7 +131,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText,
   }
 
   // sentinel check
-  TQString align = layout.alignment.lower();
+  TQString align = tqlayout.tqalignment.lower();
   if( ( align!="left" ) && ( align!="right" ) && ( align!="center" ) )
     align = "left"; 
 
@@ -145,7 +145,7 @@ WMLExport::WMLExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus WMLExport::convert( const TQCString& from, 
+KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, 
   const TQCString& to )
 {
   // check for proper conversion
@@ -155,7 +155,7 @@ KoFilter::ConversionStatus WMLExport::convert( const TQCString& from,
   WMLWorker* worker = new WMLWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h
index 2f81c897..8d3a105e 100644
--- a/filters/kword/wml/wmlexport.h
+++ b/filters/kword/wml/wmlexport.h
@@ -35,7 +35,7 @@ class WMLExport : public KoFilter
 
     virtual ~WMLExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WMLEXPORT_H
diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc
index 83e14d9f..e44c10ae 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 layout );
+      WMLLayout tqlayout );
   private:
     TQString m_title;
 };
@@ -105,13 +105,13 @@ static TQString WMLFormatAsXML( WMLFormat format )
   return result;
 }
 
-static TQString WMLLayoutAsXML( WMLLayout layout )
+static TQString WMLLayoutAsXML( WMLLayout tqlayout )
 {
   TQString result;
 
   TQString align = "left";
-  if( layout.align == WMLLayout::Center ) align = "center";
-  if( layout.align == WMLLayout::Right ) align = "right";
+  if( tqlayout.align == WMLLayout::Center ) align = "center";
+  if( tqlayout.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 layout  )
+  WMLLayout tqlayout  )
 {
   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( layout) );
+  root.append( WMLLayoutAsXML( tqlayout) );
   root.append( "</PARAGRAPH>\n" );
 
   return TRUE;
@@ -231,7 +231,7 @@ void WMLConverter::parse( const char* filename )
 
 }
 
-KoFilter::ConversionStatus WMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus WMLImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "text/vnd.wap.wml" )
diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h
index 1c169af1..049ff8db 100644
--- a/filters/kword/wml/wmlimport.h
+++ b/filters/kword/wml/wmlimport.h
@@ -37,7 +37,7 @@ class WMLImport : public KoFilter
 
     virtual ~WMLImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WMLIMPORT_H
diff --git a/filters/kword/wml/wmlparser.cpp b/filters/kword/wml/wmlparser.cpp
index 81ccbd24..ecbb235c 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 layout info
+// paragraph tqlayout info
 WMLLayout::WMLLayout()
 {
   align = Left;
diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cc
index ac211d04..bffdecf1 100644
--- a/filters/kword/wordperfect/export/wp5.cc
+++ b/filters/kword/wordperfect/export/wp5.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <KWEFBaseWorker.h>
 #include <KWEFKWordLeader.h>
@@ -125,7 +125,7 @@ bool WPFiveWorker::doOpenDocument(void)
   for( int i=0; i<14; i++ ) output << index_header[i];
 
   // document area starts, mark it for the header fields
-  document_area_ptr = output.device()->at();
+  document_area_ptr = output.tqdevice()->at();
 
   return true;
 }
@@ -143,7 +143,7 @@ static TQCString WPFiveEscape( const TQString& text )
 
   for( unsigned int i=0; i < text.length(); i++ )
   {
-    int c = text[i].unicode();
+    int c = text[i].tqunicode();
     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& /*layout*/, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& /*tqlayout*/, 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 dc75e2f7..0791459b 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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cc
index a9dd9109..21c59606 100644
--- a/filters/kword/wordperfect/export/wp6.cc
+++ b/filters/kword/wordperfect/export/wp6.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvaluevector.h>
 
 #include <KWEFBaseWorker.h>
@@ -125,7 +125,7 @@ bool WPSixWorker::doOpenDocument(void)
   for( int i=0; i<14; i++ ) output << index_header[i];
 
   // document area starts, mark it for the header fields
-  document_area_ptr = output.device()->at();
+  document_area_ptr = output.tqdevice()->at();
 
   return true;
 }
@@ -144,7 +144,7 @@ static TQCString WPSixEscape( const TQString& text )
 
   for( unsigned int i=0; i < text.length(); i++ )
   {
-    int c = text[i].unicode();
+    int c = text[i].tqunicode();
     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& layout, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
-  // handle paragraph alignment/justification (default to left)
+  // handle paragraph tqalignment/justification (default to left)
   unsigned char wp_align[] = { 0xd3, 5, 12, 0, 0, 1, 0, 0, 2, 12, 0, 0xd3 };
-  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;
+  if( tqlayout.tqalignment == "left" ) wp_align[7] = 0;
+  if( tqlayout.tqalignment == "justify" ) wp_align[7] = 1;
+  if( tqlayout.tqalignment == "center" ) wp_align[7] = 2;
+  if( tqlayout.tqalignment == "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 05abb60f..73397338 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& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cc
index f1dde8ad..43a688c3 100644
--- a/filters/kword/wordperfect/export/wpexport.cc
+++ b/filters/kword/wordperfect/export/wpexport.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -47,7 +47,7 @@ WPExport::WPExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus 
+KoFilter::ConversiontqStatus 
 WPExport::convert( const TQCString& from, 
   const TQCString& to )
 {
@@ -69,7 +69,7 @@ WPExport::convert( const TQCString& from,
 
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h
index 16e81a1b..55f43a47 100644
--- a/filters/kword/wordperfect/export/wpexport.h
+++ b/filters/kword/wordperfect/export/wpexport.h
@@ -35,7 +35,7 @@ class WPExport : public KoFilter
 
     virtual ~WPExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WPEXPORT_H
diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp
index 1b3b83df..de9246cc 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 layout;
+  TQString tqlayout;
   TQString formats;
   int LeftMargin = 0;
   int TopMargin = 36;
@@ -253,32 +253,32 @@ KWordFilter::parse (const TQString & filename)
           formats.append( "  " + fmt );
           formats.append ( "  </FORMAT>\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" );
+          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" );
           lm = LeftMargin + LeftMarginAdjust - frameLeftMargin;
           rm = RightMargin + RightMarginAdjust - frameRightMargin;
-          layout.append( "  <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + 
+          tqlayout.append( "  <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + 
                          " right=\"" + TQString::number( TQMAX( 0 , rm ) ) + "\"" +
                          " first=\"0\" />\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" );
+          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" );
 
           // 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( layout );
+          root.append( tqlayout );
           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 96a2559c..7b87e5a6 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 unicode character
+// the following tables maps WP charset/charcode to tqunicode character
 
 // WP multinational characters (charset 1)
 static unsigned multinational_map[] = {
diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc
index 09fc4d5c..460915af 100644
--- a/filters/kword/wordperfect/import/wpimport.cc
+++ b/filters/kword/wordperfect/import/wpimport.cc
@@ -227,7 +227,7 @@ WPImport::WPImport( KoFilter *, const char *, const TQStringList& ):  KoFilter()
 {
 }
 
-KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if(to!= "application/vnd.sun.xml.writer" || from != "application/wordperfect" )
diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h
index 3fc52796..02cd323d 100644
--- a/filters/kword/wordperfect/import/wpimport.h
+++ b/filters/kword/wordperfect/import/wpimport.h
@@ -48,7 +48,7 @@ class WPImport : public KoFilter
 
     virtual ~WPImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 };
 #endif // __WPIMPORT_H
diff --git a/filters/kword/wordperfect/status_old.html b/filters/kword/wordperfect/status_old.html
index 5465048d..1db3dc09 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 layout: linespacing, justification</li>
+       <li>paragraph tqlayout: linespacing, justification</li>
        <li>page settings: margins</li>
        <li>document summary: title, author, abstract</li>
      </ul>
-- 
cgit v1.2.1