flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed clazy warnings: returning void expression.

Browse Source
This commit is contained in:
Mat Sutcliffe
2018-12-17 17:19:49 +00:00
parent e32ea65a27
commit 8979b5257e
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/contextsimulatorimpl.cpp
View File

@@ -875,7 +875,7 @@ namespace BlackCore
{ {
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_simulatorPlugin.second) { return; } if (!m_simulatorPlugin.second) { return; }
return m_simulatorPlugin.second->recalculateAllAircraft(); m_simulatorPlugin.second->recalculateAllAircraft();
} }
bool CContextSimulator::resetToModelMatchingAircraft(const CCallsign &callsign) bool CContextSimulator::resetToModelMatchingAircraft(const CCallsign &callsign)

4
src/blackgui/guiapplication.cpp
View File

@@ -786,8 +786,8 @@ namespace BlackGui
void CGuiApplication::showHelp(const QObject *qObject) const void CGuiApplication::showHelp(const QObject *qObject) const
{ {
if (this->isShuttingDown()) { return; } if (this->isShuttingDown()) { return; }
if (!qObject || qObject->objectName().isEmpty()) { return this->showHelp(); } if (!qObject || qObject->objectName().isEmpty()) { this->showHelp(); }
return this->showHelp(qObject->objectName()); this->showHelp(qObject->objectName());
} }
bool CGuiApplication::triggerShowHelp(const QWidget *widget, QEvent *event) bool CGuiApplication::triggerShowHelp(const QWidget *widget, QEvent *event)

2
src/blackmisc/network/clientprovider.cpp
View File

@@ -136,7 +136,7 @@ namespace BlackMisc
{ {
QWriteLocker l(&m_lockClient); QWriteLocker l(&m_lockClient);
if (!m_clients.contains(callsign)) { return; } if (!m_clients.contains(callsign)) { return; }
return m_clients[callsign].setSwiftClient(true); m_clients[callsign].setSwiftClient(true);
} }
// Pin the vtable to this file // Pin the vtable to this file

8
src/blackmisc/simulation/data/modelcaches.h
View File

@@ -466,8 +466,8 @@ namespace BlackMisc
CStatusMessage clearCachedModels(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().clearCachedModels(simulator); } CStatusMessage clearCachedModels(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().clearCachedModels(simulator); }
QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getCacheTimestamp(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); } 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 synchronizeCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().synchronizeCache(simulator); }
void admitCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().admitCache(simulator); } void admitCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().admitCache(simulator); }
QString getFilename(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getFilename(simulator); } QString getFilename(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getFilename(simulator); }
bool isSaved(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().isSaved(simulator); } bool isSaved(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().isSaved(simulator); }
QString getDescription() const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getDescription(); } QString getDescription() const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getDescription(); }
@@ -519,8 +519,8 @@ namespace BlackMisc
CStatusMessage clearCachedModels(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().clearCachedModels(simulator); } CStatusMessage clearCachedModels(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().clearCachedModels(simulator); }
QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCacheTimestamp(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); } 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 synchronizeCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().synchronizeCache(simulator); }
void admitCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().admitCache(simulator); } void admitCache(const CSimulatorInfo &simulator) { CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().admitCache(simulator); }
QString getFilename(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getFilename(simulator); } QString getFilename(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getFilename(simulator); }
bool isSaved(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().isSaved(simulator); } bool isSaved(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().isSaved(simulator); }
QString getDescription() const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getDescription(); } QString getDescription() const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getDescription(); }

2
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -83,7 +83,7 @@ namespace BlackSimPlugin
void CSimulatorEmulated::unload() void CSimulatorEmulated::unload()
{ {
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO); } if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO); }
return CSimulatorPluginCommon::unload(); CSimulatorPluginCommon::unload();
} }
bool CSimulatorEmulated::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) bool CSimulatorEmulated::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft)

2
src/plugins/simulator/fsxcommon/simconnectobject.cpp
View File

@@ -209,7 +209,7 @@ namespace BlackSimPlugin
void CSimConnectObject::attachInterpolatorLogger(CInterpolationLogger *logger) const void CSimConnectObject::attachInterpolatorLogger(CInterpolationLogger *logger) const
{ {
Q_ASSERT(m_interpolator); Q_ASSERT(m_interpolator);
return m_interpolator->attachLogger(logger); m_interpolator->attachLogger(logger);
} }
CInterpolationResult CSimConnectObject::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const CInterpolationResult CSimConnectObject::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const

4
src/plugins/simulator/p3d/simulatorp3d.cpp
View File

@@ -294,10 +294,10 @@ namespace BlackSimPlugin
{ {
#ifdef Q_OS_WIN64 #ifdef Q_OS_WIN64
if (!loadAndResolveP3DSimConnectByString(m_p3dVersion.get())) { return; } if (!loadAndResolveP3DSimConnectByString(m_p3dVersion.get())) { return; }
return CSimulatorFsxCommonListener::startImpl(); CSimulatorFsxCommonListener::startImpl();
#else #else
if (!loadAndResolveFsxSimConnect(true)) { return; } if (!loadAndResolveFsxSimConnect(true)) { return; }
return CSimulatorFsxCommonListener::startImpl(); CSimulatorFsxCommonListener::startImpl();
#endif #endif
} }

2
src/plugins/simulator/xplane/xplanempaircraft.cpp
View File

@@ -41,7 +41,7 @@ namespace BlackSimPlugin
void CXPlaneMPAircraft::attachInterpolatorLogger(CInterpolationLogger *logger) const void CXPlaneMPAircraft::attachInterpolatorLogger(CInterpolationLogger *logger) const
{ {
Q_ASSERT(m_interpolator); Q_ASSERT(m_interpolator);
return m_interpolator->attachLogger(logger); m_interpolator->attachLogger(logger);
} }
CInterpolationResult CXPlaneMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const CInterpolationResult CXPlaneMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) const

2
src/xswiftbus/dbusconnection.cpp
View File

@@ -159,7 +159,7 @@ namespace XSwiftBus
void CDBusConnection::setDispatchStatus(DBusConnection *connection, DBusDispatchStatus status, void *data) void CDBusConnection::setDispatchStatus(DBusConnection *connection, DBusDispatchStatus status, void *data)
{ {
auto *obj = static_cast<CDBusConnection *>(data); auto *obj = static_cast<CDBusConnection *>(data);
return obj->setDispatchStatus(connection, status); obj->setDispatchStatus(connection, status);
} }
DBusHandlerResult CDBusConnection::filterDisconnectedFunction(DBusConnection *connection, DBusMessage *message, void *data) DBusHandlerResult CDBusConnection::filterDisconnectedFunction(DBusConnection *connection, DBusMessage *message, void *data)

2
src/xswiftbus/dbusserver.cpp
View File

@@ -80,7 +80,7 @@ namespace XSwiftBus
void CDBusServer::onNewConnection(DBusServer *server, DBusConnection *conn, void *data) void CDBusServer::onNewConnection(DBusServer *server, DBusConnection *conn, void *data)
{ {
auto *obj = static_cast<CDBusServer *>(data); auto *obj = static_cast<CDBusServer *>(data);
return obj->onNewConnection(server, conn); obj->onNewConnection(server, conn);
} }
} }