diff options
Diffstat (limited to 'src/dbus/qdbusabstractinterface.cpp')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 9f2e688ebb..7ddf68daa0 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -70,10 +70,10 @@ class DisconnectRelayEvent : public QMetaCallEvent { public: DisconnectRelayEvent(QObject *sender, const QMetaMethod &m) - : QMetaCallEvent(0, 0, Q_NULLPTR, sender, m.methodIndex()) + : QMetaCallEvent(0, 0, nullptr, sender, m.methodIndex()) {} - void placeMetaCall(QObject *object) Q_DECL_OVERRIDE + void placeMetaCall(QObject *object) override { QDBusAbstractInterface *iface = static_cast<QDBusAbstractInterface *>(object); QDBusAbstractInterfacePrivate::finishDisconnectNotify(iface, signalId()); @@ -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); |