Rename old tq methods that no longer need a unique name

1 files changed, 11 insertions, 11 deletions

diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 5fd196f8a..87e41f492 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;
             }