From e513494c567d3c90933a661d03856a0c3ba21f68 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 18 Feb 2016 19:50:14 -0800
Subject: [PATCH] Header re-structuring

I removed some needed headers from a top level file which then causes a
ripple effect downstream
---
 src/AutoPilotPlugins/APM/APMAirframeComponentController.cc | 1 +
 src/FactSystem/ParameterLoader.h                           | 1 +
 src/FirmwarePlugin/APM/APMParameterMetaData.cc             | 1 +
 src/QmlControls/ParameterEditorController.cc               | 2 ++
 src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc     | 7 +++++--
 src/Vehicle/MultiVehicleManager.cc                         | 2 ++
 src/Vehicle/Vehicle.h                                      | 1 -
 src/VehicleSetup/FirmwareUpgradeController.cc              | 3 +++
 src/ViewWidgets/LogDownloadController.cc                   | 2 ++
 9 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
index 72ac85485..b4759e353 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
@@ -34,6 +34,7 @@
 
 #include <QVariant>
 #include <QQmlProperty>
+#include <QStandardPaths>
 
 bool APMAirframeComponentController::_typesRegistered = false;
 
diff --git a/src/FactSystem/ParameterLoader.h b/src/FactSystem/ParameterLoader.h
index 48638d51a..4c17cd0d2 100644
--- a/src/FactSystem/ParameterLoader.h
+++ b/src/FactSystem/ParameterLoader.h
@@ -29,6 +29,7 @@
 #include <QXmlStreamReader>
 #include <QLoggingCategory>
 #include <QMutex>
+#include <QDir>
 
 #include "FactSystem.h"
 #include "MAVLinkProtocol.h"
diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
index be7fc932c..2ad3c75bd 100644
--- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc
+++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
@@ -32,6 +32,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
+#include <QStack>
 
 QGC_LOGGING_CATEGORY(APMParameterMetaDataLog, "APMParameterMetaDataLog")
 QGC_LOGGING_CATEGORY(APMParameterMetaDataVerboseLog, "APMParameterMetaDataVerboseLog")
diff --git a/src/QmlControls/ParameterEditorController.cc b/src/QmlControls/ParameterEditorController.cc
index 58824d49f..31f8652a3 100644
--- a/src/QmlControls/ParameterEditorController.cc
+++ b/src/QmlControls/ParameterEditorController.cc
@@ -34,6 +34,8 @@
 #include "MainWindow.h"
 #endif
 
+#include <QStandardPaths>
+
 /// @Brief Constructs a new ParameterEditorController Widget. This widget is used within the PX4VehicleConfig set of screens.
 ParameterEditorController::ParameterEditorController(void)
 {
diff --git a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
index e506dcb42..a9579a036 100644
--- a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
+++ b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
@@ -26,12 +26,15 @@
 
 #include "QGCMapEngineManager.h"
 #include "QGCApplication.h"
-#include <QSettings>
 #include "QGCMapTileSet.h"
 #include "QGCMapUrlEngine.h"
-#include <QStorageInfo>
+
 #include <stdio.h>
 
+#include <QQmlEngine>
+#include <QSettings>
+#include <QStorageInfo>
+
 QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "QGCMapEngineManagerLog")
 
 static const char* kQmlOfflineMapKeyName = "QGCOfflineMap";
diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index 29b8331a6..3e324d599 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -30,6 +30,8 @@
 #include "UAS.h"
 #include "QGCApplication.h"
 
+#include <QQmlEngine>
+
 QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog")
 
 const char* MultiVehicleManager::_gcsHeartbeatEnabledKey = "gcsHeartbeatEnabled";
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index b44d3e78c..49aef16b6 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -33,7 +33,6 @@
 #include "FactGroup.h"
 #include "LinkInterface.h"
 #include "QGCMAVLink.h"
-#include "MissionItem.h"
 #include "QmlObjectListModel.h"
 #include "MAVLinkProtocol.h"
 #include "UASMessageHandler.h"
diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index a2cba8654..c8267358d 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -31,6 +31,9 @@
 #include "QGCApplication.h"
 #include "QGCFileDownload.h"
 
+#include <QStandardPaths>
+#include <QRegularExpression>
+
 struct FirmwareToUrlElement_t {
     FirmwareUpgradeController::AutoPilotStackType_t    stackType;
     FirmwareUpgradeController::FirmwareType_t          firmwareType;
diff --git a/src/ViewWidgets/LogDownloadController.cc b/src/ViewWidgets/LogDownloadController.cc
index db1f8afae..891ad4c6d 100644
--- a/src/ViewWidgets/LogDownloadController.cc
+++ b/src/ViewWidgets/LogDownloadController.cc
@@ -34,6 +34,8 @@
 #include <QDebug>
 #include <QSettings>
 #include <QUrl>
+#include <QBitArray>
+#include <QtCore/qmath.h>
 
 #define kTimeOutMilliseconds 500
 #define kGUIRateMilliseconds 17
-- 
2.22.0