diff options
| author | hjk <qtc-committer@nokia.com> | 2009-01-09 17:31:53 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-01-09 17:31:53 +0100 |
| commit | fb93fdaea2ace69c8ffc81ecf6ced754e3119dae (patch) | |
| tree | 010fcdd44a8798c1e4aa5b0aded234e922106429 /src/libs/cplusplus/SimpleLexer.cpp | |
| parent | b1f4889ac4deceed793f444a7405db4850fe9199 (diff) | |
| parent | 914c3fa63770ecf69517d9eb0b3c330236deaf2d (diff) | |
| download | qt-creator-fb93fdaea2ace69c8ffc81ecf6ced754e3119dae.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Diffstat (limited to 'src/libs/cplusplus/SimpleLexer.cpp')
| -rw-r--r-- | src/libs/cplusplus/SimpleLexer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index 583f45da38..440946cdb3 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -58,7 +58,7 @@ SimpleLexer::SimpleLexer() : _lastState(0), _skipComments(false), _qtMocRunEnabled(true), - _objcEnabled(false) + _objCEnabled(false) { } SimpleLexer::~SimpleLexer() @@ -74,15 +74,14 @@ void SimpleLexer::setQtMocRunEnabled(bool enabled) _qtMocRunEnabled = enabled; } - -bool SimpleLexer::objcEnabled() const +bool SimpleLexer::objCEnabled() const { - return _objcEnabled; + return _objCEnabled; } -void SimpleLexer::setObjcEnabled(bool onoff) +void SimpleLexer::setObjCEnabled(bool onoff) { - _objcEnabled = onoff; + _objCEnabled = onoff; } bool SimpleLexer::skipComments() const @@ -105,7 +104,7 @@ QList<SimpleToken> SimpleLexer::operator()(const QString &text, int state) Lexer lex(firstChar, lastChar); lex.setQtMocRunEnabled(_qtMocRunEnabled); - lex.setObjcEnabled(_objcEnabled); + lex.setObjCEnabled(_objCEnabled); if (! _skipComments) lex.setScanCommentTokens(true); |