forked from qt-creator/qt-creator
More ObjC++
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user