feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed pre-processor handling for Q_PROPERTY, Q_ENUMS and Q_FLAGS.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-02-22 13:11:09 +01:00
parent 41e2b885b8
commit 72c3ba791e
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/cplusplus/Keywords.cpp
View File

@@ -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') {