diff options
| author | Leandro Melo <leandro.melo@nokia.com> | 2012-06-28 10:55:51 +0200 |
|---|---|---|
| committer | Leandro Melo <leandro.melo@nokia.com> | 2012-06-28 11:49:50 +0200 |
| commit | 621e5c3dbefef6d90ce02229aeff2da16309d541 (patch) | |
| tree | f101e2b881d17467b20ba25d516945670ede9e20 /src/libs/3rdparty/cplusplus/Token.h | |
| parent | d1971174d4d475e48c6f922e9aefab933a8581af (diff) | |
C++: Parse emit/Q_EMIT properly
The parser now understands emit/Q_EMIT as an expression statement.
Also, the recent fixes in the preprocessor introduced a side-effect
in the hanlding of code such as: emit signal(); Member signal started
being treated as a local use (parsed as a declaration) and possibily
being highlighted as unused variable.
Previously that worked by accident since there was an inconsistency
in the preprocessor on which only object-like macros were being
expanded even when the "no expand" flag was set. Then, the code
mentioned above was being parsed as an expression, what kind of worked.
Change-Id: I47a68ed4c1c1702872620b8ed7c7264fb0997034
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Token.h')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Token.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/3rdparty/cplusplus/Token.h b/src/libs/3rdparty/cplusplus/Token.h index a30474adc6..41abe17e9a 100644 --- a/src/libs/3rdparty/cplusplus/Token.h +++ b/src/libs/3rdparty/cplusplus/Token.h @@ -217,7 +217,8 @@ enum Kind { T_FIRST_QT_KEYWORD, // Qt keywords - T_SIGNAL = T_FIRST_QT_KEYWORD, + T_EMIT = T_FIRST_QT_KEYWORD, + T_SIGNAL, T_SLOT, T_Q_SIGNAL, T_Q_SLOT, @@ -230,6 +231,7 @@ enum Kind { T_Q_PROPERTY, T_Q_PRIVATE_PROPERTY, T_Q_INTERFACES, + T_Q_EMIT, T_Q_ENUMS, T_Q_FLAGS, T_Q_PRIVATE_SLOT, |