diff --git a/src/core/context/contextownaircraft.h b/src/core/context/contextownaircraft.h index 031ed38b0..f683ce202 100644 --- a/src/core/context/contextownaircraft.h +++ b/src/core/context/contextownaircraft.h @@ -99,12 +99,6 @@ namespace swift::core::context //! Aircraft has been moved from one location to another (changed scenery) void movedAircraft(const swift::misc::physical_quantities::CLength &distance); - //! Just airborne - void isTakingOff(); - - //! Just landed - void isTouchingDown(); - public slots: //! Get own aircraft virtual swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const = 0; diff --git a/src/core/context/contextownaircraftimpl.cpp b/src/core/context/contextownaircraftimpl.cpp index 9ae4e1899..5fef0bd85 100644 --- a/src/core/context/contextownaircraftimpl.cpp +++ b/src/core/context/contextownaircraftimpl.cpp @@ -196,16 +196,6 @@ namespace swift::core::context } emit this->movedAircraft(distance); } - else - { - const bool to = situations.isTakingOff(true); - if (to) { emit this->isTakingOff(); } - else - { - const bool td = situations.isTouchingDown(true); - if (td) { emit this->isTouchingDown(); } - } - } } CAircraftModel CContextOwnAircraft::reverseLookupModel(const CAircraftModel &model) diff --git a/src/core/context/contextownaircraftproxy.cpp b/src/core/context/contextownaircraftproxy.cpp index 677d06463..02bc2e5bf 100644 --- a/src/core/context/contextownaircraftproxy.cpp +++ b/src/core/context/contextownaircraftproxy.cpp @@ -53,12 +53,6 @@ namespace swift::core::context s = connection.connect(serviceName, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName(), "movedAircraft", this, SIGNAL(movedAircraft(swift::misc::physical_quantities::CLength))); Q_ASSERT(s); - s = connection.connect(serviceName, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName(), - "isTakingOff", this, SIGNAL(isTakingOff())); - Q_ASSERT(s); - s = connection.connect(serviceName, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName(), - "isTouchingDown", this, SIGNAL(isTouchingDown())); - Q_ASSERT(s); this->relayBaseClassSignals(serviceName, connection, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName()); diff --git a/src/misc/aviation/aircraftsituationlist.cpp b/src/misc/aviation/aircraftsituationlist.cpp index fb3f2cdbc..3602395de 100644 --- a/src/misc/aviation/aircraftsituationlist.cpp +++ b/src/misc/aviation/aircraftsituationlist.cpp @@ -232,18 +232,6 @@ namespace swift::misc::aviation return this->size() - 1 == c; // all others not on ground } - bool CAircraftSituationList::isTakingOff(bool alreadySortedLatestFirst) const - { - const QPair r = this->isGndFlagStableChanging(alreadySortedLatestFirst); - return r.first && r.second == COnGroundInfo::NotOnGround; - } - - bool CAircraftSituationList::isTouchingDown(bool alreadySortedLatestFirst) const - { - const QPair r = this->isGndFlagStableChanging(alreadySortedLatestFirst); - return r.first && r.second == COnGroundInfo::OnGround; - } - bool CAircraftSituationList::isRotatingUp(bool alreadySortedLatestFirst) const { if (this->size() < 2) { return false; } diff --git a/src/misc/aviation/aircraftsituationlist.h b/src/misc/aviation/aircraftsituationlist.h index b5e7e89e1..f6167bd4b 100644 --- a/src/misc/aviation/aircraftsituationlist.h +++ b/src/misc/aviation/aircraftsituationlist.h @@ -103,12 +103,6 @@ namespace swift::misc //! Is just touching down? bool isJustTouchingDown(bool alreadySortedLatestFirst = false) const; - //! Is taking off? - bool isTakingOff(bool alreadySortedLatestFirst = false) const; - - //! Is touching down? - bool isTouchingDown(bool alreadySortedLatestFirst = false) const; - //! Is rotating up? bool isRotatingUp(bool alreadySortedLatestFirst = false) const;