From c55c9be51ced08203993d08134eafb6d2233a33a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 20 May 2014 22:36:51 +0200 Subject: [PATCH] refs #242, own aircraft context methods --- src/blackcore/context.cpp | 10 +++++++++ src/blackcore/context.h | 26 +++++++++++++++--------- src/blackcore/context_ownaircraft_impl.h | 7 ++++++- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/blackcore/context.cpp b/src/blackcore/context.cpp index f02a85549..a0a834119 100644 --- a/src/blackcore/context.cpp +++ b/src/blackcore/context.cpp @@ -34,6 +34,16 @@ namespace BlackCore return this->getRuntime()->getIContextApplication(); } + IContextOwnAircraft *CContext::getIContextOwnAircraft() + { + return this->getRuntime()->getIContextOwnAircraft(); + } + + const IContextOwnAircraft *CContext::getIContextOwnAircraft() const + { + return this->getRuntime()->getIContextOwnAircraft(); + } + IContextSettings *CContext::getIContextSettings() { return this->getRuntime()->getIContextSettings(); diff --git a/src/blackcore/context.h b/src/blackcore/context.h index 986404bad..9d71660f9 100644 --- a/src/blackcore/context.h +++ b/src/blackcore/context.h @@ -47,11 +47,11 @@ namespace BlackCore // cross context access // - //! Context for network - IContextNetwork *getIContextNetwork(); + //! Context for application + const IContextApplication *getIContextApplication() const; - //! Context for network - const IContextNetwork *getIContextNetwork() const; + //! Application + IContextApplication *getIContextApplication(); //! Context for network IContextAudio *getIContextAudio(); @@ -59,18 +59,24 @@ namespace BlackCore //! Context for network const IContextAudio *getIContextAudio() const; + //! Context for network + IContextNetwork *getIContextNetwork(); + + //! Context for network + const IContextNetwork *getIContextNetwork() const; + + //! Context for own aircraft + IContextOwnAircraft *getIContextOwnAircraft(); + + //! Context for own aircraft + const IContextOwnAircraft *getIContextOwnAircraft() const; + //! Settings IContextSettings *getIContextSettings(); //! Settings const IContextSettings *getIContextSettings() const; - //! Context for application - const IContextApplication *getIContextApplication() const; - - //! Application - IContextApplication *getIContextApplication(); - //! Context for simulator const IContextSimulator *getIContextSimulator() const; diff --git a/src/blackcore/context_ownaircraft_impl.h b/src/blackcore/context_ownaircraft_impl.h index c88348b52..bf8326d75 100644 --- a/src/blackcore/context_ownaircraft_impl.h +++ b/src/blackcore/context_ownaircraft_impl.h @@ -25,6 +25,12 @@ namespace BlackCore //! Destructor virtual ~CContextOwnAircraft(); + //! Own aircraft + const BlackMisc::Aviation::CAircraft &ownAircraft() const { return this->m_ownAircraft; } + + //! Own aircraft + BlackMisc::Aviation::CAircraft &ownAircraft() { return this->m_ownAircraft; } + public slots: // IContextOwnAircraft overrides //! \copydoc IContextOwnAircraft::setOwnAircraft() @@ -60,7 +66,6 @@ namespace BlackCore //! Init my very own aircraft void initOwnAircraft(); - }; }