Use nested namespaces (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-09-15 21:44:54 +01:00
parent 3f2e5b0b69
commit 57d32da826
1345 changed files with 146075 additions and 150376 deletions

View File

@@ -15,83 +15,80 @@
#include "blackmisc/simulation/interpolatorspline.h"
#include "blackmisc/statusmessagelist.h"
namespace BlackMisc
namespace BlackMisc::Simulation
{
namespace Simulation
//! Multiplexed interpolator which allows switching between modes at runtime.
class BLACKMISC_EXPORT CInterpolatorMulti
{
//! Multiplexed interpolator which allows switching between modes at runtime.
class BLACKMISC_EXPORT CInterpolatorMulti
{
public:
//! Constructor
CInterpolatorMulti(const Aviation::CCallsign &callsign,
ISimulationEnvironmentProvider *p1, IInterpolationSetupProvider *p2, IRemoteAircraftProvider *p3,
CInterpolationLogger *logger = nullptr);
public:
//! Constructor
CInterpolatorMulti(const Aviation::CCallsign &callsign,
ISimulationEnvironmentProvider *p1, IInterpolationSetupProvider *p2, IRemoteAircraftProvider *p3,
CInterpolationLogger *logger = nullptr);
//! \copydoc CInterpolator::getInterpolation
CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber);
//! \copydoc CInterpolator::getInterpolation
CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber);
//! \copydoc CInterpolator::getLastInterpolatedSituation
const Aviation::CAircraftSituation &getLastInterpolatedSituation(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;
//! \copydoc CInterpolator::getLastInterpolatedSituation
const Aviation::CAircraftSituation &getLastInterpolatedSituation(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;
//! \copydoc CInterpolator::getInterpolationMessages
const CStatusMessageList &getInterpolationMessages(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;
//! \copydoc CInterpolator::getInterpolationMessages
const CStatusMessageList &getInterpolationMessages(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;
//! \copydoc CInterpolator::attachLogger
void attachLogger(CInterpolationLogger *logger);
//! \copydoc CInterpolator::attachLogger
void attachLogger(CInterpolationLogger *logger);
//! \copydoc CInterpolator::initCorrespondingModel
void initCorrespondingModel(const CAircraftModel &model);
//! \copydoc CInterpolator::initCorrespondingModel
void initCorrespondingModel(const CAircraftModel &model);
//! Info string
QString getInterpolatorInfo(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;
//! Info string
QString getInterpolatorInfo(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;
private:
CInterpolatorSpline m_spline;
CInterpolatorLinear m_linear;
};
private:
CInterpolatorSpline m_spline;
CInterpolatorLinear m_linear;
};
/**
* CInterpolatorMulti which can be used with QMap/QHash
* \remark Use case is emulated driver
*/
class BLACKMISC_EXPORT CInterpolatorMultiWrapper
{
public:
//! Default ctor, needed for QMap/QHash
CInterpolatorMultiWrapper();
/**
* CInterpolatorMulti which can be used with QMap/QHash
* \remark Use case is emulated driver
*/
class BLACKMISC_EXPORT CInterpolatorMultiWrapper
{
public:
//! Default ctor, needed for QMap/QHash
CInterpolatorMultiWrapper();
//! Constructor
CInterpolatorMultiWrapper(
const Aviation::CCallsign &callsign,
ISimulationEnvironmentProvider *p1, IInterpolationSetupProvider *p2, IRemoteAircraftProvider *p3,
CInterpolationLogger *logger = nullptr);
//! Constructor
CInterpolatorMultiWrapper(
const Aviation::CCallsign &callsign,
ISimulationEnvironmentProvider *p1, IInterpolationSetupProvider *p2, IRemoteAircraftProvider *p3,
CInterpolationLogger *logger = nullptr);
//! Has interpolator initialized?
bool hasInterpolator() const { return m_interpolator; }
//! Has interpolator initialized?
bool hasInterpolator() const { return m_interpolator; }
//! Interpolator
CInterpolatorMulti *interpolator() const { return m_interpolator.data(); }
//! Interpolator
CInterpolatorMulti *interpolator() const { return m_interpolator.data(); }
//! Allows implicit conversion
operator CInterpolatorMulti *() const { return this->interpolator(); }
//! Allows implicit conversion
operator CInterpolatorMulti *() const { return this->interpolator(); }
//! Bool conversion
operator bool() const { return this->hasInterpolator(); }
//! Bool conversion
operator bool() const { return this->hasInterpolator(); }
//! Bool conversion
bool operator !() const { return !this->hasInterpolator(); }
//! Bool conversion
bool operator !() const { return !this->hasInterpolator(); }
//! * operator
CInterpolatorMulti &operator *() const { return *this->interpolator(); }
//! * operator
CInterpolatorMulti &operator *() const { return *this->interpolator(); }
//! -> operator
CInterpolatorMulti *operator ->() const { return this->interpolator(); }
//! -> operator
CInterpolatorMulti *operator ->() const { return this->interpolator(); }
private:
QSharedPointer<CInterpolatorMulti> m_interpolator; //!< shared pointer because CInterpolatorMultiWrapper can be copied
};
} // ns
private:
QSharedPointer<CInterpolatorMulti> m_interpolator; //!< shared pointer because CInterpolatorMultiWrapper can be copied
};
} // ns
#endif