Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

src/blackcore/context_simulator.h

@@ -56,12 +56,6 @@ namespace BlackCore
          */
         virtual bool usingLocalObjects() const = 0;
 
-        /*!
-         * \brief Get user aircraft value object
-         * \return
-         */
-        virtual BlackMisc::Aviation::CAircraft ownAircraft() const = 0;
-
     signals:
         /*!
          * \brief Emitted when the simulator connection changes
@@ -73,6 +67,12 @@ namespace BlackCore
 
         //! Returns true when simulator is connected and available
         virtual bool isConnected() const = 0;
+
+        /*!
+         * \brief Get user aircraft value object
+         * \return
+         */
+        virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const = 0;
     };
 
 } // namespace BlackCore

src/blackcore/context_simulator_impl.cpp

@@ -47,7 +47,7 @@ namespace BlackCore
         return m_simulator->isConnected();
     }
 
-    BlackMisc::Aviation::CAircraft CContextSimulator::ownAircraft() const
+    BlackMisc::Aviation::CAircraft CContextSimulator::getOwnAircraft() const
     {
         return m_ownAircraft;
     }

src/blackcore/context_simulator_impl.h

@@ -60,12 +60,13 @@ namespace BlackCore
         //! \copydoc IContextSimulator::usingLocalObjects()
         virtual bool usingLocalObjects() const override { return true; }
 
-        virtual BlackMisc::Aviation::CAircraft ownAircraft() const override;
-
     public slots:
         //! \copydoc IContextSimulator::isConnected()
         virtual bool isConnected() const override;
 
+        //! \copydoc IContextSimulator::getOwnAircraft()
+        virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const override;
+
     private slots:
         //! \copydoc IContextSimulator::updateOwnAircraft()
         virtual void updateOwnAircraft();

src/blackcore/context_simulator_proxy.cpp

@@ -35,9 +35,9 @@ namespace BlackCore
         return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("isConnected"));
     }
 
-    BlackMisc::Aviation::CAircraft CContextSimulatorProxy::ownAircraft() const
+    BlackMisc::Aviation::CAircraft CContextSimulatorProxy::getOwnAircraft() const
     {
-        return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAircraft>(QLatin1Literal("ownAircraft"));
+        return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAircraft>(QLatin1Literal("getOwnAircraft"));
     }
 
 } // namespace BlackCore

src/blackcore/context_simulator_proxy.h

@@ -33,8 +33,6 @@ namespace BlackCore
          */
         virtual bool usingLocalObjects() const override { return false; }
 
-        virtual BlackMisc::Aviation::CAircraft ownAircraft() const override;
-
     private:
         BlackMisc::CGenericDBusInterface *m_dBusInterface;
 
@@ -59,8 +57,8 @@ namespace BlackCore
         //! \copydoc IContextSimulator::isConnected()
         virtual bool isConnected() const override;
 
-        //virtual void ownAircraftUpdateReceived(BlackMisc::Aviation::CAircraft aircraft) override;
-
+        //! \copydoc IContextSimulator::getOwnAircraft()
+        virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const override;
     };
 
 } // namespace BlackCore