diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/cppparser/ast.cpp | 2 | ||||
-rw-r--r-- | lib/cppparser/ast.h | 3 | ||||
-rw-r--r-- | lib/cppparser/driver.cpp | 1 | ||||
-rw-r--r-- | lib/cppparser/lexer.h | 2 | ||||
-rw-r--r-- | lib/cppparser/parser.cpp | 1 | ||||
-rw-r--r-- | lib/cppparser/parser.h | 2 |
6 files changed, 4 insertions, 7 deletions
diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 20cf0fc8..f0cc848c 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -83,7 +83,7 @@ TQString nodeTypeToString( int type ) return "DoStatement"; case NodeType_ForStatement: return "ForStatement"; - case NodeType_ForEachStatement: // qt4 [erbsland] + case NodeType_ForEachStatement: return "ForEachStatement"; case NodeType_SwitchStatement: return "SwitchStatement"; diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index a55325bd..c53cce20 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -72,7 +72,7 @@ enum NodeType NodeType_WhileStatement, NodeType_DoStatement, NodeType_ForStatement, - NodeType_ForEachStatement, // qt4 [erbsland] + NodeType_ForEachStatement, NodeType_SwitchStatement, NodeType_CatchStatement, NodeType_CatchStatementList, @@ -1249,7 +1249,6 @@ private: void operator = ( const ForStatementAST& source ); }; -// qt4 [erbsland] class ForEachStatementAST: public StatementAST { public: diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index c1a6f55a..c08f0c1c 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -621,7 +621,6 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments ); lexer->addSkipWord( "CALLBACK_CALL_TYPE" ); - // qt4 [erbsland] lexer->addSkipWord( "TQ_DECLARE_FLAGS", SkipWordAndArguments ); lexer->addSkipWord( "TQ_DECLARE_OPERATORS_FOR_FLAGS", SkipWordAndArguments ); diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index dd3e5824..576c0cfa 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -65,7 +65,7 @@ enum Type { Token_signals, Token_slots, Token_emit, - Token_foreach, // qt4 [erbsland] + Token_foreach, Token_and, Token_and_eq, diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 5e394b27..9c1b58b4 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -2748,7 +2748,6 @@ bool Parser::parseForStatement( StatementAST::Node& node ) return true; } -// qt4 [erbsland] ///@todo add the right parsing for the foreach statement bool Parser::parseForEachStatement( StatementAST::Node& node ) { diff --git a/lib/cppparser/parser.h b/lib/cppparser/parser.h index fbefd8c5..40173c86 100644 --- a/lib/cppparser/parser.h +++ b/lib/cppparser/parser.h @@ -368,7 +368,7 @@ public /*rules*/ : bool parseWhileStatement( StatementAST::Node& node ); bool parseDoStatement( StatementAST::Node& node ); bool parseForStatement( StatementAST::Node& node ); - bool parseForEachStatement( StatementAST::Node& node ); // qt4 [erbsland] + bool parseForEachStatement( StatementAST::Node& node ); bool parseCompoundStatement( StatementAST::Node& node ); bool parseForInitStatement( StatementAST::Node& node ); bool parseIfStatement( StatementAST::Node& node ); |