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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2018-04-06 04:00:22 +02:00
committed by Roland Winklmeier
parent cd1ce37ec3
commit 0d76cc8d3e
5 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/vatsim/vatsimdatafilereader.cpp
View File

@@ -272,7 +272,7 @@ namespace BlackCore
const QMap<QString, QString> clientPartsMap = clientPartsToMap(currentLine, clientSectionAttributes); const QMap<QString, QString> clientPartsMap = clientPartsToMap(currentLine, clientSectionAttributes);
const CCallsign callsign = CCallsign(clientPartsMap["callsign"]); const CCallsign callsign = CCallsign(clientPartsMap["callsign"]);
if (callsign.isEmpty()) { break; } if (callsign.isEmpty()) { break; }
const BlackMisc::Network::CUser user(clientPartsMap["cid"], clientPartsMap["realname"], callsign); const CUser user(clientPartsMap["cid"], clientPartsMap["realname"], callsign);
const QString clientType = clientPartsMap["clienttype"].toLower(); const QString clientType = clientPartsMap["clienttype"].toLower();
if (clientType.isEmpty()) { break; } // sometimes type is empty if (clientType.isEmpty()) { break; } // sometimes type is empty
const double lat = clientPartsMap["latitude"].toDouble(); const double lat = clientPartsMap["latitude"].toDouble();
@@ -405,7 +405,7 @@ namespace BlackCore
// warnings, if required // warnings, if required
if (!illegalEquipmentCodes.isEmpty()) if (!illegalEquipmentCodes.isEmpty())
{ {
logInconsistentData( CVatsimDataFileReader::logInconsistentData(
CStatusMessage(this, CStatusMessage::SeverityInfo, "Illegal / ignored equipment code(s) in VATSIM data file: " + illegalEquipmentCodes.join(", ")) CStatusMessage(this, CStatusMessage::SeverityInfo, "Illegal / ignored equipment code(s) in VATSIM data file: " + illegalEquipmentCodes.join(", "))
); );
} }

2
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -169,7 +169,7 @@ namespace BlackMisc
//! Aircraft ICAO code //! Aircraft ICAO code
const Aviation::CAircraftIcaoCode &getAircraftIcaoCode() const { return m_aircraftIcao; } const Aviation::CAircraftIcaoCode &getAircraftIcaoCode() const { return m_aircraftIcao; }
//! \copydoc BlackMisc::Aviation::CAircraftIcaoCode::getEngineCount //! \copydoc BlackMisc::Aviation::CAircraftIcaoCode::getEnginesCount
int getEngineCount() const { return m_aircraftIcao.getEnginesCount(); } int getEngineCount() const { return m_aircraftIcao.getEnginesCount(); }
//! Aircraft ICAO code designator //! Aircraft ICAO code designator

4
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -875,9 +875,9 @@ namespace BlackSimPlugin
// create AI // create AI
bool adding = false; bool adding = false;
CSimulatedAircraft addedAircraft(newRemoteAircraft); const CSimulatedAircraft addedAircraft(newRemoteAircraft);
const SIMCONNECT_DATA_REQUEST_ID requestId = this->obtainRequestIdForSimData(); const SIMCONNECT_DATA_REQUEST_ID requestId = this->obtainRequestIdForSimData();
const SIMCONNECT_DATA_INITPOSITION initialPosition = aircraftSituationToFsxPosition(addedAircraft.getSituation()); const SIMCONNECT_DATA_INITPOSITION initialPosition = CSimulatorFsxCommon::aircraftSituationToFsxPosition(addedAircraft.getSituation());
const QString modelString(addedAircraft.getModelString()); const QString modelString(addedAircraft.getModelString());
if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("Cs: '%1' model: '%2' request: %3, init pos: %4").arg(callsign.toQString(), modelString).arg(requestId).arg(fsxPositionToString(initialPosition))); } if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("Cs: '%1' model: '%2' request: %3, init pos: %4").arg(callsign.toQString(), modelString).arg(requestId).arg(fsxPositionToString(initialPosition))); }

2
src/xswiftbus/dbusmessage.cpp
View File

@@ -116,7 +116,7 @@ namespace XSwiftBus
DBusMessageIter arrayIterator; DBusMessageIter arrayIterator;
dbus_message_iter_open_container(&m_messageIterator, DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE_AS_STRING, &arrayIterator); dbus_message_iter_open_container(&m_messageIterator, DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE_AS_STRING, &arrayIterator);
const double *ptr = array.data(); const double *ptr = array.data();
dbus_message_iter_append_fixed_array(&arrayIterator, DBUS_TYPE_DOUBLE, &ptr, array.size()); dbus_message_iter_append_fixed_array(&arrayIterator, DBUS_TYPE_DOUBLE, &ptr, static_cast<int>(array.size()));
dbus_message_iter_close_container(&m_messageIterator, &arrayIterator); dbus_message_iter_close_container(&m_messageIterator, &arrayIterator);
} }