Rename old tq methods that no longer need a unique name

7 files changed, 22 insertions, 22 deletions

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.