diff --git a/src/blackcore/airspace_analyzer.h b/src/blackcore/airspace_analyzer.h index 41a37559f..1473e22f0 100644 --- a/src/blackcore/airspace_analyzer.h +++ b/src/blackcore/airspace_analyzer.h @@ -12,6 +12,7 @@ #ifndef BLACKCORE_AIRSPACE_ANALYZER_H #define BLACKCORE_AIRSPACE_ANALYZER_H +#include "blackcore/blackcoreexport.h" #include "blackcore/network.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/remoteaircraftprovider.h" @@ -31,7 +32,7 @@ namespace BlackCore //! clients nearby. The server does not take care of that. When a client crashes, no delete packet is ever sent. This class therefore monitors callsigns and emits a timeout signal if it //! wasn't resetted during the specified timeout value. //! - class CAirspaceAnalyzer : + class BLACKCORE_EXPORT CAirspaceAnalyzer : public BlackMisc::CContinuousWorker, public BlackMisc::Simulation::COwnAircraftAware, public BlackMisc::Simulation::CRemoteAircraftAware diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index 9cb1d94f5..814ceb2bb 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -12,7 +12,11 @@ #ifndef BLACKCORE_AIRSPACE_MONITOR_H #define BLACKCORE_AIRSPACE_MONITOR_H -#include "blackcoreexport.h" +#include "blackcore/blackcoreexport.h" +#include "blackcore/network.h" +#include "blackcore/vatsimbookingreader.h" +#include "blackcore/vatsimdatafilereader.h" +#include "airspace_analyzer.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/simulation/ownaircraftprovider.h" #include "blackmisc/simulation/remoteaircraftprovider.h" @@ -22,10 +26,6 @@ #include "blackmisc/aviation/flightplan.h" #include "blackmisc/network/userlist.h" #include "blackmisc/aviation/callsignset.h" -#include "network.h" -#include "vatsimbookingreader.h" -#include "vatsimdatafilereader.h" -#include "airspace_analyzer.h" namespace BlackCore { diff --git a/src/blackcore/airspace_watchdog.h b/src/blackcore/airspace_watchdog.h deleted file mode 100644 index c44453bef..000000000 --- a/src/blackcore/airspace_watchdog.h +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright (C) 2014 - * 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 and at http://www.swift-project.org/license.html. 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 BLACKCORE_AIRSPACE_WATCHDOG_H -#define BLACKCORE_AIRSPACE_WATCHDOG_H - -#include "blackcoreexport.h" -#include "blackmisc/pq/time.h" -#include "blackmisc/aviation/callsign.h" -#include -#include - -namespace BlackCore -{ - - /*! - * CAirspaceWatchdog monitores any added callsign, if it has timed out. - * - * This class was introduced due to a flaw in the VATSIM server implementation: - * Every client needs to send an add/delete packet on its own to inform other - * clients nearby. The server does not take care of that. When a client crashes, - * no delete packet is ever sent. This class therefore monitors callsigns and - * emits a timeout signal if it wasn't resetted during the specified timeout - * value. - */ - class BLACKCORE_EXPORT CAirspaceWatchdog : public QObject - { - Q_OBJECT - - public: - //! Default constructor - CAirspaceWatchdog(QObject *parent); - - //! Constructor - CAirspaceWatchdog(const BlackMisc::PhysicalQuantities::CTime & initialTimeOut, QObject *parent); - - //! Sets the maximum time, after a client is considered timed out - void setTimeout(const BlackMisc::PhysicalQuantities::CTime &value) { m_timeout = value; } - - //! Returns the currently configured timeout value - const BlackMisc::PhysicalQuantities::CTime &getTimeout() const { return m_timeout; } - - //! Add a new callsign to watch list - void addCallsign(const BlackMisc::Aviation::CCallsign &callsign); - - //! Reset the watchdog for Callsign - //! The callsign must have been added by \sa addCallsign before. - void resetCallsign(const BlackMisc::Aviation::CCallsign &callsign); - - //! Remove Callsign from watch list - void removeCallsign(const BlackMisc::Aviation::CCallsign &callsign); - - //! Remove all watched callsigns - void removeAll(); - - signals: - //! Callsign has timed out - void timeout(const BlackMisc::Aviation::CCallsign &callsign); - - protected: - //! \overload QObject::timerEvent - virtual void timerEvent(QTimerEvent * event) override; - - private: - - void checkTimeouts(); - - BlackMisc::PhysicalQuantities::CTime m_timeout = {15, BlackMisc::PhysicalQuantities::CTimeUnit::s() }; //!< Timeout value - QHash m_callsignTimestamps; //!< Hash of callsigns and latest timestamp - - }; - -} // namespace - -#endif diff --git a/src/blackcore/simulator_common.h b/src/blackcore/simulator_common.h index dfff84543..f671ff7f6 100644 --- a/src/blackcore/simulator_common.h +++ b/src/blackcore/simulator_common.h @@ -12,6 +12,7 @@ #ifndef BLACKCORE_SIMULATOR_COMMON_H #define BLACKCORE_SIMULATOR_COMMON_H +#include "blackcore/blackcoreexport.h" #include "blackcore/interpolator.h" #include "blackcore/simulator.h" #include "blackmisc/simulation/simulatorplugininfo.h" @@ -31,7 +32,7 @@ namespace BlackCore { //! Common base class with providers, interface and some base functionality - class CSimulatorCommon : + class BLACKCORE_EXPORT CSimulatorCommon : public BlackCore::ISimulator, public BlackMisc::Simulation::COwnAircraftAware, // gain access to in memor own aircraft data public BlackMisc::Simulation::CRemoteAircraftAware // gain access to in memory remote aircraft data diff --git a/src/blackmisc/aviation/avionicsbase.h b/src/blackmisc/aviation/avionicsbase.h index 8dd7e0476..797ca2643 100644 --- a/src/blackmisc/aviation/avionicsbase.h +++ b/src/blackmisc/aviation/avionicsbase.h @@ -35,7 +35,13 @@ namespace BlackMisc //! Are set values valid? virtual bool validValues() const { return true; } + //! Virtual destructor + virtual ~CAvionicsBase() {} + protected: + //! Constructor + CAvionicsBase() : m_name("default") {} + //! Constructor CAvionicsBase(const QString &name) : m_name(name) {} diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h index f23cf0d96..ebaa0e86c 100644 --- a/src/blackmisc/aviation/modulator.h +++ b/src/blackmisc/aviation/modulator.h @@ -88,10 +88,13 @@ namespace BlackMisc void setEnabled(bool enable) { this->m_enabled = enable;} //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); + + //! \copydoc CValueObject::convertToQString + QString convertToQString(bool i18n = false) const; protected: //! Default constructor @@ -101,9 +104,6 @@ namespace BlackMisc CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) : CModulator::CValueObject(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {} - //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; - //! Set active frequency void setFrequencyActiveKHz(double frequencyKHz) { @@ -207,16 +207,18 @@ namespace BlackMisc //! Easy access to derived class (CRTP template parameter) AVIO *derived() { return static_cast(this); } - //! \cond PRIVATE - class CComSystem; - class CNavSystem; - class CAdfSystem; - - extern template class BLACKMISC_EXPORT_TEMPLATE CModulator; - extern template class BLACKMISC_EXPORT_TEMPLATE CModulator; - extern template class BLACKMISC_EXPORT_TEMPLATE CModulator; - //! \endcond }; + + //! \cond PRIVATE + class CComSystem; + class CNavSystem; + class CAdfSystem; + + extern template class BLACKMISC_EXPORT_TEMPLATE CModulator; + extern template class BLACKMISC_EXPORT_TEMPLATE CModulator; + extern template class BLACKMISC_EXPORT_TEMPLATE CModulator; + //! \endcond + } // namespace } // namespace diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h index 6ffd950db..443084d8b 100644 --- a/src/blackmisc/aviation/transponder.h +++ b/src/blackmisc/aviation/transponder.h @@ -176,8 +176,8 @@ namespace BlackMisc TransponderMode m_transponderMode; //!< Transponder mode }; - } -} + } // ns +} // ns BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, ( o.m_transponderCode, diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index 03981b72f..9a4fad0b1 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -319,7 +319,6 @@ namespace BlackMisc BLACKMISC_EXPORT QJsonObject applyIncrementalObject(const QJsonObject &previousObject, const QJsonObject &incrementalObject); - } // BlackMisc #endif // guard diff --git a/src/blackmisc/pq/physicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp index cb3e61302..7fad0c2ad 100644 --- a/src/blackmisc/pq/physicalquantity.cpp +++ b/src/blackmisc/pq/physicalquantity.cpp @@ -22,12 +22,6 @@ namespace BlackMisc return this->m_unit; } - template - void CPhysicalQuantity::setUnit(const MU &unit) - { - this->m_unit = unit; - } - template void CPhysicalQuantity::setUnitBySymbol(const QString &unitName) { diff --git a/src/blackmisc/propertyindexvariantmap.cpp b/src/blackmisc/propertyindexvariantmap.cpp index a595f1f94..367ecc200 100644 --- a/src/blackmisc/propertyindexvariantmap.cpp +++ b/src/blackmisc/propertyindexvariantmap.cpp @@ -82,11 +82,6 @@ namespace BlackMisc return s; } - int CPropertyIndexVariantMap::getMetaTypeId() const - { - return qMetaTypeId(); - } - void CPropertyIndexVariantMap::marshallToDbus(QDBusArgument &argument) const { argument << this->m_values.keys(); @@ -136,12 +131,6 @@ namespace BlackMisc return CPropertyIndexList::fromImpl(this->m_values.keys()); } - void CPropertyIndexVariantMap::registerMetadata() - { - qRegisterMetaType(); - qDBusRegisterMetaType(); - } - uint CPropertyIndexVariantMap::getValueHash() const { // there is no hash for map, so I use this workaround here diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index 0cbcb62de..5b389cb01 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/src/blackmisc/propertyindexvariantmap.h @@ -120,10 +120,8 @@ namespace BlackMisc public Mixin::String { public: - /*! - * Constructor - * \param wildcard when used in search, for setting values irrelevant - */ + //! Constructor + //! \param wildcard when used in search, for setting values irrelevant CPropertyIndexVariantMap(bool wildcard = false); //! Single value constructor @@ -240,6 +238,7 @@ namespace BlackMisc //! \copydoc CValueObject::unmarshallFromDbus void unmarshallFromDbus(const QDBusArgument &argument); + }; namespace Mixin diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.h b/src/blackmisc/simulation/airspaceaircraftsnapshot.h index acdf6c0dc..3916fd604 100644 --- a/src/blackmisc/simulation/airspaceaircraftsnapshot.h +++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_AIRSPACEAIRCRAFTANALYZER_H #define BLACKMISC_SIMULATION_AIRSPACEAIRCRAFTANALYZER_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/propertyindex.h" @@ -22,7 +23,7 @@ namespace BlackMisc namespace Simulation { //! Current situation in the sky analyzed. - class CAirspaceAircraftSnapshot : public CValueObject + class BLACKMISC_EXPORT CAirspaceAircraftSnapshot : public CValueObject { public: //! Default constructor @@ -74,14 +75,13 @@ namespace BlackMisc bool isRenderingEnabled() const { return m_renderingEnabled; } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); - protected: //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAirspaceAircraftSnapshot) diff --git a/src/blackmisc/simulation/ownaircraftprovider.h b/src/blackmisc/simulation/ownaircraftprovider.h index 6a7ecb8e1..338b828e7 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.h +++ b/src/blackmisc/simulation/ownaircraftprovider.h @@ -21,7 +21,7 @@ namespace BlackMisc { //! Direct threadsafe in memory access to own aircraft - class IOwnAircraftProvider + class BLACKMISC_EXPORT IOwnAircraftProvider { public: @@ -83,7 +83,7 @@ namespace BlackMisc }; //! Delegating class which can be directly used to access an \sa IOwnAircraftProvider instance - class COwnAircraftAware + class BLACKMISC_EXPORT COwnAircraftAware { public: //! \copydoc IOwnAircraftProvider::getOwnAircraft diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.h b/src/blackmisc/simulation/ownaircraftproviderdummy.h index aa0a42772..16e868690 100644 --- a/src/blackmisc/simulation/ownaircraftproviderdummy.h +++ b/src/blackmisc/simulation/ownaircraftproviderdummy.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDERDUMMY_H #define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDERDUMMY_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/ownaircraftprovider.h" namespace BlackMisc @@ -19,7 +20,7 @@ namespace BlackMisc namespace Simulation { //! For testing, thread safety not implemented in this class - class COwnAircraftProviderDummy : + class BLACKMISC_EXPORT COwnAircraftProviderDummy : public QObject, public IOwnAircraftProvider { diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 97a98feb4..5dd293ee6 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -109,7 +109,7 @@ namespace BlackMisc }; //! Class which can be directly used to access an \sa IRemoteAircraftProvider object - class CRemoteAircraftAware + class BLACKMISC_EXPORT CRemoteAircraftAware { public: //! \copydoc IRemoteAircraftProvider::getAircraftInRange diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index 5e0e12493..9cd5fe725 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -47,7 +47,7 @@ namespace BlackMisc static void registerMetadata() { Private::MetaTypeHelper::maybeRegisterMetaType(); - + //! \todo KB: What does this monster do? Please some comment [](...){}((qRegisterMetaType(), qDBusRegisterMetaType(), 0)...); }