From e53690ba2a8e2f54acb65139bb9ed176d3362019 Mon Sep 17 00:00:00 2001
From: jennerl <jenner@airmap.com>
Date: Thu, 15 Apr 2021 15:42:13 -0500
Subject: [PATCH] project and code changes to rename Airmap/qt dir to
 Airmap/services

---
 qgroundcontrol.pro                    | 62 +++++++++++++++++------------------
 src/Airmap/AirMapManager.h            |  4 +--
 src/Airmap/AirMapSharedState.h        |  2 +-
 src/Airmap/services/advisory.cpp      |  2 +-
 src/Airmap/services/aircrafts.cpp     |  2 +-
 src/Airmap/services/aircrafts.h       |  2 +-
 src/Airmap/services/airspaces.cpp     |  2 +-
 src/Airmap/services/airspaces.h       |  2 +-
 src/Airmap/services/authenticator.cpp |  2 +-
 src/Airmap/services/authenticator.h   |  2 +-
 src/Airmap/services/client.cpp        | 32 +++++++++---------
 src/Airmap/services/dispatcher.cpp    |  2 +-
 src/Airmap/services/flight_plans.cpp  |  2 +-
 src/Airmap/services/flight_plans.h    |  2 +-
 src/Airmap/services/flights.cpp       |  2 +-
 src/Airmap/services/flights.h         |  2 +-
 src/Airmap/services/logger.cpp        |  4 +--
 src/Airmap/services/pilots.cpp        |  2 +-
 src/Airmap/services/pilots.h          |  2 +-
 src/Airmap/services/rulesets.cpp      |  2 +-
 src/Airmap/services/rulesets.h        |  2 +-
 src/Airmap/services/status.cpp        |  2 +-
 src/Airmap/services/status.h          |  2 +-
 src/Airmap/services/telemetry.cpp     |  2 +-
 src/Airmap/services/telemetry.h       |  2 +-
 src/Airmap/services/traffic.cpp       |  2 +-
 src/Airmap/services/traffic.h         |  2 +-
 src/Airmap/services/types.cpp         |  2 +-
 28 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 4d0b61c..d3baa43 100644
--- a/qgroundcontrol.pro
+++ b/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) {
diff --git a/src/Airmap/AirMapManager.h b/src/Airmap/AirMapManager.h
index bc5c653..99af59b 100644
--- a/src/Airmap/AirMapManager.h
+++ b/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>
 
diff --git a/src/Airmap/AirMapSharedState.h b/src/Airmap/AirMapSharedState.h
index e2cfc6c..7269b84 100644
--- a/src/Airmap/AirMapSharedState.h
+++ b/src/Airmap/AirMapSharedState.h
@@ -14,7 +14,7 @@
 
 #include "AirspaceManager.h"
 
-#include <Airmap/qt/client.h>
+#include <Airmap/services/client.h>
 
 /**
  * @class AirMapSharedState
diff --git a/src/Airmap/services/advisory.cpp b/src/Airmap/services/advisory.cpp
index f0d548f..95745b7 100644
--- a/src/Airmap/services/advisory.cpp
+++ b/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) {
diff --git a/src/Airmap/services/aircrafts.cpp b/src/Airmap/services/aircrafts.cpp
index 1b8bd2f..428b50e 100644
--- a/src/Airmap/services/aircrafts.cpp
+++ b/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) {
diff --git a/src/Airmap/services/aircrafts.h b/src/Airmap/services/aircrafts.h
index 4bf8461..21231f9 100644
--- a/src/Airmap/services/aircrafts.h
+++ b/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>
diff --git a/src/Airmap/services/airspaces.cpp b/src/Airmap/services/airspaces.cpp
index 3915913..6958af6 100644
--- a/src/Airmap/services/airspaces.cpp
+++ b/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) {
diff --git a/src/Airmap/services/airspaces.h b/src/Airmap/services/airspaces.h
index 619b0df..38df223 100644
--- a/src/Airmap/services/airspaces.h
+++ b/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>
 
diff --git a/src/Airmap/services/authenticator.cpp b/src/Airmap/services/authenticator.cpp
index c715e21..e00054b 100644
--- a/src/Airmap/services/authenticator.cpp
+++ b/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) {
diff --git a/src/Airmap/services/authenticator.h b/src/Airmap/services/authenticator.h
index 729cb63..4b53de1 100644
--- a/src/Airmap/services/authenticator.h
+++ b/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>
 
diff --git a/src/Airmap/services/client.cpp b/src/Airmap/services/client.cpp
index c27814d..dca403f 100644
--- a/src/Airmap/services/client.cpp
+++ b/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>
diff --git a/src/Airmap/services/dispatcher.cpp b/src/Airmap/services/dispatcher.cpp
index 789d92d..772fec7 100644
--- a/src/Airmap/services/dispatcher.cpp
+++ b/src/Airmap/services/dispatcher.cpp
@@ -1,4 +1,4 @@
-#include <Airmap/qt/dispatcher.h>
+#include <Airmap/services/dispatcher.h>
 
 #include <QCoreApplication>
 #include <QThread>
diff --git a/src/Airmap/services/flight_plans.cpp b/src/Airmap/services/flight_plans.cpp
index 6f0a68a..9e9eb01 100644
--- a/src/Airmap/services/flight_plans.cpp
+++ b/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) {
diff --git a/src/Airmap/services/flight_plans.h b/src/Airmap/services/flight_plans.h
index 8e124f7..e3f764d 100644
--- a/src/Airmap/services/flight_plans.h
+++ b/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>
 
diff --git a/src/Airmap/services/flights.cpp b/src/Airmap/services/flights.cpp
index abdcc02..f2d18ef 100644
--- a/src/Airmap/services/flights.cpp
+++ b/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) {
diff --git a/src/Airmap/services/flights.h b/src/Airmap/services/flights.h
index c03d1e4..194fc96 100644
--- a/src/Airmap/services/flights.h
+++ b/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>
 
diff --git a/src/Airmap/services/logger.cpp b/src/Airmap/services/logger.cpp
index b4c7678..29b6f42 100644
--- a/src/Airmap/services/logger.cpp
+++ b/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"};
diff --git a/src/Airmap/services/pilots.cpp b/src/Airmap/services/pilots.cpp
index 1971f3d..904e9ac 100644
--- a/src/Airmap/services/pilots.cpp
+++ b/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) {
diff --git a/src/Airmap/services/pilots.h b/src/Airmap/services/pilots.h
index 37c97ad..5067f99 100644
--- a/src/Airmap/services/pilots.h
+++ b/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>
 
diff --git a/src/Airmap/services/rulesets.cpp b/src/Airmap/services/rulesets.cpp
index f08104d..16a4ed5 100644
--- a/src/Airmap/services/rulesets.cpp
+++ b/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) {
diff --git a/src/Airmap/services/rulesets.h b/src/Airmap/services/rulesets.h
index 613ec7f..8d098d2 100644
--- a/src/Airmap/services/rulesets.h
+++ b/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 {
diff --git a/src/Airmap/services/status.cpp b/src/Airmap/services/status.cpp
index da2a58b..cda0587 100644
--- a/src/Airmap/services/status.cpp
+++ b/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) {
diff --git a/src/Airmap/services/status.h b/src/Airmap/services/status.h
index 6b8138e..b0393e4 100644
--- a/src/Airmap/services/status.h
+++ b/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>
diff --git a/src/Airmap/services/telemetry.cpp b/src/Airmap/services/telemetry.cpp
index ca565c9..ffb3eb1 100644
--- a/src/Airmap/services/telemetry.cpp
+++ b/src/Airmap/services/telemetry.cpp
@@ -1,4 +1,4 @@
-#include <Airmap/qt/telemetry.h>
+#include <Airmap/services/telemetry.h>
 
 #include <airmap/flight.h>
 
diff --git a/src/Airmap/services/telemetry.h b/src/Airmap/services/telemetry.h
index 13a5e9a..acb5ea8 100644
--- a/src/Airmap/services/telemetry.h
+++ b/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>
diff --git a/src/Airmap/services/traffic.cpp b/src/Airmap/services/traffic.cpp
index 6281ef7..ab60954 100644
--- a/src/Airmap/services/traffic.cpp
+++ b/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) {
diff --git a/src/Airmap/services/traffic.h b/src/Airmap/services/traffic.h
index e4fa980..ca9f915 100644
--- a/src/Airmap/services/traffic.h
+++ b/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>
diff --git a/src/Airmap/services/types.cpp b/src/Airmap/services/types.cpp
index 90e5f23..14721ba 100644
--- a/src/Airmap/services/types.cpp
+++ b/src/Airmap/services/types.cpp
@@ -1,4 +1,4 @@
-#include <Airmap/qt/types.h>
+#include <Airmap/services/types.h>
 
 namespace {