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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

1 files changed, 9 insertions, 9 deletions

diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 3ab33287..63a01d38 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -48,7 +48,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include "libgettext/pofiles.h"
 #include "libgettext/tokens.h"
@@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
 }
 
 
-ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
+ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
 {
     return PoInfo::info( url, info, wordList, updateWordList, interactive, true);
 }
 
-ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
+ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
 {
    stopStaticRead = false;
 
@@ -372,7 +372,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
             // First check file with msgfmt to be sure, it is syntactically correct
             Msgfmt msgfmt;
             TQString output;
-            Msgfmt::Status stat = msgfmt.checkSyntax( target , output );
+            Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output );
             if(stat == Msgfmt::SyntaxError)
             {
                 KIO::NetAccess::removeTempFile(target);
@@ -395,11 +395,11 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 	   lexer->yylex();
 	   
            // now parse the rest of the file
-           ConversionStatus success=OK;
+           ConversiontqStatus success=OK;
 	   
            while( lexer->lastToken != T_EOF && success==OK)
            {
-               if( interactive ) kapp->processEvents(10);
+               if( interactive ) kapp->tqprocessEvents(10);
 	       
 	       if( stopStaticRead )
 	       {
@@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
            // first read header
 	   CatalogItem temp;
 	   
-	   ConversionStatus status = fastRead( temp, lexer, true );
+	   ConversiontqStatus status = fastRead( temp, lexer, true );
 	   if( status != OK || !temp.msgid().first().isEmpty() ) 
 	   {
 		delete lexer;
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 		   }
 		   case T_MSGID: 
 		   case T_MSGIDPLURAL: {
-	    		kapp->processEvents(10);
+	    		kapp->tqprocessEvents(10);
 			
 			// if stopped, return not found
 			if( stopStaticRead ) 
@@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 }
 
 // this does not like any incorrect files
-ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
+ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
 {
    item.clear();
    _gettextPluralForm = false;