diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-22 13:11:09 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-22 18:00:26 +0100 |
| commit | 72c3ba791ed898ceb1d706f467dbacd19c4ab95c (patch) | |
| tree | 525b4c12ee9ed23046dfe2b94d6c0d660cd9e631 /src/shared/cplusplus | |
| parent | 41e2b885b87e191a9a768087c5a6fc941b39660e (diff) | |
| download | qt-creator-72c3ba791ed898ceb1d706f467dbacd19c4ab95c.tar.gz | |
Fixed pre-processor handling for Q_PROPERTY, Q_ENUMS and Q_FLAGS.
Diffstat (limited to 'src/shared/cplusplus')
| -rw-r--r-- | src/shared/cplusplus/Keywords.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/cplusplus/Keywords.cpp b/src/shared/cplusplus/Keywords.cpp index e1e45373ea..3ea26e2419 100644 --- a/src/shared/cplusplus/Keywords.cpp +++ b/src/shared/cplusplus/Keywords.cpp @@ -745,7 +745,7 @@ static inline int classify7(const char *s, bool q) { return T_IDENTIFIER; } -static inline int classify8(const char *s, bool) { +static inline int classify8(const char *s, bool q) { if (s[0] == '_') { if (s[1] == '_') { if (s[2] == 'i') { @@ -910,7 +910,7 @@ static inline int classify8(const char *s, bool) { } } } - else if (s[0] == 'Q') { + else if (q && s[0] == 'Q') { if (s[1] == '_') { if (s[2] == 'S') { if (s[3] == 'I') { @@ -1024,7 +1024,7 @@ static inline int classify9(const char *s, bool q) { return T_IDENTIFIER; } -static inline int classify10(const char *s, bool) { +static inline int classify10(const char *s, bool q) { if (s[0] == '_') { if (s[1] == '_') { if (s[2] == 'i') { @@ -1101,7 +1101,7 @@ static inline int classify10(const char *s, bool) { } } } - else if (s[0] == 'Q') { + else if (q && s[0] == 'Q') { if (s[1] == '_') { if (s[2] == 'P') { if (s[3] == 'R') { @@ -1125,7 +1125,7 @@ static inline int classify10(const char *s, bool) { return T_IDENTIFIER; } -static inline int classify11(const char *s, bool) { +static inline int classify11(const char *s, bool q) { if (s[0] == '_') { if (s[1] == '_') { if (s[2] == 'a') { @@ -1172,7 +1172,7 @@ static inline int classify11(const char *s, bool) { } } } - else if (s[0] == 'Q') { + else if (q && s[0] == 'Q') { if (s[1] == '_') { if (s[2] == 'I') { if (s[3] == 'N') { |