diff options
Diffstat (limited to 'kbabel/common/poinfo.cpp')
| -rw-r--r-- | kbabel/common/poinfo.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp index 63a01d38..3ab33287 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 <tqtextcodec.h> +#include <textcodec.h> #include "libgettext/pofiles.h" #include "libgettext/tokens.h" @@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) } -ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive) +ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive) { return PoInfo::info( url, info, wordList, updateWordList, interactive, true); } -ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt) +ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt) { stopStaticRead = false; @@ -372,7 +372,7 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList // First check file with msgfmt to be sure, it is syntactically correct Msgfmt msgfmt; TQString output; - Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output ); + Msgfmt::Status stat = msgfmt.checkSyntax( target , output ); if(stat == Msgfmt::SyntaxError) { KIO::NetAccess::removeTempFile(target); @@ -395,11 +395,11 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList lexer->yylex(); // now parse the rest of the file - ConversiontqStatus success=OK; + ConversionStatus success=OK; while( lexer->lastToken != T_EOF && success==OK) { - if( interactive ) kapp->tqprocessEvents(10); + if( interactive ) kapp->processEvents(10); if( stopStaticRead ) { @@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) // first read header CatalogItem temp; - ConversiontqStatus status = fastRead( temp, lexer, true ); + ConversionStatus 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->tqprocessEvents(10); + kapp->processEvents(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 -ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText) +ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText) { item.clear(); _gettextPluralForm = false; |