flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-10 03:16:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove deprecated function

Browse Source
This commit is contained in:
Lars Toenning
2024-12-29 13:17:23 +01:00
parent e427ac7321
commit acb3d77904
7 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/context/contextsimulator.cpp
View File

@@ -49,11 +49,6 @@ namespace swift::core::context
}
}
ISimulator::SimulatorStatus IContextSimulator::getSimulatorStatusEnum() const
{
return static_cast<ISimulator::SimulatorStatus>(this->getSimulatorStatus());
}
CSimulatorInfo IContextSimulator::getSimulatorInfo() const
{
return this->getSimulatorPluginInfo().getSimulatorInfo();
@@ -66,7 +61,7 @@ namespace swift::core::context
bool IContextSimulator::isSimulatorSimulating() const
{
if (!isSimulatorAvailable() || !getSimulatorStatusEnum().testFlag(ISimulator::Simulating)) { return false; }
if (!isSimulatorAvailable() || !getSimulatorStatus().testFlag(ISimulator::Simulating)) { return false; }
return true;
}
} // namespace swift::core::context

6
src/core/context/contextsimulator.h
View File

@@ -74,10 +74,6 @@ namespace swift::core::context
//! Destructor
~IContextSimulator() override {}
//! Get simulator status as enum
//! \fixme To be removed with Qt 5.5 when getSimualtorStatus directly provides the enum
ISimulator::SimulatorStatus getSimulatorStatusEnum() const;
// ---- some convenienc functions implemented on interface level
//! Current simulator
@@ -169,7 +165,7 @@ namespace swift::core::context
virtual void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) = 0;
//! Simulator combined status
virtual int getSimulatorStatus() const = 0;
virtual ISimulator::SimulatorStatus getSimulatorStatus() const = 0;
//! Simulator setup
virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const = 0;

4
src/core/context/contextsimulatorempty.h
View File

@@ -67,10 +67,10 @@ namespace swift::core::context
virtual int checkListeners() override { return 0; }
//! \copydoc IContextSimulator::getSimulatorStatus
virtual int getSimulatorStatus() const override
virtual ISimulator::SimulatorStatus getSimulatorStatus() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return 0;
return ISimulator::Unspecified;
}
//! \copydoc IContextSimulator::stopSimulatorPlugin

4
src/core/context/contextsimulatorimpl.cpp
View File

@@ -188,10 +188,10 @@ namespace swift::core::context
return m_plugins->checkAvailableListeners();
}
int CContextSimulator::getSimulatorStatus() const
ISimulator::SimulatorStatus CContextSimulator::getSimulatorStatus() const
{
if (isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return 0; }
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return ISimulator::Unspecified; }
return m_simulatorPlugin.second->getSimulatorStatus();
}

2
src/core/context/contextsimulatorimpl.h
View File

@@ -98,7 +98,7 @@ namespace swift::core
virtual int checkListeners() override;
//! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus
virtual int getSimulatorStatus() const override;
virtual ISimulator::SimulatorStatus getSimulatorStatus() const override;
//! \copydoc swift::core::context::IContextSimulator::getSimulatorInternals
virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override;

4
src/core/context/contextsimulatorproxy.cpp
View File

@@ -131,9 +131,9 @@ namespace swift::core::context
return m_dBusInterface->callDBusRet<bool>(QLatin1String("setSimulatorSettings"), settings, simulatorInfo);
}
int CContextSimulatorProxy::getSimulatorStatus() const
ISimulator::SimulatorStatus CContextSimulatorProxy::getSimulatorStatus() const
{
return m_dBusInterface->callDBusRet<int>(QLatin1String("getSimulatorStatus"));
return m_dBusInterface->callDBusRet<ISimulator::SimulatorStatus>(QLatin1String("getSimulatorStatus"));
}
CAirportList CContextSimulatorProxy::getAirportsInRange(bool recalculatePosition) const

2
src/core/context/contextsimulatorproxy.h
View File

@@ -81,7 +81,7 @@ namespace swift::core
virtual int checkListeners() override;
//! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus
virtual int getSimulatorStatus() const override;
virtual ISimulator::SimulatorStatus getSimulatorStatus() const override;
//! \copydoc swift::core::context::IContextSimulator::getAirportsInRange
virtual swift::misc::aviation::CAirportList getAirportsInRange(bool recalculatePosition) const override;