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

@@ -52,123 +52,120 @@ namespace BlackMisc
class CTransponder;
}
}
namespace BlackCore
namespace BlackCore::Context
{
namespace Context
//! Own context proxy
//! \ingroup dbus
class BLACKCORE_EXPORT IContextOwnAircraft : public IContext
{
//! Own context proxy
//! \ingroup dbus
class BLACKCORE_EXPORT IContextOwnAircraft : public IContext
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME)
public:
//! DBus interface name
static const QString &InterfaceName()
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME)
static QString s(BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME);
return s;
}
public:
//! DBus interface name
static const QString &InterfaceName()
{
static QString s(BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME);
return s;
}
//! DBus object path
static const QString &ObjectPath()
{
static QString s(BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH);
return s;
}
//! DBus object path
static const QString &ObjectPath()
{
static QString s(BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH);
return s;
}
//! \copydoc IContext::getPathAndContextId()
virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); }
//! \copydoc IContext::getPathAndContextId()
virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); }
//! Factory method
static IContextOwnAircraft *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection);
//! Factory method
static IContextOwnAircraft *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection);
//! Destructor
virtual ~IContextOwnAircraft() override {}
//! Destructor
virtual ~IContextOwnAircraft() override {}
signals:
//! Aircraft cockpit update
void changedAircraftCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
signals:
//! Aircraft cockpit update
void changedAircraftCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
//! Changed SELCAL code
void changedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator);
//! Changed SELCAL code
void changedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator);
//! Own callsign was changed
void changedCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! Own callsign was changed
void changedCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! Own ICAO was changed
void changedAircraftIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode);
//! Own ICAO was changed
void changedAircraftIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode);
//! Own pilot (aka the swift user) changed
void changedPilot(const BlackMisc::Network::CUser &pilot);
//! Own pilot (aka the swift user) changed
void changedPilot(const BlackMisc::Network::CUser &pilot);
//! Aircraft has been moved from one location to another (changed scenery)
void movedAircraft(const BlackMisc::PhysicalQuantities::CLength &distance);
//! Aircraft has been moved from one location to another (changed scenery)
void movedAircraft(const BlackMisc::PhysicalQuantities::CLength &distance);
//! Just airborne
void isTakingOff();
//! Just airborne
void isTakingOff();
//! Just landed
void isTouchingDown();
//! Just landed
void isTouchingDown();
public slots:
//! Get own aircraft
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const = 0;
public slots:
//! Get own aircraft
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const = 0;
//! Get own COM system
virtual BlackMisc::Aviation::CComSystem getOwnComSystem(BlackMisc::Aviation::CComSystem::ComUnit unit) const = 0;
//! Get own COM system
virtual BlackMisc::Aviation::CComSystem getOwnComSystem(BlackMisc::Aviation::CComSystem::ComUnit unit) const = 0;
//! Get own transponder
virtual BlackMisc::Aviation::CTransponder getOwnTransponder() const = 0;
//! Get own transponder
virtual BlackMisc::Aviation::CTransponder getOwnTransponder() const = 0;
//! Get own aircraft
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const = 0;
//! Get own aircraft
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const = 0;
//! Update position
//! \note this is in \sa IContextOwnAircraft as we want to set test positions from the GUI / elsewhere
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude, const BlackMisc::Aviation::CAltitude &pressureAltitude) = 0;
//! Update position
//! \note this is in \sa IContextOwnAircraft as we want to set test positions from the GUI / elsewhere
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude, const BlackMisc::Aviation::CAltitude &pressureAltitude) = 0;
//! Update own cockpit
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) = 0;
//! Update own cockpit
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) = 0;
//! Update own transponder mode
virtual bool updateTransponderMode(const BlackMisc::Aviation::CTransponder::TransponderMode &transponderMode, const BlackMisc::CIdentifier &originator) = 0;
//! Update own transponder mode
virtual bool updateTransponderMode(const BlackMisc::Aviation::CTransponder::TransponderMode &transponderMode, const BlackMisc::CIdentifier &originator) = 0;
//! Toggle XPDR mode
virtual void toggleTransponderMode() = 0;
//! Toggle XPDR mode
virtual void toggleTransponderMode() = 0;
//! Set XPDR mode
virtual bool setTransponderMode(BlackMisc::Aviation::CTransponder::TransponderMode mode) = 0;
//! Set XPDR mode
virtual bool setTransponderMode(BlackMisc::Aviation::CTransponder::TransponderMode mode) = 0;
//! Tune in a COM frequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) = 0;
//! Tune in a COM frequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) = 0;
//! Set current pilot
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) = 0;
//! Set current pilot
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) = 0;
//! Set ICAO data
virtual bool updateOwnIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode) = 0;
//! Set ICAO data
virtual bool updateOwnIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode) = 0;
//! Set callsign
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0;
//! Set callsign
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0;
//! Own SELCAL code
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) = 0;
//! Own SELCAL code
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) = 0;
//! Default situation
//! \remark normally used when no driver is attached
static const BlackMisc::Aviation::CAircraftSituation &getDefaultSituation();
//! Default situation
//! \remark normally used when no driver is attached
static const BlackMisc::Aviation::CAircraftSituation &getDefaultSituation();
//! Default own aircraft
//! \remark normally used when no driver is attached
static BlackMisc::Simulation::CAircraftModel getDefaultOwnAircraftModel();
//! Default own aircraft
//! \remark normally used when no driver is attached
static BlackMisc::Simulation::CAircraftModel getDefaultOwnAircraftModel();
protected:
//! Constructor
IContextOwnAircraft(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContext(mode, runtime) {}
};
} // ns
protected:
//! Constructor
IContextOwnAircraft(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContext(mode, runtime) {}
};
} // ns
#endif // guard