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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

66 files changed, 400 insertions, 400 deletions

diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc
index 5b88d11c..a75cccac 100644
--- a/filters/kspread/applixspread/applixspreadimport.cc
+++ b/filters/kspread/applixspread/applixspreadimport.cc
@@ -55,7 +55,7 @@ TQString APPLIXSPREADImport::nextLine( TQTextStream & stream )
     return s;
 }
 
-KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to )
 {
 
     if (to != "application/x-kspread" || from != "application/x-applixspread")
@@ -390,7 +390,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               //kdDebug()<< "   Type (%2d)   >%s< ",
               //    nn, (*it).latin1() );
             nn++;
-            // Grep horizontal alignment
+            // Grep horizontal tqalignment
             if      ( (*it) == "1")
             {
                 kdDebug()<< " = left align\n";
@@ -407,7 +407,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               align = 2; // center
 	    }
 
-            // Grep verticale alignment
+            // Grep verticale tqalignment
             else if ( (*it) == "VT")
             {
                 kdDebug()<<" = top valign\n";
@@ -1268,7 +1268,7 @@ APPLIXSPREADImport::readHeader (TQTextStream &stream)
       TQMessageBox::critical (0L, "Applix spreadsheet header problem",
               TQString ("The Applix Spreadsheet header is not correct. "
                        "May be it is not an applix spreadsheet 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");
 
 
diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h
index 15decadc..78deb2ca 100644
--- a/filters/kspread/applixspread/applixspreadimport.h
+++ b/filters/kspread/applixspread/applixspreadimport.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqfile.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqptrlist.h>
 
 #include <KoFilter.h>
@@ -57,7 +57,7 @@ public:
     APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~APPLIXSPREADImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     TQString nextLine           (TQTextStream &);
diff --git a/filters/kspread/applixspread/status.html b/filters/kspread/applixspread/status.html
index c944ef5c..968bf333 100644
--- a/filters/kspread/applixspread/status.html
+++ b/filters/kspread/applixspread/status.html
@@ -53,7 +53,7 @@
        - tests the headline of the document<br>
        - converts &lt;, &gt;, &amp;, to &amp;lt; &amp;gt; &amp;amp;<br>
        - converts all applix special characters<br>
-       - converts fontsize, fontcolor, horizontal and vertical alignment, bold, italic, underline<br>
+       - converts fontsize, fontcolor, horizontal and vertical tqalignment, bold, italic, underline<br>
        - eats long text strings (more than one row in inputfile)<br>
        - converts different tables inside of one document<br>
        - cellformat: background color, brushstyles, brushcolor<br>
@@ -352,43 +352,43 @@
 
 
          <spacer size="20"><U>6.1.1. Part 1 - Alignment format</U><BR>
-         <spacer size="30">This is the alignment format for vertical, horizontal alignment<BR>
+         <spacer size="30">This is the tqalignment format for vertical, horizontal tqalignment<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
            <TD>6.1.1.1&nbsp;&nbsp;</TD>
            <TD><B>1</B></TD>
-           <TD>horizontal alignment</TD>
+           <TD>horizontal tqalignment</TD>
            <TD>left</TD>
           </TR>
           <TR>
            <TD>6.1.1.2&nbsp;&nbsp;</TD>
            <TD><B>2</B></TD>
-           <TD>horizontal alignment</TD>
+           <TD>horizontal tqalignment</TD>
            <TD>right</TD>
           </TR>
           <TR>
            <TD>6.1.1.3&nbsp;&nbsp;</TD>
            <TD><B>3</B></TD>
-           <TD>horizontal alignment</TD>
+           <TD>horizontal tqalignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.4&nbsp;&nbsp;</TD>
            <TD><B>VT</B></TD>
-           <TD>vertical alignment</TD>
+           <TD>vertical tqalignment</TD>
            <TD>top</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VC</B></TD>
-           <TD>vertical alignment</TD>
+           <TD>vertical tqalignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VB</B></TD>
-           <TD>vertical alignment</TD>
+           <TD>vertical tqalignment</TD>
            <TD>bottom</TD>
           </TR>
           <TR>
@@ -402,7 +402,7 @@
 
 
          <spacer size="20"><U>6.1.2. Part 2 - Text format</U><BR>
-         <spacer size="30">This is the alignment format for the text<BR>
+         <spacer size="30">This is the tqalignment format for the text<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
@@ -441,7 +441,7 @@
         
 
          <spacer size="20"><U>6.1.3. Part 3 - Cell format</U><BR>
-         <spacer size="30">This is the alignment format for the text<BR>
+         <spacer size="30">This is the tqalignment format for the text<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index 3ea3f967..17e9cc65 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -27,11 +27,11 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -60,14 +60,14 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
     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);
 
     m_formatList << i18n( "Text" );
@@ -84,7 +84,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
 
     fillTable();
 
-    //resize(sizeHint());
+    //resize(tqsizeHint());
     resize( 600, 400 ); // Try to show as much as possible of the table view
     setMainWidget(m_dialog);
 
@@ -613,7 +613,7 @@ TQTextCodec* CSVDialog::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/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc
index b37d1c8f..9961d218 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cc
@@ -21,7 +21,7 @@
 #include <csvexport.h>
 
 #include <tqfile.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -118,7 +118,7 @@ TQString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row,
 
 // The reason why we use the KoDocument* approach and not the TQDomDocument
 // approach is because we don't want to export formulas but values !
-KoFilter::ConversionStatus CSVExport::convert( const TQCString & from, const TQCString & to )
+KoFilter::ConversiontqStatus CSVExport::convert( const TQCString & from, const TQCString & to )
 {
   kdDebug(30501) << "CSVExport::convert" << endl;
   KoDocument* document = m_chain->inputDocument();
diff --git a/filters/kspread/csv/csvexport.h b/filters/kspread/csv/csvexport.h
index ebc8a861..decdb81c 100644
--- a/filters/kspread/csv/csvexport.h
+++ b/filters/kspread/csv/csvexport.h
@@ -38,7 +38,7 @@ class CSVExport : public KoFilter
   CSVExport(KoFilter * parent, const char * name, const TQStringList &);
   virtual ~CSVExport() {}
 
-  virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to );
+  virtual KoFilter::ConversiontqStatus convert( const TQCString & from, const TQCString & to );
 
   private:
   TQString exportCSVCell( KSpread::Sheet const * const sheet, int col, int row, TQChar const & textQuote, TQChar delimiter );
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index e0a4db8c..a4ef1347 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -33,9 +33,9 @@
 #include <tqlistview.h>
 #include <tqptrlist.h>
 #include <tqradiobutton.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtabwidget.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqvalidator.h>
 
 #include <kapplication.h>
@@ -57,14 +57,14 @@ CSVExportDialog::CSVExportDialog( 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);
 
@@ -306,7 +306,7 @@ TQTextCodec* CSVExportDialog::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/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc
index e9852c61..cd93017b 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cc
@@ -57,7 +57,7 @@ CSVFilter::CSVFilter(KoFilter *, const char*, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus CSVFilter::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQCString& to )
 {
     TQString file( m_chain->inputFile() );
     KoDocument* document = m_chain->outputDocument();
diff --git a/filters/kspread/csv/csvimport.h b/filters/kspread/csv/csvimport.h
index c68ecffb..df14a756 100644
--- a/filters/kspread/csv/csvimport.h
+++ b/filters/kspread/csv/csvimport.h
@@ -31,6 +31,6 @@ public:
     CSVFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~CSVFilter() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // CSVFILTER_H
diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui
index f8960f4b..8c3a72cf 100644
--- a/filters/kspread/csv/dialogui.ui
+++ b/filters/kspread/csv/dialogui.ui
@@ -66,7 +66,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>tqlayout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -104,7 +104,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -123,7 +123,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>60</height>
@@ -223,7 +223,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>32767</height>
@@ -313,7 +313,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>51</width>
                                 <height>21</height>
@@ -330,7 +330,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>51</width>
                                 <height>21</height>
@@ -379,7 +379,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -428,7 +428,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -472,7 +472,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>468</width>
                                         <height>20</height>
@@ -489,7 +489,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>468</width>
                                         <height>20</height>
@@ -506,7 +506,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>611</width>
                                         <height>20</height>
@@ -523,7 +523,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>71</width>
                                         <height>20</height>
diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui
index f6a552e1..45eb6914 100644
--- a/filters/kspread/csv/exportdialogui.ui
+++ b/filters/kspread/csv/exportdialogui.ui
@@ -47,7 +47,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>tqlayout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -85,7 +85,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -156,7 +156,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>96</height>
@@ -254,7 +254,7 @@
                                 <property name="text">
                                     <string>&lt;SHEETNAME&gt; gets replaced by the name of the next sheet.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -375,7 +375,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>32767</height>
@@ -469,7 +469,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>81</height>
diff --git a/filters/kspread/csv/xmltree.h b/filters/kspread/csv/xmltree.h
index 1eede0dc..247af4e5 100644
--- a/filters/kspread/csv/xmltree.h
+++ b/filters/kspread/csv/xmltree.h
@@ -22,7 +22,7 @@
 
 #include <tqdom.h>
 #include <tqmemarray.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 class XMLTree
 {
diff --git a/filters/kspread/dbase/dbase.cpp b/filters/kspread/dbase/dbase.cpp
index 2c8ba3b8..acc1e27d 100644
--- a/filters/kspread/dbase/dbase.cpp
+++ b/filters/kspread/dbase/dbase.cpp
@@ -165,7 +165,7 @@ bool DBase::load( const TQString& filename )
   }
 
   // set the index to the first record
-  m_stream.device()->at( m_headerLength );
+  m_stream.tqdevice()->at( m_headerLength );
 
   return true;
 }
@@ -184,7 +184,7 @@ TQStringList DBase::readRecord( unsigned recno )
 
   // seek to where the record is
   unsigned filepos = m_headerLength + recno * m_recordLength;
-  m_stream.device()->at( filepos );
+  m_stream.tqdevice()->at( filepos );
 
   // first char == '*' means the record is deleted
   // so we just skip it
diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc
index 6121baaf..bcbc98b8 100644
--- a/filters/kspread/dbase/dbaseimport.cc
+++ b/filters/kspread/dbase/dbaseimport.cc
@@ -48,7 +48,7 @@ DBaseImport::DBaseImport ( TQObject*, const char*, const TQStringList& )
 {
 }
 
-KoFilter::ConversionStatus DBaseImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus DBaseImport::convert( const TQCString& from, const TQCString& to )
 {
   if (to != "application/x-kspread" || from != "application/x-dbase")
     return KoFilter::NotImplemented;
diff --git a/filters/kspread/dbase/dbaseimport.h b/filters/kspread/dbase/dbaseimport.h
index 293bda21..39a0ac0e 100644
--- a/filters/kspread/dbase/dbaseimport.h
+++ b/filters/kspread/dbase/dbaseimport.h
@@ -33,7 +33,7 @@ public:
     DBaseImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~DBaseImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __DBASEIMPORT_H
diff --git a/filters/kspread/excel/excelexport.cc b/filters/kspread/excel/excelexport.cc
index 0ecf41f7..2e2c50e7 100644
--- a/filters/kspread/excel/excelexport.cc
+++ b/filters/kspread/excel/excelexport.cc
@@ -13,7 +13,7 @@ ExcelExport::ExcelExport(KoFilter *, const char *, const TQStringList&) : KoFilt
 }
 
 
-KoFilter::ConversionStatus ExcelExport::convert(const TQCString& from, const TQCString& to) {
+KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const TQCString& to) {
 	// Double check that's we really what we want to do
 	if ( ( (to != "application/excel") && (to != "application/msexcel") ) || from != "application/x-kspread") {
 		kdWarning(0) << "Invalid mimetypes " << to << ", " << from << endl;
@@ -28,37 +28,37 @@ KoFilter::ConversionStatus ExcelExport::convert(const TQCString& from, const TQC
 
 
 /*
-KoFilter::ConversionStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 */
diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h
index e4b6b499..029cdac1 100644
--- a/filters/kspread/excel/excelexport.h
+++ b/filters/kspread/excel/excelexport.h
@@ -16,20 +16,20 @@ public:
 	ExcelExport(KoFilter *parent, const char*name, const TQStringList&);
 	virtual ~ExcelExport() {}
 
-	virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 
 class ExcelWorker : public KSpreadBaseWorker {
 public:
 	// Implement those
-	//KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property);
 };
 
 #endif
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc
index 75ee412a..f1bade9e 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cc
@@ -33,7 +33,7 @@
 #include <tqfile.h>
 #include <tqmap.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -107,7 +107,7 @@ ExcelImport::~ExcelImport()
   delete d;
 }
 
-KoFilter::ConversionStatus ExcelImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ExcelImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/msexcel" )
     return KoFilter::NotImplemented; 
@@ -348,7 +348,7 @@ void ExcelImport::Private::processSheetForBody( Sheet* sheet, KoXmlWriter* xmlWr
   xmlWriter->addAttribute( "table:name", string( sheet->name() ).string() );
   xmlWriter->addAttribute( "table:print", "false" );
   xmlWriter->addAttribute( "table:protected", "false" );
-  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").arg(sheetFormatIndex));
+  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").tqarg(sheetFormatIndex));
   sheetFormatIndex++;
   
   unsigned ci = 0;
@@ -397,7 +397,7 @@ void ExcelImport::Private::processSheetForStyle( Sheet* sheet, KoXmlWriter* xmlW
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table" );  
   xmlWriter->addAttribute( "style:master-page-name", "Default" );  
-  xmlWriter->addAttribute( "style:name", TQString("ta%1").arg(sheetFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ta%1").tqarg(sheetFormatIndex) );  
   sheetFormatIndex++;
   
   xmlWriter->startElement( "style:table-properties" );
@@ -450,7 +450,7 @@ void ExcelImport::Private::processColumnForBody( Column* column, int repeat, KoX
   xmlWriter->addAttribute( "table:default-style-name", "Default" );  
   xmlWriter->addAttribute( "table:visibility", column->visible() ? "visible" : "collapse" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-columns-repeated", repeat );  
-  xmlWriter->addAttribute( "table:style-name", TQString("co%1").arg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("co%1").tqarg(columnFormatIndex) );  
   columnFormatIndex++;
 
   xmlWriter->endElement();  // table:table-column
@@ -463,12 +463,12 @@ void ExcelImport::Private::processColumnForStyle( Column* column, int /*repeat*/
   
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-column" );  
-  xmlWriter->addAttribute( "style:name", TQString("co%1").arg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("co%1").tqarg(columnFormatIndex) );  
   columnFormatIndex++;
   
   xmlWriter->startElement( "style:table-column-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:column-width", TQString("%1in").arg(column->width()/27) );
+  xmlWriter->addAttribute( "style:column-width", TQString("%1in").tqarg(column->width()/27) );
   xmlWriter->endElement();  // style:table-column-properties
   
   xmlWriter->endElement();  // style:style
@@ -494,7 +494,7 @@ void ExcelImport::Private::processRowForBody( Row* row, int /*repeat*/, KoXmlWri
   
   xmlWriter->startElement( "table:table-row" );
   xmlWriter->addAttribute( "table:visibility", row->visible() ? "visible" : "collapse" );  
-  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").arg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").tqarg(rowFormatIndex) );  
   rowFormatIndex++;
   
   for( int i = 0; i <= lastCol; i++ )
@@ -530,12 +530,12 @@ void ExcelImport::Private::processRowForStyle( Row* row, int repeat, KoXmlWriter
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-row" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-rows-repeated", repeat );  
-  xmlWriter->addAttribute( "style:name", TQString("ro%1").arg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ro%1").tqarg(rowFormatIndex) );  
   rowFormatIndex++;
   
   xmlWriter->startElement( "style:table-row-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").arg(row->height()) );
+  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").tqarg(row->height()) );
   xmlWriter->endElement();  // style:table-row-properties
   
   xmlWriter->endElement();  // style:style
@@ -703,7 +703,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
     const UString& valueFormat = format.valueFormat();
     if( !valueFormat.isEmpty() )
     {
-      refName = TQString("N%1").arg(cell->formatIndex());
+      refName = TQString("N%1").tqarg(cell->formatIndex());
       TQString numformat = string( valueFormat ).string();
       processValueFormat( numformat, refName, xmlWriter );
     }
@@ -717,7 +717,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
     // now the real table-cell  
     xmlWriter->startElement( "style:style" );
     xmlWriter->addAttribute( "style:family", "table-cell" );  
-    xmlWriter->addAttribute( "style:name", TQString("ce%1").arg( cell->formatIndex() ) );  
+    xmlWriter->addAttribute( "style:name", TQString("ce%1").tqarg( cell->formatIndex() ) );  
     if( !refName.isEmpty() )
       xmlWriter->addAttribute( "style:data-style-name", refName );  
     
@@ -759,7 +759,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
   if( !xmlWriter ) return;
   
   const FormatFont& font = format->font();
-  const FormatAlignment& align = format->alignment();
+  const FormatAlignment& align = format->tqalignment();
   const FormatBackground& back = format->background();
   const FormatBorders& borders = format->borders();
   
@@ -792,7 +792,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
     if( !font.fontFamily().isEmpty() )
       xmlWriter->addAttribute( "style:font-name", string(font.fontFamily()).string() );
       
-    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").arg(font.fontSize()) );  
+    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").tqarg(font.fontSize()) );  
     
     xmlWriter->addAttribute( "fo:color", convertColor( font.color() ) );
     
diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h
index 84729b4d..5b733733 100644
--- a/filters/kspread/excel/import/excelimport.h
+++ b/filters/kspread/excel/import/excelimport.h
@@ -35,7 +35,7 @@ public:
     ExcelImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~ExcelImport();
 
-    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/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 2a3a6247..8155bca5 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode )
 class EString::Private
 {
 public:
-  bool unicode;
+  bool tqunicode;
   bool richText;
   UString str;
   unsigned size;
@@ -194,7 +194,7 @@ public:
 EString::EString()
 {
   d = new EString::Private();
-  d->unicode  = false;
+  d->tqunicode  = false;
   d->richText = false;
   d->str      = UString::null;
   d->size     = 0;
@@ -208,7 +208,7 @@ EString::EString( const EString& es )
 
 EString& EString::operator=( const EString& es )
 {
-  d->unicode  = es.d->unicode;
+  d->tqunicode  = es.d->tqunicode;
   d->richText = es.d->richText;
   d->size     = es.d->size;
   d->str      = es.d->str;
@@ -220,14 +220,14 @@ EString::~EString()
   delete d;
 }
 
-bool EString::unicode() const
+bool EString::tqunicode() const
 {
-  return d->unicode;
+  return d->tqunicode;
 }
 
 void EString::setUnicode( bool u )
 {
-  d->unicode = u;
+  d->tqunicode = u;
 }
 
 bool EString::richText() const
@@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   unsigned char flag = data[ offset ];
   offset++; // for flag (1 byte)
   
-  bool unicode = flag & 0x01;
+  bool tqunicode = flag & 0x01;
   bool richText = flag & 0x08;
   unsigned formatRuns = 0;
   
@@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   
   // find out total bytes used in this string
   unsigned size = offset + len; // string data
-  if( unicode ) size += len; // because unicode takes 2-bytes char
+  if( tqunicode ) size += len; // because tqunicode takes 2-bytes char
   if( richText ) size += (formatRuns*4);
   
-  if( !unicode )
+  if( !tqunicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   }
   
   EString result;
-  result.setUnicode( unicode );
+  result.setUnicode( tqunicode );
   result.setRichText( richText );
   result.setSize( size );
   result.setStr( str );
@@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   
   unsigned len = data[0];
   unsigned flag = data[1];
-  bool unicode = flag & 1;
+  bool tqunicode = flag & 1;
   
   if( len > datasize-2 ) len = datasize-2;
   if( len == 0 ) return EString();
   
   unsigned offset = 2;
   
-  if( !unicode )
+  if( !tqunicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   }
   
   EString result;
-  result.setUnicode( unicode );
+  result.setUnicode( tqunicode );
   result.setRichText( richText );
   result.setSize( datasize );
   result.setStr( str );
@@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data )
   d->visibility = data[4];
   d->type = data[5];
   
-  /* FIXME: it turned out that sheet name is not normal unicode string
+  /* FIXME: it turned out that sheet name is not normal tqunicode string
      where the first two bytes specifies string length, but instead
      only the first specifies it.
      the next byte could be correctly interpreted as flag.
@@ -5113,31 +5113,31 @@ bool ExcelReader::load( Workbook* workbook, const char* filename )
       
     format.setFont( convertFont( xf.fontIndex() ) );
     
-    FormatAlignment alignment;
+    FormatAlignment tqalignment;
     switch( xf.horizontalAlignment() )
     {
       case XFRecord::Left:     
-        alignment.setAlignX( Format::Left ); break;
+        tqalignment.setAlignX( Format::Left ); break;
       case XFRecord::Right:    
-        alignment.setAlignX( Format::Right ); break;
+        tqalignment.setAlignX( Format::Right ); break;
       case XFRecord::Centered: 
-        alignment.setAlignX( Format::Center ); break;
+        tqalignment.setAlignX( Format::Center ); break;
       default: break;
       // FIXME still unsupported: Repeat, Justified, Filled, Distributed
     };
     switch( xf.verticalAlignment() )
     {
       case XFRecord::Top:
-        alignment.setAlignY( Format::Top ); break;
+        tqalignment.setAlignY( Format::Top ); break;
       case XFRecord::VCentered:
-        alignment.setAlignY( Format::Middle ); break;
+        tqalignment.setAlignY( Format::Middle ); break;
       case XFRecord::Bottom:
-        alignment.setAlignY( Format::Bottom ); break;
+        tqalignment.setAlignY( Format::Bottom ); break;
       default: break;
       // FIXME still unsupported: Justified, Distributed
     }
-    alignment.setWrap( xf.textWrap() );
-    format.setAlignment( alignment );
+    tqalignment.setWrap( xf.textWrap() );
+    format.tqsetAlignment( tqalignment );
   
     FormatBorders borders;
       
@@ -5929,31 +5929,31 @@ Format ExcelReader::convertFormat( unsigned xfIndex )
     
   format.setFont( convertFont( xf.fontIndex() ) );
   
-  FormatAlignment alignment;
+  FormatAlignment tqalignment;
   switch( xf.horizontalAlignment() )
   {
     case XFRecord::Left:     
-      alignment.setAlignX( Format::Left ); break;
+      tqalignment.setAlignX( Format::Left ); break;
     case XFRecord::Right:    
-      alignment.setAlignX( Format::Right ); break;
+      tqalignment.setAlignX( Format::Right ); break;
     case XFRecord::Centered: 
-      alignment.setAlignX( Format::Center ); break;
+      tqalignment.setAlignX( Format::Center ); break;
     default: break;
     // FIXME still unsupported: Repeat, Justified, Filled, Distributed
   };
   switch( xf.verticalAlignment() )
   {
     case XFRecord::Top:
-      alignment.setAlignY( Format::Top ); break;
+      tqalignment.setAlignY( Format::Top ); break;
     case XFRecord::VCentered:
-      alignment.setAlignY( Format::Middle ); break;
+      tqalignment.setAlignY( Format::Middle ); break;
     case XFRecord::Bottom:
-      alignment.setAlignY( Format::Bottom ); break;
+      tqalignment.setAlignY( Format::Bottom ); break;
     default: break;
     // FIXME still unsupported: Justified, Distributed
   }
-  alignment.setWrap( xf.textWrap() );
-  format.setAlignment( alignment );
+  tqalignment.setWrap( xf.textWrap() );
+  format.tqsetAlignment( tqalignment );
 
   FormatBorders borders;
     
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index 5221b518..8cbdfd53 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 };
 
 class Record;
 
-// rich-text, unicode, far-east support Excel string
+// rich-text, tqunicode, far-east support Excel string
 
 class EString
 {
@@ -50,7 +50,7 @@ public:
   
   ~EString();
   
-  bool unicode() const;
+  bool tqunicode() const;
   
   void setUnicode( bool u );
   
@@ -2805,17 +2805,17 @@ public:
     Distributed };
   
   /**
-   * Gets the horizontal alignment, e.g Left.
+   * Gets the horizontal tqalignment, e.g Left.
    */
   unsigned horizontalAlignment() const;
   
   /**
-   * Sets the horizontal alignment, e.g Left.
+   * Sets the horizontal tqalignment, e.g Left.
    */
   void setHorizontalAlignment( unsigned ha );
   
   /**
-   * Returns human-readable string representation of the horizontal alignment.
+   * Returns human-readable string representation of the horizontal tqalignment.
      For example, XFRecord::Left will return "Left".
    */
   const char* horizontalAlignmentAsString() const; 
@@ -2828,21 +2828,21 @@ public:
     VDistributed = 4 };
   
   /**
-   * Gets the vertical alignment, e.g Bottom.
+   * Gets the vertical tqalignment, e.g Bottom.
    *
    * \sa setVerticalAlignment
    */
   unsigned verticalAlignment() const;
   
   /**
-   * Sets the vertical alignment, e.g Top.
+   * Sets the vertical tqalignment, e.g Top.
    *
    * \sa verticalAlignment
    */
   void setVerticalAlignment( unsigned va );
   
   /**
-   * Returns human-readable string representation of the vertical alignment.
+   * Returns human-readable string representation of the vertical tqalignment.
      For example, XFRecord::Top will return "Top".
    */
   const char* verticalAlignmentAsString() const; 
diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp
index 8ce69f24..29481fd0 100644
--- a/filters/kspread/excel/sidewinder/format.cpp
+++ b/filters/kspread/excel/sidewinder/format.cpp
@@ -271,7 +271,7 @@ FormatAlignment& FormatAlignment::operator=( const FormatAlignment& align )
   return assign( align );
 }
 
-// assign from another alignment
+// assign from another tqalignment
 FormatAlignment& FormatAlignment::assign( const FormatAlignment& align )
 {
   d->null          = align.isNull();
@@ -398,7 +398,7 @@ FormatBackground& FormatBackground::operator=( const FormatBackground& backgroun
   return assign( background );
 }
 
-// assign from another alignment
+// assign from another tqalignment
 FormatBackground& FormatBackground::assign( const FormatBackground& background )
 {
   d->null         = background.isNull();
@@ -498,7 +498,7 @@ FormatBorders& FormatBorders::operator=( const FormatBorders& border )
   return assign( border );
 }
 
-// assign from another alignment
+// assign from another tqalignment
 FormatBorders& FormatBorders::assign( const FormatBorders& border )
 {
   d->null         = border.isNull();
@@ -581,7 +581,7 @@ class Format::Private
 {
 public:
   FormatFont font;
-  FormatAlignment alignment;
+  FormatAlignment tqalignment;
   FormatBorders borders;
   FormatBackground background;
   UString valueFormat;
@@ -617,7 +617,7 @@ Format& Format::operator=( const Format& f )
 Format& Format::assign( const Format& f )
 {
   d->font = f.font();
-  d->alignment = f.alignment();
+  d->tqalignment = f.tqalignment();
   d->borders = f.borders();
   d->valueFormat = f.valueFormat();
   d->background = f.background();
@@ -626,7 +626,7 @@ Format& Format::assign( const Format& f )
 
 bool Format::isNull() const
 {
-  return d->font.isNull() && d->alignment.isNull() && d->borders.isNull();
+  return d->font.isNull() && d->tqalignment.isNull() && d->borders.isNull();
 }
 
 FormatFont& Format::font() const
@@ -639,14 +639,14 @@ void Format::setFont( const FormatFont& font )
   d->font = font;
 }
 
-FormatAlignment& Format::alignment() const
+FormatAlignment& Format::tqalignment() const
 {
-  return d->alignment;
+  return d->tqalignment;
 }
 
-void Format::setAlignment( const FormatAlignment& alignment )
+void Format::tqsetAlignment( const FormatAlignment& tqalignment )
 {
-  d->alignment = alignment;
+  d->tqalignment = tqalignment;
 }
 
 FormatBorders& Format::borders() const
@@ -682,8 +682,8 @@ void Format::setValueFormat( const UString& valueFormat )
 // merge f into current format
 Format& Format::apply( const Format& f )
 {
-  if( !f.alignment().isNull() )
-    alignment() = f.alignment();
+  if( !f.tqalignment().isNull() )
+    tqalignment() = f.tqalignment();
   if( !f.font().isNull() )
     font() = f.font();
   if( !f.borders().isNull() )
@@ -700,7 +700,7 @@ bool Format::operator==(const Format& format) const
 {
 	return 
     d->font == format.d->font &&
-    d->alignment == format.d->alignment &&
+    d->tqalignment == format.d->tqalignment &&
     d->borders == format.d->borders &&
     d->background == format.d->background &&
     d->valueFormat == format.d->valueFormat;
@@ -710,7 +710,7 @@ bool Format::operator!=(const Format& format) const
 {
 	return 
     d->font != format.d->font ||
-    d->alignment != format.d->alignment ||
+    d->tqalignment != format.d->tqalignment ||
     d->borders != format.d->borders ||
     d->background != format.d->background ||
     d->valueFormat != format.d->valueFormat;
diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h
index acb566a5..dcadc1c2 100644
--- a/filters/kspread/excel/sidewinder/format.h
+++ b/filters/kspread/excel/sidewinder/format.h
@@ -266,9 +266,9 @@ private:
 
 
 /**
- * Defines alignment information for cell format.
+ * Defines tqalignment information for cell format.
  *
- * Class FormatAlignment defines the horizontal and vertical alignment
+ * Class FormatAlignment defines the horizontal and vertical tqalignment
  * for the text inside a cell.
  * 
  */
@@ -278,37 +278,37 @@ class FormatAlignment
 public:
 
   /**
-   * Creates a default alignment information.
+   * Creates a default tqalignment information.
    */
   FormatAlignment();
   
   /**
-   * Destroys the alignment information
+   * Destroys the tqalignment information
    */
   ~FormatAlignment();
   
   /**
-   * Creates a copy of alignment information.
+   * Creates a copy of tqalignment information.
    */
   FormatAlignment( const FormatAlignment& );
   
   /**
-   * Assigns from another alignment information.
+   * Assigns from another tqalignment information.
    */
   FormatAlignment& operator=( const FormatAlignment& );
   
   /**
-   * Assigns from another alignment information.
+   * Assigns from another tqalignment information.
    */
   FormatAlignment& assign( const FormatAlignment& );
   
   /**
-   * Returns true if it is a default alignment information.
+   * Returns true if it is a default tqalignment information.
    */
   bool isNull() const;
   
   /**
-   * Returns horizontal alignment. Possible values are
+   * Returns horizontal tqalignment. Possible values are
    * Format::Left, Format::Right and Format::Center.
    *
    * \sa setAlignX
@@ -316,14 +316,14 @@ public:
   unsigned alignX() const;
   
   /**
-   * Sets the horizontal alignment.
+   * Sets the horizontal tqalignment.
    *
    * \sa alignX
    */
   void setAlignX( unsigned xa );
   
   /**
-   * Returns horizontal alignment. Possible values are
+   * Returns horizontal tqalignment. Possible values are
    * Format::Top, Format::Middle and Format::Bottom.
    *
    * \sa setAlignY
@@ -331,7 +331,7 @@ public:
   unsigned alignY() const;
   
   /**
-   * Sets the horizontal alignment.
+   * Sets the horizontal tqalignment.
    *
    * \sa alignY
    */
@@ -380,12 +380,12 @@ public:
    void setRotationAngle( unsigned r );
        
   /**
-   * Returns true if this alignment is equal to f; otherwise returns false.
+   * Returns true if this tqalignment is equal to f; otherwise returns false.
    */
   bool operator==(const FormatAlignment& f) const;
 
   /**
-   * Returns true if this alignment is not equal to f; otherwise returns false.
+   * Returns true if this tqalignment is not equal to f; otherwise returns false.
    */
   bool operator!=(const FormatAlignment& f) const;
 
@@ -683,14 +683,14 @@ public:
   void setFont( const FormatFont& font );
   
   /** 
-   * Returns a constant reference to the alignment information of this format.
+   * Returns a constant reference to the tqalignment information of this format.
    */
-  FormatAlignment& alignment() const;
+  FormatAlignment& tqalignment() const;
   
   /** 
-   * Sets new alignment information for this format.
+   * Sets new tqalignment information for this format.
    */
-  void setAlignment( const FormatAlignment& alignment );
+  void tqsetAlignment( const FormatAlignment& tqalignment );
   
   /** 
    * Returns a reference to the borders information of this format.
diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp
index e4090cd9..38fe8cb5 100644
--- a/filters/kspread/excel/sidewinder/pole.cpp
+++ b/filters/kspread/excel/sidewinder/pole.cpp
@@ -95,7 +95,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in 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
@@ -116,7 +116,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();
@@ -509,11 +509,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;
@@ -577,8 +577,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++ )
      {
@@ -593,7 +593,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
@@ -650,7 +650,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;
 
@@ -1286,9 +1286,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/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp
index 304fed18..b26ee196 100644
--- a/filters/kspread/excel/sidewinder/ustring.cpp
+++ b/filters/kspread/excel/sidewinder/ustring.cpp
@@ -39,7 +39,7 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.unicode() )
+    : uc( c.tqunicode() )
 {
 }
 
@@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->unicode() < c2->unicode());
+    return (c1->tqunicode() < c2->tqunicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h
index 3f41867b..1c4f2bc5 100644
--- a/filters/kspread/excel/sidewinder/ustring.h
+++ b/filters/kspread/excel/sidewinder/ustring.h
@@ -68,7 +68,7 @@ namespace Swinder {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short unicode() const { return uc; }
+    unsigned short tqunicode() const { return uc; }
   public:
     /**
      * A static instance of UChar(0).
@@ -120,7 +120,7 @@ namespace Swinder {
     /**
      * @return Unicode value.
      */
-    unsigned short unicode() const { return ref().uc; }
+    unsigned short tqunicode() const { return ref().uc; }
     /**
      * @return Lower byte.
      */
diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd
index 7150f7e4..04949083 100644
--- a/filters/kspread/gnumeric/gnumeric.xsd
+++ b/filters/kspread/gnumeric/gnumeric.xsd
@@ -427,8 +427,8 @@
                 </xsd:complexType>
             </xsd:element>
         </xsd:sequence>
-        <xsd:attribute name="HAlign"       type="gmr:horizontal_alignment"/>
-        <xsd:attribute name="VAlign"       type="gmr:vertical_alignment"  />
+        <xsd:attribute name="HAlign"       type="gmr:horizontal_tqalignment"/>
+        <xsd:attribute name="VAlign"       type="gmr:vertical_tqalignment"  />
         <xsd:attribute name="WrapText"     type="xsd:boolean"          	  />
         <xsd:attribute name="ShrinkToFit"  type="xsd:integer"          	  />	<!-- should be bool, but some files have odd truth values -->
         <xsd:attribute name="Rotation"	   type="xsd:integer"		  use="optional"/>
@@ -492,7 +492,7 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="horizontal_alignment">
+    <xsd:simpleType name="horizontal_tqalignment">
         <xsd:restriction base="xsd:integer">
             <!-- this is a bit map as follows:
                   1 = GENERAL
@@ -508,7 +508,7 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="vertical_alignment">
+    <xsd:simpleType name="vertical_tqalignment">
         <xsd:restriction base="xsd:integer">
             <!-- this is a bit map as follows:
                  1 = TOP
@@ -644,7 +644,7 @@
                     <xsd:attribute name="FillColor"        type="gmr:color"               use="required"/>
                     <xsd:attribute name="Type"             type="gmr:objectfilled"        use="required"/>
                     <xsd:attribute name="Width"            type="xsd:positiveInteger" use="required"/>
-                    <!-- the arrow shape attributes are only used if the type is
+                    <!-- the arrow tqshape attributes are only used if the type is
                          arrow (type="gmr:2")
                     -->
                     <xsd:attribute name="ArrowShapeA"      type="xsd:double"          use="optional"/>
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index f7416cc7..cccfcc9f 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -31,7 +31,7 @@
 #include <tqptrlist.h>
 #include <tqsortedlist.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kspread_map.h>
 #include <kspread_sheet.h>
@@ -540,7 +540,7 @@ TQDomElement GNUMERICExport::GetLinkStyle(TQDomDocument gnumeric_doc)
 
 TQDomElement GNUMERICExport::GetCellStyle(TQDomDocument gnumeric_doc,Cell * cell, int currentcolumn, int currentrow)
 {
-    TQColorGroup defaultColorGroup = TQApplication::palette().active();
+    TQColorGroup defaultColorGroup = TQApplication::tqpalette().active();
 
 	TQDomElement cell_style;
 
@@ -938,7 +938,7 @@ void GNUMERICExport::addSummaryItem(TQDomDocument gnumeric_doc, TQDomElement sum
 
 // The reason why we use the KoDocument* approach and not the TQDomDocument
 // approach is because we don't want to export formulas but values !
-KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to )
 {
     kdDebug(30521) << "Exporting GNUmeric" << endl;
 
@@ -1443,7 +1443,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const
                         //<gmr:CellComment Author="" Text="cvbcvbxcvb&#10;cb&#10;xc&#10;vbxcv&#10;" ObjectBound="A1" ObjectOffset="0 0 0 0" ObjectAnchorType="17 16 17 16" Direction="17"/>
                         cellComment = gnumeric_doc.createElement("gmr:CellComment");
                         cellComment.setAttribute( "Text", cell->format()->comment( currentcolumn, currentrow ) );
-                        TQString sCell=TQString( "%1%2" ).arg( Cell::columnName(currentcolumn ) ).arg( currentrow );
+                        TQString sCell=TQString( "%1%2" ).tqarg( Cell::columnName(currentcolumn ) ).tqarg( currentrow );
 
                         cellComment.setAttribute("ObjectBound", sCell );
                         objects.appendChild(cellComment);
diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h
index 0b2b0324..392f0f72 100644
--- a/filters/kspread/gnumeric/gnumericexport.h
+++ b/filters/kspread/gnumeric/gnumericexport.h
@@ -37,7 +37,7 @@ public:
     GNUMERICExport(KoFilter *parent, const char*name, const TQStringList&);
     virtual ~GNUMERICExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
     TQDomElement GetCellStyle(TQDomDocument gnumeric_doc, KSpread::Cell* cell, int currentcolumn, int currentrow);
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc
index b0833e87..249258b3 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cc
@@ -1822,7 +1822,7 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table)
   */
 
 
-KoFilter::ConversionStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to )
+KoFilter::ConversiontqStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to )
 {
     dateInit();
     bool bSuccess=true;
diff --git a/filters/kspread/gnumeric/gnumericimport.h b/filters/kspread/gnumeric/gnumericimport.h
index c449a599..b7fbd4bd 100644
--- a/filters/kspread/gnumeric/gnumericimport.h
+++ b/filters/kspread/gnumeric/gnumericimport.h
@@ -39,7 +39,7 @@ class GNUMERICFilter : public KoFilter
     GNUMERICFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~GNUMERICFilter() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 enum borderStyle { Left, Right, Top, Bottom, Diagonal, Revdiagonal};
  private:
diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html
index a25cdf4b..7bd198cc 100644
--- a/filters/kspread/gnumeric/status.html
+++ b/filters/kspread/gnumeric/status.html
@@ -211,7 +211,7 @@ Bold
 <br>Cell Size:Qt::Horizontal &amp;Qt::Vertical
 <br>Hidden columns/rows&nbsp;
 <br>Selected Tab
-<br>Paper layout
+<br>Paper tqlayout
 <br>area name
 <br>Cell comment
 <br>Text Rotation
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index aa9366bf..72dd6875 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -22,7 +22,7 @@
 #include <tqlistbox.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <kglobal.h>
@@ -44,7 +44,7 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name )
            m_mainwidget->mSheets, TQT_SLOT( clearSelection() ) );
 
   m_mainwidget->mEncodingBox->insertItem( i18n( "Recommended: UTF-8" ) );
-  m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( KGlobal::locale()->codecForEncoding()->name() ) );
+  m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).tqarg( KGlobal::locale()->codecForEncoding()->name() ) );
 
   m_mainwidget->mCustomURL->setMode( KFile::ExistingOnly );
 
diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui
index 1b6ad59b..df5dcc90 100644
--- a/filters/kspread/html/exportwidget.ui
+++ b/filters/kspread/html/exportwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -86,7 +86,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -124,7 +124,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>330</width>
                                     <height>20</height>
@@ -222,7 +222,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -271,7 +271,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -292,7 +292,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc
index 93991ad0..54711d8d 100644
--- a/filters/kspread/html/htmlexport.cc
+++ b/filters/kspread/html/htmlexport.cc
@@ -23,7 +23,7 @@
 #include <exportdialog.h>
 
 #include <tqfile.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -76,7 +76,7 @@ const TQString strGt  ("&gt;");
 
 // The reason why we use the KoDocument* approach and not the TQDomDocument
 // approach is because we don't want to export formulas but values !
-KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="text/html" || from!="application/x-kspread")
     {
@@ -186,7 +186,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str )
   str += "<html>\n";
   str += "<head>\n";
   str += "<meta http-equiv=\"Content-Type\" ";
-  str += TQString("content=\"text/html; charset=%1\">\n").arg( m_dialog->encoding()->mimeName() );
+  str += TQString("content=\"text/html; charset=%1\">\n").tqarg( m_dialog->encoding()->mimeName() );
   str += "<meta name=\"Generator\" ";
   str += "content=\"KSpread HTML Export Filter Version = ";
   str += KOFFICE_VERSION_STRING;
@@ -202,7 +202,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str )
 
   str += "<title>" + title + "</title>\n";
   str += "</head>\n";
-  str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").arg(
+  str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").tqarg(
       sheet->isRightToLeft()?"rtl":"ltr");
 
   str += "<a name=\"__top\">\n";
@@ -234,8 +234,8 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int
     int step=iMaxRow > 50 ? iMaxRow/50 : 1;
     int i=1;
 
-    str += "<" + html_table_tag + html_table_options.arg( m_dialog->useBorders() ? "1" : "0" ).arg( m_dialog->pixelsBetweenCells() ) +
-           TQString("dir=\"%1\">\n").arg(sheet->isRightToLeft()?"rtl":"ltr");
+    str += "<" + html_table_tag + html_table_options.tqarg( m_dialog->useBorders() ? "1" : "0" ).tqarg( m_dialog->pixelsBetweenCells() ) +
+           TQString("dir=\"%1\">\n").tqarg(sheet->isRightToLeft()?"rtl":"ltr");
 
     unsigned int nonempty_cells_prev=0;
 
@@ -297,7 +297,7 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int
 #endif
             line += "  <" + html_cell_tag + html_cell_options;
 	    if (text.isRightToLeft() != sheet->isRightToLeft())
-                line += TQString(" dir=\"%1\" ").arg(text.isRightToLeft()?"rtl":"ltr");
+                line += TQString(" dir=\"%1\" ").tqarg(text.isRightToLeft()?"rtl":"ltr");
             if (bgcolor.isValid() && bgcolor.name()!="#ffffff") // change color only for non-white cells
                 line += " bgcolor=\"" + bgcolor.name() + "\"";
 
diff --git a/filters/kspread/html/htmlexport.h b/filters/kspread/html/htmlexport.h
index c7007157..09f904d3 100644
--- a/filters/kspread/html/htmlexport.h
+++ b/filters/kspread/html/htmlexport.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 );
   private:
     /** Writes the top of the page in HTML to @par str */
     void openPage( KSpread::Sheet *sheet,KoDocument *document, TQString &str);
diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc
index ac725982..15e8ee2a 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cc
@@ -74,7 +74,7 @@ KSpreadKexiImport::~KSpreadKexiImport()
 
 //=============================================================================
 
-KoFilter::ConversionStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to )
 {
     TQPtrList<TQListViewItem> objects;
     TQString file( m_chain->inputFile() );
diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h
index 4de3e704..aec65889 100644
--- a/filters/kspread/kexi/kspread_kexiimport.h
+++ b/filters/kspread/kexi/kspread_kexiimport.h
@@ -76,7 +76,7 @@ class KSpreadKexiImport : public KoFilter
      */
       virtual ~KSpreadKexiImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
     
     private:
         KSpread::Doc *ksdoc;
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc
index f99b76a3..9ddf240f 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.cc
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc
@@ -35,7 +35,7 @@
 #include <klistview.h>
 #include <kcombobox.h>
 #include <tqradiobutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 
diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
index fad0e0be..d9d28d55 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
+++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
@@ -35,7 +35,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout5</cstring>
+                    <cstring>tqlayout5</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -110,7 +110,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout8</cstring>
+                    <cstring>tqlayout8</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -180,7 +180,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -196,7 +196,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>145</width>
                             <height>0</height>
diff --git a/filters/kspread/latex/export/config.h b/filters/kspread/latex/export/config.h
index 969d021d..6e35bd1c 100644
--- a/filters/kspread/latex/export/config.h
+++ b/filters/kspread/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/kspread/latex/export/document.h b/filters/kspread/latex/export/document.h
index 733310bc..b8f0296c 100644
--- a/filters/kspread/latex/export/document.h
+++ b/filters/kspread/latex/export/document.h
@@ -24,7 +24,7 @@
 #define __KSPREAD_LATEX_DOCUMENT_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 "xmlparser.h"
diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cc
index 07b1fbe4..8ee9eee0 100644
--- a/filters/kspread/latex/export/fileheader.cc
+++ b/filters/kspread/latex/export/fileheader.cc
@@ -79,7 +79,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();
@@ -282,7 +282,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/kspread/latex/export/fileheader.h b/filters/kspread/latex/export/fileheader.h
index 1d9b6025..5c4e7774 100644
--- a/filters/kspread/latex/export/fileheader.h
+++ b/filters/kspread/latex/export/fileheader.h
@@ -22,7 +22,7 @@
 #ifndef __KSPREAD_LATEX_FILEHEADER_H__
 #define __KSPREAD_LATEX_FILEHEADER_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "xmlparser.h"
 
diff --git a/filters/kspread/latex/export/format.h b/filters/kspread/latex/export/format.h
index 9b03a258..7025c371 100644
--- a/filters/kspread/latex/export/format.h
+++ b/filters/kspread/latex/export/format.h
@@ -23,7 +23,7 @@
 #ifndef __KSPREAD_LATEX_FORMAT_H__
 #define __KSPREAD_LATEX_FORMAT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/formula.h b/filters/kspread/latex/export/formula.h
index b023cdf6..03ba4bd6 100644
--- a/filters/kspread/latex/export/formula.h
+++ b/filters/kspread/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/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 7a058550..a7f03f60 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -69,7 +69,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
 	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())
 		{
@@ -99,7 +99,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
   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/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc
index c1cdd389..66927728 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cc
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "kspreadlatexexportdiaImpl.h"
 
 typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory;
@@ -35,7 +35,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/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h
index 4d34e0f0..e7c0312b 100644
--- a/filters/kspread/latex/export/latexexport.h
+++ b/filters/kspread/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/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui
index 741a9c7e..8c3835ed 100644
--- a/filters/kspread/latex/export/latexexportdia.ui
+++ b/filters/kspread/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/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cc
index 886f6c11..a2256d5e 100644
--- a/filters/kspread/latex/export/map.cc
+++ b/filters/kspread/latex/export/map.cc
@@ -46,7 +46,7 @@ void Map::analyse(const TQDomNode balise)
 	/* Analyse of the parameters */
 	kdDebug(30522) << "ANALYSE A MAP" << endl;
 
-	/* Analyse of the children markups */
+	/* Analyse of the tqchildren markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		// Only tables
diff --git a/filters/kspread/latex/export/pen.h b/filters/kspread/latex/export/pen.h
index 54792205..49da17e0 100644
--- a/filters/kspread/latex/export/pen.h
+++ b/filters/kspread/latex/export/pen.h
@@ -23,7 +23,7 @@
 #ifndef __KSPREAD_LATEX_PEN_H__
 #define __KSPREAD_LATEX_PEN_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/spreadsheet.h b/filters/kspread/latex/export/spreadsheet.h
index dfc2f092..03984105 100644
--- a/filters/kspread/latex/export/spreadsheet.h
+++ b/filters/kspread/latex/export/spreadsheet.h
@@ -23,7 +23,7 @@
 #define __KSPREAD_LATEX_SPREADSHEET_H__
 
 #include <tqptrlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "map.h"
 #include "config.h"
diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cc
index fb2c8e1f..6b85f243 100644
--- a/filters/kspread/latex/export/xmlparser.cc
+++ b/filters/kspread/latex/export/xmlparser.cc
@@ -89,18 +89,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/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
index cc7b2b46..ba56c229 100644
--- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
+++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
@@ -31,7 +31,7 @@ KSpreadBaseWorker::~KSpreadBaseWorker() {
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startDocument: " << it.key() << "->" << it.data() << endl;
@@ -40,7 +40,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startDocument(KSpreadFilterPropert
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startInfoLog: " << it.key() << "->" << it.data() << endl;
@@ -49,7 +49,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startInfoAuthor: " << it.key() << "->" << it.data() << endl;
@@ -58,7 +58,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterPrope
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startInfoAbout: " << it.key() << "->" << it.data() << endl;
@@ -67,7 +67,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProper
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startSpreadBook: " << it.key() << "->" << it.data() << endl;
@@ -76,7 +76,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterPrope
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startSpreadSheet: " << it.key() << "->" << it.data() << endl;
@@ -85,7 +85,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProp
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startSpreadCell: " << it.key() << "->" << it.data() << endl;
diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
index 13b3d380..4ba82383 100644
--- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
+++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
@@ -33,13 +33,13 @@ public:
 	KSpreadBaseWorker();
 	virtual ~KSpreadBaseWorker();
 
-	virtual KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property);
 };
 
 #endif /* KSPREAD_BASE_WORKER_H */
diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cc
index b1b9a0aa..9ba2d874 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.cc
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.cc
@@ -48,8 +48,8 @@ void Leader::setWorker(KSpreadBaseWorker *newWorker) {
 }
 
 
-KoFilter::ConversionStatus Leader::convert() {
-	KoFilter::ConversionStatus status;
+KoFilter::ConversiontqStatus Leader::convert() {
+	KoFilter::ConversiontqStatus status;
 
 	// Validate the filter chain and the worker
 	if (!m_filterChain) {
@@ -122,8 +122,8 @@ KoFilter::ConversionStatus Leader::convert() {
 }
 
 
-KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) {
-	KoFilter::ConversionStatus status;
+KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) {
+	KoFilter::ConversiontqStatus status;
 
 #if 0 // this was never used, it's been removed now
 	// Gather data about the document log
@@ -164,7 +164,7 @@ KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) {
 }
 
 
-KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) {
+KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) {
 	KSpreadFilterProperty docSpreadBookProperty;
 	docSpreadBookProperty["spreadsheetcount"] = TQString::number(document->map()->count());
 	docSpreadBookProperty["decimalsymbol"] = document->locale()->decimalSymbol();
@@ -216,7 +216,7 @@ KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) {
 }
 
 
-KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
+KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
 	KSpreadFilterProperty docSpreadSheetProperty;
 	docSpreadSheetProperty["name"] = spreadSheet->tableName();
 	docSpreadSheetProperty["sizemaxx"] = TQString::number(spreadSheet->sizeMaxX());
@@ -257,7 +257,7 @@ KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
 }
 
 
-KoFilter::ConversionStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) {
+KoFilter::ConversiontqStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) {
 	KSpreadFilterProperty docSpreadCellProperty;
 	docSpreadCellProperty["column"] = TQString::number(column);
 	docSpreadCellProperty["row"] = TQString::number(row);
diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.h b/filters/kspread/libkspreadexport/KSpreadLeader.h
index eee950b9..7e9abfed 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.h
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.h
@@ -78,10 +78,10 @@ private:
 
 protected:
 	KSpreadBaseWorker *getWorker() const;
-	KoFilter::ConversionStatus doSpreadCell(Cell *spreadCell, int column, int row);
-	KoFilter::ConversionStatus doSpreadSheet(Sheet *spreadSheet);
-	KoFilter::ConversionStatus doSpreadBook(Doc *document);
-	KoFilter::ConversionStatus doInfo(KoDocumentInfo *info);
+	KoFilter::ConversiontqStatus doSpreadCell(Cell *spreadCell, int column, int row);
+	KoFilter::ConversiontqStatus doSpreadSheet(Sheet *spreadSheet);
+	KoFilter::ConversiontqStatus doSpreadBook(Doc *document);
+	KoFilter::ConversiontqStatus doInfo(KoDocumentInfo *info);
 
 public:
 	/**
@@ -97,7 +97,7 @@ public:
 	*
 	* @return status of the conversion.
 	*/
-	KoFilter::ConversionStatus convert();
+	KoFilter::ConversiontqStatus convert();
 };
 
 } // namespace KSpread
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index ce1a55ad..9e37597c 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -83,7 +83,7 @@ OpenCalcExport::OpenCalcExport( KoFilter *, const char *, const TQStringList & )
 {
 }
 
-KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from,
+KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from,
                                                     const TQCString & to )
 {
   /* later...
@@ -91,7 +91,7 @@ KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from,
      OpenCalcWorker * worker = new OpenCalcWorker();
      leader->setWorker( worker );
 
-     KoFilter::ConversionStatus status = leader->convert();
+     KoFilter::ConversiontqStatus status = leader->convert();
 
      delete worker;
      delete leader;
@@ -227,7 +227,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc )
   data.appendChild( meta.createTextNode( aboutPage->subject() ) );
   officeMeta.appendChild( data );
 
-  const TQDateTime dt ( TQDateTime::currentDateTime() );
+  const TQDateTime dt ( TQDateTime::tqcurrentDateTime() );
   if ( dt.isValid() )
   {
     data = meta.createElement( "dc:date" );
@@ -844,7 +844,7 @@ void OpenCalcExport::exportDefaultCellStyle( TQDomDocument & doc, TQDomElement &
 
   TQDomElement style = doc.createElement( "style:properties" );
   style.setAttribute( "style:font-name", font.family() );
-  style.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( font.pointSize() ) );
+  style.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( font.pointSize() ) );
   style.setAttribute( "style:decimal-places", TQString::number( locale->fracDigits() ) );
   style.setAttribute( "fo:language", language );
   style.setAttribute( "fo:country", country );
@@ -881,8 +881,8 @@ void OpenCalcExport::exportPageAutoStyles( TQDomDocument & doc, TQDomElement & a
     height = sheet->print()->paperHeight() / 10;
   }
 
-  TQString sWidth  = TQString( "%1cm" ).arg( width  );
-  TQString sHeight = TQString( "%1cm" ).arg( height );
+  TQString sWidth  = TQString( "%1cm" ).tqarg( width  );
+  TQString sHeight = TQString( "%1cm" ).tqarg( height );
 
   TQDomElement pageMaster = doc.createElement( "style:page-master" );
   pageMaster.setAttribute( "style:name", "pm1" );
@@ -1073,7 +1073,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
           TQDomElement t = doc.createElement( "text:date" );
           t.setAttribute( "text:date-value", "0-00-00" );
           // todo: "style:data-style-name", "N2"
-          t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) );
+          t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) );
           parent.appendChild( t );
         }
         else if ( var == "<time>" )
diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h
index 03cfa245..97832a9a 100644
--- a/filters/kspread/opencalc/opencalcexport.h
+++ b/filters/kspread/opencalc/opencalcexport.h
@@ -46,7 +46,7 @@ class OpenCalcExport : public KoFilter
   OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcExport() {}
 
-  virtual KoFilter::ConversionStatus convert( const TQCString & from,
+  virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
                                               const TQCString & to );
 
  private:
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 60412181..376a8f77 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -168,7 +168,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
 
   double height = -1.0;
   bool insertPageBreak = false;
-  Format layout( table, table->doc()->styleManager()->defaultStyle() );
+  Format tqlayout( table, table->doc()->styleManager()->defaultStyle() );
 
   while( !node.isNull() )
   {
@@ -190,7 +190,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
         }
       }
 
-      loadStyleProperties( &layout, property );
+      loadStyleProperties( &tqlayout, property );
     }
 
     node = node.nextSibling();
@@ -219,7 +219,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
   for ( int i = 0; i < number; ++i )
   {
     RowFormat * rowL = table->nonDefaultRowFormat( row );
-    rowL->copy( layout );
+    rowL->copy( tqlayout );
 
     if ( height != -1 )
     {
@@ -480,10 +480,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet  * table, int row,
         psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() );
 
       kdDebug(30518) << "Default style: " << psName << endl;
-      Format * layout = m_defaultStyles[psName];
+      Format * tqlayout = m_defaultStyles[psName];
 
-      if ( layout )
-        cell->format()->copy( *layout );
+      if ( tqlayout )
+        cell->format()->copy( *tqlayout );
 
       TQDomElement * st = 0;
       if ( e.hasAttributeNS( ooNS::table, "style-name" ) )
@@ -548,10 +548,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet  * table, int row,
 
       TQString psName( "Default" );
       kdDebug(30518) << "Default style: " << psName << endl;
-      Format * layout = m_defaultStyles[psName];
+      Format * tqlayout = m_defaultStyles[psName];
 
-      if ( layout )
-        cell->format()->copy( *layout );
+      if ( tqlayout )
+        cell->format()->copy( *tqlayout );
     }
     if ( e.hasAttributeNS( ooNS::table, "formula" ) )
     {
@@ -959,16 +959,16 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table )
       return false;
 
     RowFormat * srcLayout = table->nonDefaultRowFormat( backupRow );
-    RowFormat * layout = 0;
+    RowFormat * tqlayout = 0;
 
     if ( collapsed )
       srcLayout->setHide( true );
 
     for ( i = 1; i < number; ++i )
     {
-      layout = table->nonDefaultRowFormat( backupRow + i );
+      tqlayout = table->nonDefaultRowFormat( backupRow + i );
 
-      layout->copy( *srcLayout );
+      tqlayout->copy( *srcLayout );
 
       /*
        * TODO: Test: do we need to copy the cells, too?
@@ -1047,14 +1047,14 @@ bool OpenCalcImport::readColLayouts( TQDomElement & content, Sheet * table )
 
         if ( st && !st->isNull() )
         {
-          Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+          Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
 
-          readInStyle( layout, *st );
+          readInStyle( tqlayout, *st );
 
-          m_defaultStyles.insert( name, layout );
+          m_defaultStyles.insert( name, tqlayout );
           kdDebug(30518) << "Insert default cell style: " << name << endl;
 
-          defaultStyle = layout;
+          defaultStyle = tqlayout;
         }
       }
 
@@ -1281,7 +1281,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
     TQString orientation = "Portrait";
     TQString format;
 
-    // Laurent : Why we stored layout information as Millimeter ?!!!!!
+    // Laurent : Why we stored tqlayout information as Millimeter ?!!!!!
     // kspread used point for all other attribute
     // I don't understand :(
     if ( styleStack.hasAttributeNS( ooNS::fo, "page-width" ) )
@@ -1387,7 +1387,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
             kdDebug(30518)<<" table-centering unknown :"<<str<<endl;
 #endif
     }
-    format = TQString( "%1x%2" ).arg( width ).arg( height );
+    format = TQString( "%1x%2" ).tqarg( width ).tqarg( height );
     kdDebug(30518)<<" format : "<<format<<endl;
     table->print()->setPaperLayout( left, top, right, bottom, format, orientation );
 
@@ -1962,32 +1962,32 @@ TQString * OpenCalcImport::loadFormat( TQDomElement * element,
   return format;
 }
 
-void OpenCalcImport::loadFontStyle( Format * layout, TQDomElement const * font ) const
+void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font ) const
 {
-  if ( !font || !layout )
+  if ( !font || !tqlayout )
     return;
 
-  kdDebug(30518) << "Copy font style from the layout " << font->tagName() << ", " << font->nodeName() << endl;
+  kdDebug(30518) << "Copy font style from the tqlayout " << font->tagName() << ", " << font->nodeName() << endl;
 
   if ( font->hasAttributeNS( ooNS::fo, "font-family" ) )
-    layout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
+    tqlayout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
   if ( font->hasAttributeNS( ooNS::fo, "color" ) )
-    layout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
+    tqlayout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
   if ( font->hasAttributeNS( ooNS::fo, "font-size" ) )
-      layout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
+      tqlayout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
   else
-    layout->setTextFontSize( 10 );
+    tqlayout->setTextFontSize( 10 );
   if ( font->hasAttributeNS( ooNS::fo, "font-style" ) )
   {
     kdDebug(30518) << "italic" << endl;
-    layout->setTextFontItalic( true ); // only thing we support
+    tqlayout->setTextFontItalic( true ); // only thing we support
   }
   if ( font->hasAttributeNS( ooNS::fo, "font-weight" ) )
-    layout->setTextFontBold( true ); // only thing we support
+    tqlayout->setTextFontBold( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::fo, "text-underline" ) || font->hasAttributeNS( ooNS::style, "text-underline" ) )
-    layout->setTextFontUnderline( true ); // only thing we support
+    tqlayout->setTextFontUnderline( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::style, "text-crossing-out" ) )
-    layout->setTextFontStrike( true ); // only thing we support
+    tqlayout->setTextFontStrike( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::style, "font-pitch" ) )
   {
     // TODO: possible values: fixed, variable
@@ -1996,7 +1996,7 @@ void OpenCalcImport::loadFontStyle( Format * layout, TQDomElement const * font )
   // text-underline-color
 }
 
-void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bPos pos ) const
+void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, bPos pos ) const
 {
   if ( borderDef == "none" )
     return;
@@ -2038,24 +2038,24 @@ void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bP
   pen.setColor( TQColor( borderDef.right( p - p2 ) ) );
 
   if ( pos == Left )
-    layout->setLeftBorderPen( pen );
+    tqlayout->setLeftBorderPen( pen );
   else if ( pos == Top )
-    layout->setTopBorderPen( pen );
+    tqlayout->setTopBorderPen( pen );
   else if ( pos == Right )
-    layout->setRightBorderPen( pen );
+    tqlayout->setRightBorderPen( pen );
   else if ( pos == Bottom )
-    layout->setBottomBorderPen( pen );
+    tqlayout->setBottomBorderPen( pen );
   else if ( pos == Border )
   {
-    layout->setLeftBorderPen( pen );
-    layout->setTopBorderPen( pen );
-    layout->setRightBorderPen( pen );
-    layout->setBottomBorderPen( pen );
+    tqlayout->setLeftBorderPen( pen );
+    tqlayout->setTopBorderPen( pen );
+    tqlayout->setRightBorderPen( pen );
+    tqlayout->setBottomBorderPen( pen );
   }
   // TODO Diagonals not supported by oocalc
 }
 
-void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const & property ) const
+void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const & property ) const
 {
   kdDebug(30518) << "*** Loading style properties *****" << endl;
 
@@ -2064,16 +2064,16 @@ void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const &
     bool ok = false;
     int p = property.attributeNS( ooNS::style, "decimal-places", TQString() ).toInt( &ok );
     if (ok )
-      layout->setPrecision( p );
+      tqlayout->setPrecision( p );
   }
 
   if ( property.hasAttributeNS( ooNS::style, "font-name" ) )
   {
     TQDomElement * font = m_styles[ property.attributeNS( ooNS::style, "font-name", TQString() ) ];
-    loadFontStyle( layout, font ); // generell font style
+    loadFontStyle( tqlayout, font ); // generell font style
   }
 
-  loadFontStyle( layout, &property ); // specific font style
+  loadFontStyle( tqlayout, &property ); // specific font style
 
   // TODO:
   //   diagonal: fall + goup
@@ -2090,133 +2090,133 @@ void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const &
     bool ok = false;
     int a = property.attributeNS( ooNS::style, "rotation-angle", TQString() ).toInt( &ok );
     if ( ok )
-      layout->setAngle( -a + 1 );
+      tqlayout->setAngle( -a + 1 );
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "direction" ) )
   {
-      layout->setVerticalText( true );
+      tqlayout->setVerticalText( true );
   }
   if ( property.hasAttributeNS( ooNS::fo, "text-align" ) )
   {
     TQString s = property.attributeNS( ooNS::fo, "text-align", TQString() );
     if ( s == "center" )
-      layout->setAlign( Format::Center );
+      tqlayout->setAlign( Format::Center );
     else if ( s == "end" )
-      layout->setAlign( Format::Right );
+      tqlayout->setAlign( Format::Right );
     else if ( s == "start" )
-      layout->setAlign( Format::Left );
+      tqlayout->setAlign( Format::Left );
     else if ( s == "justify" ) // TODO in KSpread!
-      layout->setAlign( Format::Center );
+      tqlayout->setAlign( Format::Center );
   }
   if (  property.hasAttributeNS( ooNS::fo, "margin-left" ) )
   {
       kdDebug(30518)<<"margin-left :"<<KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 )<<endl;
-      layout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
+      tqlayout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
   }
   if ( property.hasAttributeNS( ooNS::fo, "background-color" ) )
-    layout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
+    tqlayout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
 
   if ( property.hasAttributeNS( ooNS::style, "print-content" ) )
   {
     if ( property.attributeNS( ooNS::style, "print-content", TQString() ) == "false" )
-      layout->setDontPrintText( false );
+      tqlayout->setDontPrintText( false );
   }
   if ( property.hasAttributeNS( ooNS::style, "cell-protect" ) )
   {
     TQString prot( property.attributeNS( ooNS::style, "cell-protect", TQString() ) );
     if ( prot == "none" )
     {
-      layout->setNotProtected( true );
-      layout->setHideFormula( false );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( true );
+      tqlayout->setHideFormula( false );
+      tqlayout->setHideAll( false );
     }
     else if ( prot == "formula-hidden" )
     {
-      layout->setNotProtected( true );
-      layout->setHideFormula( true );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( true );
+      tqlayout->setHideFormula( true );
+      tqlayout->setHideAll( false );
     }
     else if ( prot == "protected formula-hidden" )
     {
-      layout->setNotProtected( false );
-      layout->setHideFormula( true );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( false );
+      tqlayout->setHideFormula( true );
+      tqlayout->setHideAll( false );
     }
     else if ( prot == "hidden-and-protected" )
     {
-      layout->setNotProtected( false );
-      layout->setHideFormula( false );
-      layout->setHideAll( true );
+      tqlayout->setNotProtected( false );
+      tqlayout->setHideFormula( false );
+      tqlayout->setHideAll( true );
     }
     else if ( prot == "protected" )
     {
-      layout->setNotProtected( false );
-      layout->setHideFormula( false );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( false );
+      tqlayout->setHideFormula( false );
+      tqlayout->setHideAll( false );
     }
     kdDebug(30518) << "Cell " << prot << endl;
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "padding-left" ) )
-    layout->setIndent(  KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
+    tqlayout->setIndent(  KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
 
   if ( property.hasAttributeNS( ooNS::fo, "vertical-align" ) )
   {
     TQString s = property.attributeNS( ooNS::fo, "vertical-align", TQString() );
     if ( s == "middle" )
-      layout->setAlignY( Format::Middle );
+      tqlayout->setAlignY( Format::Middle );
     else if ( s == "bottom" )
-      layout->setAlignY( Format::Bottom );
+      tqlayout->setAlignY( Format::Bottom );
     else
-      layout->setAlignY( Format::Top );
+      tqlayout->setAlignY( Format::Top );
   }
   else
-      layout->setAlignY( Format::Bottom );
+      tqlayout->setAlignY( Format::Bottom );
 
   if ( property.hasAttributeNS( ooNS::fo, "wrap-option" ) )
   {
-    layout->setMultiRow( true );
+    tqlayout->setMultiRow( true );
 
     /* we do not support anything else yet
       TQString s = property.attributeNS( ooNS::fo, "wrap-option", TQString() );
       if ( s == "wrap" )
-      layout->setMultiRow( true );
+      tqlayout->setMultiRow( true );
     */
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-bottom" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
     // TODO: style:border-line-width-bottom if double!
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-right" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
     // TODO: style:border-line-width-right
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-top" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
     // TODO: style:border-line-width-top
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-left" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
     // TODO: style:border-line-width-left
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
     // TODO: style:border-line-width-left
   }
 }
 
-void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
+void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style )
 {
   kdDebug(30518) << "** Reading Style: " << style.tagName() << "; " << style.attributeNS( ooNS::style, "name", TQString()) << endl;
   if ( style.localName() == "style" && style.namespaceURI()==ooNS::style)
@@ -2225,20 +2225,20 @@ void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
     {
       Format * cp
         = m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) );
-      kdDebug(30518) << "Copying layout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
+      kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
 
       if ( cp != 0 )
-        layout->copy( *cp );
+        tqlayout->copy( *cp );
     }
     else if ( style.hasAttributeNS( ooNS::style, "family") )
     {
       TQString name = style.attribute( "style-family" ) + "default";
       Format * cp = m_defaultStyles.find( name );
 
-      kdDebug(30518) << "Copying layout from " << name << ", " << !cp << endl;
+      kdDebug(30518) << "Copying tqlayout from " << name << ", " << !cp << endl;
 
       if ( cp != 0 )
-        layout->copy( *cp );
+        tqlayout->copy( *cp );
     }
 
     if ( style.hasAttributeNS( ooNS::style, "data-style-name" ) )
@@ -2255,8 +2255,8 @@ void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
 
       if ( format )
       {
-        layout->setFormatString( *format );
-        layout->setFormatType( formatType );
+        tqlayout->setFormatString( *format );
+        tqlayout->setFormatType( formatType );
       }
 
       // <number:currency-symbol number:language="de" number:country="DE">€</number:currency-symbol>
@@ -2267,9 +2267,9 @@ void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
   forEachElement( property, style )
   {
     if ( property.localName() == "properties" && property.namespaceURI() == ooNS::style )
-      loadStyleProperties( layout, property );
+      loadStyleProperties( tqlayout, property );
 
-    kdDebug(30518) << layout->textFontFamily( 0, 0 ) << endl;
+    kdDebug(30518) << tqlayout->textFontFamily( 0, 0 ) << endl;
   }
 }
 
@@ -2289,7 +2289,7 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
       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.arg( content.attributeNS( ooNS::office, "version", TQString() ) );
+        message.tqarg( content.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
@@ -2358,13 +2358,13 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
 
     if ( !e.isNull() )
     {
-      Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+      Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
 
-      readInStyle( layout, e );
+      readInStyle( tqlayout, e );
       kdDebug(30518) << "Default style " << e.attributeNS( ooNS::style, "family", TQString() ) << "default" << " loaded " << endl;
 
-      m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", layout );
-      //      TQFont font = layout->font();
+      m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", tqlayout );
+      //      TQFont font = tqlayout->font();
       //      kdDebug(30518) << "Font: " << font.family() << ", " << font.toString() << endl;
     }
 
@@ -2384,12 +2384,12 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
       continue;
     }
 
-    Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
-    readInStyle( layout, defs );
+    Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+    readInStyle( tqlayout, defs );
     kdDebug(30518) << "Default style " << defs.attributeNS( ooNS::style, "name", TQString() ) << " loaded " << endl;
 
-    m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), layout );
-    //    kdDebug(30518) << "Font: " << layout->font().family() << ", " << layout->font().toString() << endl;
+    m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), tqlayout );
+    //    kdDebug(30518) << "Font: " << tqlayout->font().family() << ", " << tqlayout->font().toString() << endl;
 
     defs = defs.nextSibling().toElement();
   }
@@ -2735,7 +2735,7 @@ int OpenCalcImport::readMetaData()
   return result;
 }
 
-KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
 {
   kdDebug(30518) << "Entering OpenCalc Import filter: " << from << " - " << to << endl;
 
@@ -2765,10 +2765,10 @@ KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCS
 
   kdDebug(30518) << "Opening file " << endl;
 
-  KoFilter::ConversionStatus preStatus = openFile();
+  KoFilter::ConversiontqStatus pretqStatus = openFile();
 
-  if ( preStatus != KoFilter::OK )
-    return preStatus;
+  if ( pretqStatus != KoFilter::OK )
+    return pretqStatus;
 
   emit sigProgress( 13 );
   int tables = readMetaData();
@@ -2782,7 +2782,7 @@ KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCS
   return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OpenCalcImport::openFile()
+KoFilter::ConversiontqStatus OpenCalcImport::openFile()
 {
   KoStore * store = KoStore::createStore( m_chain->inputFile(), KoStore::Read);
 
@@ -2817,7 +2817,7 @@ KoFilter::ConversionStatus OpenCalcImport::openFile()
   return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store )
+KoFilter::ConversiontqStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store )
 {
     return OoUtils::loadAndParse( fileName, doc, m_store);
 }
diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h
index 8965dae5..cd1f23b6 100644
--- a/filters/kspread/opencalc/opencalcimport.h
+++ b/filters/kspread/opencalc/opencalcimport.h
@@ -47,7 +47,7 @@ class OpenCalcImport : public KoFilter
   OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcImport();
 
-  virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
+  virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
 
 
  private:
@@ -90,10 +90,10 @@ class OpenCalcImport : public KoFilter
   bool readRowsAndCells( TQDomElement & content, KSpread::Sheet * table );
   bool readCells( TQDomElement & rowNode, KSpread::Sheet  * table, int row, int & columns );
   void convertFormula( TQString & text, TQString const & f ) const;
-  void loadFontStyle( KSpread::Format * layout, TQDomElement const * font ) const;
-  void readInStyle( KSpread::Format * layout, TQDomElement const & style );
-  void loadStyleProperties( KSpread::Format * layout, TQDomElement const & property ) const;
-  void loadBorder( KSpread::Format * layout, TQString const & borderDef, bPos pos ) const;
+  void loadFontStyle( KSpread::Format * tqlayout, TQDomElement const * font ) const;
+  void readInStyle( KSpread::Format * tqlayout, TQDomElement const & style );
+  void loadStyleProperties( KSpread::Format * tqlayout, TQDomElement const & property ) const;
+  void loadBorder( KSpread::Format * tqlayout, TQString const & borderDef, bPos pos ) const;
   void loadTableMasterStyle( KSpread::Sheet * table, TQString const & stylename );
   TQString * loadFormat( TQDomElement * element,
                         KSpread::FormatType & formatType,
@@ -111,9 +111,9 @@ class OpenCalcImport : public KoFilter
     void loadOasisConditionValue( const TQString &styleCondition, KSpread::Conditional &newCondition );
     void loadOasisCondition( TQString &valExpression, KSpread::Conditional &newCondition );
     void loadOasisValidationValue( const TQStringList &listVal, KSpread::Conditional &newCondition );
-    KoFilter::ConversionStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
+    KoFilter::ConversiontqStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
 
-  KoFilter::ConversionStatus openFile();
+  KoFilter::ConversiontqStatus openFile();
 };
 
 #endif // OpenCalc_IMPORT_H__
diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc
index 9585ae13..f075713a 100644
--- a/filters/kspread/opencalc/opencalcstyleexport.cc
+++ b/filters/kspread/opencalc/opencalcstyleexport.cc
@@ -111,7 +111,7 @@ TQString OpenCalcStyles::cellStyle( CellStyle const & cs )
 
   m_cellStyles.append( t );
 
-  t->name = TQString( "ce%1" ).arg( m_cellStyles.count() );
+  t->name = TQString( "ce%1" ).tqarg( m_cellStyles.count() );
 
   return t->name;
 }
@@ -132,7 +132,7 @@ TQString OpenCalcStyles::columnStyle( ColumnStyle const & cs )
 
   m_columnStyles.append( t );
 
-  t->name = TQString( "co%1" ).arg( m_columnStyles.count() );
+  t->name = TQString( "co%1" ).tqarg( m_columnStyles.count() );
 
   return t->name;
 }
@@ -158,7 +158,7 @@ TQString OpenCalcStyles::rowStyle( RowStyle const & rs )
 
   m_rowStyles.append( t );
 
-  t->name = TQString( "ro%1" ).arg( m_rowStyles.count() );
+  t->name = TQString( "ro%1" ).tqarg( m_rowStyles.count() );
 
   return t->name;
 }
@@ -179,14 +179,14 @@ TQString OpenCalcStyles::sheetStyle( SheetStyle const & ts )
 
   m_sheetStyles.append( t );
 
-  t->name = TQString( "ta%1" ).arg( m_sheetStyles.count() );
+  t->name = TQString( "ta%1" ).tqarg( m_sheetStyles.count() );
 
   return t->name;
 }
 
 TQString convertPenToString( TQPen const & pen )
 {
-  TQString s( TQString( "%1cm solid " ).arg( pen.width() * 0.035 ) );
+  TQString s( TQString( "%1cm solid " ).tqarg( pen.width() * 0.035 ) );
   s += pen.color().name();
 
   return s;
@@ -212,7 +212,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
         if ( t->font.bold() != m_defaultFont.bold() )
             prop.setAttribute( "fo:font-weight", ( t->font.bold() ? "bold" : "light" ) );
 
-        prop.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( t->font.pointSize() ) );
+        prop.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( t->font.pointSize() ) );
 
         if ( t->font.underline() != m_defaultFont.underline() )
         {
@@ -250,7 +250,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
 
         if ( t->indent > 0.0 )
         {
-            prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).arg( t->indent ) );
+            prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).tqarg( t->indent ) );
             if ( t->alignX == Format::Undefined )
                 prop.setAttribute( "fo:text-align", "start" );
         }
@@ -323,7 +323,7 @@ void OpenCalcStyles::addColumnStyles( TQDomDocument & doc, TQDomElement & autoSt
     TQDomElement prop = doc.createElement( "style:properties" );
     if ( t->breakB != ::Style::none )
       prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) );
-    prop.setAttribute( "style:column-width", TQString( "%1cm" ).arg( t->size ) );
+    prop.setAttribute( "style:column-width", TQString( "%1cm" ).tqarg( t->size ) );
 
     ts.appendChild( prop );
     autoStyles.appendChild( ts );
@@ -346,7 +346,7 @@ void OpenCalcStyles::addRowStyles( TQDomDocument & doc, TQDomElement & autoStyle
     ts.setAttribute( "style:family", "table-row" );
 
     TQDomElement prop = doc.createElement( "style:properties" );
-    prop.setAttribute( "style:row-height", TQString( "%1cm" ).arg( t->size ) );
+    prop.setAttribute( "style:row-height", TQString( "%1cm" ).tqarg( t->size ) );
     if ( t->breakB != ::Style::none )
       prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) );
 
diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html
index b23f6ae9..dfaed8a4 100644
--- a/filters/kspread/opencalc/status.html
+++ b/filters/kspread/opencalc/status.html
@@ -51,7 +51,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
     Borders, background colors<br>
     column width, row width<br>
     column layouts, row layouts<br>
-    page layout (size, border)<br>
+    page tqlayout (size, border)<br>
     OpenCalc style import, default style<br>
     format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)<br>
     header, footer (including macros)<br>
@@ -139,7 +139,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
     Page sizes, header and footer (including variable converting)<br>    
     Font (sizes, attributes, color)<br>    
     Background color<br>
-    Text alignment, angle, vertical text, text wrap and indents<br>
+    Text tqalignment, angle, vertical text, text wrap and indents<br>
     Merged Cells<br>
     DontPrint flag<br>
     Comments<br>
@@ -169,10 +169,10 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
 
 <td>
  Jan 12, 2003 - Initial Revision<br>
- Jan 18, 2003 - page layout, header, footer<br>
+ Jan 18, 2003 - page tqlayout, header, footer<br>
  Jan 19, 2003 - Added support for fonts, text color, background color, formula 
 conversion<br>
- Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells<br>
+ Jan 19, 2003 - text tqalignment, indents, comments, NoPrint, Merged Cells<br>
  Jan 19, 2003 - angle, vertical text, text wrap<br>
  Jan 19, 2003 - named area, hidden columns and rows<br>
  Jan 20, 2003 - cell borders<br>
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc
index 920d20a7..9a0db4fa 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cc
@@ -94,7 +94,7 @@ QpImport::InitTableName(int pIdx, TQString& pResult)
    }
 }
 
-KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQCString& to )
 {
     bool bSuccess=true;
 
diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h
index e69d2a65..1c3c7d85 100644
--- a/filters/kspread/qpro/qproimport.h
+++ b/filters/kspread/qpro/qproimport.h
@@ -37,7 +37,7 @@ public:
     QpImport(KoFilter* parent, const char* name, const TQStringList&);
     virtual ~QpImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
     void InitTableName(int pIdx, TQString& pResult);
 };