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/libs/3rdparty/cplusplus/TranslationUnit.cpp | |
| parent | 0a600e041afd7478aef528c61776a0fc660fd175 (diff) | |
CPlusPlus: Make (sub-)languague selection more generic
Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/TranslationUnit.cpp')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/TranslationUnit.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp index 0ecb9827f8..53725dc1a0 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp @@ -63,24 +63,6 @@ TranslationUnit::~TranslationUnit() delete _pool; } -bool TranslationUnit::qtMocRunEnabled() const -{ return f._qtMocRunEnabled; } - -void TranslationUnit::setQtMocRunEnabled(bool onoff) -{ f._qtMocRunEnabled = onoff; } - -bool TranslationUnit::cxx0xEnabled() const -{ return f._cxx0xEnabled; } - -void TranslationUnit::setCxxOxEnabled(bool onoff) -{ f._cxx0xEnabled = onoff; } - -bool TranslationUnit::objCEnabled() const -{ return f._objCEnabled; } - -void TranslationUnit::setObjCEnabled(bool onoff) -{ f._objCEnabled = onoff; } - Control *TranslationUnit::control() const { return _control; } @@ -157,9 +139,7 @@ void TranslationUnit::tokenize() f._tokenized = true; Lexer lex(this); - lex.setQtMocRunEnabled(f._qtMocRunEnabled); - lex.setCxxOxEnabled(f._cxx0xEnabled); - lex.setObjCEnabled(f._objCEnabled); + lex.setLanguageFeatures(_languageFeatures); lex.setScanCommentTokens(true); std::stack<unsigned> braces; @@ -319,10 +299,6 @@ bool TranslationUnit::parse(ParseMode mode) f._parsed = true; Parser parser(this); - parser.setQtMocRunEnabled(f._qtMocRunEnabled); - parser.setCxxOxEnabled(f._cxx0xEnabled); - parser.setObjCEnabled(f._objCEnabled); - bool parsed = false; switch (mode) { |