diff options
| author | hjk <hjk121@nokiamail.com> | 2013-10-06 02:41:22 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-10-15 16:22:28 +0200 |
| commit | 2b532c73ee96314c4af5d7ff0ecd4c31c6f81730 (patch) | |
| tree | 3d7d4fc1adb7800a13fdf2ca37fee9f1ed485d76 /src/plugins/cpptools/cppcodeformatter.cpp | |
| parent | 0a600e041afd7478aef528c61776a0fc660fd175 (diff) | |
| download | qt-creator-2b532c73ee96314c4af5d7ff0ecd4c31c6f81730.tar.gz | |
CPlusPlus: Make (sub-)languague selection more generic
Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodeformatter.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index 72e0edb76f..d83434fde9 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -1055,9 +1055,14 @@ int CodeFormatter::tokenizeBlock(const QTextBlock &block, bool *endedJoined) startState = 0; QTC_ASSERT(startState != -1, return 0); + LanguageFeatures features; + features.qtEnabled = true; + features.qtMocRunEnabled = true; + features.qtKeywordsEnabled = true; + features.objCEnabled = true; + SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(true); - tokenize.setObjCEnabled(true); + tokenize.setLanguageFeatures(features); m_currentLine = block.text(); // to determine whether a line was joined, Tokenizer needs a |