From b5399649067823a1a55b514d4f089093f90e67bf Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 31 Jul 2019 16:48:21 +0200 Subject: [PATCH] Ref T709, style --- src/plugins/simulator/xplane/xswiftbustrafficproxy.h | 4 ++-- src/xswiftbus/traffic.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index 9e802ec4b..772b61ca3 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -54,14 +54,14 @@ namespace BlackSimPlugin return true; } - QStringList callsigns; //!< List of callsigns + QStringList callsigns; //!< List of callsigns QList latitudesDeg; //!< List of latitudes QList longitudesDeg; //!< List of longitudes QList altitudesFt; //!< List of altitudes QList pitchesDeg; //!< List of pitches QList rollsDeg; //!< List of rolls QList headingsDeg; //!< List of headings - QList onGrounds; //!< List of onGrounds + QList onGrounds; //!< List of onGrounds }; //! Planes surfaces diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index 1cd9f6171..abce1088b 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -216,7 +216,7 @@ namespace XSwiftBus { if (strcmp(section, "planes") == 0 && strcmp(name, "max_full_count") == 0) { - return s_settingsProvider->getSettings().getMaxPlanes(); + return CTraffic::s_settingsProvider->getSettings().getMaxPlanes(); // preferences } else if (strcmp(section, "debug") == 0 && strcmp(name, "allow_obj8_async_load") == 0) { @@ -231,7 +231,7 @@ namespace XSwiftBus { if (strcmp(section, "planes") == 0 && strcmp(name, "full_distance") == 0) { - return static_cast(s_settingsProvider->getSettings().getMaxDrawDistanceNM()); + return static_cast(CTraffic::s_settingsProvider->getSettings().getMaxDrawDistanceNM()); // preferences } return def; } @@ -906,7 +906,7 @@ namespace XSwiftBus // Now calculate where the camera should be positioned to be x // meters from the plane and pointing at the plane at the pitch and // heading we wanted above. - const double distanceMeterM = static_cast(std::max(10, s_settingsProvider->getSettings().getFollowAircraftDistanceM())); + const double distanceMeterM = static_cast(std::max(10, traffic->getSettings().getFollowAircraftDistanceM())); static const double PI = std::acos(-1); traffic->m_deltaCameraPosition.dx = -distanceMeterM * sin(traffic->m_deltaCameraPosition.heading * PI / 180.0); traffic->m_deltaCameraPosition.dz = distanceMeterM * cos(traffic->m_deltaCameraPosition.heading * PI / 180.0);