Introduce Q_FALLTHROUGH()

Silence g++ 7.X warnings.

Change-Id: I9d06d04b496c9ec060e13e1be6f43d8fbadb1f3b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Friedemann Kleint
2018-01-10 16:51:58 +01:00
parent 66488ba0b8
commit f482270432
19 changed files with 71 additions and 43 deletions

View File

@@ -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;