diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h index 88d7783fc..6b44279a1 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/context_simulator.h @@ -125,7 +125,7 @@ namespace BlackCore //! Set time synchronization between simulator and user's computer time //! \remarks not all drivers implement this, e.g. if it is an intrinsic simulator feature - virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) = 0; + virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) = 0; //! Is time synchronization on? virtual bool isTimeSynchronized() const = 0; @@ -146,7 +146,7 @@ namespace BlackCore virtual void setMaxRenderedAircraft(int number) = 0; //! Max. distance until we render an aircraft - virtual void setMaxRenderedDistance(BlackMisc::PhysicalQuantities::CLength &distance) = 0; + virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) = 0; //! Delete all restrictions (if any) -> unlimited number of aircraft virtual void deleteAllRenderingRestrictions() = 0; diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp index 0d8078922..f73898b82 100644 --- a/src/blackcore/context_simulator_impl.cpp +++ b/src/blackcore/context_simulator_impl.cpp @@ -75,16 +75,16 @@ namespace BlackCore return plugin->factory; } - CVariant CContextSimulator::getPluginData(const QObject *obj, const QString& key) const + CVariant CContextSimulator::getPluginData(const QObject *obj, const QString &key) const { - const QObject* p = obj; + const QObject *p = obj; while (p && !p->inherits("BlackCore::ISimulatorFactory")) { p = p->parent(); } if (!p) return CVariant(); - auto it = std::find_if(m_simulatorPlugins.begin(), m_simulatorPlugins.end(), [p](const PluginData &plugin) + auto it = std::find_if(m_simulatorPlugins.begin(), m_simulatorPlugins.end(), [p](const PluginData & plugin) { return plugin.factory == qobject_cast(p); }); @@ -94,14 +94,14 @@ namespace BlackCore void CContextSimulator::setPluginData(const QObject *obj, const QString &key, const CVariant &value) { - const QObject* p = obj; + const QObject *p = obj; while (p && !p->inherits("BlackCore::ISimulatorFactory")) { p = p->parent(); } if (!p) { return; } - auto it = std::find_if(m_simulatorPlugins.begin(), m_simulatorPlugins.end(), [p](const PluginData &plugin) + auto it = std::find_if(m_simulatorPlugins.begin(), m_simulatorPlugins.end(), [p](const PluginData & plugin) { return plugin.factory == qobject_cast(p); }); @@ -231,7 +231,7 @@ namespace BlackCore return m_simulatorPlugin->simulator->getIcaoForModelString(modelString); } - bool CContextSimulator::setTimeSynchronization(bool enable, CTime offset) + bool CContextSimulator::setTimeSynchronization(bool enable, const CTime &offset) { if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin) { return false; } @@ -270,7 +270,7 @@ namespace BlackCore } - void CContextSimulator::setMaxRenderedDistance(CLength &distance) + void CContextSimulator::setMaxRenderedDistance(const CLength &distance) { if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << distance; } if (!m_simulatorPlugin) { return; } diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h index 51fd16a67..c3bfc322c 100644 --- a/src/blackcore/context_simulator_impl.h +++ b/src/blackcore/context_simulator_impl.h @@ -90,7 +90,7 @@ namespace BlackCore virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override; //! \copydoc IContextSimulator::setTimeSynchronization - virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override; + virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override; //! \copydoc IContextSimulator::isTimeSynchronized virtual bool isTimeSynchronized() const override; @@ -105,7 +105,7 @@ namespace BlackCore virtual BlackMisc::PhysicalQuantities::CLength getMaxRenderedDistance() const override; //! \copydoc IContextSimulator::setMaxRenderedDistance - virtual void setMaxRenderedDistance(BlackMisc::PhysicalQuantities::CLength &distance) override; + virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) override; //! \copydoc IContextSimulator::getRenderRestrictionText virtual QString getRenderRestrictionText() const override; diff --git a/src/blackcore/context_simulator_proxy.cpp b/src/blackcore/context_simulator_proxy.cpp index 342ac2310..23c06de94 100644 --- a/src/blackcore/context_simulator_proxy.cpp +++ b/src/blackcore/context_simulator_proxy.cpp @@ -111,7 +111,7 @@ namespace BlackCore return m_dBusInterface->callDBusRet(QLatin1Literal("getSimulatorSetup")); } - bool CContextSimulatorProxy::setTimeSynchronization(bool enable, CTime offset) + bool CContextSimulatorProxy::setTimeSynchronization(bool enable, const CTime &offset) { return m_dBusInterface->callDBusRet(QLatin1Literal("setTimeSynchronization"), enable, offset); } @@ -126,7 +126,7 @@ namespace BlackCore m_dBusInterface->callDBus(QLatin1Literal("setMaxRenderedAircraft"), number); } - void CContextSimulatorProxy::setMaxRenderedDistance(CLength &distance) + void CContextSimulatorProxy::setMaxRenderedDistance(const CLength &distance) { m_dBusInterface->callDBus(QLatin1Literal("setMaxRenderedDistance"), distance); } diff --git a/src/blackcore/context_simulator_proxy.h b/src/blackcore/context_simulator_proxy.h index 0c28b90fb..d1dcbde33 100644 --- a/src/blackcore/context_simulator_proxy.h +++ b/src/blackcore/context_simulator_proxy.h @@ -79,7 +79,7 @@ namespace BlackCore virtual BlackMisc::Simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override; //! \copydoc IContextSimulator::setTimeSynchronization - virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override; + virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override; //! \copydoc IContextSimulator::isTimeSynchronized virtual bool isTimeSynchronized() const override; @@ -91,7 +91,7 @@ namespace BlackCore virtual void setMaxRenderedAircraft(int number) override; //! \copydoc IContextSimulator::setMaxRenderedDistance - virtual void setMaxRenderedDistance(BlackMisc::PhysicalQuantities::CLength &distance); + virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance); //! \copydoc IContextSimulator::setMaxRenderedDistance virtual void deleteAllRenderingRestrictions() override; diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 49bd50e39..a2cb792ed 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -120,7 +120,7 @@ namespace BlackCore //! Set time synchronization between simulator and user's computer time //! \remarks not all drivers implement this, e.g. if it is an intrinsic simulator feature - virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) = 0; + virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) = 0; //! Time synchronization offset virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const = 0; @@ -135,7 +135,7 @@ namespace BlackCore virtual void setMaxRenderedAircraft(int maxRenderedAircraft) = 0; //! Max. distance for rendered aircraft - virtual void setMaxRenderedDistance(BlackMisc::PhysicalQuantities::CLength &distance) = 0; + virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) = 0; //! Max. distance for rendered aircraft virtual BlackMisc::PhysicalQuantities::CLength getMaxRenderedDistance() const = 0; diff --git a/src/blackcore/simulator_common.cpp b/src/blackcore/simulator_common.cpp index 00c3c1cc3..134315f9b 100644 --- a/src/blackcore/simulator_common.cpp +++ b/src/blackcore/simulator_common.cpp @@ -175,7 +175,7 @@ namespace BlackCore emit renderRestrictionsChanged(r, e, getMaxRenderedAircraft(), getMaxRenderedDistance(), getRenderedDistanceBoundary()); } - void CSimulatorCommon::setMaxRenderedDistance(CLength &distance) + void CSimulatorCommon::setMaxRenderedDistance(const CLength &distance) { if (distance == m_maxRenderedDistance) { return; } if (distance.isNull() || distance > getRenderedDistanceBoundary() || distance.isNegativeWithEpsilonConsidered()) diff --git a/src/blackcore/simulator_common.h b/src/blackcore/simulator_common.h index b0a16a566..07120dc86 100644 --- a/src/blackcore/simulator_common.h +++ b/src/blackcore/simulator_common.h @@ -53,7 +53,7 @@ namespace BlackCore virtual void setMaxRenderedAircraft(int maxRenderedAircraft) override; //! \copydoc ISimulator::setMaxRenderedDistance - virtual void setMaxRenderedDistance(BlackMisc::PhysicalQuantities::CLength &distance) override; + virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) override; //! \copydoc ISimulator::getMaxRenderedDistance virtual BlackMisc::PhysicalQuantities::CLength getMaxRenderedDistance() const override; diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.cpp b/src/plugins/simulator/fscommon/simulator_fscommon.cpp index 2769692c8..138b0e738 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp +++ b/src/plugins/simulator/fscommon/simulator_fscommon.cpp @@ -83,7 +83,7 @@ namespace BlackSimPlugin return m_syncTimeOffset; } - bool CSimulatorFsCommon::setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) + bool CSimulatorFsCommon::setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) { this->m_simTimeSynced = enable; this->m_syncTimeOffset = offset; diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.h b/src/plugins/simulator/fscommon/simulator_fscommon.h index eaeca737c..cc06043ea 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.h +++ b/src/plugins/simulator/fscommon/simulator_fscommon.h @@ -50,7 +50,7 @@ namespace BlackSimPlugin virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override; //! \copydoc ISimulator::setTimeSynchronization - virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override; + virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override; //! \copydoc ISimulator::getAirportsInRange virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override; diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp index ca9cfb5e6..deac99b40 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -38,10 +38,10 @@ namespace BlackSimPlugin { CSimulatorXPlane::CSimulatorXPlane(const BlackMisc::Simulation::CSimulatorPluginInfo &info, - IOwnAircraftProvider *ownAircraftProvider, - IRemoteAircraftProvider *remoteAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, - QObject *parent) : + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, + IPluginStorageProvider *pluginStorageProvider, + QObject *parent) : CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, parent) { m_watcher = new QDBusServiceWatcher(this); @@ -296,8 +296,9 @@ namespace BlackSimPlugin return copy; } - bool CSimulatorXPlane::setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime) + bool CSimulatorXPlane::setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) { + Q_UNUSED(offset); if (enable) { CLogMessage(this).info("X-Plane provides real time synchronization, use this on"); @@ -436,9 +437,9 @@ namespace BlackSimPlugin } BlackCore::ISimulator *CSimulatorXPlaneFactory::create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, - IOwnAircraftProvider *ownAircraftProvider, - IRemoteAircraftProvider *renderedAircraftProvider, - IPluginStorageProvider *pluginStorageProvider) + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *renderedAircraftProvider, + IPluginStorageProvider *pluginStorageProvider) { return new CSimulatorXPlane(info, ownAircraftProvider, renderedAircraftProvider, pluginStorageProvider, this); } diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h index 092f6a0e9..b596412e8 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.h +++ b/src/plugins/simulator/xplane/simulator_xplane.h @@ -94,7 +94,7 @@ namespace BlackSimPlugin virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const; //! \copydoc ISimulator::setTimeSynchronization - virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override; + virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override; //! \copydoc ISimulator::getTimeSynchronizationOffset virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override { return BlackMisc::PhysicalQuantities::CTime(0, BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); }