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/cplusplus/SimpleLexer.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/libs/cplusplus/SimpleLexer.h') diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index dac658f01f..a730b2d42a 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -30,6 +30,7 @@ #define CPLUSPLUS_SIMPLELEXER_H #include +#include #include #include @@ -48,14 +49,8 @@ public: bool skipComments() const; void setSkipComments(bool skipComments); - bool qtMocRunEnabled() const; - void setQtMocRunEnabled(bool enabled); - - bool objCEnabled() const; - void setObjCEnabled(bool onoff); - - bool cxx0xEnabled() const; - void setCxx0xEnabled(bool enabled); + LanguageFeatures languageFeatures() const { return _languageFeatures; } + void setLanguageFeatures(LanguageFeatures features) { _languageFeatures = features; } bool endedJoined() const; @@ -74,11 +69,9 @@ public: private: int _lastState; + LanguageFeatures _languageFeatures; bool _skipComments: 1; - bool _qtMocRunEnabled: 1; - bool _objCEnabled: 1; bool _endedJoined: 1; - bool _cxx0xEnabled: 1; }; } // namespace CPlusPlus -- cgit v1.2.3