Rename old tq methods that no longer need a unique name

41 files changed, 102 insertions, 102 deletions

diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc
index a75cccac..2f15eeed 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::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to )
 {
 
     if (to != "application/x-kspread" || from != "application/x-applixspread")
diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h
index 78deb2ca..584949d9 100644
--- a/filters/kspread/applixspread/applixspreadimport.h
+++ b/filters/kspread/applixspread/applixspreadimport.h
@@ -57,7 +57,7 @@ public:
     APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~APPLIXSPREADImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     TQString nextLine           (TQTextStream &);
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index 17e9cc65..95f4727c 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -84,7 +84,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
 
     fillTable();
 
-    //resize(tqsizeHint());
+    //resize(sizeHint());
     resize( 600, 400 ); // Try to show as much as possible of the table view
     setMainWidget(m_dialog);
 
diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc
index 9961d218..c7a3b6c0 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cc
@@ -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::ConversiontqStatus CSVExport::convert( const TQCString & from, const TQCString & to )
+KoFilter::ConversionStatus 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 decdb81c..ebc8a861 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::ConversiontqStatus convert( const TQCString & from, const TQCString & to );
+  virtual KoFilter::ConversionStatus 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/csvimport.cc b/filters/kspread/csv/csvimport.cc
index cd93017b..e9852c61 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::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus 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 df14a756..c68ecffb 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::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus 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 8c3a72cf..5e709007 100644
--- a/filters/kspread/csv/dialogui.ui
+++ b/filters/kspread/csv/dialogui.ui
@@ -104,7 +104,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -123,7 +123,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>60</height>
@@ -223,7 +223,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>32767</height>
@@ -313,7 +313,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>51</width>
                                 <height>21</height>
@@ -330,7 +330,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>51</width>
                                 <height>21</height>
@@ -472,7 +472,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>468</width>
                                         <height>20</height>
@@ -489,7 +489,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>468</width>
                                         <height>20</height>
@@ -506,7 +506,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>611</width>
                                         <height>20</height>
@@ -523,7 +523,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>71</width>
                                         <height>20</height>
diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui
index 45eb6914..a60c3d65 100644
--- a/filters/kspread/csv/exportdialogui.ui
+++ b/filters/kspread/csv/exportdialogui.ui
@@ -85,7 +85,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -156,7 +156,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>96</height>
@@ -375,7 +375,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>32767</height>
@@ -469,7 +469,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>81</height>
diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc
index bcbc98b8..6121baaf 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::ConversiontqStatus DBaseImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus 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 39a0ac0e..293bda21 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::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus 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 2e2c50e7..0ecf41f7 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::ConversiontqStatus ExcelExport::convert(const TQCString& from, const TQCString& to) {
+KoFilter::ConversionStatus 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::ConversiontqStatus ExcelExport::convert(const TQCString& from, const T
 
 
 /*
-KoFilter::ConversiontqStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversiontqStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversiontqStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversiontqStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversiontqStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversiontqStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversiontqStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 */
diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h
index 029cdac1..e4b6b499 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+	virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 
 class ExcelWorker : public KSpreadBaseWorker {
 public:
 	// Implement those
-	//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);
+	//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);
 };
 
 #endif
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc
index f1bade9e..e705a933 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cc
@@ -107,7 +107,7 @@ ExcelImport::~ExcelImport()
   delete d;
 }
 
-KoFilter::ConversiontqStatus ExcelImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus ExcelImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/msexcel" )
     return KoFilter::NotImplemented; 
diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h
index 5b733733..84729b4d 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::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/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 8155bca5..651b7f2c 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -5137,7 +5137,7 @@ bool ExcelReader::load( Workbook* workbook, const char* filename )
       // FIXME still unsupported: Justified, Distributed
     }
     tqalignment.setWrap( xf.textWrap() );
-    format.tqsetAlignment( tqalignment );
+    format.setAlignment( tqalignment );
   
     FormatBorders borders;
       
@@ -5953,7 +5953,7 @@ Format ExcelReader::convertFormat( unsigned xfIndex )
     // FIXME still unsupported: Justified, Distributed
   }
   tqalignment.setWrap( xf.textWrap() );
-  format.tqsetAlignment( tqalignment );
+  format.setAlignment( tqalignment );
 
   FormatBorders borders;
     
diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp
index 29481fd0..b54f2a4c 100644
--- a/filters/kspread/excel/sidewinder/format.cpp
+++ b/filters/kspread/excel/sidewinder/format.cpp
@@ -644,7 +644,7 @@ FormatAlignment& Format::tqalignment() const
   return d->tqalignment;
 }
 
-void Format::tqsetAlignment( const FormatAlignment& tqalignment )
+void Format::setAlignment( const FormatAlignment& tqalignment )
 {
   d->tqalignment = tqalignment;
 }
diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h
index dcadc1c2..1177b1bb 100644
--- a/filters/kspread/excel/sidewinder/format.h
+++ b/filters/kspread/excel/sidewinder/format.h
@@ -690,7 +690,7 @@ public:
   /** 
    * Sets new tqalignment information for this format.
    */
-  void tqsetAlignment( const FormatAlignment& tqalignment );
+  void setAlignment( const FormatAlignment& tqalignment );
   
   /** 
    * Returns a reference to the borders information of this format.
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index cccfcc9f..b5666916 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -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::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to )
 {
     kdDebug(30521) << "Exporting GNUmeric" << endl;
 
diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h
index 392f0f72..0b2b0324 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::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus 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 249258b3..b0833e87 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::ConversiontqStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to )
+KoFilter::ConversionStatus 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 b7fbd4bd..c449a599 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::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 enum borderStyle { Left, Right, Top, Bottom, Diagonal, Revdiagonal};
  private:
diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui
index df5dcc90..cfaedfa7 100644
--- a/filters/kspread/html/exportwidget.ui
+++ b/filters/kspread/html/exportwidget.ui
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -124,7 +124,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>330</width>
                                     <height>20</height>
@@ -271,7 +271,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -292,7 +292,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc
index 54711d8d..b81d8e22 100644
--- a/filters/kspread/html/htmlexport.cc
+++ b/filters/kspread/html/htmlexport.cc
@@ -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::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="text/html" || from!="application/x-kspread")
     {
diff --git a/filters/kspread/html/htmlexport.h b/filters/kspread/html/htmlexport.h
index 09f904d3..c7007157 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::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus 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 15e8ee2a..ac725982 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cc
@@ -74,7 +74,7 @@ KSpreadKexiImport::~KSpreadKexiImport()
 
 //=============================================================================
 
-KoFilter::ConversiontqStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus 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 aec65889..4de3e704 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::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
     
     private:
         KSpread::Doc *ksdoc;
diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
index d9d28d55..82f95406 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
+++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
@@ -196,7 +196,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>145</width>
                             <height>0</height>
diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc
index 66927728..c303a59e 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cc
@@ -35,7 +35,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/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h
index e7c0312b..1d8076eb 100644
--- a/filters/kspread/latex/export/latexexport.h
+++ b/filters/kspread/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/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui
index 8c3835ed..741a9c7e 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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
index ba56c229..cc7b2b46 100644
--- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
+++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
@@ -31,7 +31,7 @@ KSpreadBaseWorker::~KSpreadBaseWorker() {
 }
 
 
-KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus 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::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterPrope
 }
 
 
-KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus 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::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProper
 }
 
 
-KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus 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::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterPro
 }
 
 
-KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus 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::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProp
 }
 
 
-KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus 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::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterPro
 }
 
 
-KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus 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::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterPr
 }
 
 
-KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) {
+KoFilter::ConversionStatus 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 4ba82383..13b3d380 100644
--- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
+++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
@@ -33,13 +33,13 @@ public:
 	KSpreadBaseWorker();
 	virtual ~KSpreadBaseWorker();
 
-	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);
+	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);
 };
 
 #endif /* KSPREAD_BASE_WORKER_H */
diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cc
index 9ba2d874..b1b9a0aa 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.cc
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.cc
@@ -48,8 +48,8 @@ void Leader::setWorker(KSpreadBaseWorker *newWorker) {
 }
 
 
-KoFilter::ConversiontqStatus Leader::convert() {
-	KoFilter::ConversiontqStatus status;
+KoFilter::ConversionStatus Leader::convert() {
+	KoFilter::ConversionStatus status;
 
 	// Validate the filter chain and the worker
 	if (!m_filterChain) {
@@ -122,8 +122,8 @@ KoFilter::ConversiontqStatus Leader::convert() {
 }
 
 
-KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) {
-	KoFilter::ConversiontqStatus status;
+KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) {
+	KoFilter::ConversionStatus status;
 
 #if 0 // this was never used, it's been removed now
 	// Gather data about the document log
@@ -164,7 +164,7 @@ KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) {
 }
 
 
-KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) {
+KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) {
 	KSpreadFilterProperty docSpreadBookProperty;
 	docSpreadBookProperty["spreadsheetcount"] = TQString::number(document->map()->count());
 	docSpreadBookProperty["decimalsymbol"] = document->locale()->decimalSymbol();
@@ -216,7 +216,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) {
 }
 
 
-KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
+KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
 	KSpreadFilterProperty docSpreadSheetProperty;
 	docSpreadSheetProperty["name"] = spreadSheet->tableName();
 	docSpreadSheetProperty["sizemaxx"] = TQString::number(spreadSheet->sizeMaxX());
@@ -257,7 +257,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
 }
 
 
-KoFilter::ConversiontqStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) {
+KoFilter::ConversionStatus 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 7e9abfed..eee950b9 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.h
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.h
@@ -78,10 +78,10 @@ private:
 
 protected:
 	KSpreadBaseWorker *getWorker() const;
-	KoFilter::ConversiontqStatus doSpreadCell(Cell *spreadCell, int column, int row);
-	KoFilter::ConversiontqStatus doSpreadSheet(Sheet *spreadSheet);
-	KoFilter::ConversiontqStatus doSpreadBook(Doc *document);
-	KoFilter::ConversiontqStatus doInfo(KoDocumentInfo *info);
+	KoFilter::ConversionStatus doSpreadCell(Cell *spreadCell, int column, int row);
+	KoFilter::ConversionStatus doSpreadSheet(Sheet *spreadSheet);
+	KoFilter::ConversionStatus doSpreadBook(Doc *document);
+	KoFilter::ConversionStatus doInfo(KoDocumentInfo *info);
 
 public:
 	/**
@@ -97,7 +97,7 @@ public:
 	*
 	* @return status of the conversion.
 	*/
-	KoFilter::ConversiontqStatus convert();
+	KoFilter::ConversionStatus convert();
 };
 
 } // namespace KSpread
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index 9e37597c..828d817a 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::ConversiontqStatus OpenCalcExport::convert( const TQCString & from,
+KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from,
                                                     const TQCString & to )
 {
   /* later...
@@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from,
      OpenCalcWorker * worker = new OpenCalcWorker();
      leader->setWorker( worker );
 
-     KoFilter::ConversiontqStatus status = leader->convert();
+     KoFilter::ConversionStatus 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::tqcurrentDateTime() );
+  const TQDateTime dt ( TQDateTime::currentDateTime() );
   if ( dt.isValid() )
   {
     data = meta.createElement( "dc:date" );
@@ -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::tqcurrentDate().toString() ) );
+          t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) );
           parent.appendChild( t );
         }
         else if ( var == "<time>" )
diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h
index 97832a9a..03cfa245 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::ConversiontqStatus convert( const TQCString & from,
+  virtual KoFilter::ConversionStatus convert( const TQCString & from,
                                               const TQCString & to );
 
  private:
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 376a8f77..0fbe52e0 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -2735,7 +2735,7 @@ int OpenCalcImport::readMetaData()
   return result;
 }
 
-KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
 {
   kdDebug(30518) << "Entering OpenCalc Import filter: " << from << " - " << to << endl;
 
@@ -2765,10 +2765,10 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ
 
   kdDebug(30518) << "Opening file " << endl;
 
-  KoFilter::ConversiontqStatus pretqStatus = openFile();
+  KoFilter::ConversionStatus preStatus = openFile();
 
-  if ( pretqStatus != KoFilter::OK )
-    return pretqStatus;
+  if ( preStatus != KoFilter::OK )
+    return preStatus;
 
   emit sigProgress( 13 );
   int tables = readMetaData();
@@ -2782,7 +2782,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ
   return KoFilter::OK;
 }
 
-KoFilter::ConversiontqStatus OpenCalcImport::openFile()
+KoFilter::ConversionStatus OpenCalcImport::openFile()
 {
   KoStore * store = KoStore::createStore( m_chain->inputFile(), KoStore::Read);
 
@@ -2817,7 +2817,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::openFile()
   return KoFilter::OK;
 }
 
-KoFilter::ConversiontqStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store )
+KoFilter::ConversionStatus 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 cd1f23b6..071a87ff 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::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
+  virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
 
 
  private:
@@ -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::ConversiontqStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
+    KoFilter::ConversionStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
 
-  KoFilter::ConversiontqStatus openFile();
+  KoFilter::ConversionStatus openFile();
 };
 
 #endif // OpenCalc_IMPORT_H__
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc
index 9a0db4fa..920d20a7 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cc
@@ -94,7 +94,7 @@ QpImport::InitTableName(int pIdx, TQString& pResult)
    }
 }
 
-KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus 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 1c3c7d85..e69d2a65 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::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
     void InitTableName(int pIdx, TQString& pResult);
 };