diff options
author | Roberto Raggi <qtc-committer@nokia.com> | 2009-01-09 16:55:25 +0100 |
---|---|---|
committer | Roberto Raggi <qtc-committer@nokia.com> | 2009-01-09 16:55:51 +0100 |
commit | 599cdcfa064c91a2a4dcbb3d76dab799b19e4ecf (patch) | |
tree | bdbd8011612f4fe0cf3ac18d909914c0fed66919 /src/libs | |
parent | 5f9669d8d264bc0c97afae61269c25e485949b83 (diff) | |
download | qt-creator-599cdcfa064c91a2a4dcbb3d76dab799b19e4ecf.tar.gz |
More ObjC++
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/cplusplus/SimpleLexer.cpp | 13 | ||||
-rw-r--r-- | src/libs/cplusplus/SimpleLexer.h | 6 |
2 files changed, 9 insertions, 10 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); diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index fb64a66c03..3f5b736e2d 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -91,8 +91,8 @@ public: bool qtMocRunEnabled() const; void setQtMocRunEnabled(bool enabled); - bool objcEnabled() const; - void setObjcEnabled(bool onoff); + bool objCEnabled() const; + void setObjCEnabled(bool onoff); QList<SimpleToken> operator()(const QString &text, int state = 0); @@ -103,7 +103,7 @@ private: int _lastState; bool _skipComments: 1; bool _qtMocRunEnabled: 1; - bool _objcEnabled: 1; + bool _objCEnabled: 1; }; } // end of namespace CPlusPlus |