Merge pull request #7119 from DonLakeFlyer/MissionController

Expose complex item names in a way useful for custom builds

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)

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);