From e53395412a52d2d0ab7f45849513f2b7257adc53 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 17 May 2015 20:24:05 +0200
Subject: [PATCH] refs #420, refs #417, removes canConnect as it is not
 consumed, just generated.

---
 src/blackcore/simulator.h                         | 4 ----
 src/plugins/simulator/fs9/simulator_fs9.h         | 3 ---
 src/plugins/simulator/fsx/simulator_fsx.cpp       | 9 ---------
 src/plugins/simulator/fsx/simulator_fsx.h         | 3 ---
 src/plugins/simulator/xplane/simulator_xplane.cpp | 8 --------
 src/plugins/simulator/xplane/simulator_xplane.h   | 3 ---
 6 files changed, 30 deletions(-)

diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index f2708cc24..548e806a0 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -219,10 +219,6 @@ namespace BlackCore
         //! Remove all remote aircraft
         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
         //! \sa simulatorStatusChanged;
         void emitSimulatorCombinedStatus();
diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h
index 9520c3e42..f8be8723b 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.h
+++ b/src/plugins/simulator/fs9/simulator_fs9.h
@@ -51,9 +51,6 @@ namespace BlackSimPlugin
             //! \copydoc ISimulator::isConnected()
             virtual bool isConnected() const override;
 
-            //! \copydoc ISimulator::canConnect()
-            virtual bool canConnect() const override { return true; }
-
             //! \copydoc ISimulator::isSimulating
             virtual bool isSimulating() const override { return isConnected(); }
 
diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp
index 95ede72f9..22a6ca2e4 100644
--- a/src/plugins/simulator/fsx/simulator_fsx.cpp
+++ b/src/plugins/simulator/fsx/simulator_fsx.cpp
@@ -128,15 +128,6 @@ namespace BlackSimPlugin
             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)
         {
             CCallsign callsign(newRemoteAircraft.getCallsign());
diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h
index 291af332b..9210f760e 100644
--- a/src/plugins/simulator/fsx/simulator_fsx.h
+++ b/src/plugins/simulator/fsx/simulator_fsx.h
@@ -89,9 +89,6 @@ namespace BlackSimPlugin
             //! \copydoc ISimulator::isSimulating
             virtual bool isSimulating() const override;
 
-            //! \copydoc ISimulator::canConnect()
-            virtual bool canConnect() const override;
-
             //! SimConnect Callback
             static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
 
diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp
index 6e85702be..1ec25b43d 100644
--- a/src/plugins/simulator/xplane/simulator_xplane.cpp
+++ b/src/plugins/simulator/xplane/simulator_xplane.cpp
@@ -156,14 +156,6 @@ namespace BlackSimPlugin
             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()
         {
             if (isConnected())
diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h
index 67b2b955f..044b18553 100644
--- a/src/plugins/simulator/xplane/simulator_xplane.h
+++ b/src/plugins/simulator/xplane/simulator_xplane.h
@@ -41,9 +41,6 @@ namespace BlackSimPlugin
             //! \copydoc BlackCore::ISimulator::isConnected
             virtual bool isConnected() const override;
 
-            //! \copydoc BlackCore::ISimulator::canConnect
-            virtual bool canConnect() const override;
-
             //! \copydoc ISimulator::isTimeSynchronized
             virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature?