flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #395, refs #413, refs #403 Post merge tasks

Browse Source 
* missing exports for new classes
* public non virtual convertToQString, propertyByIndex
* removed left-over of watchdog
* virtual destructor for avionicsbase.h
This commit is contained in:
Klaus Basan
2015-05-07 03:21:45 +02:00
committed by Mathew Sutcliffe
parent e7f65ba0b6
commit f18cfed087
16 changed files with 47 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/aviation/avionicsbase.h
View File

@@ -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) {}

30
src/blackmisc/aviation/modulator.h
View File

@@ -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<AVIO *>(this); }
//! \cond PRIVATE
class CComSystem;
class CNavSystem;
class CAdfSystem;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CComSystem>;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CNavSystem>;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CAdfSystem>;
//! \endcond
};
//! \cond PRIVATE
class CComSystem;
class CNavSystem;
class CAdfSystem;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CComSystem>;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CNavSystem>;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CAdfSystem>;
//! \endcond
} // namespace
} // namespace

4
src/blackmisc/aviation/transponder.h
View File

@@ -176,8 +176,8 @@ namespace BlackMisc
TransponderMode m_transponderMode; //!< Transponder mode
};
}
}
} // ns
} // ns
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, (
o.m_transponderCode,

1
src/blackmisc/blackmiscfreefunctions.h
View File

@@ -319,7 +319,6 @@ namespace BlackMisc
BLACKMISC_EXPORT QJsonObject applyIncrementalObject(const QJsonObject &previousObject, const QJsonObject &incrementalObject);
} // BlackMisc
#endif // guard

6
src/blackmisc/pq/physicalquantity.cpp
View File

@@ -22,12 +22,6 @@ namespace BlackMisc
return this->m_unit;
}
template <class MU, class PQ>
void CPhysicalQuantity<MU, PQ>::setUnit(const MU &unit)
{
this->m_unit = unit;
}
template <class MU, class PQ>
void CPhysicalQuantity<MU, PQ>::setUnitBySymbol(const QString &unitName)
{

11
src/blackmisc/propertyindexvariantmap.cpp
View File

@@ -82,11 +82,6 @@ namespace BlackMisc
return s;
}
int CPropertyIndexVariantMap::getMetaTypeId() const
{
return qMetaTypeId<CPropertyIndexVariantMap>();
}
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<CPropertyIndexVariantMap>();
qDBusRegisterMetaType<CPropertyIndexVariantMap>();
}
uint CPropertyIndexVariantMap::getValueHash() const
{
// there is no hash for map, so I use this workaround here

7
src/blackmisc/propertyindexvariantmap.h
View File

@@ -120,10 +120,8 @@ namespace BlackMisc
public Mixin::String<CPropertyIndexVariantMap>
{
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

10
src/blackmisc/simulation/airspaceaircraftsnapshot.h
View File

@@ -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<CAirspaceAircraftSnapshot>
class BLACKMISC_EXPORT CAirspaceAircraftSnapshot : public CValueObject<CAirspaceAircraftSnapshot>
{
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)

4
src/blackmisc/simulation/ownaircraftprovider.h
View File

@@ -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

3
src/blackmisc/simulation/ownaircraftproviderdummy.h
View File

@@ -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
{

2
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -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

2
src/blackmisc/variant.h
View File

@@ -47,7 +47,7 @@ namespace BlackMisc
static void registerMetadata()
{
Private::MetaTypeHelper<Derived>::maybeRegisterMetaType();
//! \todo KB: What does this monster do? Please some comment
[](...){}((qRegisterMetaType<AdditionalTypes>(), qDBusRegisterMetaType<AdditionalTypes>(), 0)...);
}