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

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

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

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();