From 18409818cc62693f3dccf759a725b5f34689907e Mon Sep 17 00:00:00 2001 From: DoinLakeFlyer Date: Thu, 26 Mar 2020 17:31:19 -0700 Subject: [PATCH] Remove unnecessary includes of QGroundCotrolQmlGlobal.h --- src/MissionManager/CorridorScanComplexItem.cc | 2 +- src/MissionManager/FixedWingLandingComplexItem.cc | 1 - src/MissionManager/MissionCommandList.cc | 1 - src/MissionManager/MissionCommandTree.cc | 1 - src/MissionManager/MissionSettingsItem.cc | 1 - src/MissionManager/RallyPointController.cc | 5 ----- src/MissionManager/SurveyComplexItem.cc | 2 +- src/MissionManager/TransectStyleComplexItem.cc | 2 +- src/Vehicle/MultiVehicleManager.cc | 1 - src/Vehicle/Vehicle.cc | 1 - 10 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/MissionManager/CorridorScanComplexItem.cc b/src/MissionManager/CorridorScanComplexItem.cc index aa003ebc6..01a4b3c28 100644 --- a/src/MissionManager/CorridorScanComplexItem.cc +++ b/src/MissionManager/CorridorScanComplexItem.cc @@ -11,12 +11,12 @@ #include "JsonHelper.h" #include "MissionController.h" #include "QGCGeo.h" -#include "QGroundControlQmlGlobal.h" #include "QGCQGeoCoordinate.h" #include "SettingsManager.h" #include "AppSettings.h" #include "QGCQGeoCoordinate.h" #include "PlanMasterController.h" +#include "QGCApplication.h" #include diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc index d2f8256da..32db40605 100644 --- a/src/MissionManager/FixedWingLandingComplexItem.cc +++ b/src/MissionManager/FixedWingLandingComplexItem.cc @@ -11,7 +11,6 @@ #include "JsonHelper.h" #include "MissionController.h" #include "QGCGeo.h" -#include "QGroundControlQmlGlobal.h" #include "SimpleMissionItem.h" #include "PlanMasterController.h" diff --git a/src/MissionManager/MissionCommandList.cc b/src/MissionManager/MissionCommandList.cc index 2a33d3cec..f156212a4 100644 --- a/src/MissionManager/MissionCommandList.cc +++ b/src/MissionManager/MissionCommandList.cc @@ -12,7 +12,6 @@ #include "Vehicle.h" #include "FirmwarePluginManager.h" #include "QGCApplication.h" -#include "QGroundControlQmlGlobal.h" #include "JsonHelper.h" #include "MissionCommandUIInfo.h" diff --git a/src/MissionManager/MissionCommandTree.cc b/src/MissionManager/MissionCommandTree.cc index f7aa8bafa..bee62b823 100644 --- a/src/MissionManager/MissionCommandTree.cc +++ b/src/MissionManager/MissionCommandTree.cc @@ -14,7 +14,6 @@ #include "Vehicle.h" #include "FirmwarePluginManager.h" #include "QGCApplication.h" -#include "QGroundControlQmlGlobal.h" #include "MissionCommandUIInfo.h" #include "MissionCommandList.h" #include "SettingsManager.h" diff --git a/src/MissionManager/MissionSettingsItem.cc b/src/MissionManager/MissionSettingsItem.cc index 30c412489..4302a21ea 100644 --- a/src/MissionManager/MissionSettingsItem.cc +++ b/src/MissionManager/MissionSettingsItem.cc @@ -11,7 +11,6 @@ #include "JsonHelper.h" #include "MissionController.h" #include "QGCGeo.h" -#include "QGroundControlQmlGlobal.h" #include "SimpleMissionItem.h" #include "SettingsManager.h" #include "AppSettings.h" diff --git a/src/MissionManager/RallyPointController.cc b/src/MissionManager/RallyPointController.cc index 9a85904d0..77be14448 100644 --- a/src/MissionManager/RallyPointController.cc +++ b/src/MissionManager/RallyPointController.cc @@ -7,10 +7,6 @@ * ****************************************************************************/ - -/// @file -/// @author Don Gagne - #include "RallyPointController.h" #include "RallyPoint.h" #include "Vehicle.h" @@ -20,7 +16,6 @@ #include "ParameterManager.h" #include "JsonHelper.h" #include "SimpleMissionItem.h" -#include "QGroundControlQmlGlobal.h" #include "SettingsManager.h" #include "AppSettings.h" #include "PlanMasterController.h" diff --git a/src/MissionManager/SurveyComplexItem.cc b/src/MissionManager/SurveyComplexItem.cc index 60a2dd0cf..7232f759f 100644 --- a/src/MissionManager/SurveyComplexItem.cc +++ b/src/MissionManager/SurveyComplexItem.cc @@ -12,11 +12,11 @@ #include "JsonHelper.h" #include "MissionController.h" #include "QGCGeo.h" -#include "QGroundControlQmlGlobal.h" #include "QGCQGeoCoordinate.h" #include "SettingsManager.h" #include "AppSettings.h" #include "PlanMasterController.h" +#include "QGCApplication.h" #include diff --git a/src/MissionManager/TransectStyleComplexItem.cc b/src/MissionManager/TransectStyleComplexItem.cc index 727d0bc48..78941c7e9 100644 --- a/src/MissionManager/TransectStyleComplexItem.cc +++ b/src/MissionManager/TransectStyleComplexItem.cc @@ -11,11 +11,11 @@ #include "JsonHelper.h" #include "MissionController.h" #include "QGCGeo.h" -#include "QGroundControlQmlGlobal.h" #include "QGCQGeoCoordinate.h" #include "SettingsManager.h" #include "AppSettings.h" #include "QGCQGeoCoordinate.h" +#include "QGCApplication.h" #include diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc index 7f4180d75..654cf5925 100644 --- a/src/Vehicle/MultiVehicleManager.cc +++ b/src/Vehicle/MultiVehicleManager.cc @@ -13,7 +13,6 @@ #include "UAS.h" #include "QGCApplication.h" #include "FollowMe.h" -#include "QGroundControlQmlGlobal.h" #include "ParameterManager.h" #include "SettingsManager.h" #include "QGCCorePlugin.h" diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index 9bd2e9111..75708ec4b 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -31,7 +31,6 @@ #include "QGCApplication.h" #include "QGCImageProvider.h" #include "MissionCommandTree.h" -#include "QGroundControlQmlGlobal.h" #include "SettingsManager.h" #include "QGCQGeoCoordinate.h" #include "QGCCorePlugin.h" -- 2.22.0