Ref T739, style

This commit is contained in:
Klaus Basan
2019-10-05 00:04:35 +02:00
committed by Mat Sutcliffe
parent 7e36e67f89
commit 66968ff3a5
8 changed files with 30 additions and 56 deletions

View File

@@ -26,6 +26,7 @@ namespace BlackCore
CActionBind::~CActionBind()
{
// void
}
void CActionBind::unbind()

View File

@@ -739,28 +739,6 @@ namespace BlackCore
return;
Q_UNUSED(url)
Q_UNUSED(callsign)
/**
// URL
const QString trimmedUrl = url.trimmed();
CPropertyIndexVariantMap vm({ CAtcStation::IndexVoiceRoom, CVoiceRoom::IndexUrl }, trimmedUrl);
const int changedOnline = this->updateOnlineStation(callsign, vm, true, true);
if (changedOnline < 1) { return; }
Q_ASSERT(changedOnline == 1);
const CAtcStation station = m_atcStationsOnline.findFirstByCallsign(callsign);
emit this->changedAtcStationOnlineConnectionStatus(station, true); // send when voice room url is available
vm.addValue(CAtcStation::IndexIsOnline, true); // with voice room ATC is online
this->updateBookedStation(callsign, vm);
// receiving voice room means ATC has voice
if (!trimmedUrl.isEmpty())
{
vm = CPropertyIndexVariantMap(CClient::IndexVoiceCapabilities, CVariant::from(CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Voice)));
this->updateOrAddClient(callsign, vm, false);
}
**/
}
void CAirspaceMonitor::onAtisLogoffTimeReceived(const CCallsign &callsign, const QString &zuluTime)

View File

@@ -177,7 +177,7 @@ namespace BlackCore
void CCoreFacade::initPostSetup(QMap<QString, int> &times)
{
bool c = false;
Q_UNUSED(c); // for release version
Q_UNUSED(c) // for release version
QTime time;
time.start();

View File

@@ -164,15 +164,15 @@ namespace BlackCore
static void registerMetadata();
private:
bool m_initalized = false; //!< flag if already initialized
bool m_shuttingDown = false; //!< flag if shutting down
bool m_initalized = false; //!< flag if already initialized
bool m_shuttingDown = false; //!< flag if shutting down
const CCoreFacadeConfig m_config; //!< used config
BlackMisc::CData<Data::TLauncherSetup> m_launcherSetup { this }; //!< updating DBus
// DBus
BlackMisc::CDBusServer *m_dbusServer = nullptr;
bool m_initDBusConnection = false;
QDBusConnection m_dbusConnection { "default" };
bool m_initDBusConnection = false;
QDBusConnection m_dbusConnection { "default" };
// contexts:
// There is a reason why we do not use smart pointers here. When the context is deleted

View File

@@ -37,7 +37,7 @@ namespace BlackCore
ContextMode m_ownAircraft;
ContextMode m_settings;
ContextMode m_simulator;
QString m_dbusAddress; //!< for boot strapping
QString m_dbusAddress; //!< for boot strapping
public:
//! Constructor
@@ -53,25 +53,25 @@ namespace BlackCore
{}
//! application mode
ContextMode getModeApplication() const { return this->m_application; }
ContextMode getModeApplication() const { return m_application; }
//! audio mode
ContextMode getModeAudio() const { return this->m_audio; }
ContextMode getModeAudio() const { return m_audio; }
//! network mode
ContextMode getModeNetwork() const { return this->m_network; }
ContextMode getModeNetwork() const { return m_network; }
//! own aircraft
ContextMode getModeOwnAircraft() const { return this->m_ownAircraft; }
ContextMode getModeOwnAircraft() const { return m_ownAircraft; }
//! settings mode
ContextMode getModeSettings() const { return this->m_settings; }
ContextMode getModeSettings() const { return m_settings; }
//! simulator mode
ContextMode getModeSimulator() const { return this->m_simulator; }
ContextMode getModeSimulator() const { return m_simulator; }
//! local settings?
bool hasLocalSettings() const { return this->m_settings == Local || this->m_settings == LocalInDBusServer; }
bool hasLocalSettings() const { return m_settings == Local || m_settings == LocalInDBusServer; }
//! requires server (at least one in server)?
bool requiresDBusSever() const;
@@ -80,10 +80,10 @@ namespace BlackCore
bool requiresDBusConnection() const;
//! DBus address
QString getDBusAddress() const { return this->m_dbusAddress; }
QString getDBusAddress() const { return m_dbusAddress; }
//! DBus address?
bool hasDBusAddress() const { return !this->m_dbusAddress.isEmpty(); }
bool hasDBusAddress() const { return !m_dbusAddress.isEmpty(); }
//! Any context in given mode
bool any(ContextMode mode) const;