Browse Source

Header re-structuring

I removed some needed headers from a top level file which then causes a
ripple effect downstream
QGC4.4
Don Gagne 9 years ago
parent
commit
e513494c56
  1. 1
      src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
  2. 1
      src/FactSystem/ParameterLoader.h
  3. 1
      src/FirmwarePlugin/APM/APMParameterMetaData.cc
  4. 2
      src/QmlControls/ParameterEditorController.cc
  5. 7
      src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
  6. 2
      src/Vehicle/MultiVehicleManager.cc
  7. 1
      src/Vehicle/Vehicle.h
  8. 3
      src/VehicleSetup/FirmwareUpgradeController.cc
  9. 2
      src/ViewWidgets/LogDownloadController.cc

1
src/AutoPilotPlugins/APM/APMAirframeComponentController.cc

@ -34,6 +34,7 @@
#include <QVariant> #include <QVariant>
#include <QQmlProperty> #include <QQmlProperty>
#include <QStandardPaths>
bool APMAirframeComponentController::_typesRegistered = false; bool APMAirframeComponentController::_typesRegistered = false;

1
src/FactSystem/ParameterLoader.h

@ -29,6 +29,7 @@
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMutex> #include <QMutex>
#include <QDir>
#include "FactSystem.h" #include "FactSystem.h"
#include "MAVLinkProtocol.h" #include "MAVLinkProtocol.h"

1
src/FirmwarePlugin/APM/APMParameterMetaData.cc

@ -32,6 +32,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
#include <QStack>
QGC_LOGGING_CATEGORY(APMParameterMetaDataLog, "APMParameterMetaDataLog") QGC_LOGGING_CATEGORY(APMParameterMetaDataLog, "APMParameterMetaDataLog")
QGC_LOGGING_CATEGORY(APMParameterMetaDataVerboseLog, "APMParameterMetaDataVerboseLog") QGC_LOGGING_CATEGORY(APMParameterMetaDataVerboseLog, "APMParameterMetaDataVerboseLog")

2
src/QmlControls/ParameterEditorController.cc

@ -34,6 +34,8 @@
#include "MainWindow.h" #include "MainWindow.h"
#endif #endif
#include <QStandardPaths>
/// @Brief Constructs a new ParameterEditorController Widget. This widget is used within the PX4VehicleConfig set of screens. /// @Brief Constructs a new ParameterEditorController Widget. This widget is used within the PX4VehicleConfig set of screens.
ParameterEditorController::ParameterEditorController(void) ParameterEditorController::ParameterEditorController(void)
{ {

7
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc

@ -26,12 +26,15 @@
#include "QGCMapEngineManager.h" #include "QGCMapEngineManager.h"
#include "QGCApplication.h" #include "QGCApplication.h"
#include <QSettings>
#include "QGCMapTileSet.h" #include "QGCMapTileSet.h"
#include "QGCMapUrlEngine.h" #include "QGCMapUrlEngine.h"
#include <QStorageInfo>
#include <stdio.h> #include <stdio.h>
#include <QQmlEngine>
#include <QSettings>
#include <QStorageInfo>
QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "QGCMapEngineManagerLog") QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "QGCMapEngineManagerLog")
static const char* kQmlOfflineMapKeyName = "QGCOfflineMap"; static const char* kQmlOfflineMapKeyName = "QGCOfflineMap";

2
src/Vehicle/MultiVehicleManager.cc

@ -30,6 +30,8 @@
#include "UAS.h" #include "UAS.h"
#include "QGCApplication.h" #include "QGCApplication.h"
#include <QQmlEngine>
QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog") QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog")
const char* MultiVehicleManager::_gcsHeartbeatEnabledKey = "gcsHeartbeatEnabled"; const char* MultiVehicleManager::_gcsHeartbeatEnabledKey = "gcsHeartbeatEnabled";

1
src/Vehicle/Vehicle.h

@ -33,7 +33,6 @@
#include "FactGroup.h" #include "FactGroup.h"
#include "LinkInterface.h" #include "LinkInterface.h"
#include "QGCMAVLink.h" #include "QGCMAVLink.h"
#include "MissionItem.h"
#include "QmlObjectListModel.h" #include "QmlObjectListModel.h"
#include "MAVLinkProtocol.h" #include "MAVLinkProtocol.h"
#include "UASMessageHandler.h" #include "UASMessageHandler.h"

3
src/VehicleSetup/FirmwareUpgradeController.cc

@ -31,6 +31,9 @@
#include "QGCApplication.h" #include "QGCApplication.h"
#include "QGCFileDownload.h" #include "QGCFileDownload.h"
#include <QStandardPaths>
#include <QRegularExpression>
struct FirmwareToUrlElement_t { struct FirmwareToUrlElement_t {
FirmwareUpgradeController::AutoPilotStackType_t stackType; FirmwareUpgradeController::AutoPilotStackType_t stackType;
FirmwareUpgradeController::FirmwareType_t firmwareType; FirmwareUpgradeController::FirmwareType_t firmwareType;

2
src/ViewWidgets/LogDownloadController.cc

@ -34,6 +34,8 @@
#include <QDebug> #include <QDebug>
#include <QSettings> #include <QSettings>
#include <QUrl> #include <QUrl>
#include <QBitArray>
#include <QtCore/qmath.h>
#define kTimeOutMilliseconds 500 #define kTimeOutMilliseconds 500
#define kGUIRateMilliseconds 17 #define kGUIRateMilliseconds 17

Loading…
Cancel
Save