From beeabb51c2a5a6f3ff5bfd961b90b1455c5d2f0a Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 24 Apr 2022 16:00:39 +0200 Subject: [PATCH] Remove unused adfsystem --- src/blackmisc/aviation/adfsystem.h | 79 ------------------- src/blackmisc/aviation/aviation.h | 1 - src/blackmisc/aviation/modulator.cpp | 16 ---- src/blackmisc/aviation/modulator.h | 8 -- .../aviation/registermetadataaviation.cpp | 1 - 5 files changed, 105 deletions(-) delete mode 100644 src/blackmisc/aviation/adfsystem.h diff --git a/src/blackmisc/aviation/adfsystem.h b/src/blackmisc/aviation/adfsystem.h deleted file mode 100644 index e2c64dffa..000000000 --- a/src/blackmisc/aviation/adfsystem.h +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright (C) 2013 - * swift project Community / Contributors - * - * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level - * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, - * or distributed except according to the terms contained in the LICENSE file. - */ - -//! \file - -#ifndef BLACKMISC_AVIATION_ADFSYSTEM_H -#define BLACKMISC_AVIATION_ADFSYSTEM_H - -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/aviation/modulator.h" - -namespace BlackMisc::Aviation -{ - //! ADF system ("for NDBs") - class BLACKMISC_EXPORT CAdfSystem : - public CModulator, - public Mixin::MetaType, - public Mixin::JsonOperators, - public Mixin::Index - { - public: - //! Base type - using base_type = CModulator; - - BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAdfSystem) - BLACKMISC_DECLARE_USING_MIXIN_INDEX(CAdfSystem) - - //! Default constructor - CAdfSystem() = default; - - //! Constructor - CAdfSystem(const QString &name, const PhysicalQuantities::CFrequency &activeFrequency, - const PhysicalQuantities::CFrequency &standbyFrequency = { 0, BlackMisc::PhysicalQuantities::CFrequencyUnit::nullUnit() }): - CModulator(name, activeFrequency, standbyFrequency.isNull() ? activeFrequency : standbyFrequency) - { } - - //! Valid aviation frequency? - static bool isValidFrequency(const PhysicalQuantities::CFrequency &f) - { - double fr = f.valueRounded(PhysicalQuantities::CFrequencyUnit::kHz(), 3); - return fr >= 190.0 && fr <= 1750.0; - } - - //! ADF1 unit - static CAdfSystem GetAdf1System(double activeFrequencyKHz, double standbyFrequencyKHz = -1) - { - return CAdfSystem(CModulator::NameCom1(), PhysicalQuantities::CFrequency(activeFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyKHz < 0 ? activeFrequencyKHz : standbyFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz())); - } - - //! ADF1 unit - static CAdfSystem GetAdf1System(const PhysicalQuantities::CFrequency &activeFrequency, - const PhysicalQuantities::CFrequency &standbyFrequency = { 0, BlackMisc::PhysicalQuantities::CFrequencyUnit::nullUnit() }) - { - return CAdfSystem(CModulator::NameCom1(), activeFrequency, standbyFrequency.isNull() ? activeFrequency : standbyFrequency); - } - - //! ADF2 unit - static CAdfSystem GetAdf2System(double activeFrequencyKHz, double standbyFrequencyKHz = -1) - { - return CAdfSystem(CModulator::NameCom2(), PhysicalQuantities::CFrequency(activeFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyKHz < 0 ? activeFrequencyKHz : standbyFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz())); - } - - //! ADF2 unit - static CAdfSystem GetAdf2System(const PhysicalQuantities::CFrequency &activeFrequency, - const PhysicalQuantities::CFrequency &standbyFrequency = { 0, BlackMisc::PhysicalQuantities::CFrequencyUnit::nullUnit() }) - { - return CAdfSystem(CModulator::NameCom2(), activeFrequency, standbyFrequency.isNull() ? activeFrequency : standbyFrequency); - } - }; -} // ns - -Q_DECLARE_METATYPE(BlackMisc::Aviation::CAdfSystem) - -#endif // guard diff --git a/src/blackmisc/aviation/aviation.h b/src/blackmisc/aviation/aviation.h index c1f820ee3..40d9cf625 100644 --- a/src/blackmisc/aviation/aviation.h +++ b/src/blackmisc/aviation/aviation.h @@ -16,7 +16,6 @@ #include "blackmisc/aviation/altitude.h" #include "blackmisc/aviation/heading.h" -#include "blackmisc/aviation/adfsystem.h" #include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/navsystem.h" #include "blackmisc/aviation/transponder.h" diff --git a/src/blackmisc/aviation/modulator.cpp b/src/blackmisc/aviation/modulator.cpp index 19833cc29..840b5372c 100644 --- a/src/blackmisc/aviation/modulator.cpp +++ b/src/blackmisc/aviation/modulator.cpp @@ -9,7 +9,6 @@ #include "blackmisc/aviation/modulator.h" #include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/navsystem.h" -#include "blackmisc/aviation/adfsystem.h" #include "blackmisc/pq/units.h" #include "blackmisc/propertyindexref.h" #include "blackmisc/comparefunctions.h" @@ -243,26 +242,11 @@ namespace BlackMisc::Aviation return n; } - template - const QString &CModulator::NameAdf1() - { - static QString n("ADF1"); - return n; - } - - template - const QString &CModulator::NameAdf2() - { - static QString n("ADF2"); - return n; - } - // see here for the reason of the forward instantiations // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl //! \cond PRIVATE template class CModulator; template class CModulator; - template class CModulator; //! \endcond } // namespace diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h index 4e10708e4..142a7b6ba 100644 --- a/src/blackmisc/aviation/modulator.h +++ b/src/blackmisc/aviation/modulator.h @@ -116,12 +116,6 @@ namespace BlackMisc::Aviation //! NAV3 static const QString &NameNav3(); - //! ADF1 - static const QString &NameAdf1(); - - //! ADF2 - static const QString &NameAdf2(); - private: QString m_name; //!< name of the unit PhysicalQuantities::CFrequency m_frequencyActive; //!< active frequency @@ -158,11 +152,9 @@ namespace BlackMisc::Aviation //! \cond PRIVATE class CComSystem; class CNavSystem; - class CAdfSystem; extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE CModulator; extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE CModulator; - extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE CModulator; //! \endcond } // namespace diff --git a/src/blackmisc/aviation/registermetadataaviation.cpp b/src/blackmisc/aviation/registermetadataaviation.cpp index 8a488a957..da0738d18 100644 --- a/src/blackmisc/aviation/registermetadataaviation.cpp +++ b/src/blackmisc/aviation/registermetadataaviation.cpp @@ -15,7 +15,6 @@ namespace BlackMisc { void registerMetadata() { - CAdfSystem::registerMetadata(); CAircraftEngine::registerMetadata(); CAircraftEngineList::registerMetadata(); CAircraftIcaoCode::registerMetadata();