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

Formatting comments and "private slots" -> "private"

Browse Source
This commit is contained in:
Klaus Basan
2018-01-14 04:26:55 +01:00
parent de4fe44156
commit 8bb47a555c
7 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/context/contextownaircraftimpl.cpp
View File

@@ -62,7 +62,7 @@ namespace BlackCore
if (sApp && sApp->getWebDataServices())
{
connect(sApp->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CContextOwnAircraft::ps_allSwiftWebDataRead);
connect(sApp->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CContextOwnAircraft::allSwiftWebDataRead);
}
// Init own aircraft
@@ -322,7 +322,7 @@ namespace BlackCore
if (this->getIContextAudio()) this->getIContextAudio()->setVoiceOutputVolume(outputVolume);
}
void CContextOwnAircraft::ps_changedAtcStationOnlineConnectionStatus(const CAtcStation &atcStation, bool connected)
void CContextOwnAircraft::changedAtcStationOnlineConnectionStatus(const CAtcStation &atcStation, bool connected)
{
// any of our active frequencies?
Q_UNUSED(connected);
@@ -331,12 +331,12 @@ namespace BlackCore
this->resolveVoiceRooms();
}
void CContextOwnAircraft::ps_changedSimulatorModel(const CAircraftModel &model)
void CContextOwnAircraft::changedSimulatorModel(const CAircraftModel &model)
{
this->updateOwnModel(model);
}
void CContextOwnAircraft::ps_allSwiftWebDataRead()
void CContextOwnAircraft::allSwiftWebDataRead()
{
// we should already have received a reverse lookup model
// from the driver

23
src/blackcore/context/contextownaircraftimpl.h
View File

@@ -174,18 +174,6 @@ namespace BlackCore
//! Register myself in DBus
CContextOwnAircraft *registerWithDBus(BlackMisc::CDBusServer *server);
private slots:
//! Station has been changed, needed to tune in/out voice room
//! \ingroup crosscontextslot
void ps_changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
//! Simulator model has been changed
//! \ingroup crosscontextslot
void ps_changedSimulatorModel(const BlackMisc::Simulation::CAircraftModel &model);
//! Web data loaded
void ps_allSwiftWebDataRead();
private:
BlackMisc::Simulation::CSimulatedAircraft m_ownAircraft; //!< my aircraft
bool m_automaticVoiceRoomResolution = true; //!< automatic voice room resolution, or disable for override
@@ -195,6 +183,17 @@ namespace BlackCore
BlackMisc::CSetting<Vatsim::TCurrentTrafficServer> m_currentNetworkServer { this };
//! Station has been changed, needed to tune in/out voice room
//! \ingroup crosscontextslot
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
//! Simulator model has been changed
//! \ingroup crosscontextslot
void changedSimulatorModel(const BlackMisc::Simulation::CAircraftModel &model);
//! Web data loaded
void allSwiftWebDataRead();
//! Init my very own aircraft with some defaults, before overridden by simulator
void initOwnAircraft();

4
src/blackcore/corefacade.cpp
View File

@@ -232,7 +232,7 @@ namespace BlackCore
this->getCContextSimulator(), &CContextSimulator::ps_updateSimulatorSelcalFromContext);
Q_ASSERT(c);
c = connect(this->getCContextSimulator(), &CContextSimulator::ownAircraftModelChanged,
this->getCContextOwnAircraft(), &CContextOwnAircraft::ps_changedSimulatorModel);
this->getCContextOwnAircraft(), &CContextOwnAircraft::changedSimulatorModel);
Q_ASSERT(c);
}
@@ -245,7 +245,7 @@ namespace BlackCore
if (m_contextNetwork && m_contextOwnAircraft && m_contextNetwork->isUsingImplementingObject() && m_contextOwnAircraft->isUsingImplementingObject())
{
c = connect(m_contextNetwork, &IContextNetwork::changedAtcStationOnlineConnectionStatus,
this->getCContextOwnAircraft(), &CContextOwnAircraft::ps_changedAtcStationOnlineConnectionStatus);
this->getCContextOwnAircraft(), &CContextOwnAircraft::changedAtcStationOnlineConnectionStatus);
Q_ASSERT(c);
times.insert("Post setup, connects network", time.restart());
}

4
src/blackcore/db/databasereader.h
View File

@@ -241,10 +241,10 @@ namespace BlackCore
//! Is the shared info timestamp newer than cache timestamp?
bool isSharedInfoObjectNewerThanCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entity) const;
//! Those entities where the timestamp of header is newer than the cache timestamp
//! Those entities where the timestamp of the header is newer than the cache timestamp
BlackMisc::Network::CEntityFlags::Entity getEntitesWithNewerHeaderTimestamp(BlackMisc::Network::CEntityFlags::Entity entities) const;
//! Those entities where the timestamp of shared info obejct is newer than the cache timestamp
//! Those entities where the timestamp of a shared info object is newer than the cache timestamp
BlackMisc::Network::CEntityFlags::Entity getEntitesWithNewerSharedInfoObject(BlackMisc::Network::CEntityFlags::Entity entities) const;
//! Request headers of shared file

3
src/blackcore/db/infodatareader.h
View File

@@ -78,7 +78,8 @@ namespace BlackCore
//! URL shared info objects
BlackMisc::Network::CUrl getSharedInfoObjectsUrl() const;
//! Entity for mode
//! Info object entity for mode
//! \remark CEntityFlags::DbInfoObjectEntity or CEntityFlags::SharedInfoObjectEntity
BlackMisc::Network::CEntityFlags::EntityFlag getEntityForMode() const;
BlackMisc::Db::CDbFlags::DataRetrievalModeFlag m_mode; //!< shared or DB web service?

12
src/blackcore/webdataservices.h
View File

@@ -375,10 +375,10 @@ namespace BlackCore
//! \note requires info objects loaded upfront and uses the full cache logic
BlackMisc::Network::CEntityFlags::Entity triggerRead(BlackMisc::Network::CEntityFlags::Entity whatToRead, const QDateTime &newerThan = QDateTime());
//! Trigger reload from DB, only loads the DB data and bypasses the caches checks and info objects
//! Trigger reload from DB, loads the DB data and bypasses the caches checks and info objects
BlackMisc::Network::CEntityFlags::Entity triggerLoadingDirectlyFromDb(BlackMisc::Network::CEntityFlags::Entity whatToRead, const QDateTime &newerThan = QDateTime());
//! Trigger reload from shared files, only loads the data and bypasses caches
//! Trigger reload from shared files, loads the data and bypasses caches
BlackMisc::Network::CEntityFlags::Entity triggerLoadingDirectlyFromSharedFiles(BlackMisc::Network::CEntityFlags::Entity whatToRead, bool checkCacheTsUpfront);
//! Corresponding cache timestamp if applicable
@@ -421,12 +421,16 @@ namespace BlackCore
//! Reset the flags what was already signaled
void resetSignalFlags();
//! All DB data for an aircraft entity available?
//! Are all DB data for an aircraft entity available?
bool hasDbAircraftData() const;
//! Admit all DB caches
//! Admit all DB caches specified
void admitDbCaches(BlackMisc::Network::CEntityFlags::Entity entities);
//! Synchronize all DB caches specified
//! \remark can be slow if all data are forced to be loaded
void synchronizeDbCaches(BlackMisc::Network::CEntityFlags::Entity entities);
//! Write data to disk (mainly for testing scenarios)
bool writeDbDataToDisk(const QString &dir) const;

2
src/swiftguistandard/swiftguistdapplication.cpp
View File

@@ -95,7 +95,7 @@ bool CSwiftGuiStdApplication::parsingHookIn()
// check if rechable
if (!CDBusServer::isDBusAvailable(dBusAddress))
{
this->cmdLineErrorMessage("DBus server at " + dBusAddress + " can not be reached");
this->cmdLineErrorMessage("DBus server at '" + dBusAddress + "' can not be reached");
return false;
}
}