refs #417 Add support for FSX and FS9

src/plugins/simulator/fs9/simulator_fs9.cpp

@@ -88,12 +88,6 @@ namespace BlackSimPlugin
             return true;
         }
 
-        void CSimulatorFs9::asyncConnectTo()
-        {
-            // Since we are running the host in its own thread, it is async anyway
-            connectTo();
-        }
-
         bool CSimulatorFs9::disconnectFrom()
         {
             if (!m_simConnected) { return true; }

src/plugins/simulator/fs9/simulator_fs9.h

@@ -52,9 +52,6 @@ namespace BlackSimPlugin
             //! \copydoc ISimulator::connectTo()
             virtual bool connectTo() override;
 
-            //! \copydoc ISimulator::connectTo()
-            virtual void asyncConnectTo() override;
-
             //! \copydoc ISimulator::disconnectFrom()
             virtual bool disconnectFrom() override;
 

src/plugins/simulator/fsx/simulator_fsx.cpp

@@ -78,30 +78,6 @@ namespace BlackSimPlugin
         }
 
         bool CSimulatorFsx::connectTo()
-        {
-            if (m_simConnected) { return true; }
-            int oldStatus = getSimulatorStatus();
-            if (FAILED(SimConnect_Open(&m_hSimConnect, BlackMisc::CProject::systemNameAndVersionChar(), nullptr, 0, 0, 0)))
-            {
-                m_simConnected = false;
-                m_simPaused = false;
-                m_simSimulating = false;
-                emitSimulatorCombinedStatus(oldStatus);
-                return false;
-            }
-            else
-            {
-                if (m_useFsuipc) { this->m_fsuipc->connect(); } // connect FSUIPC too
-            }
-
-            initWhenConnected();
-            m_simconnectTimerId = startTimer(10);
-            m_simConnected = true;
-            emitSimulatorCombinedStatus(oldStatus);
-            return true;
-        }
-
-        void CSimulatorFsx::asyncConnectTo()
         {
             connect(&m_watcherConnect, SIGNAL(finished()), this, SLOT(ps_connectToFinished()));
 
@@ -115,6 +91,8 @@ namespace BlackSimPlugin
 
             QFuture<bool> result = QtConcurrent::run(asyncConnectFunc);
             m_watcherConnect.setFuture(result);
+
+            return true;
         }
 
         bool CSimulatorFsx::disconnectFrom()

src/plugins/simulator/fsx/simulator_fsx.h

@@ -90,9 +90,6 @@ namespace BlackSimPlugin
             //! \copydoc ISimulator::connectTo()
             virtual bool connectTo() override;
 
-            //! \copydoc ISimulator::asyncConnectTo()
-            virtual void asyncConnectTo() override;
-
             //! \copydoc ISimulator::disconnectFrom()
             virtual bool disconnectFrom() override;