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

refs #420, refs #417, removes canConnect as it is not consumed, just generated.

Browse Source
This commit is contained in:
Klaus Basan
2015-05-17 20:24:05 +02:00
parent 0ea07e28e0
commit e53395412a
6 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/simulator.h
View File

@@ -219,10 +219,6 @@ namespace BlackCore
//! Remove all remote aircraft //! Remove all remote aircraft
virtual void physicallyRemoveAllRemoteAircraft() = 0; virtual void physicallyRemoveAllRemoteAircraft() = 0;
//! Can we connect?
//! \todo Do we really need this function? Currently made protected, as
virtual bool canConnect() const = 0;
//! Emit the combined status //! Emit the combined status
//! \sa simulatorStatusChanged; //! \sa simulatorStatusChanged;
void emitSimulatorCombinedStatus(); void emitSimulatorCombinedStatus();

3
src/plugins/simulator/fs9/simulator_fs9.h
View File

@@ -51,9 +51,6 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::isConnected() //! \copydoc ISimulator::isConnected()
virtual bool isConnected() const override; virtual bool isConnected() const override;
//! \copydoc ISimulator::canConnect()
virtual bool canConnect() const override { return true; }
//! \copydoc ISimulator::isSimulating //! \copydoc ISimulator::isSimulating
virtual bool isSimulating() const override { return isConnected(); } virtual bool isSimulating() const override { return isConnected(); }

9
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -128,15 +128,6 @@ namespace BlackSimPlugin
return true; return true;
} }
bool CSimulatorFsx::canConnect() const
{
if (m_simConnected) { return true; }
HANDLE hSimConnect; // temporary handle
bool connect = SUCCEEDED(SimConnect_Open(&hSimConnect, BlackMisc::CProject::systemNameAndVersionChar(), nullptr, 0, 0, 0));
SimConnect_Close(hSimConnect);
return connect;
}
bool CSimulatorFsx::physicallyAddRemoteAircraft(const Simulation::CSimulatedAircraft &newRemoteAircraft) bool CSimulatorFsx::physicallyAddRemoteAircraft(const Simulation::CSimulatedAircraft &newRemoteAircraft)
{ {
CCallsign callsign(newRemoteAircraft.getCallsign()); CCallsign callsign(newRemoteAircraft.getCallsign());

3
src/plugins/simulator/fsx/simulator_fsx.h
View File

@@ -89,9 +89,6 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::isSimulating //! \copydoc ISimulator::isSimulating
virtual bool isSimulating() const override; virtual bool isSimulating() const override;
//! \copydoc ISimulator::canConnect()
virtual bool canConnect() const override;
//! SimConnect Callback //! SimConnect Callback
static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext); static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);

8
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -156,14 +156,6 @@ namespace BlackSimPlugin
return m_service && m_traffic; return m_service && m_traffic;
} }
bool CSimulatorXPlane::canConnect() const
{
if (isConnected()) { return true; }
auto conn = QDBusConnection::sessionBus(); // TODO make this configurable
CXBusServiceProxy dummy(conn, nullptr, true);
return dummy.isValid();
}
bool CSimulatorXPlane::connectTo() bool CSimulatorXPlane::connectTo()
{ {
if (isConnected()) if (isConnected())

3
src/plugins/simulator/xplane/simulator_xplane.h
View File

@@ -41,9 +41,6 @@ namespace BlackSimPlugin
//! \copydoc BlackCore::ISimulator::isConnected //! \copydoc BlackCore::ISimulator::isConnected
virtual bool isConnected() const override; virtual bool isConnected() const override;
//! \copydoc BlackCore::ISimulator::canConnect
virtual bool canConnect() const override;
//! \copydoc ISimulator::isTimeSynchronized //! \copydoc ISimulator::isTimeSynchronized
virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature? virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature?