flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-10 14:07:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T778, style

Browse Source
This commit is contained in:
Klaus Basan
2020-04-11 04:48:24 +02:00
committed by Mat Sutcliffe
parent 12403700ea
commit b5d100b71b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/orderable.cpp
View File

@@ -81,7 +81,7 @@ namespace BlackMisc
int IOrderable::comparePropertyByIndex(const CPropertyIndex &index, const IOrderable &compareValue) const int IOrderable::comparePropertyByIndex(const CPropertyIndex &index, const IOrderable &compareValue) const
{ {
Q_UNUSED(index); Q_UNUSED(index)
static const int max = std::numeric_limits<int>::max(); static const int max = std::numeric_limits<int>::max();
const int o1 = this->hasValidOrder() ? this->getOrder() : max; const int o1 = this->hasValidOrder() ? this->getOrder() : max;
const int o2 = compareValue.hasValidOrder() ? compareValue.getOrder() : max; const int o2 = compareValue.hasValidOrder() ? compareValue.getOrder() : max;

8
src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp
View File

@@ -56,7 +56,7 @@ namespace BlackSimPlugin
reply.waitForFinished(); reply.waitForFinished();
if (reply.isError()) if (reply.isError())
{ {
BlackMisc::CLogMessage(this).debug(u"CXSwiftBusTrafficProxy::acquireMultiplayerPlanes returned: %1") << reply.error().message(); CLogMessage(this).debug(u"CXSwiftBusTrafficProxy::acquireMultiplayerPlanes returned: %1") << reply.error().message();
} }
MultiplayerAcquireInfo info; MultiplayerAcquireInfo info;
info.hasAcquired = reply.argumentAt<0>(); info.hasAcquired = reply.argumentAt<0>();
@@ -180,10 +180,10 @@ namespace BlackSimPlugin
if (!reply.isError()) if (!reply.isError())
{ {
const CCallsign cs(reply.argumentAt<0>()); const CCallsign cs(reply.argumentAt<0>());
const double elevationMeters = reply.argumentAt<1>(); const double elevationMeters = reply.argumentAt<1>();
const double latitudeDegrees = reply.argumentAt<2>(); const double latitudeDegrees = reply.argumentAt<2>();
const double longitudeDegrees = reply.argumentAt<3>(); const double longitudeDegrees = reply.argumentAt<3>();
const CAltitude elevationAlt = std::isnan(elevationMeters) ? CAltitude::null() : CAltitude(elevationMeters, CLengthUnit::m(), CLengthUnit::ft()); const CAltitude elevationAlt = std::isnan(elevationMeters) ? CAltitude::null() : CAltitude(elevationMeters, CLengthUnit::m(), CLengthUnit::ft());
const CElevationPlane elevation(CLatitude(latitudeDegrees, CAngleUnit::deg()), const CElevationPlane elevation(CLatitude(latitudeDegrees, CAngleUnit::deg()),
CLongitude(longitudeDegrees, CAngleUnit::deg()), CLongitude(longitudeDegrees, CAngleUnit::deg()),
elevationAlt, CElevationPlane::singlePointRadius()); elevationAlt, CElevationPlane::singlePointRadius());

6
src/xswiftbus/traffic.cpp
View File

@@ -791,12 +791,12 @@ namespace XSwiftBus
} }
else if (message.getMethodName() == "getRemoteAircraftData") else if (message.getMethodName() == "getRemoteAircraftData")
{ {
std::vector<std::string> requestedcallsigns; std::vector<std::string> requestedCallsigns;
message.beginArgumentRead(); message.beginArgumentRead();
message.getArgument(requestedcallsigns); message.getArgument(requestedCallsigns);
queueDBusCall([ = ]() queueDBusCall([ = ]()
{ {
std::vector<std::string> callsigns = requestedcallsigns; std::vector<std::string> callsigns = requestedCallsigns;
std::vector<double> latitudesDeg; std::vector<double> latitudesDeg;
std::vector<double> longitudesDeg; std::vector<double> longitudesDeg;
std::vector<double> elevationsM; std::vector<double> elevationsM;