diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-11-18 15:57:44 +1000 |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-11-18 17:40:09 +1000 |
commit | 2d4e75101e65286d9bb59e56c868ec972ed66eb5 (patch) | |
tree | bd51291aefb13e32e5333518469f0c8b410a1358 /src/libs/glsl/glsl.g | |
parent | 1370d1d796b4e62d65aac953bc62006945fef7b4 (diff) | |
download | qt-creator-2d4e75101e65286d9bb59e56c868ec972ed66eb5.tar.gz |
Use QString instead of std::string in GLSL parser
Diffstat (limited to 'src/libs/glsl/glsl.g')
-rw-r--r-- | src/libs/glsl/glsl.g | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g index a30376f934..c594c77358 100644 --- a/src/libs/glsl/glsl.g +++ b/src/libs/glsl/glsl.g @@ -253,7 +253,7 @@ class GLSL_EXPORT Parser: public $table public: union Value { void *ptr; - const std::string *string; + const QString *string; AST *ast; List<AST *> *ast_list; Declaration *declaration; @@ -290,7 +290,7 @@ public: } type_qualifier; struct { Type *type; - const std::string *name; + const QString *name; } param_declarator; ParameterDeclaration *param_declaration; FunctionDeclaration *function_declaration; @@ -305,7 +305,7 @@ private: // 1-based Value &sym(int n) { return _symStack[_tos + n - 1]; } AST *&ast(int n) { return _symStack[_tos + n - 1].ast; } - const std::string *&string(int n) { return _symStack[_tos + n - 1].string; } + const QString *&string(int n) { return _symStack[_tos + n - 1].string; } Expression *&expression(int n) { return _symStack[_tos + n - 1].expression; } Statement *&statement(int n) { return _symStack[_tos + n - 1].statement; } Type *&type(int n) { return _symStack[_tos + n - 1].type; } @@ -1312,7 +1312,7 @@ case $rule_number: { (makeAstNode<QualifiedType> (sym(1).qualifier, type(3), (List<LayoutQualifier *> *)0), ParameterDeclaration::Qualifier(sym(2).qualifier), - (const std::string *)0); + (const QString *)0); } break; ./ @@ -1321,7 +1321,7 @@ parameter_declaration ::= parameter_qualifier parameter_type_specifier ; case $rule_number: { ast(1) = makeAstNode<ParameterDeclaration> (type(2), ParameterDeclaration::Qualifier(sym(1).qualifier), - (const std::string *)0); + (const QString *)0); } break; ./ @@ -1565,7 +1565,7 @@ case $rule_number: { layout_qualifier_id ::= IDENTIFIER ; /. case $rule_number: { - sym(1).layout = makeAstNode<LayoutQualifier>(string(1), (const std::string *)0); + sym(1).layout = makeAstNode<LayoutQualifier>(string(1), (const QString *)0); } break; ./ |