From 97bfcb4904f9bcef984e65b2d65fa32f7b12fdf8 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 23 Feb 2016 11:30:03 -0800 Subject: [PATCH] MissionManager, mission items no longer exposed --- src/Vehicle/Vehicle.cc | 5 ----- src/Vehicle/Vehicle.h | 3 --- 2 files changed, 8 deletions(-) diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index a0d360521..da217cd33 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -923,11 +923,6 @@ void Vehicle::setActive(bool active) _startJoystick(_active); } -QmlObjectListModel* Vehicle::missionItemsModel(void) -{ - return missionManager()->missionItems(); -} - bool Vehicle::homePositionAvailable(void) { return _homePositionAvailable; diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index 49aef16b6..e2722cc52 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -160,7 +160,6 @@ public: Q_PROPERTY(AutoPilotPlugin* autopilot MEMBER _autopilotPlugin CONSTANT) Q_PROPERTY(QGeoCoordinate coordinate READ coordinate NOTIFY coordinateChanged) Q_PROPERTY(bool coordinateValid READ coordinateValid NOTIFY coordinateValidChanged) - Q_PROPERTY(MissionManager* missionManager MEMBER _missionManager CONSTANT) Q_PROPERTY(bool homePositionAvailable READ homePositionAvailable NOTIFY homePositionAvailableChanged) Q_PROPERTY(QGeoCoordinate homePosition READ homePosition NOTIFY homePositionChanged) Q_PROPERTY(bool armed READ armed WRITE setArmed NOTIFY armedChanged) @@ -173,7 +172,6 @@ public: Q_PROPERTY(float latitude READ latitude NOTIFY coordinateChanged) Q_PROPERTY(float longitude READ longitude NOTIFY coordinateChanged) Q_PROPERTY(QString currentState READ currentState NOTIFY currentStateChanged) - Q_PROPERTY(QmlObjectListModel* missionItems READ missionItemsModel CONSTANT) Q_PROPERTY(bool messageTypeNone READ messageTypeNone NOTIFY messageTypeChanged) Q_PROPERTY(bool messageTypeNormal READ messageTypeNormal NOTIFY messageTypeChanged) Q_PROPERTY(bool messageTypeWarning READ messageTypeWarning NOTIFY messageTypeChanged) @@ -237,7 +235,6 @@ public: QGeoCoordinate coordinate(void) { return _coordinate; } bool coordinateValid(void) { return _coordinateValid; } void _setCoordinateValid(bool coordinateValid); - QmlObjectListModel* missionItemsModel(void); typedef enum { JoystickModeRC, ///< Joystick emulates an RC Transmitter -- 2.22.0