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

Recognize Q_* and QT_* as reserved keywords.

Browse Source
This commit is contained in:
Roberto Raggi
2010-06-01 10:08:00 +02:00
parent efc01fd994
commit 829df11c9d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/cpphighlighter.cpp
View File

@@ -359,16 +359,18 @@ void CppHighlighter::highlightLine(const QString &text, int position, int length
void CppHighlighter::highlightWord(QStringRef word, int position, int length) void CppHighlighter::highlightWord(QStringRef word, int position, int length)
{ {
// try to highlight Qt 'identifiers' like QObject and Q_PROPERTY // try to highlight Qt 'identifiers' like QObject and Q_PROPERTY
// but don't highlight words like 'Query'
if (word.length() > 1 && word.at(0) == QLatin1Char('Q')) { if (word.length() > 2 && word.at(0) == QLatin1Char('Q')) {
for (int i = 1; i < word.length(); ++i) { if (word.at(1) == QLatin1Char('_') // Q_
const QChar &ch = word.at(i); || word.at(1) == QLatin1Char('T') && word.at(2) == QLatin1Char('_')) { // QT_
if (! (ch.isUpper() || ch == QLatin1Char('_'))) for (int i = 1; i < word.length(); ++i) {
return; const QChar &ch = word.at(i);
if (! (ch.isUpper() || ch == QLatin1Char('_')))
return;
}
setFormat(position, length, m_formats[CppTypeFormat]);
} }
setFormat(position, length, m_formats[CppTypeFormat]);
} }
} }