summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-13 17:43:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-13 17:43:39 -0600
commit359640943bcf155faa9a067dde9e00a123276290 (patch)
treefb3d55ea5e18949042fb0064123fb73d2b1eb932 /tools/linguist/lupdate
parenta829bcdc533e154000803d517200d32fe762e85c (diff)
downloadtqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz
tqt3-359640943bcf155faa9a067dde9e00a123276290.zip
Automated update from Qt3
Diffstat (limited to 'tools/linguist/lupdate')
-rw-r--r--tools/linguist/lupdate/fetchtr.cpp36
-rw-r--r--tools/linguist/lupdate/main.cpp2
-rw-r--r--tools/linguist/lupdate/numberh.cpp2
3 files changed, 20 insertions, 20 deletions
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index a557fd518..7201f3a0e 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -45,12 +45,12 @@
#include <stdio.h>
#include <string.h>
-/* qmake ignore Q_OBJECT */
+/* qmake ignore TQ_OBJECT */
static const char MagicComment[] = "TRANSLATOR ";
-static TQMap<TQCString, int> needs_Q_OBJECT;
-static TQMap<TQCString, int> lacks_Q_OBJECT;
+static TQMap<TQCString, int> needs_TQ_OBJECT;
+static TQMap<TQCString, int> lacks_TQ_OBJECT;
/*
The first part of this source file is the C++ tokenizer. We skip
@@ -75,7 +75,7 @@ static TQMap<TQCString, int> lacks_Q_OBJECT;
*/
enum { Tok_Eof, Tok_class, Tok_namespace, Tok_return, Tok_tr,
- Tok_trUtf8, Tok_translate, Tok_Q_OBJECT, Tok_Ident,
+ Tok_trUtf8, Tok_translate, Tok_TQ_OBJECT, Tok_Ident,
Tok_Comment, Tok_String, Tok_Arrow, Tok_Colon,
Tok_Gulbrandsen, Tok_LeftBrace, Tok_RightBrace, Tok_LeftParen,
Tok_RightParen, Tok_Comma, Tok_Semicolon };
@@ -167,7 +167,7 @@ static int getToken()
switch ( yyIdent[0] ) {
case 'Q':
if ( strcmp(yyIdent + 1, "_OBJECT") == 0 ) {
- return Tok_Q_OBJECT;
+ return Tok_TQ_OBJECT;
} else if ( strcmp(yyIdent + 1, "T_TR_NOOP") == 0 ) {
return Tok_tr;
} else if ( strcmp(yyIdent + 1, "T_TRANSLATE_NOOP") == 0 ) {
@@ -480,7 +480,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
TQCString functionContext = initialContext;
TQCString prefix;
bool utf8 = FALSE;
- bool missing_Q_OBJECT = FALSE;
+ bool missing_TQ_OBJECT = FALSE;
yyTok = getToken();
while ( yyTok != Tok_Eof ) {
@@ -511,7 +511,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
}
if ( yyTok == Tok_Colon ) {
- missing_Q_OBJECT = TRUE;
+ missing_TQ_OBJECT = TRUE;
} else {
functionContext = defaultContext;
}
@@ -550,13 +550,13 @@ static void parse( MetaTranslator *tor, const char *initialContext,
tor->insert( MetaTranslatorMessage(context, text, com,
TQString::null, utf8) );
- if ( lacks_Q_OBJECT.contains(context) ) {
- qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
+ if ( lacks_TQ_OBJECT.contains(context) ) {
+ qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
(const char *) yyFileName, yyLineNo,
(const char *) context );
- lacks_Q_OBJECT.remove( context );
+ lacks_TQ_OBJECT.remove( context );
} else {
- needs_Q_OBJECT.insert( context, 0 );
+ needs_TQ_OBJECT.insert( context, 0 );
}
}
}
@@ -580,8 +580,8 @@ static void parse( MetaTranslator *tor, const char *initialContext,
TQString::null, utf8) );
}
break;
- case Tok_Q_OBJECT:
- missing_Q_OBJECT = FALSE;
+ case Tok_TQ_OBJECT:
+ missing_TQ_OBJECT = FALSE;
yyTok = getToken();
break;
case Tok_Ident:
@@ -637,17 +637,17 @@ static void parse( MetaTranslator *tor, const char *initialContext,
yyBraceDepth + 1 == (int) namespaces.count() )
namespaces.remove( namespaces.fromLast() );
if ( yyBraceDepth == (int) namespaces.count() ) {
- if ( missing_Q_OBJECT ) {
- if ( needs_Q_OBJECT.contains(functionContext) ) {
- qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
+ if ( missing_TQ_OBJECT ) {
+ if ( needs_TQ_OBJECT.contains(functionContext) ) {
+ qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
(const char *) yyFileName, yyLineNo,
(const char *) functionContext );
} else {
- lacks_Q_OBJECT.insert( functionContext, 0 );
+ lacks_TQ_OBJECT.insert( functionContext, 0 );
}
}
functionContext = defaultContext;
- missing_Q_OBJECT = FALSE;
+ missing_TQ_OBJECT = FALSE;
}
yyTok = getToken();
break;
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 7c933afed..1e7225081 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -126,7 +126,7 @@ int main( int argc, char **argv )
verbose = TRUE;
continue;
} else if ( qstrcmp(argv[i], "-version") == 0 ) {
- fprintf( stderr, "lupdate version %s\n", QT_VERSION_STR );
+ fprintf( stderr, "lupdate version %s\n", TQT_VERSION_STR );
return 0;
} else if ( qstrcmp(argv[i], "-ts") == 0 ) {
metTsFlag = TRUE;
diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp
index 52593b59e..29d6fd2f9 100644
--- a/tools/linguist/lupdate/numberh.cpp
+++ b/tools/linguist/lupdate/numberh.cpp
@@ -98,7 +98,7 @@ static TQString translationAttempt( const TQString& oldTranslation,
const char *newSource )
{
int p = zeroKey( oldSource ).contains( '0' );
- int oldSourceLen = qstrlen( oldSource );
+ int oldSourceLen = tqstrlen( oldSource );
TQString attempt;
TQStringList oldNumbers;
TQStringList newNumbers;