diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
| commit | a374efce3a207b39514be3c52264091400ce297e (patch) | |
| tree | 77bdf654b55826d4f59b53a5621310206bcaead1 /kturtle/src/parser.cpp | |
| parent | f81a494f3957d5cf38c787973415597941934727 (diff) | |
| download | tdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip | |
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kturtle/src/parser.cpp')
| -rw-r--r-- | kturtle/src/parser.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kturtle/src/parser.cpp b/kturtle/src/parser.cpp index 07a33aea..64d83cb0 100644 --- a/kturtle/src/parser.cpp +++ b/kturtle/src/parser.cpp @@ -94,7 +94,7 @@ void Parser::matchToken(int expectedToken) switch (expectedToken) { case tokEOL: - Error(currentToken, i18n("Unexpected intruction after the '%1' command, please use only one instruction per line").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Unexpected intruction after the '%1' command, please use only one instruction per line").tqarg(preservedToken.look), 1010); break; case tokBegin: @@ -102,23 +102,23 @@ void Parser::matchToken(int expectedToken) break; case tokTo: - Error(currentToken, i18n("Expected 'to' after the '%1' command").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Expected 'to' after the '%1' command").tqarg(preservedToken.look), 1010); break; case tokAssign: - Error(currentToken, i18n("Expected '=' after the '%1' command").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Expected '=' after the '%1' command").tqarg(preservedToken.look), 1010); break; case tokEnd: - Error(currentToken, i18n("Expected ']' after the '%1' command").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Expected ']' after the '%1' command").tqarg(preservedToken.look), 1010); break; case tokUnknown: - Error(preservedToken, i18n("Expected a name after the '%1' command").arg(preservedToken.look), 1010); + Error(preservedToken, i18n("Expected a name after the '%1' command").tqarg(preservedToken.look), 1010); break; default: - Error(currentToken, i18n("UNDEFINED ERROR NR %1: please send this Logo script to the KTurtle developers").arg(expectedToken), 1010); + Error(currentToken, i18n("UNDEFINED ERROR NR %1: please send this Logo script to the KTurtle developers").tqarg(expectedToken), 1010); break; } } @@ -188,7 +188,7 @@ TreeNode* Parser::Factor() case tokUnknown: node = getId(); - if (learnedFunctionList.contains(rememberedToken.look) > 0) // is function call + if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) // is function call { delete node; node = FunctionCall(rememberedToken); @@ -241,12 +241,12 @@ TreeNode* Parser::Factor() TQString s = currentToken.look; if ( s.isEmpty() || currentToken.type == tokEOF ) { - Error(currentToken, i18n("INTERNAL ERROR NR %1: please sent this Logo script to KTurtle developers").arg(1), 1020); + Error(currentToken, i18n("INTERNAL ERROR NR %1: please sent this Logo script to KTurtle developers").tqarg(1), 1020); // if this error occurs the see the Parser::Repeat for the good solution using 'preservedToken' } else { - Error(currentToken, i18n("Cannot understand '%1', expected an expression after the '%2' command").arg(s).arg(preservedToken.look), 1020); + Error(currentToken, i18n("Cannot understand '%1', expected an expression after the '%2' command").tqarg(s).tqarg(preservedToken.look), 1020); } node = new TreeNode(currentToken, Unknown); getToken(); @@ -538,7 +538,7 @@ TreeNode* Parser::Statement() } if (currentToken.type != tokEnd) { - Error(currentToken, i18n("Cannot understand '%1'").arg(currentToken.look), 1060); + Error(currentToken, i18n("Cannot understand '%1'").tqarg(currentToken.look), 1060); } getToken(); @@ -1057,7 +1057,7 @@ TreeNode* Parser::Other() matchToken(tokUnknown); if (currentToken.type == tokAssign) return Assignment(rememberedToken); - else if (learnedFunctionList.contains(rememberedToken.look) > 0) + else if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) { TreeNode* node; node = FunctionCall(rememberedToken); @@ -1065,7 +1065,7 @@ TreeNode* Parser::Other() return node; } - Error(rememberedToken, i18n("'%1' is neither a Logo command nor a learned command.").arg(rememberedToken.look), 1020); + Error(rememberedToken, i18n("'%1' is neither a Logo command nor a learned command.").tqarg(rememberedToken.look), 1020); TreeNode* errNode = new TreeNode(rememberedToken, Unknown); // skip the rest of the line |