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

refs #315 Style

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-08-19 21:54:23 +01:00
parent 96ca38a3db
commit f311582c28
11 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/context_runtime.cpp
View File

@@ -305,7 +305,6 @@ namespace BlackCore
this->connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, &CRuntime::gracefulShutdown);
// upfront reading of settings, as DBus server already relies on settings
CContextSettings *settings = nullptr;
QString dbusAddress;
QMap<QString, int> times;
QTime time;
@@ -316,7 +315,7 @@ namespace BlackCore
if (config.hasDBusAddress()) dbusAddress = config.getDBusAddress(); // bootstrap / explicit
if (config.hasLocalSettings())
{
settings = new CContextSettings(config.getModeSettings(), this);
auto *settings = new CContextSettings(config.getModeSettings(), this);
if (settings) settings->read();
if (dbusAddress.isEmpty()) dbusAddress = settings->getNetworkSettings().getDBusServerAddress();
@@ -396,7 +395,7 @@ namespace BlackCore
void CRuntime::initPostSetup()
{
bool c;
bool c = false;
Q_UNUSED(c); // for release version
if (this->m_contextSettings && this->m_contextApplication)
@@ -548,11 +547,9 @@ namespace BlackCore
void CRuntime::disconnectLogSignals(const QString &name)
{
if (!this->m_logSignalConnections.contains(name)) return;
QMultiMap<QString, QMetaObject::Connection>::const_iterator i = this->m_logSignalConnections.constFind(name);
while (i != this->m_logSignalConnections.end() && i.key() == name)
for (auto i = this->m_logSignalConnections.lowerBound(name), end = this->m_logSignalConnections.upperBound(name); i != end; ++i)
{
disconnect(i.value());
++i;
}
this->m_logSignalConnections.remove(name);
}