From 14fb35a975d82e63512045eace7ab5067f37c66a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 5 Feb 2018 01:37:39 +0100 Subject: [PATCH] Formatting --- src/blackmisc/geo/elevationplane.cpp | 2 +- src/plugins/simulator/xplane/xswiftbusserviceproxy.h | 3 --- src/xswiftbus/traffic.cpp | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/blackmisc/geo/elevationplane.cpp b/src/blackmisc/geo/elevationplane.cpp index 8ece8c3ca..d05176f5c 100644 --- a/src/blackmisc/geo/elevationplane.cpp +++ b/src/blackmisc/geo/elevationplane.cpp @@ -50,7 +50,7 @@ namespace BlackMisc { if (coordinate.isNull()) { return false; } if (radius.isNull()) { return false; } - if (isNull()) { return false; } + if (this->isNull()) { return false; } const CLength d = this->calculateGreatCircleDistance(coordinate); const bool inRange = (radius >= d); return inRange; diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h index f954e1643..f16a6056e 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h @@ -12,8 +12,6 @@ #ifndef BLACKSIMPLUGIN_XSWIFTBUS_SERVICE_PROXY_H #define BLACKSIMPLUGIN_XSWIFTBUS_SERVICE_PROXY_H - - #include "blackmisc/genericdbusinterface.h" #include @@ -36,7 +34,6 @@ namespace BlackSimPlugin { namespace XPlane { - /*! * Proxy object connected to a real XSwiftBus::CService object via DBus */ diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index 116db35c2..9d48ca787 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -243,9 +243,10 @@ namespace XSwiftBus { using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; + using namespace BlackMisc::Geo; CAircraftSituation situation( callsign, - BlackMisc::Geo::CCoordinateGeodetic(latitude, longitude, altitude), + CCoordinateGeodetic(latitude, longitude, altitude), CHeading(heading, CHeading::True, CAngleUnit::deg()), CAngle(pitch, CAngleUnit::deg()), CAngle(roll, CAngleUnit::deg()),