Rename old tq methods that no longer need a unique name

76 files changed, 138 insertions, 138 deletions

diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index 717611cd..cac51013 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo)
 
     *m_streamOut << "</m>\n";
 
-    TQDateTime now (TQDateTime::tqcurrentDateTime(Qt::UTC)); // current time in UTC
+    TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC
     *m_streamOut << "<m key=\"abiword.date_last_changed\">"
          << escapeAbiWordText(transformToTextDate(now))
          << "</m>\n";
@@ -1225,7 +1225,7 @@ ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const T
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/x-abiword" || from != "application/x-kword" )
     {
@@ -1252,7 +1252,7 @@ KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, cons
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h
index 550b7682..656283f8 100644
--- a/filters/kword/abiword/abiwordexport.h
+++ b/filters/kword/abiword/abiwordexport.h
@@ -47,6 +47,6 @@ public:
     ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~ABIWORDExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // ABIWORDEXPORT_H
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 4815d02c..2de6d457 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler
 public:
     StructureParser(KoFilterChain* chain)
         :  m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0),
-        m_timepoint(TQDateTime::tqcurrentDateTime(Qt::UTC)), m_fatalerror(false)
+        m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false)
     {
         createDocument();
         structureStack.setAutoDelete(true);
@@ -1757,7 +1757,7 @@ ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const T
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to )
 {
     if ((to != "application/x-kword") || (from != "application/x-abiword"))
         return KoFilter::NotImplemented;
diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h
index 9ff4d764..8b8349b7 100644
--- a/filters/kword/abiword/abiwordimport.h
+++ b/filters/kword/abiword/abiwordimport.h
@@ -50,6 +50,6 @@ public:
     ABIWORDImport();
     virtual ~ABIWORDImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // ABIWORDIMPORT_H
diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc
index dd4550b8..4084d335 100644
--- a/filters/kword/amipro/amiproexport.cc
+++ b/filters/kword/amipro/amiproexport.cc
@@ -180,7 +180,7 @@ AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversiontqStatus 
+KoFilter::ConversionStatus 
 AmiProExport::convert( const TQCString& from, 
   const TQCString& to )
 {
@@ -191,7 +191,7 @@ AmiProExport::convert( const TQCString& from,
   AmiProWorker* worker = new AmiProWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversiontqStatus result;
+  KoFilter::ConversionStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h
index c9e1f5d9..bffb4362 100644
--- a/filters/kword/amipro/amiproexport.h
+++ b/filters/kword/amipro/amiproexport.h
@@ -35,7 +35,7 @@ class AmiProExport : public KoFilter
 
     virtual ~AmiProExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __AMIPROEXPORT_H
diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc
index 7f37746c..6061da20 100644
--- a/filters/kword/amipro/amiproimport.cc
+++ b/filters/kword/amipro/amiproimport.cc
@@ -157,9 +157,9 @@ static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout )
             "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\"";
 
   TQString linespacing;
-  linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) :
-                tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) :
-                tqlayout.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) :
+  linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
+                tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
+                tqlayout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
                   TQString::number( tqlayout.linespace );
 
   result.append( "<LAYOUT>\n" );
@@ -213,9 +213,9 @@ static TQString AmiProStyleAsXML( const AmiProStyle& style )
           "left";
 
   TQString linespacing;
-  linespacing = style.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) :
-                style.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) :
-                style.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) :
+  linespacing = style.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
+                style.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
+                style.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
                   TQString::number( style.linespace );
 
   TQString offsets;
@@ -319,7 +319,7 @@ bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList format
   return true;
 }
 
-KoFilter::ConversiontqStatus AmiProImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus AmiProImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "application/x-amipro" )
diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h
index ad078543..45c8cc2b 100644
--- a/filters/kword/amipro/amiproimport.h
+++ b/filters/kword/amipro/amiproimport.h
@@ -37,7 +37,7 @@ class AmiProImport : public KoFilter
 
     virtual ~AmiProImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __AMIPROIMPORT_H
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc
index d7acc7ed..8c805111 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cc
@@ -85,7 +85,7 @@ APPLIXWORDImport::nextLine (TQTextStream & stream)
  *                                                                            *
  *                                                                            *
  ******************************************************************************/
-KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to )
 {
 
     if (to!="application/x-kword" || from!="application/x-applixword")
diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h
index ccd80df7..90333f47 100644
--- a/filters/kword/applixword/applixwordimport.h
+++ b/filters/kword/applixword/applixwordimport.h
@@ -50,7 +50,7 @@ public:
     APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~APPLIXWORDImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     TQChar   specCharfind     (TQChar , TQChar );
diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui
index 8f66942c..8ba0d757 100644
--- a/filters/kword/ascii/ExportDialogUI.ui
+++ b/filters/kword/ascii/ExportDialogUI.ui
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui
index fd124062..d173386f 100644
--- a/filters/kword/ascii/ImportDialogUI.ui
+++ b/filters/kword/ascii/ImportDialogUI.ui
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc
index 4f4fbb06..7bba005c 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cc
@@ -474,7 +474,7 @@ ASCIIExport::ASCIIExport(KoFilter*, const char*, const TQStringList&)
 {
 }
 
-KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQCString& to)
 {
     if (to != "text/plain" || from != "application/x-kword")
     {
@@ -534,7 +534,7 @@ KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const T
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversiontqStatus result = leader->convert(m_chain,from,to);
+    KoFilter::ConversionStatus result = leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h
index af1e2e04..429ad6c8 100644
--- a/filters/kword/ascii/asciiexport.h
+++ b/filters/kword/ascii/asciiexport.h
@@ -31,7 +31,7 @@ public:
     ASCIIExport(KoFilter* parent, const char* name, const TQStringList&);
     virtual ~ASCIIExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // ASCIIEXPORT_H
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index f2a6e039..7040e9f1 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -195,7 +195,7 @@ void ASCIIImport::prepareDocument(TQDomDocument& mainDocument, TQDomElement& mai
 
 }
 
-KoFilter::ConversiontqStatus ASCIIImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus ASCIIImport::convert( const TQCString& from, const TQCString& to )
 {
     if (to!="application/x-kword" || from!="text/plain")
         return KoFilter::NotImplemented;
diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h
index 4d332776..b2cfcbdd 100644
--- a/filters/kword/ascii/asciiimport.h
+++ b/filters/kword/ascii/asciiimport.h
@@ -65,7 +65,7 @@ public:
     ASCIIImport();
     virtual ~ASCIIImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 private: // not yet changed
 #if 0
     void WriteOutTableCell( int table_no, int row, int col, Position *pos,
diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc
index db9c754a..372a3b5c 100644
--- a/filters/kword/docbook/docbookexport.cc
+++ b/filters/kword/docbook/docbookexport.cc
@@ -782,7 +782,7 @@ bool DocBookWorker::doFullDocumentInfo ( const KWEFDocumentInfo &docInfo )
 }
 
 
-KoFilter::ConversiontqStatus DocBookExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus DocBookExport::convert( const TQCString& from, const TQCString& to )
 {
 #if 0
     kdError (30507) << "to = " << to << ", from = " << from << endl;
diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h
index cf7ec804..29362aaa 100644
--- a/filters/kword/docbook/docbookexport.h
+++ b/filters/kword/docbook/docbookexport.h
@@ -38,6 +38,6 @@ public:
     DocBookExport (KoFilter *parent, const char *name, const TQStringList & );
     virtual ~DocBookExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // DOCBOOKEXPORT_H
diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp
index 6fc353e5..bfab48ab 100644
--- a/filters/kword/hancomword/hancomwordimport.cpp
+++ b/filters/kword/hancomword/hancomwordimport.cpp
@@ -82,7 +82,7 @@ static inline unsigned long readU16( const void* p )
 
 }
 
-KoFilter::ConversiontqStatus HancomWordImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus HancomWordImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/x-hancomword" )
     return KoFilter::NotImplemented; 
diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h
index 64d279a8..f78c3a47 100644
--- a/filters/kword/hancomword/hancomwordimport.h
+++ b/filters/kword/hancomword/hancomwordimport.h
@@ -35,7 +35,7 @@ public:
     HancomWordImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~HancomWordImport();
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 private:
   class Private;
diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui
index cbdc4fc2..e68cb6ab 100644
--- a/filters/kword/html/export/ExportDialogUI.ui
+++ b/filters/kword/html/export/ExportDialogUI.ui
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -212,7 +212,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -262,7 +262,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cc
index f8af8e3e..28573517 100644
--- a/filters/kword/html/export/htmlexport.cc
+++ b/filters/kword/html/export/htmlexport.cc
@@ -61,7 +61,7 @@ HTMLExport::HTMLExport(KoFilter *, const char *, const TQStringList &) :
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if ((from != "application/x-kword") || (to != "text/html"))
     {
@@ -118,7 +118,7 @@ KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const T
         delete worker;
         return KoFilter::StupidError;
     }
-    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h
index 5de5ef6a..10617bae 100644
--- a/filters/kword/html/export/htmlexport.h
+++ b/filters/kword/html/export/htmlexport.h
@@ -39,7 +39,7 @@ public:
     HTMLExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // HTMLEXPORT_H
diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp
index 2c403b2f..9b29320d 100644
--- a/filters/kword/html/import/htmlimport.cpp
+++ b/filters/kword/html/import/htmlimport.cpp
@@ -39,7 +39,7 @@ HTMLImport::HTMLImport(KoFilter *, const char*, const TQStringList &) :
 // 123
 }
 
-KoFilter::ConversiontqStatus HTMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQCString& to )
 {
 	if(to!="application/x-kword" || from!="text/html")
 		return KoFilter::NotImplemented;
diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h
index f7c61a41..ab2a293c 100644
--- a/filters/kword/html/import/htmlimport.h
+++ b/filters/kword/html/import/htmlimport.h
@@ -37,7 +37,7 @@ public:
     HTMLImport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // HTMLIMPORT_H
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index ebcf3f6a..82812412 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -104,7 +104,7 @@ bool KWord13Import::postParse( KoStore* store, KWord13Document& doc )
     return post.postParse( store, doc );
 }
 
-KoFilter::ConversiontqStatus KWord13Import::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/vnd.oasis.opendocument.text"
         || from != "application/x-kword" )
diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h
index 7d60dd89..77c05c23 100644
--- a/filters/kword/kword1.3/import/kword13import.h
+++ b/filters/kword/kword1.3/import/kword13import.h
@@ -39,7 +39,7 @@ public:
     KWord13Import(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~KWord13Import() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 protected:
     bool parseInfo( TQIODevice* io, KWord13Document& kwordDocument );
     bool parseRoot( TQIODevice* io, KWord13Document& kwordDocument );
diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc
index f521ec9d..083f2375 100644
--- a/filters/kword/latex/export/latexexport.cc
+++ b/filters/kword/latex/export/latexexport.cc
@@ -36,7 +36,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h
index e7c0312b..1d8076eb 100644
--- a/filters/kword/latex/export/latexexport.h
+++ b/filters/kword/latex/export/latexexport.h
@@ -38,7 +38,7 @@ class LATEXExport : public KoFilter
 		LATEXExport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXExport() {}
 
-		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+		virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* __LATEXExport_H__ */
diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui
index 8c3835ed..741a9c7e 100644
--- a/filters/kword/latex/export/latexexportdia.ui
+++ b/filters/kword/latex/export/latexexportdia.ui
@@ -593,7 +593,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc
index f644910a..00f069cf 100644
--- a/filters/kword/latex/import/lateximport.cc
+++ b/filters/kword/latex/import/lateximport.cc
@@ -35,7 +35,7 @@ LATEXImport::LATEXImport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus LATEXImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus LATEXImport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h
index 949d7163..9c85cad0 100644
--- a/filters/kword/latex/import/lateximport.h
+++ b/filters/kword/latex/import/lateximport.h
@@ -38,7 +38,7 @@ class LATEXImport : public KoFilter
 		LATEXImport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXImport() {}
 
-		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+		virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* __LATEXIMPORT_H__ */
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index 3e9a724e..b627ebd2 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -1361,7 +1361,7 @@ bool KWEFKWordLeader::loadSubFile(const TQString& fileName, TQByteArray& array)
     return true;
 }
 
-KoFilter::ConversiontqStatus KWEFKWordLeader::convert( KoFilterChain* chain,
+KoFilter::ConversionStatus KWEFKWordLeader::convert( KoFilterChain* chain,
     const TQCString& from, const TQCString& to)
 {
     if ( from != "application/x-kword" )
diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h
index 78ce1348..ee1d7694 100644
--- a/filters/kword/libexport/KWEFKWordLeader.h
+++ b/filters/kword/libexport/KWEFKWordLeader.h
@@ -38,7 +38,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader
     public:
         void setWorker ( KWEFBaseWorker *newWorker );
         KWEFBaseWorker *getWorker(void) const;
-        KoFilter::ConversiontqStatus convert( KoFilterChain* chain,
+        KoFilter::ConversionStatus convert( KoFilterChain* chain,
             const TQCString& from, const TQCString& to);
     public: // ### TODO: where to put in the end?
         void createBookmarkFormatData( ParaData& paraData );
diff --git a/filters/kword/msword/mswordimport.cpp b/filters/kword/msword/mswordimport.cpp
index 3be95f7a..714db274 100644
--- a/filters/kword/msword/mswordimport.cpp
+++ b/filters/kword/msword/mswordimport.cpp
@@ -41,7 +41,7 @@ MSWordImport::~MSWordImport()
 {
 }
 
-KoFilter::ConversiontqStatus MSWordImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus MSWordImport::convert( const TQCString& from, const TQCString& to )
 {
     // check for proper conversion
     if ( to != "application/x-kword" || from != "application/msword" )
diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h
index 73a568ff..ae348fc7 100644
--- a/filters/kword/msword/mswordimport.h
+++ b/filters/kword/msword/mswordimport.h
@@ -33,7 +33,7 @@ public:
     MSWordImport( KoFilter* parent, const char* name, const TQStringList& );
     virtual ~MSWordImport();
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 private:
     void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem );
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 07eb3da7..10c3abb9 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -464,7 +464,7 @@ void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::W
             int dist = fontSize > 20 ? 2 : 1;
             if (chp->fImprint) // ## no real support for imprint, we use a topleft shadow
                 dist = -dist;
-            css = TQString::tqfromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist);
+            css = TQString::fromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist);
         }
         shadowElem.setAttribute( "text-shadow", css );
         format.appendChild( shadowElem );
diff --git a/filters/kword/mswrite/ImportDialogUI.ui b/filters/kword/mswrite/ImportDialogUI.ui
index db7dcc20..bed2bad1 100644
--- a/filters/kword/mswrite/ImportDialogUI.ui
+++ b/filters/kword/mswrite/ImportDialogUI.ui
@@ -92,7 +92,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -218,7 +218,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -237,7 +237,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index 02d980ef..e6d211b9 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -1450,13 +1450,13 @@ public:
 		{
 			if (tqlayout.tqalignment == "left")
 				// quite useless since MSWrite::Alignment::Left is the default anyway
-				paraProp.tqsetAlignment (MSWrite::Alignment::Left);
+				paraProp.setAlignment (MSWrite::Alignment::Left);
 			else if (tqlayout.tqalignment == "right")
-				paraProp.tqsetAlignment (MSWrite::Alignment::Right);
+				paraProp.setAlignment (MSWrite::Alignment::Right);
 			else if (tqlayout.tqalignment == "center")
-				paraProp.tqsetAlignment (MSWrite::Alignment::Center);
+				paraProp.setAlignment (MSWrite::Alignment::Center);
 			else if (tqlayout.tqalignment == "justify")
-				paraProp.tqsetAlignment (MSWrite::Alignment::Justify);
+				paraProp.setAlignment (MSWrite::Alignment::Justify);
 			else
 				kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl;
 		}
@@ -1903,7 +1903,7 @@ MSWriteExport::~MSWriteExport ()
 {
 }
 
-KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, const TQCString &to)
+KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const TQCString &to)
 {
 	kdDebug (30509) << "MSWriteExport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite "
 			  				<< MSWrite::Version << endl;
@@ -1929,7 +1929,7 @@ KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, cons
 		return KoFilter::OutOfMemory;
 	}
 
-	KoFilter::ConversiontqStatus ret = leader->convert (m_chain, from, to);
+	KoFilter::ConversionStatus ret = leader->convert (m_chain, from, to);
 	int errorCode = worker->getError ();
 
 	delete leader;
diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h
index 796ce705..adfbc4ba 100644
--- a/filters/kword/mswrite/mswriteexport.h
+++ b/filters/kword/mswrite/mswriteexport.h
@@ -31,7 +31,7 @@ public:
 	MSWriteExport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteExport ();
 
-	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
+	KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to);
 };
 
 #endif // MSWRITEEXPORT_H
diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc
index 379d3c01..c28c9d62 100644
--- a/filters/kword/mswrite/mswriteimport.cc
+++ b/filters/kword/mswrite/mswriteimport.cc
@@ -1345,7 +1345,7 @@ MSWriteImport::~MSWriteImport ()
 	delete m_device;
 }
 
-KoFilter::ConversiontqStatus MSWriteImport::convert (const TQCString &from, const TQCString &to)
+KoFilter::ConversionStatus MSWriteImport::convert (const TQCString &from, const TQCString &to)
 {
 	kdDebug (30509) << "MSWriteImport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite "
 			  				<< MSWrite::Version << endl;
diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h
index 65be7e7a..8d59fe38 100644
--- a/filters/kword/mswrite/mswriteimport.h
+++ b/filters/kword/mswrite/mswriteimport.h
@@ -40,7 +40,7 @@ public:
 	MSWriteImport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteImport ();
 
-	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
+	KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to);
 	
 	void sigProgress (const int value)
 	{
diff --git a/filters/kword/mswrite/structures.h b/filters/kword/mswrite/structures.h
index af687b3a..5aa4f6a3 100644
--- a/filters/kword/mswrite/structures.h
+++ b/filters/kword/mswrite/structures.h
@@ -378,7 +378,7 @@ namespace MSWrite
 		
 		// convenience functions
 		Byte getAlign (void) const	{	return getAlignment ();	}
-		void setAlign (const Byte val)	{	tqsetAlignment (val);	}
+		void setAlign (const Byte val)	{	setAlignment (val);	}
 		
 		Short getLeftIndentFirstLine (const bool purist = false) const
 		{
diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h
index 0ee985ce..bc068758 100644
--- a/filters/kword/mswrite/structures_generated.h
+++ b/filters/kword/mswrite/structures_generated.h
@@ -759,7 +759,7 @@ namespace MSWrite
 		//
 		
 		Byte getAlignment (void) const	{	return m_tqalignment;	}
-		void tqsetAlignment (const Byte val)	{	m_tqalignment = val;	signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
+		void setAlignment (const Byte val)	{	m_tqalignment = val;	signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
 		
 		Word getRightIndent (void) const	{	return m_rightIndent;	}
 		void setRightIndent (const Word val)	{	m_rightIndent = val;	signalHaveSetData (m_rightIndent == Word (0), 32/*offset*/ + 16/*size*/);	}
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index ff9c8276..9287169f 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -2160,12 +2160,12 @@ void OOWriterWorker::declareFont(const TQString& fontName)
     {
         TQString props;
 
-        // Disabled, as TQFontInfo::tqstyleHint() cannot guess
+        // Disabled, as TQFontInfo::styleHint() cannot guess
 #if 0
         TQFont font(fontName);
         TQFontInfo info(font);
         props+="style:font-family-generic=\""
-        switch (info.tqstyleHint())
+        switch (info.styleHint())
         {
         case TQFont::SansSerif:
         default:
@@ -2217,7 +2217,7 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c
         return str2;
 
     // If it is still not unique, try a time stamp.
-    const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC));
+    const TQDateTime dt(TQDateTime::currentDateTime(Qt::UTC));
 
     str2 = str + "_" + TQString::number(dt.toTime_t(),16);
     if (m_styleMap.find(str2)==m_styleMap.end())
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc
index 209b2bec..2401508c 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cc
@@ -37,13 +37,13 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap )
     if ( oowrap == "run-through" )
         return tqMakePair( 0, TQString() );
     if ( oowrap == "biggest" ) // OASIS extension
-        return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) );
+        return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
 
     ////if ( oowrap == "parallel" || oowrap == "dynamic" )
     // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel.
 
     // Those are not supported in KWord, let's use biggest instead
-    return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) );
+    return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
 }
 
 TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs )
diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc
index 426105e8..aba0ee9f 100644
--- a/filters/kword/oowriter/oowriterexport.cc
+++ b/filters/kword/oowriter/oowriterexport.cc
@@ -52,7 +52,7 @@ OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/vnd.sun.xml.writer" || from != "application/x-kword" )
     {
@@ -79,7 +79,7 @@ KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, con
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h
index 8f4695b8..bd1a0f40 100644
--- a/filters/kword/oowriter/oowriterexport.h
+++ b/filters/kword/oowriter/oowriterexport.h
@@ -47,6 +47,6 @@ public:
     OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~OOWRITERExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // OOWRITEREXPORT_H
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 5fd196f8..87e41f49 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -69,7 +69,7 @@ OoWriterImport::~OoWriterImport()
 {
 }
 
-KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug(30518) << "Entering Oowriter Import filter: " << from << " - " << to << endl;
 
@@ -99,20 +99,20 @@ KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQ
     }
 
 
-    KoFilter::ConversiontqStatus pretqStatus = openFile();
+    KoFilter::ConversionStatus preStatus = openFile();
 
     TQImage thumbnail;
-    if ( pretqStatus == KoFilter::OK )
+    if ( preStatus == KoFilter::OK )
     {
         // We do not care about the failure
         OoUtils::loadThumbnail( thumbnail, m_zip );
     }
 
-    if ( pretqStatus != KoFilter::OK )
+    if ( preStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return pretqStatus;
+        return preStatus;
     }
 
     m_currentMasterPage = TQString();
@@ -535,14 +535,14 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetEle
     return frameElementOut;
 }
 
-KoFilter::ConversiontqStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversionStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
     return OoUtils::loadAndParse( filename, doc, m_zip);
 }
 
-KoFilter::ConversiontqStatus OoWriterImport::openFile()
+KoFilter::ConversionStatus OoWriterImport::openFile()
 {
-    KoFilter::ConversiontqStatus status=loadAndParse("content.xml", m_content);
+    KoFilter::ConversionStatus status=loadAndParse("content.xml", m_content);
     if ( status != KoFilter::OK )
     {
         kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl;
@@ -1817,7 +1817,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href.mid(1));
-        KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
+        KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
         picture.setKey(key);
 
         if (!m_zip)
@@ -1966,7 +1966,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats
             bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
             if (!dt.isValid())
             {
-                dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
+                dt = TQDateTime::currentDateTime(); // OOo docs say so :)
                 fixed = false;
             }
             const TQDate date(dt.date());
@@ -1995,7 +1995,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats
             bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
             if (!dt.isValid()) {
-                dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
+                dt = TQDateTime::currentDateTime(); // OOo docs say so :)
                 fixed = false;
             }
 
diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h
index 80586a31..4de60534 100644
--- a/filters/kword/oowriter/oowriterimport.h
+++ b/filters/kword/oowriter/oowriterimport.h
@@ -38,7 +38,7 @@ public:
     OoWriterImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoWriterImport();
 
-    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
 
 private:
     void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem );
@@ -61,8 +61,8 @@ private:
     void createDocumentInfo( TQDomDocument &docinfo );
     void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement );
     void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement );
-    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
-    KoFilter::ConversiontqStatus openFile();
+    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+    KoFilter::ConversionStatus openFile();
     bool createStyleMap( const TQDomDocument & styles, TQDomDocument& doc );
     void insertStyles( const TQDomElement& element, TQDomDocument& doc );
     void importDateTimeStyle( const TQDomElement& parent );
diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp
index 65a83518..89af187c 100644
--- a/filters/kword/palmdoc/palmdb.cpp
+++ b/filters/kword/palmdoc/palmdb.cpp
@@ -38,9 +38,9 @@ PalmDB::PalmDB()
   setName( "Unnamed" );
   setAttributes( 0 );
   setVersion( 0 );
-  setCreationDate( TQDateTime::tqcurrentDateTime() );
-  setModificationDate( TQDateTime::tqcurrentDateTime() );
-  setLastBackupDate( TQDateTime::tqcurrentDateTime() );
+  setCreationDate( TQDateTime::currentDateTime() );
+  setModificationDate( TQDateTime::currentDateTime() );
+  setLastBackupDate( TQDateTime::currentDateTime() );
   setType( TQString() );
   setCreator( TQString() );
 
@@ -73,11 +73,11 @@ bool PalmDB::load( const char* filename )
 
   // read and encode database name
   // The name field is 32 bytes long, and is NUL terminated.
-  // Use the length parameter of tqfromLatin1() anyway.
+  // Use the length parameter of fromLatin1() anyway.
   TQ_UINT8 name[32];
   for(int k = 0; k < 32; k++)
     stream >> name[k];
-  m_name = TQString::tqfromLatin1( (char*) name, 31 );
+  m_name = TQString::fromLatin1( (char*) name, 31 );
 
   // read database attribute
   TQ_UINT16 attr;
@@ -121,12 +121,12 @@ bool PalmDB::load( const char* filename )
   // read and encode database type
   TQ_UINT8 dbt[4];
   stream >> dbt[0] >> dbt[1] >> dbt[2] >> dbt[3];
-  m_type = TQString::tqfromLatin1( (char*) dbt, 4 );
+  m_type = TQString::fromLatin1( (char*) dbt, 4 );
 
   // read and encode database creator
   TQ_UINT8 dbc[4];
   stream >> dbc[0] >> dbc[1] >> dbc[2] >> dbc[3];
-  m_creator = TQString::tqfromLatin1( (char*) dbc, 4 );
+  m_creator = TQString::fromLatin1( (char*) dbc, 4 );
 
   // read unique id seed
   TQ_UINT32 idseed;
diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp
index 791fa356..72bb0434 100644
--- a/filters/kword/palmdoc/palmdoc.cpp
+++ b/filters/kword/palmdoc/palmdoc.cpp
@@ -106,7 +106,7 @@ bool PalmDoc::load( const char* filename )
 
   // if the text is not compressed, simply append as string
   if( format == 1 )
-      setText( TQString::tqfromLatin1( rec.data(),rec.count() ) );
+      setText( TQString::fromLatin1( rec.data(),rec.count() ) );
 
   // done
   m_result = OK;
@@ -120,7 +120,7 @@ bool PalmDoc::save( const char* filename )
   setCreator( "REAd" );
 
   // "touch" the database :-)
-  setModificationDate( TQDateTime::tqcurrentDateTime() ); 
+  setModificationDate( TQDateTime::currentDateTime() ); 
 
   // Palm record size is always 4 KB
   unsigned recsize = 4096;
diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc
index 5e18ff6f..9b748fa7 100644
--- a/filters/kword/palmdoc/palmdocexport.cc
+++ b/filters/kword/palmdoc/palmdocexport.cc
@@ -115,7 +115,7 @@ PalmDocExport::PalmDocExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, 
+KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from, 
   const TQCString& to )
 {
   // check for proper conversion
@@ -125,7 +125,7 @@ KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from,
   PalmDocWorker* worker = new PalmDocWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversiontqStatus result;
+  KoFilter::ConversionStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h
index fd2a1140..4c09946b 100644
--- a/filters/kword/palmdoc/palmdocexport.h
+++ b/filters/kword/palmdoc/palmdocexport.h
@@ -35,7 +35,7 @@ class PalmDocExport : public KoFilter
 
     virtual ~PalmDocExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __PALMDOCEXPORT_H
diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc
index 98cd7629..54056085 100644
--- a/filters/kword/palmdoc/palmdocimport.cc
+++ b/filters/kword/palmdoc/palmdocimport.cc
@@ -46,7 +46,7 @@ PalmDocImport::PalmDocImport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversiontqStatus PalmDocImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "application/vnd.palm" )
diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h
index a97f9729..77b4cc73 100644
--- a/filters/kword/palmdoc/palmdocimport.h
+++ b/filters/kword/palmdoc/palmdocimport.h
@@ -37,7 +37,7 @@ class PalmDocImport : public KoFilter
 
     virtual ~PalmDocImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
   private:
     
diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp
index ffe27e1c..80ec92d0 100644
--- a/filters/kword/pdf/pdfdocument.cpp
+++ b/filters/kword/pdf/pdfdocument.cpp
@@ -38,7 +38,7 @@ Document::Document()
     : _file(0), _object(0), _fileStream(0), _document(0), _device(0)
 {}
 
-KoFilter::ConversiontqStatus
+KoFilter::ConversionStatus
 Document::init(const TQString &name, const TQString &ownerPassword,
                const TQString &userPassword)
 {
diff --git a/filters/kword/pdf/pdfdocument.h b/filters/kword/pdf/pdfdocument.h
index c54606f4..b2da781f 100644
--- a/filters/kword/pdf/pdfdocument.h
+++ b/filters/kword/pdf/pdfdocument.h
@@ -43,7 +43,7 @@ class Document
     Document();
     ~Document() { clear(); }
 
-    KoFilter::ConversiontqStatus init(const TQString &name,
+    KoFilter::ConversionStatus init(const TQString &name,
                     const TQString &ownerPassword, const TQString &userPassword);
     void clear();
 
diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp
index bee3e39a..e2aa72e8 100644
--- a/filters/kword/pdf/pdfimport.cpp
+++ b/filters/kword/pdf/pdfimport.cpp
@@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY(libpdfimport, PdfImportFactory())
 PdfImport::PdfImport(KoFilter *, const char *, const TQStringList&)
 {}
 
-KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from,
+KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
                                               const TQCString& to)
 {
     // check for proper conversion
@@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from,
         return KoFilter::NotImplemented;
 
     // read file
-    KoFilter::ConversiontqStatus result
+    KoFilter::ConversionStatus result
         = _doc.init(m_chain->inputFile(), TQString(), TQString());
     if ( result!=KoFilter::OK ) return result;
 
diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h
index 9686714e..53ca8f97 100644
--- a/filters/kword/pdf/pdfimport.h
+++ b/filters/kword/pdf/pdfimport.h
@@ -33,7 +33,7 @@ class PdfImport : public KoFilter
 public:
     PdfImport(KoFilter *parent, const char *name, const TQStringList&);
 
-    KoFilter::ConversiontqStatus
+    KoFilter::ConversionStatus
     convert(const TQCString& from, const TQCString& to);
 
 private:
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 2fa566fa..6fefe85e 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -967,10 +967,10 @@ void RTFWorker::writeFontData(void)
         }
 #else
         else
-        // TQFontInfo:tqstyleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out.
+        // TQFontInfo:styleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out.
         {
             TQFontInfo info(*it);
-            switch (info.tqstyleHint())
+            switch (info.styleHint())
             {
             case TQFont::SansSerif:
             default:
diff --git a/filters/kword/rtf/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cc
index 15ff976b..6f23530b 100644
--- a/filters/kword/rtf/export/rtfexport.cc
+++ b/filters/kword/rtf/export/rtfexport.cc
@@ -57,7 +57,7 @@ RTFExport::RTFExport(KoFilter *, const char *, const TQStringList &) :
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCString& to )
 {
     if ((from != "application/x-kword") || (to != "text/rtf" && to != "application/msword" ))
     {
@@ -77,7 +77,7 @@ KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQ
         return KoFilter::StupidError;
     }
     
-    KoFilter::ConversiontqStatus result=leader->convert(m_chain, from,to );
+    KoFilter::ConversionStatus result=leader->convert(m_chain, from,to );
 
     delete leader;
     delete worker;
diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h
index 060139ed..5218e4c5 100644
--- a/filters/kword/rtf/export/rtfexport.h
+++ b/filters/kword/rtf/export/rtfexport.h
@@ -39,7 +39,7 @@ public:
     RTFExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~RTFExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // RTFEXPORT_H
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index 94fad697..5bfadbcb 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -309,7 +309,7 @@ RTFImport::RTFImport( KoFilter *, const char *, const TQStringList& )
     fnnum=0;
 }
 
-KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCString& to )
 {
     // This filter only supports RTF to KWord conversion
     if ((from != "text/rtf") || (to != "application/x-kword"))
@@ -911,7 +911,7 @@ void RTFImport::setEnumProperty( RTFProperty *property )
 
 void RTFImport::setFontStyleHint( RTFProperty* property )
 {
-    font.tqstyleHint = TQFont::StyleHint( property->value );
+    font.styleHint = TQFont::StyleHint( property->value );
 }
 
 void RTFImport::setPictureType( RTFProperty* property )
@@ -1321,7 +1321,7 @@ void RTFImport::parseFontTable( RTFProperty * )
     if (token.type == RTFTokenizer::OpenGroup)
     {
 	font.name = TQString();
-	font.tqstyleHint = TQFont::AnyStyle;
+	font.styleHint = TQFont::AnyStyle;
 	font.fixedPitch = 0;
     }
     else if (token.type == RTFTokenizer::PlainText)
@@ -1344,7 +1344,7 @@ void RTFImport::parseFontTable( RTFProperty * )
 	    // Use TQt to look up the closest matching installed font
 	    TQFont qFont( font.name );
 	    qFont.setFixedPitch( (font.fixedPitch == 1) );
-	    qFont.setStyleHint( font.tqstyleHint );
+	    qFont.setStyleHint( font.styleHint );
 	    for(;!qFont.exactMatch();)
 	    {
 		int space=font.name.findRev(' ', font.name.length());
@@ -1362,7 +1362,7 @@ void RTFImport::parseFontTable( RTFProperty * )
             else
                fontTable.insert( state.format.font, newFontName );
 	    font.name.truncate( 0 );
-	    font.tqstyleHint = TQFont::AnyStyle;
+	    font.styleHint = TQFont::AnyStyle;
 	    font.fixedPitch = 0;
 	}
     }
@@ -1538,8 +1538,8 @@ void RTFImport::parsePicture( RTFProperty * )
         // Add anchor to rich text destination
         addAnchor( frameName );
 
-        // It is safe, as we call tqcurrentDateTime only once for each picture
-        const TQDateTime dt(TQDateTime::tqcurrentDateTime());
+        // It is safe, as we call currentDateTime only once for each picture
+        const TQDateTime dt(TQDateTime::currentDateTime());
 
         // Add pixmap or clipart (key)
         pictures.addKey( dt, idStr, pictName );
@@ -1614,7 +1614,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName )
     // Add anchor to rich text destination
     addAnchor( frameName );
 
-    // It is safe, as we call tqcurrentDateTime only once for each picture
+    // It is safe, as we call currentDateTime only once for each picture
     const TQDateTime dt( pic.getKey().lastModified() );
 
     // Add picture key
diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h
index bf4f20b7..2003b508 100644
--- a/filters/kword/rtf/import/rtfimport.h
+++ b/filters/kword/rtf/import/rtfimport.h
@@ -93,7 +93,7 @@ struct RTFTab
 struct RTFFont
 {
     TQString name;
-    TQFont::StyleHint tqstyleHint;
+    TQFont::StyleHint styleHint;
     int fixedPitch;
     int number;
 };
@@ -255,7 +255,7 @@ public:
      * @param to the mimetype for KWord
      * @return true if the document was successfully converted
      */
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
     /**
      * Skip the keyword, as we do not need to do anything with it
diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cc
index a9bd80d3..104e08f9 100644
--- a/filters/kword/starwriter/starwriterimport.cc
+++ b/filters/kword/starwriter/starwriterimport.cc
@@ -58,7 +58,7 @@ StarWriterImport::~StarWriterImport()
 {
 }
 
-KoFilter::ConversiontqStatus StarWriterImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus StarWriterImport::convert(const TQCString& from, const TQCString& to)
 {
     // Check for proper conversion
     // When 4.x is supported, use also: || (from != "application/x-starwriter")
diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h
index b030c2ba..f71a71ed 100644
--- a/filters/kword/starwriter/starwriterimport.h
+++ b/filters/kword/starwriter/starwriterimport.h
@@ -34,7 +34,7 @@ class StarWriterImport: public KoFilter
 public:
     StarWriterImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~StarWriterImport();
-    KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 
 private:
     // most important OLE streams
diff --git a/filters/kword/starwriter/status.html b/filters/kword/starwriter/status.html
index 6919c589..d7667e6c 100644
--- a/filters/kword/starwriter/status.html
+++ b/filters/kword/starwriter/status.html
@@ -7,7 +7,7 @@
   <META NAME="GENERATOR" CONTENT="Quanta Plus">
 </HEAD>
 <BODY>
-  <H2 align="center">tqStatus of the</H2>
+  <H2 align="center">Status of the</H2>
   <H1 align="center">StarWriter 5.x filter for KWord</H1>
 
   <P>Author: <A HREF="mailto:info@marcozanon.com">Marco Zanon</A>
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc
index 92908c57..10837ba1 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cc
@@ -145,7 +145,7 @@ WMLExport::WMLExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, 
+KoFilter::ConversionStatus WMLExport::convert( const TQCString& from, 
   const TQCString& to )
 {
   // check for proper conversion
@@ -155,7 +155,7 @@ KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from,
   WMLWorker* worker = new WMLWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversiontqStatus result;
+  KoFilter::ConversionStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h
index 8d3a105e..2f81c897 100644
--- a/filters/kword/wml/wmlexport.h
+++ b/filters/kword/wml/wmlexport.h
@@ -35,7 +35,7 @@ class WMLExport : public KoFilter
 
     virtual ~WMLExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WMLEXPORT_H
diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc
index e44c10ae..a92290d9 100644
--- a/filters/kword/wml/wmlimport.cc
+++ b/filters/kword/wml/wmlimport.cc
@@ -231,7 +231,7 @@ void WMLConverter::parse( const char* filename )
 
 }
 
-KoFilter::ConversiontqStatus WMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus WMLImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "text/vnd.wap.wml" )
diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h
index 049ff8db..1c169af1 100644
--- a/filters/kword/wml/wmlimport.h
+++ b/filters/kword/wml/wmlimport.h
@@ -37,7 +37,7 @@ class WMLImport : public KoFilter
 
     virtual ~WMLImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WMLIMPORT_H
diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cc
index 43a688c3..619d5d47 100644
--- a/filters/kword/wordperfect/export/wpexport.cc
+++ b/filters/kword/wordperfect/export/wpexport.cc
@@ -47,7 +47,7 @@ WPExport::WPExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversiontqStatus 
+KoFilter::ConversionStatus 
 WPExport::convert( const TQCString& from, 
   const TQCString& to )
 {
@@ -69,7 +69,7 @@ WPExport::convert( const TQCString& from,
 
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversiontqStatus result;
+  KoFilter::ConversionStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h
index 55f43a47..16e81a1b 100644
--- a/filters/kword/wordperfect/export/wpexport.h
+++ b/filters/kword/wordperfect/export/wpexport.h
@@ -35,7 +35,7 @@ class WPExport : public KoFilter
 
     virtual ~WPExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WPEXPORT_H
diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc
index 460915af..09fc4d5c 100644
--- a/filters/kword/wordperfect/import/wpimport.cc
+++ b/filters/kword/wordperfect/import/wpimport.cc
@@ -227,7 +227,7 @@ WPImport::WPImport( KoFilter *, const char *, const TQStringList& ):  KoFilter()
 {
 }
 
-KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if(to!= "application/vnd.sun.xml.writer" || from != "application/wordperfect" )
diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h
index 02cd323d..3fc52796 100644
--- a/filters/kword/wordperfect/import/wpimport.h
+++ b/filters/kword/wordperfect/import/wpimport.h
@@ -48,7 +48,7 @@ class WPImport : public KoFilter
 
     virtual ~WPImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 };
 #endif // __WPIMPORT_H