From f8c64c0296a75cf6267e296e8a6a0cbb5546e0a0 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 6 Jul 2018 21:25:59 +0200 Subject: [PATCH] Ref T268, proxy style --- .../xplane/xswiftbustrafficproxy.cpp | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp index 8b7b3cce8..1e4d2c81d 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp @@ -119,11 +119,11 @@ namespace BlackSimPlugin QDBusPendingReply, QList, QList, QList> reply = *watcher; if (!reply.isError()) { - QStringList callsigns = reply.argumentAt<0>(); - QList latitudesDeg = reply.argumentAt<1>(); - QList longitudesDeg = reply.argumentAt<2>(); - QList elevationsM = reply.argumentAt<3>(); - QList verticalOffsets = reply.argumentAt<4>(); + const QStringList callsigns = reply.argumentAt<0>(); + const QList latitudesDeg = reply.argumentAt<1>(); + const QList longitudesDeg = reply.argumentAt<2>(); + const QList elevationsM = reply.argumentAt<3>(); + const QList verticalOffsets = reply.argumentAt<4>(); setter(callsigns, latitudesDeg, longitudesDeg, elevationsM, verticalOffsets); } watcher->deleteLater(); @@ -139,14 +139,12 @@ namespace BlackSimPlugin QDBusPendingReply reply = *watcher; if (!reply.isError()) { - CCallsign cs(reply.argumentAt<0>()); - double elevationMeters = reply.argumentAt<1>(); - CAltitude elevationAlt(elevationMeters, CLengthUnit::m()); - elevationAlt.switchUnit(CLengthUnit::ft()); - CElevationPlane elevation(CLatitude(latitude, CAngleUnit::deg()), - CLongitude(longitude, CAngleUnit::deg()), - elevationAlt); - elevation.setSinglePointRadius(); + const CCallsign cs(reply.argumentAt<0>()); + const double elevationMeters = reply.argumentAt<1>(); + const CAltitude elevationAlt(elevationMeters, CLengthUnit::m(), CLengthUnit::ft()); + const CElevationPlane elevation(CLatitude(latitude, CAngleUnit::deg()), + CLongitude(longitude, CAngleUnit::deg()), + elevationAlt, CElevationPlane::singlePointRadius()); setter(elevation, cs); } watcher->deleteLater();