Skip to content

Q
qgroundcontrol
Commit 6226743f authored by Beat Küng's avatar Beat Küng
Browse files
Options

rebase fixup: remove AirMapController.{cc,h}

parent 0a18238a
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
qgroundcontrol.pro
View file @ 6226743f
...@@ -500,7 +500,6 @@ HEADERS += \ ...@@ -500,7 +500,6 @@ HEADERS += \
src/LogCompressor.h \ src/LogCompressor.h \
src/MG.h \ src/MG.h \
src/MissionManager/CameraCalc.h \ src/MissionManager/CameraCalc.h \
src/MissionManager/AirMapController.h \
src/MissionManager/AirspaceController.h \ src/MissionManager/AirspaceController.h \
src/MissionManager/AirMapManager.h \ src/MissionManager/AirMapManager.h \
src/MissionManager/AirspaceManagement.h \ src/MissionManager/AirspaceManagement.h \
...@@ -720,7 +719,6 @@ SOURCES += \ ...@@ -720,7 +719,6 @@ SOURCES += \
src/JsonHelper.cc \ src/JsonHelper.cc \
src/LogCompressor.cc \ src/LogCompressor.cc \
src/MissionManager/CameraCalc.cc \ src/MissionManager/CameraCalc.cc \
src/MissionManager/AirMapController.cc \
src/MissionManager/AirspaceController.cc \ src/MissionManager/AirspaceController.cc \
src/MissionManager/AirMapManager.cc \ src/MissionManager/AirMapManager.cc \
src/MissionManager/AirspaceManagement.cc \ src/MissionManager/AirspaceManagement.cc \
......
src/QGCApplication.cc
View file @ 6226743f
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
#include "QGCCameraManager.h" #include "QGCCameraManager.h"
#include "CameraCalc.h" #include "CameraCalc.h"
#include "VisualMissionItem.h" #include "VisualMissionItem.h"
#include "AirMapController.h"
#include "AirspaceController.h" #include "AirspaceController.h"
#ifndef NO_SERIAL_LINK #ifndef NO_SERIAL_LINK
...@@ -362,7 +361,6 @@ void QGCApplication::_initCommon(void) ...@@ -362,7 +361,6 @@ void QGCApplication::_initCommon(void)
qmlRegisterUncreatableType<ParameterManager> ("QGroundControl.Vehicle", 1, 0, "ParameterManager", "Reference only"); qmlRegisterUncreatableType<ParameterManager> ("QGroundControl.Vehicle", 1, 0, "ParameterManager", "Reference only");
qmlRegisterUncreatableType<QGCCameraManager> ("QGroundControl.Vehicle", 1, 0, "QGCCameraManager", "Reference only"); qmlRegisterUncreatableType<QGCCameraManager> ("QGroundControl.Vehicle", 1, 0, "QGCCameraManager", "Reference only");
qmlRegisterUncreatableType<QGCCameraControl> ("QGroundControl.Vehicle", 1, 0, "QGCCameraControl", "Reference only"); qmlRegisterUncreatableType<QGCCameraControl> ("QGroundControl.Vehicle", 1, 0, "QGCCameraControl", "Reference only");
qmlRegisterUncreatableType<AirMapController> ("QGroundControl.Vehicle", 1, 0, "AirMapController", "Reference only");
qmlRegisterUncreatableType<AirspaceController> ("QGroundControl.Vehicle", 1, 0, "AirspaceController", "Reference only"); qmlRegisterUncreatableType<AirspaceController> ("QGroundControl.Vehicle", 1, 0, "AirspaceController", "Reference only");
qmlRegisterUncreatableType<JoystickManager> ("QGroundControl.JoystickManager", 1, 0, "JoystickManager", "Reference only"); qmlRegisterUncreatableType<JoystickManager> ("QGroundControl.JoystickManager", 1, 0, "JoystickManager", "Reference only");
qmlRegisterUncreatableType<Joystick> ("QGroundControl.JoystickManager", 1, 0, "Joystick", "Reference only"); qmlRegisterUncreatableType<Joystick> ("QGroundControl.JoystickManager", 1, 0, "Joystick", "Reference only");
......
src/Vehicle/Vehicle.cc
View file @ 6226743f
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include "QGCCorePlugin.h" #include "QGCCorePlugin.h"
#include "ADSBVehicle.h" #include "ADSBVehicle.h"
#include "QGCCameraManager.h" #include "QGCCameraManager.h"
#include "AirMapController.h"
#include "AirspaceController.h" #include "AirspaceController.h"
QGC_LOGGING_CATEGORY(VehicleLog, "VehicleLog") QGC_LOGGING_CATEGORY(VehicleLog, "VehicleLog")
......
src/Vehicle/Vehicle.h
View file @ 6226743f
...@@ -36,7 +36,6 @@ class UASMessage; ...@@ -36,7 +36,6 @@ class UASMessage;
class SettingsManager; class SettingsManager;
class ADSBVehicle; class ADSBVehicle;
class QGCCameraManager; class QGCCameraManager;
class AirMapController;
class AirspaceController; class AirspaceController;
Q_DECLARE_LOGGING_CATEGORY(VehicleLog) Q_DECLARE_LOGGING_CATEGORY(VehicleLog)
...@@ -323,7 +322,6 @@ public: ...@@ -323,7 +322,6 @@ public:
Q_PROPERTY(QVariantList staticCameraList READ staticCameraList CONSTANT) Q_PROPERTY(QVariantList staticCameraList READ staticCameraList CONSTANT)
Q_PROPERTY(QGCCameraManager* dynamicCameras READ dynamicCameras NOTIFY dynamicCamerasChanged) Q_PROPERTY(QGCCameraManager* dynamicCameras READ dynamicCameras NOTIFY dynamicCamerasChanged)
Q_PROPERTY(QString hobbsMeter READ hobbsMeter NOTIFY hobbsMeterChanged) Q_PROPERTY(QString hobbsMeter READ hobbsMeter NOTIFY hobbsMeterChanged)
Q_PROPERTY(AirMapController* airMapController READ airMapController CONSTANT)
Q_PROPERTY(AirspaceAuthorization::PermitStatus flightPermitStatus READ flightPermitStatus NOTIFY flightPermitStatusChanged) ///< state of flight permission Q_PROPERTY(AirspaceAuthorization::PermitStatus flightPermitStatus READ flightPermitStatus NOTIFY flightPermitStatusChanged) ///< state of flight permission
Q_PROPERTY(AirspaceController* airspaceController READ airspaceController CONSTANT) Q_PROPERTY(AirspaceController* airspaceController READ airspaceController CONSTANT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment