project and code changes to rename Airmap/qt dir to Airmap/services

qgroundcontrol.pro

@@ -1334,7 +1334,7 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
 
     INCLUDEPATH += \
         src/Airmap \
-        src/Airmap/qt
+        src/Airmap/services
 
     HEADERS += \
         src/Airmap/AirMapAdvisoryManager.h \
@@ -1350,21 +1350,21 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
         src/Airmap/AirMapVehicleManager.h \
         src/Airmap/AirMapWeatherInfoManager.h \
         src/Airmap/LifetimeChecker.h \
-        src/Airmap/qt/advisory.h \
-        src/Airmap/qt/aircrafts.h \
-        src/Airmap/qt/airspaces.h \
-        src/Airmap/qt/authenticator.h \
-        src/Airmap/qt/client.h \
-        src/Airmap/qt/dispatcher.h \
-        src/Airmap/qt/flight_plans.h \
-        src/Airmap/qt/flights.h \
-        src/Airmap/qt/logger.h \
-        src/Airmap/qt/pilots.h \
-        src/Airmap/qt/rulesets.h \
-        src/Airmap/qt/status.h \
-        src/Airmap/qt/telemetry.h \
-        src/Airmap/qt/traffic.h \
-        src/Airmap/qt/types.h \
+        src/Airmap/services/advisory.h \
+        src/Airmap/services/aircrafts.h \
+        src/Airmap/services/airspaces.h \
+        src/Airmap/services/authenticator.h \
+        src/Airmap/services/client.h \
+        src/Airmap/services/dispatcher.h \
+        src/Airmap/services/flight_plans.h \
+        src/Airmap/services/flights.h \
+        src/Airmap/services/logger.h \
+        src/Airmap/services/pilots.h \
+        src/Airmap/services/rulesets.h \
+        src/Airmap/services/status.h \
+        src/Airmap/services/telemetry.h \
+        src/Airmap/services/traffic.h \
+        src/Airmap/services/types.h \
 
     SOURCES += \
         src/Airmap/AirMapAdvisoryManager.cc \
@@ -1379,21 +1379,21 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
         src/Airmap/AirMapTrafficMonitor.cc \
         src/Airmap/AirMapVehicleManager.cc \
         src/Airmap/AirMapWeatherInfoManager.cc \
-        src/Airmap/qt/advisory.cpp \
-        src/Airmap/qt/aircrafts.cpp \
-        src/Airmap/qt/airspaces.cpp \
-        src/Airmap/qt/authenticator.cpp \
-        src/Airmap/qt/client.cpp \
-        src/Airmap/qt/dispatcher.cpp \
-        src/Airmap/qt/flight_plans.cpp \
-        src/Airmap/qt/flights.cpp \
-        src/Airmap/qt/logger.cpp \
-        src/Airmap/qt/pilots.cpp \
-        src/Airmap/qt/rulesets.cpp \
-        src/Airmap/qt/status.cpp \
-        src/Airmap/qt/telemetry.cpp \
-        src/Airmap/qt/traffic.cpp \
-        src/Airmap/qt/types.cpp \
+        src/Airmap/services/advisory.cpp \
+        src/Airmap/services/aircrafts.cpp \
+        src/Airmap/services/airspaces.cpp \
+        src/Airmap/services/authenticator.cpp \
+        src/Airmap/services/client.cpp \
+        src/Airmap/services/dispatcher.cpp \
+        src/Airmap/services/flight_plans.cpp \
+        src/Airmap/services/flights.cpp \
+        src/Airmap/services/logger.cpp \
+        src/Airmap/services/pilots.cpp \
+        src/Airmap/services/rulesets.cpp \
+        src/Airmap/services/status.cpp \
+        src/Airmap/services/telemetry.cpp \
+        src/Airmap/services/traffic.cpp \
+        src/Airmap/services/types.cpp \
 
     #-- Do we have an API key?
     exists(src/Airmap/Airmap_api_key.h) {

src/Airmap/AirMapManager.h

@@ -13,8 +13,8 @@
 #include "AirspaceManager.h"
 #include "QGCLoggingCategory.h"
 
-#include <Airmap/qt/logger.h>
-#include <Airmap/qt/types.h>
+#include <Airmap/services/logger.h>
+#include <Airmap/services/types.h>
 
 #include <memory>
 

src/Airmap/AirMapSharedState.h

@@ -14,7 +14,7 @@
 
 #include "AirspaceManager.h"
 
-#include <Airmap/qt/client.h>
+#include <Airmap/services/client.h>
 
 /**
  * @class AirMapSharedState

src/Airmap/services/advisory.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/advisory.h>
+#include <Airmap/services/advisory.h>
 
 std::shared_ptr<airmap::qt::Advisory> airmap::qt::Advisory::create(const std::shared_ptr<Dispatcher>& dispatcher,
                                                                    const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/aircrafts.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/aircrafts.h>
+#include <Airmap/services/aircrafts.h>
 
 std::shared_ptr<airmap::qt::Aircrafts> airmap::qt::Aircrafts::create(const std::shared_ptr<Dispatcher>& dispatcher,
                                                                      const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/aircrafts.h

@@ -3,7 +3,7 @@
 
 #include <airmap/aircrafts.h>
 #include <airmap/client.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <memory>
 #include <string>

src/Airmap/services/airspaces.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/airspaces.h>
+#include <Airmap/services/airspaces.h>
 
 std::shared_ptr<airmap::qt::Airspaces> airmap::qt::Airspaces::create(const std::shared_ptr<Dispatcher>& dispatcher,
                                                                      const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/airspaces.h

@@ -3,7 +3,7 @@
 
 #include <airmap/airspaces.h>
 #include <airmap/client.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <memory>
 

src/Airmap/services/authenticator.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/authenticator.h>
+#include <Airmap/services/authenticator.h>
 
 std::shared_ptr<airmap::qt::Authenticator> airmap::qt::Authenticator::create(
     const std::shared_ptr<Dispatcher>& dispatcher, const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/authenticator.h

@@ -3,7 +3,7 @@
 
 #include <airmap/authenticator.h>
 #include <airmap/client.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <memory>
 

src/Airmap/services/client.cpp

@@ -1,19 +1,19 @@
-#include <Airmap/qt/client.h>
-
-#include <Airmap/qt/dispatcher.h>
-
-#include <Airmap/qt/advisory.h>
-#include <Airmap/qt/aircrafts.h>
-#include <Airmap/qt/airspaces.h>
-#include <Airmap/qt/authenticator.h>
-#include <Airmap/qt/flight_plans.h>
-#include <Airmap/qt/flights.h>
-#include <Airmap/qt/pilots.h>
-#include <Airmap/qt/rulesets.h>
-#include <Airmap/qt/status.h>
-#include <Airmap/qt/telemetry.h>
-#include <Airmap/qt/traffic.h>
-#include <Airmap/qt/types.h>
+#include <Airmap/services/client.h>
+
+#include <Airmap/services/dispatcher.h>
+
+#include <Airmap/services/advisory.h>
+#include <Airmap/services/aircrafts.h>
+#include <Airmap/services/airspaces.h>
+#include <Airmap/services/authenticator.h>
+#include <Airmap/services/flight_plans.h>
+#include <Airmap/services/flights.h>
+#include <Airmap/services/pilots.h>
+#include <Airmap/services/rulesets.h>
+#include <Airmap/services/status.h>
+#include <Airmap/services/telemetry.h>
+#include <Airmap/services/traffic.h>
+#include <Airmap/services/types.h>
 
 #include <memory>
 #include <thread>

src/Airmap/services/dispatcher.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <QCoreApplication>
 #include <QThread>

src/Airmap/services/flight_plans.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/flight_plans.h>
+#include <Airmap/services/flight_plans.h>
 
 std::shared_ptr<airmap::qt::FlightPlans> airmap::qt::FlightPlans::create(
     const std::shared_ptr<Dispatcher>& dispatcher, const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/flight_plans.h

@@ -3,7 +3,7 @@
 
 #include <airmap/client.h>
 #include <airmap/flight_plans.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <memory>
 

src/Airmap/services/flights.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/flights.h>
+#include <Airmap/services/flights.h>
 
 std::shared_ptr<airmap::qt::Flights> airmap::qt::Flights::create(const std::shared_ptr<Dispatcher>& dispatcher,
                                                                  const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/flights.h

@@ -3,7 +3,7 @@
 
 #include <airmap/client.h>
 #include <airmap/flights.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <memory>
 

src/Airmap/services/logger.cpp

@@ -1,6 +1,6 @@
-#include <Airmap/qt/logger.h>
+#include <Airmap/services/logger.h>
 
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 struct airmap::qt::Logger::Private {
   QLoggingCategory logging_category{"airmap"};

src/Airmap/services/pilots.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/pilots.h>
+#include <Airmap/services/pilots.h>
 
 std::shared_ptr<airmap::qt::Pilots> airmap::qt::Pilots::create(const std::shared_ptr<Dispatcher>& dispatcher,
                                                                const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/pilots.h

@@ -4,7 +4,7 @@
 #include <airmap/pilots.h>
 
 #include <airmap/pilots.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <memory>
 

src/Airmap/services/rulesets.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/rulesets.h>
+#include <Airmap/services/rulesets.h>
 
 std::shared_ptr<airmap::qt::RuleSets> airmap::qt::RuleSets::create(const std::shared_ptr<Dispatcher>& dispatcher,
                                                                    const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/rulesets.h

@@ -2,7 +2,7 @@
 #define AIRMAP_QT_RULESETS_H_
 
 #include <airmap/client.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 #include <airmap/rulesets.h>
 
 namespace airmap {

src/Airmap/services/status.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/status.h>
+#include <Airmap/services/status.h>
 
 std::shared_ptr<airmap::qt::Status> airmap::qt::Status::create(const std::shared_ptr<Dispatcher>& dispatcher,
                                                                const std::shared_ptr<airmap::Client>& client) {

src/Airmap/services/status.h

@@ -2,7 +2,7 @@
 #define AIRMAP_QT_STATUS_H_
 
 #include <airmap/client.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 #include <airmap/status.h>
 
 #include <memory>

src/Airmap/services/telemetry.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/telemetry.h>
+#include <Airmap/services/telemetry.h>
 
 #include <airmap/flight.h>
 

src/Airmap/services/telemetry.h

@@ -2,7 +2,7 @@
 #define AIRMAP_QT_TELEMETRY_H_
 
 #include <airmap/client.h>
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 #include <airmap/telemetry.h>
 
 #include <memory>

src/Airmap/services/traffic.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/traffic.h>
+#include <Airmap/services/traffic.h>
 
 std::shared_ptr<airmap::qt::Traffic::Monitor> airmap::qt::Traffic::Monitor::create(
     const std::shared_ptr<Dispatcher>& dispatcher, const std::shared_ptr<airmap::Traffic::Monitor>& native) {

src/Airmap/services/traffic.h

@@ -3,7 +3,7 @@
 
 #include <airmap/traffic.h>
 
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <memory>
 #include <set>

src/Airmap/services/types.cpp

@@ -1,4 +1,4 @@
-#include <Airmap/qt/types.h>
+#include <Airmap/services/types.h>
 
 namespace {