From 4618c9d92ee95387499d57d048f85766bc466373 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 20 Jun 2017 10:26:53 +0200 Subject: Add Q_FALLTHROUGH to unmarked fallthroughs seen by GCC 7 qaxbase.cpp:2557:13: warning: this statement may fall through [-Wimplicit-fallthrough=] qaxserverbase.cpp:2343:13: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I1aad3955f2901493ac9a6fb50b7bc32b0e98f509 Reviewed-by: Andy Shaw --- src/activeqt/container/qaxbase.cpp | 2 +- src/activeqt/control/qaxserverbase.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 22aec57..cd564d3 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2555,7 +2555,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs) prototype = set + prototype; } - // FALL THROUGH to support multi-variat properties + Q_FALLTHROUGH(); // Fall through to support multi-variate properties case INVOKE_FUNC: // method { bool cloned = false; diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 9efded2..779f015 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -2342,7 +2342,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid, break; } } - // FALLTHROUGH if wFlags == DISPATCH_PROPERTYGET|DISPATCH_METHOD AND not a property. + Q_FALLTHROUGH(); // Fall through if wFlags == DISPATCH_PROPERTYGET|DISPATCH_METHOD AND not a property. case DISPATCH_METHOD: { int nameLength = 0; -- cgit v1.2.1