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

2 files changed, 10 insertions, 10 deletions

diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc
index 90320d7e..fba48867 100644
--- a/filters/karbon/oodraw/oodrawimport.cc
+++ b/filters/karbon/oodraw/oodrawimport.cc
@@ -62,7 +62,7 @@ OoDrawImport::~OoDrawImport()
 {
 }
 
-KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversionStatus OoDrawImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug() << "Entering Oodraw Import filter: " << from << " - " << to << endl;
 
@@ -81,13 +81,13 @@ KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCS
         return KoFilter::FileNotFound;
     }
 
-    KoFilter::ConversiontqStatus pretqStatus = openFile();
+    KoFilter::ConversionStatus preStatus = openFile();
 
-    if( pretqStatus != KoFilter::OK )
+    if( preStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return pretqStatus;
+        return preStatus;
     }
 /*TQDomDocument docinfo;
   createDocumentInfo( docinfo );
@@ -149,9 +149,9 @@ void OoDrawImport::createDocumentInfo( TQDomDocument &docinfo )
 
 
 // Very related to OoWriterImport::openFile()
-KoFilter::ConversiontqStatus OoDrawImport::openFile()
+KoFilter::ConversionStatus OoDrawImport::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;
@@ -223,7 +223,7 @@ void OoDrawImport::convert()
 }
 
 
-KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversionStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
      return OoUtils::loadAndParse( filename, doc, m_zip);
 }
diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h
index 2b395f48..6e753d7d 100644
--- a/filters/karbon/oodraw/oodrawimport.h
+++ b/filters/karbon/oodraw/oodrawimport.h
@@ -43,7 +43,7 @@ public:
     OoDrawImport( KoFilter *parent, const char *name, const TQStringList & );
     virtual ~OoDrawImport();
 
-    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
 
 private:
 	void createDocumentInfo( TQDomDocument &docinfo );
@@ -63,8 +63,8 @@ private:
 	double ymirror( double y );
 	KoRect parseViewBox( const TQDomElement& object );
 
-	KoFilter::ConversiontqStatus openFile();
-	KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+	KoFilter::ConversionStatus openFile();
+	KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
 
 	VDocument			m_document;
 	TQDomDocument			m_content;