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

C++: Fix lexer for token Q_SLOT

Browse Source 
When adding Q_EMIT a while ago the the if chain got messed up
and Q_SLOT was being skipped.

Change-Id: Ib1f49c00290a09286506de9510d0067eaf5e3b96
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leandro Melo
2012-08-30 15:04:25 +02:00
committed by hjk
parent e160d286f8
commit 813539a70a
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/3rdparty/cplusplus/Keywords.cpp vendored
View File

@@ -424,19 +424,6 @@ static inline int classify6(const char *s, bool q, bool) {
}
}
}
else if (q && s[0] == 'Q') {
if (s[1] == '_') {
if (s[2] == 'E') {
if (s[3] == 'M') {
if (s[4] == 'I') {
if (s[5] == 'T') {
return T_Q_EMIT;
}
}
}
}
}
}
else if (s[0] == 'r') {
if (s[1] == 'e') {
if (s[2] == 't') {
@@ -545,6 +532,15 @@ static inline int classify6(const char *s, bool q, bool) {
}
}
}
else if (s[2] == 'E') {
if (s[3] == 'M') {
if (s[4] == 'I') {
if (s[5] == 'T') {
return T_Q_EMIT;
}
}
}
}
}
}
return T_IDENTIFIER;