From 7a2d957349fea5d59c5a3f5b65c51ae6a601cb42 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Mon, 21 Apr 2014 15:02:09 +0200 Subject: [PATCH] Moved SimConnectProc from slots to public methods refs #187 --- src/plugins/simulator/fsx/simulator_fsx.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index 1dd0cec08..8370f8866 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -64,6 +64,14 @@ namespace BlackSimPlugin //! \copydoc ISimulator::canConnect() virtual bool canConnect() override; + /*! + * \brief SimConnect Callback + * \param pData + * \param cbData + * \param pContext + */ + static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext); + public slots: //! \copydoc ISimulator::connectTo() @@ -71,6 +79,7 @@ namespace BlackSimPlugin //! \copydoc ISimulator::disconnectFrom() virtual bool disconnectFrom() override; + //! \copydoc ISimulator::getOwnAircraft() virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const override { return m_ownAircraft; } @@ -86,14 +95,6 @@ namespace BlackSimPlugin //! \copydoc ISimulator::getSimulatorInfo() virtual BlackSim::CSimulatorInfo getSimulatorInfo() const override; - /*! - * \brief SimConnect Callback - * \param pData - * \param cbData - * \param pContext - */ - static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext); - //! \brief Called when sim has started void onSimRunning();