From 2b532c73ee96314c4af5d7ff0ecd4c31c6f81730 Mon Sep 17 00:00:00 2001 From: hjk Date: Sun, 6 Oct 2013 02:41:22 +0200 Subject: CPlusPlus: Make (sub-)languague selection more generic Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd Reviewed-by: Nikolai Kosjar --- src/libs/3rdparty/cplusplus/TranslationUnit.cpp | 26 +------------------------ 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'src/libs/3rdparty/cplusplus/TranslationUnit.cpp') diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp index 0ecb9827f85..53725dc1a0c 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 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) { -- cgit v1.2.3