Reduce unused includes

mavlink · Mar 13, 2024 · a739cab · a739cab
1 parent 37315ab
commit a739cab
Show file tree

Hide file tree

Showing 349 changed files with 294 additions and 753 deletions.
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
@@ -378,6 +378,7 @@ INCLUDEPATH += \
     src/Settings \
     src/Terrain \
     src/Vehicle \
+    src/Vehicle/Actuators \
     src/Audio \
     src/comm \
     src/input \

diff --git a/src/ADSB/ADSBVehicle.h b/src/ADSB/ADSBVehicle.h
@@ -13,8 +13,6 @@
 #include <QGeoCoordinate>
 #include <QElapsedTimer>
 
-#include "QGCMAVLink.h"
-
 class ADSBVehicle : public QObject
 {
     Q_OBJECT

diff --git a/src/AirLink/AirLinkManager.cc b/src/AirLink/AirLinkManager.cc
@@ -12,12 +12,11 @@
 #include "QGCCorePlugin.h"
 #include "LinkManager.h"
 #include "SettingsManager.h"
-#include "UDPLink.h"
-
-//#include "LinkInterface.h"
 
 #include <QSettings>
 #include <QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 
 const QString AirLinkManager::airlinkHost = "air-link.space";
 

diff --git a/src/AirLink/AirLinkManager.h b/src/AirLink/AirLinkManager.h
@@ -10,9 +10,6 @@
 #pragma once
 
 #include "QGCToolbox.h"
-#include "QGCLoggingCategory.h"
-#include "Fact.h"
-#include "LinkConfiguration.h"
 
 #include <QTimer>
 #include <QTime>

diff --git a/src/AnalyzeView/GeoTagController.cc b/src/AnalyzeView/GeoTagController.cc
@@ -9,10 +9,8 @@
 
 #include "GeoTagController.h"
 #include "QGCLoggingCategory.h"
-#include <math.h>
 #include <QtEndian>
 #include <QDebug>
-#include <cfloat>
 #include <QDir>
 #include <QUrl>
 

diff --git a/src/AnalyzeView/GeoTagController.h b/src/AnalyzeView/GeoTagController.h
@@ -10,9 +10,6 @@
 #ifndef GeoTagController_H
 #define GeoTagController_H
 
-#include "QmlObjectListModel.h"
-#include "Fact.h"
-#include "FactMetaData.h"
 #include <QObject>
 #include <QString>
 #include <QThread>

diff --git a/src/AnalyzeView/LogDownloadController.cc b/src/AnalyzeView/LogDownloadController.cc
@@ -16,6 +16,7 @@
 #include "ParameterManager.h"
 #include "Vehicle.h"
 #include "SettingsManager.h"
+#include "QGCLoggingCategory.h"
 
 #include <QDebug>
 #include <QSettings>

diff --git a/src/AnalyzeView/LogDownloadController.h b/src/AnalyzeView/LogDownloadController.h
@@ -17,8 +17,6 @@
 #include <QLocale>
 #include <QElapsedTimer>
 
-#include <memory>
-
 #include "AutoPilotPlugin.h"
 #include "QmlObjectListModel.h"
 

diff --git a/src/AnalyzeView/MAVLinkInspectorController.cc b/src/AnalyzeView/MAVLinkInspectorController.cc
@@ -10,7 +10,11 @@
 #include "MAVLinkInspectorController.h"
 #include "QGCApplication.h"
 #include "MultiVehicleManager.h"
+#include "QGC.h"
+#include "QGCLoggingCategory.h"
+
 #include <QtCharts/QLineSeries>
+#include <QtQml/QQmlEngine>
 
 QGC_LOGGING_CATEGORY(MAVLinkInspectorLog, "MAVLinkInspectorLog")
 

diff --git a/src/AnalyzeView/MAVLinkInspectorController.h b/src/AnalyzeView/MAVLinkInspectorController.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "MAVLinkProtocol.h"
 #include "Vehicle.h"
 
 #include <QObject>

diff --git a/src/AnalyzeView/MavlinkConsoleController.h b/src/AnalyzeView/MavlinkConsoleController.h
@@ -9,10 +9,7 @@
 
 #pragma once
 
-#include "QmlObjectListModel.h"
 #include "QGCPalette.h"
-#include "Fact.h"
-#include "FactMetaData.h"
 #include <QObject>
 #include <QString>
 #include <QMetaObject>

diff --git a/src/Audio/AudioOutput.cc b/src/Audio/AudioOutput.cc
@@ -7,13 +7,11 @@
  *
  ****************************************************************************/
 
-#include <QApplication>
 #include <QDebug>
 #include <QRegularExpression>
 
 #include "AudioOutput.h"
 #include "QGCApplication.h"
-#include "QGC.h"
 #include "SettingsManager.h"
 
 AudioOutput::AudioOutput(QGCApplication* app, QGCToolbox* toolbox)

diff --git a/src/Audio/AudioOutput.h b/src/Audio/AudioOutput.h
@@ -9,9 +9,6 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTimer>
-#include <QThread>
 #include <QStringList>
 #include <QTextToSpeech>
 

diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc
@@ -8,7 +8,6 @@
  ****************************************************************************/
 
 #include "APMAirframeComponent.h"
-#include "ArduCopterFirmwarePlugin.h"
 #include "ParameterManager.h"
 
 const char* APMAirframeComponent::_frameClassParam = "FRAME_CLASS";

diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
@@ -8,7 +8,6 @@
  ****************************************************************************/
 
 #include "APMAirframeComponentController.h"
-#include "QGCMAVLink.h"
 #include "MultiVehicleManager.h"
 #include "QGCApplication.h"
 #include "QGCFileDownload.h"
@@ -17,9 +16,6 @@
 #include "ArduRoverFirmwarePlugin.h"
 
 #include <QVariant>
-#include <QQmlProperty>
-#include <QStandardPaths>
-#include <QDir>
 #include <QJsonParseError>
 #include <QJsonObject>
 

diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentController.h b/src/AutoPilotPlugins/APM/APMAirframeComponentController.h
@@ -10,11 +10,7 @@
 #pragma once
 
 #include <QObject>
-#include <QQuickItem>
-#include <QList>
-#include <QAbstractListModel>
 
-#include "AutoPilotPlugin.h"
 #include "FactPanelController.h"
 
 class APMAirframeModel;

diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
@@ -9,10 +9,6 @@
 
 
 #include "APMAutoPilotPlugin.h"
-#include "APMParameterMetaData.h"
-#include "APMFirmwarePlugin.h"
-#include "ArduCopterFirmwarePlugin.h"
-#include "ArduRoverFirmwarePlugin.h"
 #include "VehicleComponent.h"
 #include "APMAirframeComponent.h"
 #include "APMFlightModesComponent.h"
@@ -25,7 +21,6 @@
 #include "APMCameraComponent.h"
 #include "APMLightsComponent.h"
 #include "APMSubFrameComponent.h"
-#include "APMFollowComponent.h"
 #include "ESP8266Component.h"
 #include "APMHeliComponent.h"
 #include "APMRemoteSupportComponent.h"

diff --git a/src/AutoPilotPlugins/APM/APMCameraComponent.cc b/src/AutoPilotPlugins/APM/APMCameraComponent.cc
@@ -13,7 +13,6 @@
 
 #include "APMCameraComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
 
 APMCameraComponent::APMCameraComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, parent)

diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc b/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc
@@ -10,8 +10,6 @@
 
 #include "APMFlightModesComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
-#include "APMRadioComponent.h"
 
 APMFlightModesComponent::APMFlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) :
     VehicleComponent(vehicle, autopilot, parent),

diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc b/src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc
@@ -9,10 +9,8 @@
 
 
 #include "APMFlightModesComponentController.h"
-#include "QGCMAVLink.h"
 
 #include <QVariant>
-#include <QQmlProperty>
 
 bool APMFlightModesComponentController::_typeRegistered = false;
 

diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponentController.h b/src/AutoPilotPlugins/APM/APMFlightModesComponentController.h
@@ -11,9 +11,6 @@
 #ifndef APMFlightModesComponentController_H
 #define APMFlightModesComponentController_H
 
-#include <QObject>
-#include <QQuickItem>
-#include <QList>
 #include <QStringList>
 
 #include "AutoPilotPlugin.h"

diff --git a/src/AutoPilotPlugins/APM/APMFollowComponent.cc b/src/AutoPilotPlugins/APM/APMFollowComponent.cc
@@ -9,8 +9,6 @@
 
 #include "APMFollowComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
-#include "ParameterManager.h"
 
 APMFollowComponent::APMFollowComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, parent),

diff --git a/src/AutoPilotPlugins/APM/APMFollowComponentController.h b/src/AutoPilotPlugins/APM/APMFollowComponentController.h
@@ -11,6 +11,7 @@
 
 #include "FactPanelController.h"
 #include "ArduRoverFirmwarePlugin.h"
+#include "SettingsFact.h"
 
 class APMFollowComponentController : public FactPanelController
 {

diff --git a/src/AutoPilotPlugins/APM/APMLightsComponent.cc b/src/AutoPilotPlugins/APM/APMLightsComponent.cc
@@ -14,7 +14,6 @@
 
 #include "APMLightsComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
 
 APMLightsComponent::APMLightsComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, parent)

diff --git a/src/AutoPilotPlugins/APM/APMMotorComponent.cc b/src/AutoPilotPlugins/APM/APMMotorComponent.cc
@@ -8,7 +8,6 @@
  ****************************************************************************/
 
 #include "APMMotorComponent.h"
-#include "APMSubMotorComponentController.h"
 
 APMMotorComponent::APMMotorComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) :
     MotorComponent(vehicle, autopilot, parent),

diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.cc b/src/AutoPilotPlugins/APM/APMPowerComponent.cc
@@ -10,8 +10,6 @@
 
 #include "APMPowerComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
-#include "ParameterManager.h"
 
 APMPowerComponent::APMPowerComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, parent),

diff --git a/src/AutoPilotPlugins/APM/APMRadioComponent.cc b/src/AutoPilotPlugins/APM/APMRadioComponent.cc
@@ -10,7 +10,6 @@
 
 #include "APMRadioComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
 #include "ParameterManager.h"
 
 APMRadioComponent::APMRadioComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) :

diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponent.cc b/src/AutoPilotPlugins/APM/APMSafetyComponent.cc
@@ -13,7 +13,6 @@
 
 #include "APMSafetyComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
 
 APMSafetyComponent::APMSafetyComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, parent)

diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.cc b/src/AutoPilotPlugins/APM/APMSensorsComponent.cc
@@ -10,8 +10,6 @@
 
 #include "APMSensorsComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMSensorsComponentController.h"
-#include "APMAirframeComponent.h"
 #include "ParameterManager.h"
 
 // These two list must be kept in sync

diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc b/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
@@ -9,13 +9,11 @@
 
 
 #include "APMSensorsComponentController.h"
-#include "QGCMAVLink.h"
 #include "QGCApplication.h"
 #include "APMAutoPilotPlugin.h"
 #include "ParameterManager.h"
-
+#include "QGCLoggingCategory.h"
 #include <QVariant>
-#include <QQmlProperty>
 
 QGC_LOGGING_CATEGORY(APMSensorsComponentControllerLog, "APMSensorsComponentControllerLog")
 QGC_LOGGING_CATEGORY(APMSensorsComponentControllerVerboseLog, "APMSensorsComponentControllerVerboseLog")

diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentController.h b/src/AutoPilotPlugins/APM/APMSensorsComponentController.h
@@ -10,9 +10,9 @@
 #pragma once
 
 #include <QObject>
+#include <QtCore/QLoggingCategory>
 
 #include "FactPanelController.h"
-#include "QGCLoggingCategory.h"
 #include "APMSensorsComponent.h"
 
 Q_DECLARE_LOGGING_CATEGORY(APMSensorsComponentControllerLog)

diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponent.cc b/src/AutoPilotPlugins/APM/APMSubFrameComponent.cc
@@ -14,7 +14,6 @@
 
 #include "APMSubFrameComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
 
 APMSubFrameComponent::APMSubFrameComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, parent)

diff --git a/src/AutoPilotPlugins/APM/APMSubMotorComponentController.cc b/src/AutoPilotPlugins/APM/APMSubMotorComponentController.cc
@@ -9,7 +9,6 @@
 
 
 #include "APMSubMotorComponentController.h"
-#include "ParameterManager.h"
 
 
 APMSubMotorComponentController::APMSubMotorComponentController(void)

diff --git a/src/AutoPilotPlugins/APM/APMSubMotorComponentController.h b/src/AutoPilotPlugins/APM/APMSubMotorComponentController.h
@@ -11,9 +11,7 @@
 #ifndef APMSubMotorComponentController_H
 #define APMSubMotorComponentController_H
 
-#include <QObject>
 #include "FactPanelController.h"
-#include "Vehicle.h"
 
 /// MVC Controller for APMSubMotorComponent.qml.
 class APMSubMotorComponentController : public FactPanelController

diff --git a/src/AutoPilotPlugins/APM/APMTuningComponent.cc b/src/AutoPilotPlugins/APM/APMTuningComponent.cc
@@ -10,8 +10,6 @@
 
 #include "APMTuningComponent.h"
 #include "APMAutoPilotPlugin.h"
-#include "APMAirframeComponent.h"
-#include "ParameterManager.h"
 
 APMTuningComponent::APMTuningComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, parent)

diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt
@@ -102,8 +102,8 @@ qt_add_library(AutoPilotPlugins STATIC
 )
 
 target_link_libraries(AutoPilotPlugins
-	PRIVATE
-		qgc
+        PRIVATE
+                qgc
 )
 
 target_include_directories(AutoPilotPlugins

diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentController.cc b/src/AutoPilotPlugins/Common/ESP8266ComponentController.cc
@@ -13,11 +13,9 @@
 ///     @author Gus Grubba <[email protected]>
 
 #include "ESP8266ComponentController.h"
-#include "QGCApplication.h"
 #include "ParameterManager.h"
-
+#include "QGCLoggingCategory.h"
 #include <QHostAddress>
-#include <QtEndian>
 
 QGC_LOGGING_CATEGORY(ESP8266ComponentControllerLog, "ESP8266ComponentControllerLog")
 

diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentController.h b/src/AutoPilotPlugins/Common/ESP8266ComponentController.h
@@ -16,10 +16,9 @@
 #ifndef ESP8266ComponentController_H
 #define ESP8266ComponentController_H
 
-#include <QTimer>
+#include <QtCore/QLoggingCategory>
 
 #include "FactPanelController.h"
-#include "QGCLoggingCategory.h"
 #include "AutoPilotPlugin.h"
 
 Q_DECLARE_LOGGING_CATEGORY(ESP8266ComponentControllerLog)