summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodeformatter.cpp
diff options
context:
space:
mode:
authorFrancois Ferrand <thetypz@gmail.com>2016-02-26 18:48:39 +0100
committerFrancois Ferrand <thetypz@gmail.com>2016-08-23 12:35:04 +0000
commit7b2c09a1186f2cf69f276017ba08da89560f55be (patch)
treee336ae35ba2779b4051d1fcdfb9003b40792b88a /src/plugins/cpptools/cppcodeformatter.cpp
parent285c8a7543aae0d71949451f04c99a4924900104 (diff)
downloadqt-creator-7b2c09a1186f2cf69f276017ba08da89560f55be.tar.gz
C++: Disable C++ keywords in C files
In some (legacy) C files, new and delete may be used for regular identifier. There are some limitations: * Header files have no 'implicit' type, and may be parsed as C++ or ObjC depending on the other files in the project. * QMakeProject use a single ProjectPart for C and C++ files, so there will still be the issue. Change-Id: Iec11687b35f7ccf1e7c0d091b143ae90d950e440 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
-rw-r--r--src/plugins/cpptools/cppcodeformatter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index 0d3586dcd1..e27832a2ff 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -1066,6 +1066,7 @@ int CodeFormatter::tokenizeBlock(const QTextBlock &block, bool *endedJoined)
features.qtEnabled = true;
features.qtMocRunEnabled = true;
features.qtKeywordsEnabled = true;
+ features.cxxEnabled = true;
features.objCEnabled = true;
SimpleLexer tokenize;