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

2 files changed, 15 insertions, 15 deletions

diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc
index 9a4ac58b..a04633fe 100644
--- a/filters/liboofilter/ooutils.cc
+++ b/filters/liboofilter/ooutils.cc
@@ -209,7 +209,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
     if ( !styleStack.hasChildNodeNS( ooNS::style, "tab-stops" ) ) // 3.11.10
         return;
     TQDomElement tabStops = styleStack.childNodeNS( ooNS::style, "tab-stops" );
-    //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl;
+    //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl;
     for ( TQDomNode it = tabStops.firstChild(); !it.isNull(); it = it.nextSibling() )
     {
         TQDomElement tabStop = it.toElement();
@@ -227,7 +227,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
         else if ( type == "char" ) {
             TQString delimiterChar = tabStop.attributeNS( ooNS::style, "char", TQString() ); // single character
             elem.setAttribute( "alignchar", delimiterChar );
-            kOfficeType = 3; // "tqalignment on decimal point"
+            kOfficeType = 3; // "alignment on decimal point"
         }
 
         elem.setAttribute( "type", kOfficeType );
@@ -235,7 +235,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
         double pos = KoUnit::parseValue( tabStop.attributeNS( ooNS::style, "position", TQString() ) );
         elem.setAttribute( "ptpos", pos );
 
-        // TODO Convert leaderChar's tqunicode value to the KOffice enum
+        // TODO Convert leaderChar's unicode value to the KOffice enum
         // (blank/dots/line/dash/dash-dot/dash-dot-dot, 0 to 5)
         TQString leaderChar = tabStop.attributeNS( ooNS::style, "leader-char", TQString() ); // single character
         if ( !leaderChar.isEmpty() )
@@ -499,7 +499,7 @@ void OoUtils::createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo)
     }
 }
 
-KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store )
+KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store )
 {
     kdDebug(30518) << "loadAndParse: Trying to open " << fileName << endl;
 
@@ -508,13 +508,13 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQD
         kdWarning(30519) << "Entry " << fileName << " not found!" << endl;
         return KoFilter::FileNotFound;
     }
-    KoFilter::ConversiontqStatus converttqStatus = loadAndParse( m_store->device(),doc, fileName );
+    KoFilter::ConversionStatus convertStatus = loadAndParse( m_store->device(),doc, fileName );
     m_store->close();
-    return converttqStatus;
+    return convertStatus;
 
 }
 
-KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName)
+KoFilter::ConversionStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName)
 {
     TQXmlInputSource source( io );
     // Copied from TQDomDocumentPrivate::setContent, to change the whitespace thing
@@ -538,7 +538,7 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument
 
 }
 
-KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip)
+KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip)
 {
     kdDebug(30519) << "Trying to open " << filename << endl;
 
@@ -562,12 +562,12 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQD
     const KZipFileEntry* f = static_cast<const KZipFileEntry *>(entry);
     kdDebug(30519) << "Entry " << filename << " has size " << f->size() << endl;
     TQIODevice* io = f->device();
-    KoFilter::ConversiontqStatus converttqStatus = loadAndParse( io,doc, filename );
+    KoFilter::ConversionStatus convertStatus = loadAndParse( io,doc, filename );
     delete io;
-    return converttqStatus;
+    return convertStatus;
 }
 
-KoFilter::ConversiontqStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip )
+KoFilter::ConversionStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip )
 {
     const TQString filename( "Thumbnails/thumbnail.png" );
     kdDebug(30519) << "Trying to open thumbnail " << filename << endl;
diff --git a/filters/liboofilter/ooutils.h b/filters/liboofilter/ooutils.h
index 70de64c8..a668d961 100644
--- a/filters/liboofilter/ooutils.h
+++ b/filters/liboofilter/ooutils.h
@@ -80,14 +80,14 @@ namespace OoUtils
     void importTextPosition( const TQString& text_position, TQString& value, TQString& relativetextsize );
 
     void createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo);
-    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip);
-    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store );
+    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip);
+    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store );
 
     /// Load an OASIS thumbnail
-    KoFilter::ConversiontqStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip );
+    KoFilter::ConversionStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip );
 
     // Internal
-    KoFilter::ConversiontqStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName);
+    KoFilter::ConversionStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName);
 }
 
 #endif /* OOUTILS_H */