From 23761fad13a034d7884ee8059fbd68d23ea00e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Garapich?= <michal@garapich.pl>
Date: Sun, 24 May 2015 11:28:46 +0200
Subject: [PATCH] refs #417 Remove ISimulator::asyncConnectTo() for x-plane

---
 src/blackcore/context_simulator_impl.cpp          | 3 +--
 src/blackcore/simulator.h                         | 4 ----
 src/plugins/simulator/xplane/simulator_xplane.cpp | 6 ------
 src/plugins/simulator/xplane/simulator_xplane.h   | 3 ---
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp
index f73898b82..ce7c1572d 100644
--- a/src/blackcore/context_simulator_impl.cpp
+++ b/src/blackcore/context_simulator_impl.cpp
@@ -423,8 +423,7 @@ namespace BlackCore
         settingsChanged(static_cast<uint>(IContextSettings::SettingsSimulator));
 
         // 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->asyncConnectTo();
+        m_simulatorPlugin->simulator->connectTo();
 
         if (m_simulatorPlugin) // can be already nullptr if connectTo() is synchronous and fails
         {
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index c16f7e6b1..48fc9f026 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -74,10 +74,6 @@ namespace BlackCore
         //! Connect to simulator
         virtual bool connectTo() = 0;
 
-        //! Connect asynchronously to simulator
-        //! \deprecated #417
-        virtual void asyncConnectTo() = 0;
-
         //! Disconnect from simulator
         virtual bool disconnectFrom() = 0;
 
diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp
index 68e70520d..14035f66e 100644
--- a/src/plugins/simulator/xplane/simulator_xplane.cpp
+++ b/src/plugins/simulator/xplane/simulator_xplane.cpp
@@ -185,12 +185,6 @@ namespace BlackSimPlugin
             }
         }
 
-        void CSimulatorXPlane::asyncConnectTo()
-        {
-            // TODO
-            connectTo();
-        }
-
         bool CSimulatorXPlane::disconnectFrom()
         {
             if (!this->isConnected()) { return true; } // avoid emit if already disconnected
diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h
index f70e53c74..824121db9 100644
--- a/src/plugins/simulator/xplane/simulator_xplane.h
+++ b/src/plugins/simulator/xplane/simulator_xplane.h
@@ -48,9 +48,6 @@ namespace BlackSimPlugin
             //! \copydoc BlackCore::ISimulator::connectTo
             virtual bool connectTo() override;
 
-            //! \copydoc BlackCore::ISimulator::asyncConnectTo
-            virtual void asyncConnectTo() override;
-
             //! \copydoc BlackCore::ISimulator::disconnectFrom
             virtual bool disconnectFrom() override;