diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 0ec0ccb4961f770659d97c635a1fc1f2b7c2cfa3..90bebf479071fd73593f1c01c367a7eece4486fa 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -56,11 +56,12 @@ const char* MissionController::_jsonMavAutopilotKey = "MAV_AUTOPILOT"; const int MissionController::_missionFileVersion = 2; +const QString MissionController::patternFWLandingName (tr("Fixed Wing Landing")); +const QString MissionController::patternStructureScanName (tr("Structure Scan")); +const QString MissionController::patternCorridorScanName (tr("Corridor Scan")); + MissionController::MissionController(PlanMasterController* masterController, QObject *parent) : PlanElementController (masterController, parent) - , patternFWLandingName (tr("Fixed Wing Landing")) - , patternStructureScanName (tr("Structure Scan")) - , patternCorridorScanName (tr("Corridor Scan")) , _missionManager (_managerVehicle->missionManager()) , _missionItemCount (0) , _visualItems (nullptr) diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h index 2d4d269b8ea8e6b37f3a14a6ea8e7efd6f6aaf5c..6fa6e19efba2e9ec37dbe9ade2db2c656d7a3709 100644 --- a/src/MissionManager/MissionController.h +++ b/src/MissionManager/MissionController.h @@ -196,9 +196,9 @@ public: // These are the names shown in the UI for the pattern items. They are public so custom builds can remove the ones // they don't want through the QGCCorePlugin:: - QString patternFWLandingName; - QString patternStructureScanName; - QString patternCorridorScanName; + static const QString patternFWLandingName; + static const QString patternStructureScanName; + static const QString patternCorridorScanName; signals: void visualItemsChanged (void);