diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-10 16:08:03 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-12 07:10:25 +0000 |
commit | 9031069e12a9870c61de2fb7bfe3569f8c8859b0 (patch) | |
tree | 5964cdd7cd106ca81be94424cdefc99769d9564f /src/dbus | |
parent | cf7a4016a17615df2952389bae11149a49b151bc (diff) |
Add more Q_FALLTHROUGH()
Silence g++ 7.X warnings.
Change-Id: Id06d06e7e3b5be2cf3934d81f1891da58dea2649
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 30 | ||||
-rw-r--r-- | src/dbus/qdbusdemarshaller.cpp | 2 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 50a0483231..7ddf68daa0 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -761,27 +761,28 @@ QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &m switch (count) { case 8: argList.prepend(arg8); - // fall through + Q_FALLTHROUGH(); case 7: argList.prepend(arg7); - // fall through + Q_FALLTHROUGH(); case 6: argList.prepend(arg6); - // fall through + Q_FALLTHROUGH(); case 5: argList.prepend(arg5); - // fall through + Q_FALLTHROUGH(); case 4: argList.prepend(arg4); - // fall through + Q_FALLTHROUGH(); case 3: argList.prepend(arg3); - // fall through + Q_FALLTHROUGH(); case 2: argList.prepend(arg2); - // fall through + Q_FALLTHROUGH(); case 1: argList.prepend(arg1); + break; } return callWithArgumentList(mode, method, argList); @@ -826,27 +827,28 @@ QDBusPendingCall QDBusAbstractInterface::asyncCall(const QString &method, const switch (count) { case 8: argList.prepend(arg8); - // fall through + Q_FALLTHROUGH(); case 7: argList.prepend(arg7); - // fall through + Q_FALLTHROUGH(); case 6: argList.prepend(arg6); - // fall through + Q_FALLTHROUGH(); case 5: argList.prepend(arg5); - // fall through + Q_FALLTHROUGH(); case 4: argList.prepend(arg4); - // fall through + Q_FALLTHROUGH(); case 3: argList.prepend(arg3); - // fall through + Q_FALLTHROUGH(); case 2: argList.prepend(arg2); - // fall through + Q_FALLTHROUGH(); case 1: argList.prepend(arg1); + break; } return asyncCallWithArgumentList(method, argList); diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp index 57684897c6..6befb33d61 100644 --- a/src/dbus/qdbusdemarshaller.cpp +++ b/src/dbus/qdbusdemarshaller.cpp @@ -289,7 +289,7 @@ QVariant QDBusDemarshaller::toVariantInternal() case DBUS_TYPE_UNIX_FD: if (capabilities & QDBusConnection::UnixFileDescriptorPassing) return QVariant::fromValue(toUnixFileDescriptor()); - // fall through + Q_FALLTHROUGH(); default: // qWarning("QDBusDemarshaller: Found unknown D-Bus type %d '%c'", |