diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-10 16:51:58 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-24 14:50:43 +0000 |
| commit | f482270432761e72b87fb368c2a379cd59b169b3 (patch) | |
| tree | 11bbf09187ef36eb23c51a55e4b6e617ed4b8cfb /src/plugins/cpptools/cppcodeformatter.cpp | |
| parent | 66488ba0b8d8fd7111e75fc53f37af4e4f51a12e (diff) | |
| download | qt-creator-f482270432761e72b87fb368c2a379cd59b169b3.tar.gz | |
Introduce Q_FALLTHROUGH()
Silence g++ 7.X warnings.
Change-Id: I9d06d04b496c9ec060e13e1be6f43d8fbadb1f3b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodeformatter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index 68c83f29f9..064479b9d5 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -29,6 +29,7 @@ #include <cplusplus/Lexer.h> #include <utils/qtcassert.h> +#include <utils/qtcfallthrough.h> #include <QDebug> #include <QMetaEnum> @@ -848,7 +849,7 @@ bool CodeFormatter::tryDeclaration() return true; } } - // fallthrough + Q_FALLTHROUGH(); case T_CHAR: case T_CHAR16_T: case T_CHAR32_T: @@ -1231,7 +1232,7 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd case assign_open: if (parentState.type == assign_open_or_initializer) break; - // fallthrough + Q_FALLTHROUGH(); case assign_open_or_initializer: if (!lastToken && m_styleSettings.alignAssignments) *paddingDepth = nextTokenPosition-*indentDepth; |