From 8979b5257e1f55cc5e42f96dc6516036a1ba3bdb Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 17 Dec 2018 17:19:49 +0000 Subject: [PATCH] Fixed clazy warnings: returning void expression. --- src/blackcore/context/contextsimulatorimpl.cpp | 2 +- src/blackgui/guiapplication.cpp | 4 ++-- src/blackmisc/network/clientprovider.cpp | 2 +- src/blackmisc/simulation/data/modelcaches.h | 8 ++++---- src/plugins/simulator/emulated/simulatoremulated.cpp | 2 +- src/plugins/simulator/fsxcommon/simconnectobject.cpp | 2 +- src/plugins/simulator/p3d/simulatorp3d.cpp | 4 ++-- src/plugins/simulator/xplane/xplanempaircraft.cpp | 2 +- src/xswiftbus/dbusconnection.cpp | 2 +- src/xswiftbus/dbusserver.cpp | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index cbcffac10..833973e13 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -875,7 +875,7 @@ namespace BlackCore { if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second) { return; } - return m_simulatorPlugin.second->recalculateAllAircraft(); + m_simulatorPlugin.second->recalculateAllAircraft(); } bool CContextSimulator::resetToModelMatchingAircraft(const CCallsign &callsign) diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 576c5b660..cf85659e8 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -786,8 +786,8 @@ namespace BlackGui void CGuiApplication::showHelp(const QObject *qObject) const { if (this->isShuttingDown()) { return; } - if (!qObject || qObject->objectName().isEmpty()) { return this->showHelp(); } - return this->showHelp(qObject->objectName()); + if (!qObject || qObject->objectName().isEmpty()) { this->showHelp(); } + this->showHelp(qObject->objectName()); } bool CGuiApplication::triggerShowHelp(const QWidget *widget, QEvent *event) diff --git a/src/blackmisc/network/clientprovider.cpp b/src/blackmisc/network/clientprovider.cpp index 5889b9506..ce69dde18 100644 --- a/src/blackmisc/network/clientprovider.cpp +++ b/src/blackmisc/network/clientprovider.cpp @@ -136,7 +136,7 @@ namespace BlackMisc { QWriteLocker l(&m_lockClient); if (!m_clients.contains(callsign)) { return; } - return m_clients[callsign].setSwiftClient(true); + m_clients[callsign].setSwiftClient(true); } // Pin the vtable to this file diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h index b8a930411..467b487e8 100644 --- a/src/blackmisc/simulation/data/modelcaches.h +++ b/src/blackmisc/simulation/data/modelcaches.h @@ -466,8 +466,8 @@ namespace BlackMisc CStatusMessage clearCachedModels(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().clearCachedModels(simulator); } QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getCacheTimestamp(simulator); } CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().setCacheTimestamp(ts, simulator); } - void synchronizeCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().synchronizeCache(simulator); } - void admitCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().admitCache(simulator); } + void synchronizeCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().synchronizeCache(simulator); } + void admitCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().admitCache(simulator); } QString getFilename(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getFilename(simulator); } bool isSaved(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().isSaved(simulator); } QString getDescription() const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getDescription(); } @@ -519,8 +519,8 @@ namespace BlackMisc CStatusMessage clearCachedModels(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().clearCachedModels(simulator); } QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCacheTimestamp(simulator); } CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().setCacheTimestamp(ts, simulator); } - void synchronizeCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().synchronizeCache(simulator); } - void admitCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().admitCache(simulator); } + void synchronizeCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().synchronizeCache(simulator); } + void admitCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().admitCache(simulator); } QString getFilename(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getFilename(simulator); } bool isSaved(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().isSaved(simulator); } QString getDescription() const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getDescription(); } diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp index 7e883e68e..5000474a9 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -83,7 +83,7 @@ namespace BlackSimPlugin void CSimulatorEmulated::unload() { if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO); } - return CSimulatorPluginCommon::unload(); + CSimulatorPluginCommon::unload(); } bool CSimulatorEmulated::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp index b0155859c..48cefbb93 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp @@ -209,7 +209,7 @@ namespace BlackSimPlugin void CSimConnectObject::attachInterpolatorLogger(CInterpolationLogger *logger) const { Q_ASSERT(m_interpolator); - return m_interpolator->attachLogger(logger); + m_interpolator->attachLogger(logger); } CInterpolationResult CSimConnectObject::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const diff --git a/src/plugins/simulator/p3d/simulatorp3d.cpp b/src/plugins/simulator/p3d/simulatorp3d.cpp index 8fecd5ae5..e9356f4ed 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.cpp +++ b/src/plugins/simulator/p3d/simulatorp3d.cpp @@ -294,10 +294,10 @@ namespace BlackSimPlugin { #ifdef Q_OS_WIN64 if (!loadAndResolveP3DSimConnectByString(m_p3dVersion.get())) { return; } - return CSimulatorFsxCommonListener::startImpl(); + CSimulatorFsxCommonListener::startImpl(); #else if (!loadAndResolveFsxSimConnect(true)) { return; } - return CSimulatorFsxCommonListener::startImpl(); + CSimulatorFsxCommonListener::startImpl(); #endif } diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index aff61320b..15a87ee3b 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/src/plugins/simulator/xplane/xplanempaircraft.cpp @@ -41,7 +41,7 @@ namespace BlackSimPlugin void CXPlaneMPAircraft::attachInterpolatorLogger(CInterpolationLogger *logger) const { Q_ASSERT(m_interpolator); - return m_interpolator->attachLogger(logger); + m_interpolator->attachLogger(logger); } CInterpolationResult CXPlaneMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const diff --git a/src/xswiftbus/dbusconnection.cpp b/src/xswiftbus/dbusconnection.cpp index a4567a3f5..59e6a0657 100644 --- a/src/xswiftbus/dbusconnection.cpp +++ b/src/xswiftbus/dbusconnection.cpp @@ -159,7 +159,7 @@ namespace XSwiftBus void CDBusConnection::setDispatchStatus(DBusConnection *connection, DBusDispatchStatus status, void *data) { auto *obj = static_cast(data); - return obj->setDispatchStatus(connection, status); + obj->setDispatchStatus(connection, status); } DBusHandlerResult CDBusConnection::filterDisconnectedFunction(DBusConnection *connection, DBusMessage *message, void *data) diff --git a/src/xswiftbus/dbusserver.cpp b/src/xswiftbus/dbusserver.cpp index 84f1430b9..398b47df8 100644 --- a/src/xswiftbus/dbusserver.cpp +++ b/src/xswiftbus/dbusserver.cpp @@ -80,7 +80,7 @@ namespace XSwiftBus void CDBusServer::onNewConnection(DBusServer *server, DBusConnection *conn, void *data) { auto *obj = static_cast(data); - return obj->onNewConnection(server, conn); + obj->onNewConnection(server, conn); } }