mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-26 18:55:38 +08:00
refs #417 Remove ISimulator::asyncConnectTo() for x-plane
This commit is contained in:
committed by
Michal Garapich
parent
e3bb701d7b
commit
23761fad13
@@ -423,8 +423,7 @@ namespace BlackCore
|
|||||||
settingsChanged(static_cast<uint>(IContextSettings::SettingsSimulator));
|
settingsChanged(static_cast<uint>(IContextSettings::SettingsSimulator));
|
||||||
|
|
||||||
// try to connect
|
// try to connect
|
||||||
//! \todo #417: we want to change this to connectTo, as the listener already checks the avialability of the simulator
|
m_simulatorPlugin->simulator->connectTo();
|
||||||
m_simulatorPlugin->simulator->asyncConnectTo();
|
|
||||||
|
|
||||||
if (m_simulatorPlugin) // can be already nullptr if connectTo() is synchronous and fails
|
if (m_simulatorPlugin) // can be already nullptr if connectTo() is synchronous and fails
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -74,10 +74,6 @@ namespace BlackCore
|
|||||||
//! Connect to simulator
|
//! Connect to simulator
|
||||||
virtual bool connectTo() = 0;
|
virtual bool connectTo() = 0;
|
||||||
|
|
||||||
//! Connect asynchronously to simulator
|
|
||||||
//! \deprecated #417
|
|
||||||
virtual void asyncConnectTo() = 0;
|
|
||||||
|
|
||||||
//! Disconnect from simulator
|
//! Disconnect from simulator
|
||||||
virtual bool disconnectFrom() = 0;
|
virtual bool disconnectFrom() = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -185,12 +185,6 @@ namespace BlackSimPlugin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSimulatorXPlane::asyncConnectTo()
|
|
||||||
{
|
|
||||||
// TODO
|
|
||||||
connectTo();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CSimulatorXPlane::disconnectFrom()
|
bool CSimulatorXPlane::disconnectFrom()
|
||||||
{
|
{
|
||||||
if (!this->isConnected()) { return true; } // avoid emit if already disconnected
|
if (!this->isConnected()) { return true; } // avoid emit if already disconnected
|
||||||
|
|||||||
@@ -48,9 +48,6 @@ namespace BlackSimPlugin
|
|||||||
//! \copydoc BlackCore::ISimulator::connectTo
|
//! \copydoc BlackCore::ISimulator::connectTo
|
||||||
virtual bool connectTo() override;
|
virtual bool connectTo() override;
|
||||||
|
|
||||||
//! \copydoc BlackCore::ISimulator::asyncConnectTo
|
|
||||||
virtual void asyncConnectTo() override;
|
|
||||||
|
|
||||||
//! \copydoc BlackCore::ISimulator::disconnectFrom
|
//! \copydoc BlackCore::ISimulator::disconnectFrom
|
||||||
virtual bool disconnectFrom() override;
|
virtual bool disconnectFrom() override;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user