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

refs #544 doxygen

Browse Source
This commit is contained in:
Klaus Basan
2015-12-12 04:44:09 +00:00
committed by Mathew Sutcliffe
parent 72019961eb
commit 1b46e0400c
14 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackcore/airspacemonitor.h
View File

@@ -47,63 +47,63 @@ namespace BlackCore
//! Constructor
CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, INetwork *network, CWebDataServices *webDataReader, QObject *parent);
//! \copydoc IRemoteAircraftProvider::getAircraftInRange
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRange
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeForCallsign
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeForCallsign
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeForCallsign
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeForCallsign
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeCount
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeCount
//! \ingroup remoteaircraftprovider
virtual int getAircraftInRangeCount() const override;
//! \copydoc IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituations
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSituations
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituationsCount
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSituationsCount
//! \ingroup remoteaircraftprovider
virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftParts
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore = -1) const override;
//! \copydoc IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
//! \copydoc IRemoteAircraftProvider::updateAircraftEnabled
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftModel
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftModel
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateFastPositionEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftRendered
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateMarkAllAsNotRendered
//! \ingroup remoteaircraftprovider
virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) override;
@@ -150,7 +150,7 @@ namespace BlackCore
//! Test injected aircraft parts
void testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool incremental);
//! \copydoc IRemoteAircraftProvider::connectRemoteAircraftProviderSignals
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::connectRemoteAircraftProviderSignals
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,

20
src/blackcore/contextnetworkimpl.h
View File

@@ -50,27 +50,27 @@ namespace BlackCore
//! Destructor
virtual ~CContextNetwork();
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituations
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSituations
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituationsCount
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSituationsCount
//! \ingroup remoteaircraftprovider
virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftParts
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override;
//! \copydoc IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
//! \copydoc IRemoteAircraftProvider::connectSignals
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::connectSignals
//! \ingroup remoteaircraftprovider
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver,
@@ -80,15 +80,15 @@ namespace BlackCore
std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftRendered
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateMarkAllAsNotRendered
//! \ingroup remoteaircraftprovider
virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) override;
//! \copydoc IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override;
@@ -121,7 +121,7 @@ namespace BlackCore
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeCount
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeCount
//! \ingroup remoteaircraftprovider
virtual int getAircraftInRangeCount() const override;

4
src/blackcore/settings/application.h
View File

@@ -24,10 +24,10 @@ namespace BlackCore
//! User configured hotkeys
struct ActionHotkeys : public CSettingTrait<BlackMisc::Input::CActionHotkeyList>
{
//! \copydoc BlackCore::CSetting::key
//! \copydoc BlackCore::CSettingTrait::key
static const char *key() { return "application/actionhotkeys"; }
//! \copydoc BlackCore::CSetting::isValid
//! \copydoc BlackCore::CSettingTrait::isValid
static bool isValid(const BlackMisc::Input::CActionHotkeyList &value)
{
for (const auto &actionHotkey : value)

6
src/blackcore/settings/audio.h
View File

@@ -24,13 +24,13 @@ namespace BlackCore
//! Name of text codec to use with text in FSD protocol
struct AudioSettings : public CSettingTrait<BlackMisc::Audio::Settings::CSettingsAudio>
{
//! \copydoc BlackCore::CSetting::key
//! \copydoc BlackCore::CSettingTrait::key
static const char *key() { return "audio/setup"; }
//! \copydoc BlackCore::CSetting::defaultValue
//! \copydoc BlackCore::CSettingTrait::defaultValue
static const BlackMisc::Audio::Settings::CSettingsAudio &defaultValue() { static const BlackMisc::Audio::Settings::CSettingsAudio a; return a; }
//! \copydoc BlackCore::CSetting::isValid
//! \copydoc BlackCore::CSettingTrait::isValid
static bool isValid(const BlackMisc::Audio::Settings::CSettingsAudio &value) { Q_UNUSED(value); return true; }
};

16
src/blackcore/settings/network.h
View File

@@ -25,30 +25,30 @@ namespace BlackCore
//! Name of text codec to use with text in FSD protocol
struct WireTextCodec : public CSettingTrait<QString>
{
//! \copydoc BlackCore::CSetting::key
//! \copydoc BlackCore::CSettingTrait::key
static const char *key() { return "network/wiretextcodec"; }
//! \copydoc BlackCore::CSetting::defaultValue
//! \copydoc BlackCore::CSettingTrait::defaultValue
static const QString &defaultValue() { static const QString dv("latin1"); return dv; }
//! \copydoc BlackCore::CSetting::isValid
//! \copydoc BlackCore::CSettingTrait::isValid
static bool isValid(const QString &value) { return QTextCodec::codecForName(qPrintable(value)); }
};
//! Virtual air traffic servers
struct TrafficServers : public CSettingTrait<BlackMisc::Network::CServerList>
{
//! \copydoc BlackCore::CSetting::key
//! \copydoc BlackCore::CSettingTrait::key
static const char *key() { return "network/trafficservers"; }
};
//! Currently selected virtual air traffic server
struct CurrentTrafficServer : public CSettingTrait<BlackMisc::Network::CServer>
{
//! \copydoc BlackCore::CSetting::key
//! \copydoc BlackCore::CSettingTrait::key
static const char *key() { return "network/currenttrafficserver"; }
//! \copydoc BlackCore::CSetting::defaultValue
//! \copydoc BlackCore::CSettingTrait::defaultValue
static const BlackMisc::Network::CServer &defaultValue()
{
using namespace BlackMisc::Network;
@@ -60,10 +60,10 @@ namespace BlackCore
//! DBus server address
struct DBusServerAddress : public CSettingTrait<QString>
{
//! \copydoc BlackCore::CSetting::key
//! \copydoc BlackCore::CSettingTrait::key
static const char *key() { return "network/dbusserver"; }
//! \copydoc BlackCore::CSetting::defaultValue
//! \copydoc BlackCore::CSettingTrait::defaultValue
static const QString &defaultValue() { static const QString dv("session"); return dv; }
};
} // ns

76
src/blackcore/webdataservices.h
View File

@@ -77,157 +77,157 @@ namespace BlackCore
// ------------------------ provider functionality start ------------------------------
//! \copydoc IWebDataServicesProvider::connectDataReadSignal
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::connectDataReadSignal
//! \ingroup webdatareaderprovider
virtual QList<QMetaObject::Connection> connectDataReadSignal(
QObject *receiver,
std::function<void (BlackMisc::Network::CEntityFlags::Entity, BlackMisc::Network::CEntityFlags::ReadState, int)> dataRead) override;
//! \copydoc IWebDataServicesProvider::triggerRead
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::triggerRead
//! \ingroup webdatareaderprovider
virtual BlackMisc::Network::CEntityFlags::Entity triggerRead(BlackMisc::Network::CEntityFlags::Entity whatToRead) override;
//! \copydoc IWebDataServicesProvider::getVatsimFsdServers
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getVatsimFsdServers
//! \ingroup webdatareaderprovider
virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;
//! \copydoc IWebDataServicesProvider::getVatsimVoiceServers
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getVatsimVoiceServers
//! \ingroup webdatareaderprovider
virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override;
//! \copydoc IWebDataServicesProvider::getDistributors
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getDistributors
//! \ingroup webdatareaderprovider
virtual BlackMisc::Simulation::CDistributorList getDistributors() const override;
//! \copydoc IWebDataServicesProvider::getDistributorsCount
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getDistributorsCount
//! \ingroup webdatareaderprovider
virtual int getDistributorsCount() const override;
//! \copydoc IWebDataServicesProvider::smartDistributorSelector
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::smartDistributorSelector
//! \ingroup webdatareaderprovider
virtual BlackMisc::Simulation::CDistributor smartDistributorSelector(const BlackMisc::Simulation::CDistributor &distributor) const override;
//! \copydoc IWebDataServicesProvider::getLiveries
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getLiveries
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CLiveryList getLiveries() const override;
//! \copydoc IWebDataServicesProvider::getLiveriesCount
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getLiveriesCount
//! \ingroup webdatareaderprovider
virtual int getLiveriesCount() const override;
//! \copydoc IWebDataServicesProvider::getLiveryForCombinedCode
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getLiveryForCombinedCode
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CLivery getLiveryForCombinedCode(const QString &combinedCode) const override;
//! \copydoc IWebDataServicesProvider::getLiveryForDbKey
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getLiveryForDbKey
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CLivery getLiveryForDbKey(int id) const override;
//! \copydoc IWebDataServicesProvider::smartLiverySelector
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::smartLiverySelector
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CLivery smartLiverySelector(const BlackMisc::Aviation::CLivery &livery) const override;
//! \copydoc IWebDataServicesProvider::getModels
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getModels
//! \ingroup webdatareaderprovider
virtual BlackMisc::Simulation::CAircraftModelList getModels() const override;
//! \copydoc IWebDataServicesProvider::getModelsCount
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getModelsCount
//! \ingroup webdatareaderprovider
virtual int getModelsCount() const override;
//! \copydoc IWebDataServicesProvider::getModelsForAircraftDesignatorAndLiveryCombinedCode
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getModelsForAircraftDesignatorAndLiveryCombinedCode
//! \ingroup webdatareaderprovider
virtual BlackMisc::Simulation::CAircraftModelList getModelsForAircraftDesignatorAndLiveryCombinedCode(const QString &aircraftDesignator, const QString &combinedCode) const override;
//! \copydoc IWebDataServicesProvider::getModelForModelString
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getModelForModelString
//! \ingroup webdatareaderprovider
virtual BlackMisc::Simulation::CAircraftModel getModelForModelString(const QString &modelString) const override;
//! \copydoc IWebDataServicesProvider::getAircraftIcaoCodes
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAircraftIcaoCodes
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAircraftIcaoCodeList getAircraftIcaoCodes() const override;
//! \copydoc IWebDataServicesProvider::getAircraftIcaoCodesCount
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAircraftIcaoCodesCount
//! \ingroup webdatareaderprovider
virtual int getAircraftIcaoCodesCount() const override;
//! \copydoc IWebDataServicesProvider::getAircraftIcaoCodeForDesignator
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAircraftIcaoCodeForDesignator
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcaoCodeForDesignator(const QString &designator) const override;
//! \copydoc IWebDataServicesProvider::getAircraftIcaoCodeForDbKey
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAircraftIcaoCodeForDbKey
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcaoCodeForDbKey(int key) const override;
//! \copydoc IWebDataServicesProvider::getAircraftIcaoCodeForDbKey
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAircraftIcaoCodeForDbKey
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAircraftIcaoCode smartAircraftIcaoSelector(const BlackMisc::Aviation::CAircraftIcaoCode &icao) const override;
//! \copydoc IWebDataServicesProvider::getAirlineIcaoCodes
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAirlineIcaoCodes
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAirlineIcaoCodeList getAirlineIcaoCodes() const override;
//! \copydoc IWebDataServicesProvider::getAirlineIcaoCodesCount
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAirlineIcaoCodesCount
//! \ingroup webdatareaderprovider
virtual int getAirlineIcaoCodesCount() const override;
//! \copydoc IWebDataServicesProvider::getAirlineIcaoCodeForDbKey
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAirlineIcaoCodeForDbKey
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAirlineIcaoCode getAirlineIcaoCodeForDbKey(int key) const override;
//! \copydoc IWebDataServicesProvider::getAirlineIcaoCodeForDesignator
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAirlineIcaoCodeForDesignator
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAirlineIcaoCode getAirlineIcaoCodeForDesignator(const QString &designator) const override;
//! \copydoc IWebDataServicesProvider::getCountries
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getCountries
//! \ingroup webdatareaderprovider
virtual BlackMisc::CCountryList getCountries() const override;
//! \copydoc IWebDataServicesProvider::getCountries
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getCountries
//! \ingroup webdatareaderprovider
virtual int getCountriesCount() const override;
//! \copydoc IWebDataServicesProvider::getCountryForName
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getCountryForName
//! \ingroup webdatareaderprovider
virtual BlackMisc::CCountry getCountryForName(const QString &name) const override;
//! \copydoc IWebDataServicesProvider::getCountryForIsoCode
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getCountryForIsoCode
//! \ingroup webdatareaderprovider
virtual BlackMisc::CCountry getCountryForIsoCode(const QString &iso) const override;
//! \copydoc IWebDataServicesProvider::getMetars
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getMetars
//! \ingroup webdatareaderprovider
virtual BlackMisc::Weather::CMetarSet getMetars() const override;
//! \copydoc IWebDataServicesProvider::getMetarForAirport
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getMetarForAirport
//! \ingroup webdatareaderprovider
virtual BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &icao) const override;
//! \copydoc IWebDataServicesProvider::getMetarForAirport
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getMetarForAirport
//! \ingroup webdatareaderprovider
virtual int getMetarsCount() const override;
//! \copydoc IWebDataServicesProvider::getUsersForCallsign
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getUsersForCallsign
//! \ingroup webdatareaderprovider
virtual BlackMisc::Network::CUserList getUsersForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IWebDataServicesProvider::getAtcStationsForCallsign
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getAtcStationsForCallsign
//! \ingroup webdatareaderprovider
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IWebDataServicesProvider::getVoiceCapabilityForCallsign
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::getVoiceCapabilityForCallsign
//! \ingroup webdatareaderprovider
virtual BlackMisc::Network::CVoiceCapabilities getVoiceCapabilityForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IWebDataServicesProvider::updateWithWebData
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::updateWithWebData
//! \ingroup webdatareaderprovider
virtual void updateWithVatsimDataFileData(BlackMisc::Simulation::CSimulatedAircraft &aircraftToBeUdpated) const override;
//! \copydoc IWebDataServicesProvider::asyncWriteModel
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::asyncWriteModel
//! \ingroup webdatareaderprovider
virtual BlackMisc::CStatusMessageList asyncWriteModel(BlackMisc::Simulation::CAircraftModel &model) const override;
//! \copydoc IWebDataServicesProvider::canConnectSwiftDb
//! \copydoc BlackMisc::Network::IWebDataServicesProvider::canConnectSwiftDb
//! \ingroup webdatareaderprovider
virtual bool canConnectSwiftDb() const override;

2
src/blackgui/editors/aircrafticaoform.h
View File

@@ -61,7 +61,7 @@ namespace BlackGui
//! Mapping mode
void setMappingMode();
//! \copydoc CWebDataReaderAware::setProvider
//! \copydoc CWebDataServicesAware::setProvider
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
public slots:

4
src/blackgui/models/columnformatters.h
View File

@@ -238,7 +238,7 @@ namespace BlackGui
//! \copydoc CDefaultFormatter::displayRole
virtual BlackMisc::CVariant displayRole(const BlackMisc::CVariant &valueObject) const override;
//! \copydoc CDefaultFormatter::asPixmap
//! \copydoc CDefaultFormatter::decorationRole
virtual BlackMisc::CVariant decorationRole(const BlackMisc::CVariant &valueObject) const;
};
@@ -306,7 +306,7 @@ namespace BlackGui
//! Constructor
CPhysiqalQuantiyFormatter(MU unit = MU::defaultUnit(), int digits = 2, int alignment = alignRightVCenter(), bool withUnit = true, bool i18n = true, QList<int> supportedRoles = roleDisplay()) : CValueObjectFormatter(alignment, i18n, supportedRoles), m_unit(unit), m_digits(digits), m_withUnit(withUnit) {}
//! \copydoc CDefaultFormatter::displayRole
//! \copydoc CValueObjectFormatter::displayRole
virtual BlackMisc::CVariant displayRole(const BlackMisc::CVariant &physicalQuantity) const override
{
if (physicalQuantity.canConvert<PQ>())

2
src/blackgui/models/listmodelbase.h
View File

@@ -195,7 +195,7 @@ namespace BlackGui
//! Remove object
virtual void remove(const ObjectType &object);
//! \copydoc ContainerBase::removeIf
//! \copydoc BlackMisc::ContainerBase::removeIf
template <class K0, class V0, class... KeysValues>
int removeIf(K0 k0, V0 v0, KeysValues... keysValues)
{

20
src/blackgui/views/viewbase.h
View File

@@ -297,7 +297,7 @@ namespace BlackGui
//! Model
const ModelClass *derivedModel() const { return this->m_model; }
//! \copydoc CViewBaseNonTemplate::clear
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::clear
virtual void clear() override { Q_ASSERT(this->m_model); this->m_model->clear(); }
//! Update whole container
@@ -360,36 +360,36 @@ namespace BlackGui
//! Standard initialization
void standardInit(ModelClass *model = nullptr);
//! \copydoc CViewBaseNonTemplate::reachedResizeThreshold
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::reachedResizeThreshold
virtual bool reachedResizeThreshold(int containrerSize = -1) const override;
//! \copydoc CViewBaseNonTemplate::performModeBasedResizeToContent
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::performModeBasedResizeToContent
virtual void performModeBasedResizeToContent() override;
//! \copydoc CViewBaseNonTemplate::performUpdateContainer
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::performUpdateContainer
virtual int performUpdateContainer(const BlackMisc::CVariant &variant, bool sort, bool resize) override;
//! \copydoc CViewBaseNonTemplate::ps_filterDialogFinished
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::ps_filterDialogFinished
//! \remarks Actually a slot, but not defined as such as the template does not support Q_OBJECT
virtual bool ps_filterDialogFinished(int status) override;
//! \copydoc CViewBaseNonTemplate::ps_filterWidgetChangedFilter(bool)
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::ps_filterWidgetChangedFilter(bool)
//! \remarks Actually a slot, but not defined as such as the template does not support Q_OBJECT
virtual bool ps_filterWidgetChangedFilter(bool enabled) override;
//! \copydoc CViewBaseNonTemplate::ps_removeFilter
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::ps_removeFilter
//! \remarks Actually a slot, but not defined as such as the template does not support Q_OBJECT
virtual void ps_removeFilter() override;
//! \copydoc CViewBaseNonTemplate::ps_clicked
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::ps_clicked
//! \remarks Actually a slot, but not defined as such as the template does not support Q_OBJECT
virtual void ps_clicked(const QModelIndex &index) override;
//! \copydoc CViewBaseNonTemplate::ps_doubleClicked
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::ps_doubleClicked
//! \remarks Actually a slot, but not defined as such as the template does not support Q_OBJECT
virtual void ps_doubleClicked(const QModelIndex &index) override;
//! \copydoc CViewBaseNonTemplate::ps_doubleClicked
//! \copydoc BlackGui::Views::CViewBaseNonTemplate::ps_rowSelected
//! \remarks Actually a slot, but not defined as such as the template does not support Q_OBJECT
virtual void ps_rowSelected(const QModelIndex &index) override;
};

2
src/blackmisc/aviation/aircraftsituation.h
View File

@@ -29,7 +29,7 @@ namespace BlackMisc
//! Value object encapsulating information of an aircraft's situation
class BLACKMISC_EXPORT CAircraftSituation :
public CValueObject<CAircraftSituation>,
public Geo::ICoordinateGeodetic, public BlackMisc::ITimestampBased
public BlackMisc::Geo::ICoordinateGeodetic, public BlackMisc::ITimestampBased
{
public:
//! Properties by index

8
src/blackmisc/simulation/simulatedaircraft.h
View File

@@ -160,17 +160,17 @@ namespace BlackMisc
//! Get groundspeed
const BlackMisc::PhysicalQuantities::CSpeed &getGroundSpeed() const { return this->m_situation.getGroundSpeed(); }
//! \copydoc ICoordinateGeodetic::latitude
//! \copydoc BlackMisc::Geo::ICoordinateGeodetic::latitude
virtual BlackMisc::Geo::CLatitude latitude() const override { return this->m_situation.latitude(); }
//! \copydoc ICoordinateGeodetic::longitude
//! \copydoc BlackMisc::Geo::ICoordinateGeodetic::longitude
virtual BlackMisc::Geo::CLongitude longitude() const override { return this->m_situation.longitude(); }
//! \copydoc ICoordinateGeodetic::geodeticHeight
//! \copydoc BlackMisc::Geo::ICoordinateGeodetic::geodeticHeight
//! \remarks this should be used for elevation as depicted here: http://en.wikipedia.org/wiki/Altitude#mediaviewer/File:Vertical_distances.svg
const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_situation.geodeticHeight(); }
//! \copydoc ICoordinateGeodetic::normalVector
//! \copydoc BlackMisc::Geo::ICoordinateGeodetic::normalVector
virtual QVector3D normalVector() const override { return this->m_situation.normalVector(); }
//! Elevation

26
src/plugins/simulator/fscommon/simulatorfscommon.h
View File

@@ -31,7 +31,7 @@ namespace BlackSimPlugin
//! Destructor
virtual ~CSimulatorFsCommon();
//! \copydoc ISimulator::disconnectFrom()
//! \copydoc BlackCore::ISimulator::disconnectFrom()
virtual bool disconnectFrom() override;
//! FSUIPC connected?
@@ -40,40 +40,40 @@ namespace BlackSimPlugin
//! Experimental model matching
BlackMisc::Simulation::CAircraftModel getClosestMatch(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft);
//! \copydoc ISimulator::isPaused
//! \copydoc BlackCore::ISimulator::isPaused
virtual bool isPaused() const override { return m_simPaused; }
//! \copydoc ISimulator::isTimeSynchronized
//! \copydoc BlackCore::ISimulator::isTimeSynchronized
virtual bool isTimeSynchronized() const override { return m_simTimeSynced; }
//! \copydoc ISimulator::getTimeSynchronizationOffset
//! \copydoc BlackCore::ISimulator::getTimeSynchronizationOffset
virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override;
//! \copydoc ISimulator::setTimeSynchronization
//! \copydoc BlackCore::ISimulator::setTimeSynchronization
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
//! \copydoc ISimulator::getAirportsInRange
//! \copydoc BlackCore::ISimulator::getAirportsInRange
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
//! \copydoc ISimulator::getInstalledModels
//! \copydoc BlackCore::ISimulator::getInstalledModels
virtual BlackMisc::Simulation::CAircraftModelList getInstalledModels() const override;
//! \copydoc ISimulator::reloadInstalledModels
//! \copydoc BlackCore::ISimulator::reloadInstalledModels
virtual void reloadInstalledModels() override;
//! \copydoc IContextSimulator::iconForModel
//! \copydoc BlackCore::IContextSimulator::iconForModel
virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override;
//! \copydoc ISimulator::changeRenderedAircraftModel
//! \copydoc BlackCore::ISimulator::changeRemoteAircraftModel
virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override;
//! \copydoc ISimulator::changeAircraftEnabled
//! \copydoc BlackCore::ISimulator::changeRemoteAircraftEnabled
virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override;
//! \copydoc ISimulator::enableDebuggingMessages
//! \copydoc BlackCore::ISimulator::enableDebugMessages
virtual void enableDebugMessages(bool driver, bool interpolator) override;
//! \copydoc ISimulator::unload
//! \copydoc BlackCore::ISimulator::unload
virtual void unload() override;
protected:

22
src/plugins/simulator/fsx/simulatorfsx.h
View File

@@ -87,34 +87,34 @@ namespace BlackSimPlugin
//! SimConnect Callback
static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
//! \copydoc ISimulator::connectTo()
//! \copydoc BlackCore::ISimulator::connectTo()
virtual bool connectTo() override;
//! \copydoc ISimulator::disconnectFrom()
//! \copydoc BlackCore::ISimulator::disconnectFrom()
virtual bool disconnectFrom() override;
//! \copydoc ISimulator::physicallyAddRemoteAircraft()
//! \copydoc BlackCore::ISimulator::physicallyAddRemoteAircraft()
virtual bool physicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &newRemoteAircraft) override;
//! \copydoc ISimulator::physicallyRemoveRemoteAircraft()
//! \copydoc BlackCore::ISimulator::physicallyRemoveRemoteAircraft()
virtual bool physicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::ISimulator::physicallyRemoveAllRemoteAircraft
virtual int physicallyRemoveAllRemoteAircraft() override;
//! \copydoc ISimulator::updateOwnCockpit
//! \copydoc BlackCore::ISimulator::updateOwnSimulatorCockpit
virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator) override;
//! \copydoc ISimulator::displayStatusMessage
//! \copydoc BlackCore::ISimulator::displayStatusMessage
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
//! \copydoc ISimulator::displayTextMessage()
//! \copydoc BlackCore::ISimulator::displayTextMessage()
virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;
//! \copydoc ISimulator::isPhysicallyRenderedAircraft
//! \copydoc BlackCore::ISimulator::isPhysicallyRenderedAircraft
virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc ISimulator::physicallyRenderedAircraft
//! \copydoc BlackCore::ISimulator::physicallyRenderedAircraft
virtual BlackMisc::Aviation::CCallsignSet physicallyRenderedAircraft() const override;
//! Called when data about our own aircraft are received
@@ -127,10 +127,10 @@ namespace BlackSimPlugin
void setSimConnectObjectID(DWORD requestID, DWORD objectID);
protected:
//! \copydoc ISimulator::isConnected()
//! \copydoc BlackCore::ISimulator::isConnected()
virtual bool isConnected() const override;
//! \copydoc ISimulator::isSimulating
//! \copydoc BlackCore::ISimulator::isSimulating
virtual bool isSimulating() const override;
//! Timer event (our SimConnect event loop), runs \sa ps_dispatch