From 11187870de849f5203a480463267d139502d2718 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 9 Nov 2019 15:10:29 +0100 Subject: [PATCH] Fixed missing compare index, message placeholder, and minor style fixes --- .../afv/connection/clientconnection.cpp | 2 +- src/blackcore/simulator.cpp | 4 +- .../simulation/simulatedaircraft.cpp | 51 ++++++++++--------- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/blackcore/afv/connection/clientconnection.cpp b/src/blackcore/afv/connection/clientconnection.cpp index d63a1f363..0fb9b0b23 100644 --- a/src/blackcore/afv/connection/clientconnection.cpp +++ b/src/blackcore/afv/connection/clientconnection.cpp @@ -125,7 +125,7 @@ namespace BlackCore m_udpSocket->bind(localAddress); m_voiceServerTimer->start(3000); - CLogMessage(this).info(u"Connected to voice server '%2'") << m_connection.getTokens().VoiceServer.addressIpV4; + CLogMessage(this).info(u"Connected to voice server '%1'") << m_connection.getTokens().VoiceServer.addressIpV4; } void CClientConnection::disconnectFromVoiceServer() diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index e0f66a1dd..e5eed695f 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -1236,14 +1236,14 @@ namespace BlackCore void ISimulator::rapOnRecalculatedRenderedAircraft(const CAirspaceAircraftSnapshot &snapshot) { - if (!this->isConnected()) { return; } + if (!this->isConnected()) { return; } if (this->isShuttingDown()) { return; } this->onRecalculatedRenderedAircraft(snapshot); } void ISimulator::rapOnRemoteProviderRemovedAircraft(const CCallsign &callsign) { - Q_UNUSED(callsign); + Q_UNUSED(callsign) // currently not used, the calls are handled by context call logicallyRemoveRemoteAircraft } diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index 98d7f3cce..dfc4685c7 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -345,16 +345,16 @@ namespace BlackMisc case IndexNetworkModelAircraftIcaoDifference: return this->getNetworkModelAircraftIcaoDifference(); case IndexNetworkModelAirlineIcaoDifference: return this->getNetworkModelAirlineIcaoDifference(); case IndexNetworkModelLiveryDifference: return this->getNetworkModelLiveryDifference(); - case IndexEnabled: return CVariant::fromValue(this->isEnabled()); + case IndexEnabled: return CVariant::fromValue(this->isEnabled()); case IndexRendered: return CVariant::fromValue(this->isRendered()); case IndexPartsSynchronized: return CVariant::fromValue(this->isPartsSynchronized()); case IndexFastPositionUpdates: return CVariant::fromValue(this->fastPositionUpdates()); case IndexSupportsGndFlag: return CVariant::fromValue(this->isSupportingGndFlag()); case IndexCallsign: return m_callsign.propertyByIndex(index.copyFrontRemoved()); - case IndexPilot: return m_pilot.propertyByIndex(index.copyFrontRemoved()); + case IndexPilot: return m_pilot.propertyByIndex(index.copyFrontRemoved()); case IndexRelativeDistance: return m_relativeDistance.propertyByIndex(index.copyFrontRemoved()); - case IndexCom1System: return m_com1system.propertyByIndex(index.copyFrontRemoved()); - case IndexCom2System: return m_com2system.propertyByIndex(index.copyFrontRemoved()); + case IndexCom1System: return m_com1system.propertyByIndex(index.copyFrontRemoved()); + case IndexCom2System: return m_com2system.propertyByIndex(index.copyFrontRemoved()); case IndexTransponder: return m_transponder.propertyByIndex(index.copyFrontRemoved()); case IndexSituation: return m_situation.propertyByIndex(index.copyFrontRemoved()); case IndexAircraftIcaoCode: return this->getAircraftIcaoCode().propertyByIndex(index.copyFrontRemoved()); @@ -379,17 +379,17 @@ namespace BlackMisc case IndexCallsign: m_callsign.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexPilot: m_pilot.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexRelativeDistance: m_relativeDistance.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexCom1System: m_com1system.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexCom2System: m_com2system.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexTransponder: m_transponder.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexSituation: m_situation.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexParts: m_parts.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexCom1System: m_com1system.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexCom2System: m_com2system.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexTransponder: m_transponder.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexSituation: m_situation.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexParts: m_parts.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexNetworkModel: m_models[NetworkModel].setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexEnabled: m_enabled = variant.toBool(); break; - case IndexRendered: m_rendered = variant.toBool(); break; - case IndexPartsSynchronized: m_partsSynchronized = variant.toBool(); break; + case IndexEnabled: m_enabled = variant.toBool(); break; + case IndexRendered: m_rendered = variant.toBool(); break; + case IndexPartsSynchronized: m_partsSynchronized = variant.toBool(); break; case IndexFastPositionUpdates: m_fastPositionUpdates = variant.toBool(); break; - case IndexSupportsGndFlag: m_supportsGndFlag = variant.toBool(); break; + case IndexSupportsGndFlag: m_supportsGndFlag = variant.toBool(); break; case IndexLivery: Q_ASSERT_X(false, Q_FUNC_INFO, "Unsupported"); break; case IndexModel: m_models[CurrentModel].setPropertyByIndex(index.copyFrontRemoved(), variant); @@ -414,24 +414,25 @@ namespace BlackMisc const ColumnIndex i = index.frontCasted(); switch (i) { - case IndexCallsign: return m_callsign.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCallsign()); - case IndexPilot: return m_pilot.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getPilot()); + case IndexCallsign: return m_callsign.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCallsign()); + case IndexPilot: return m_pilot.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getPilot()); case IndexSituation: return m_situation.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getSituation()); case IndexRelativeDistance: return m_relativeDistance.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getRelativeDistance()); - case IndexCom1System: return m_com1system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom1System()); - case IndexCom2System: return m_com2system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom2System()); + case IndexCom1System: return m_com1system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom1System()); + case IndexCom2System: return m_com2system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom2System()); case IndexTransponder: return Compare::compare(m_transponder.getTransponderCode(), compareValue.getTransponder().getTransponderCode()); case IndexLivery: return this->getLivery().comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getLivery()); - case IndexParts: return m_parts.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getParts()); - case IndexModel: return m_models[CurrentModel].comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getModel()); + case IndexParts: return m_parts.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getParts()); + case IndexModel: return m_models[CurrentModel].comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getModel()); case IndexNetworkModel: return m_models[NetworkModel].comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getModel()); case IndexNetworkModelAircraftIcaoDifference: return this->getNetworkModelAircraftIcaoDifference().compare(compareValue.getNetworkModelAircraftIcaoDifference()); - case IndexNetworkModelAirlineIcaoDifference: return this->getNetworkModelAirlineIcaoDifference().compare(compareValue.getNetworkModelAirlineIcaoDifference()); - case IndexNetworkModelLiveryDifference: return this->getNetworkModelLiveryDifference().compare(compareValue.getNetworkModelLiveryDifference()); - case IndexRendered: return Compare::compare(m_rendered, compareValue.isRendered()); - case IndexPartsSynchronized: return Compare::compare(m_partsSynchronized, compareValue.isPartsSynchronized()); - case IndexFastPositionUpdates: return Compare::compare(m_fastPositionUpdates, compareValue.fastPositionUpdates()); - case IndexSupportsGndFlag: return Compare::compare(m_supportsGndFlag, compareValue.isSupportingGndFlag()); + case IndexNetworkModelAirlineIcaoDifference: return this->getNetworkModelAirlineIcaoDifference().compare(compareValue.getNetworkModelAirlineIcaoDifference()); + case IndexNetworkModelLiveryDifference: return this->getNetworkModelLiveryDifference().compare(compareValue.getNetworkModelLiveryDifference()); + case IndexEnabled: return Compare::compare(this->isEnabled(), compareValue.isEnabled()); + case IndexRendered: return Compare::compare(this->isRendered(), compareValue.isRendered()); + case IndexPartsSynchronized: return Compare::compare(this->isPartsSynchronized(), compareValue.isPartsSynchronized()); + case IndexFastPositionUpdates: return Compare::compare(this->fastPositionUpdates(), compareValue.fastPositionUpdates()); + case IndexSupportsGndFlag: return Compare::compare(this->isSupportingGndFlag(), compareValue.isSupportingGndFlag()); case IndexCombinedIcaoLiveryString: return this->getCombinedIcaoLiveryString(false).compare(compareValue.getCombinedIcaoLiveryString(false)); case IndexCombinedIcaoLiveryStringNetworkModel: return this->getCombinedIcaoLiveryString(true).compare(compareValue.getCombinedIcaoLiveryString(true)); default: