Merge pull request #4718 from dogmaphobic/toolbarIndicator

Making toolbar indicator list private.

src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc

@@ -107,16 +107,16 @@ bool ArduSubFirmwarePlugin::supportsMotorInterference(void)
     return false;
 }
 
-QVariantList& ArduSubFirmwarePlugin::toolBarIndicators(const Vehicle* vehicle)
+const QVariantList& ArduSubFirmwarePlugin::toolBarIndicators(const Vehicle* vehicle)
 {
     Q_UNUSED(vehicle);
     //-- Sub specific list of indicators (Enter your modified list here)
-    if(_toolBarIndicatorList.size() == 0) {
-        _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")));
-        _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")));
-        _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml")));
-        _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/BatteryIndicator.qml")));
-        _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ModeIndicator.qml")));
+    if(_toolBarIndicators.size() == 0) {
+        _toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")));
+        _toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")));
+        _toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml")));
+        _toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/BatteryIndicator.qml")));
+        _toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ModeIndicator.qml")));
     }
-    return _toolBarIndicatorList;
+    return _toolBarIndicators;
 }

src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h

@@ -86,9 +86,10 @@ public:
     QString brandImage(const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); }
     const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; }
     int remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const final;
-    QVariantList& toolBarIndicators(const Vehicle* vehicle) final;
+    const QVariantList& toolBarIndicators(const Vehicle* vehicle) final;
 
 private:
+    QVariantList _toolBarIndicators;
     static bool _remapParamNameIntialized;
     static FirmwarePlugin::remapParamNameMajorVersionMap_t  _remapParamName;
 };

src/FirmwarePlugin/FirmwarePlugin.cc

@@ -341,7 +341,7 @@ QString FirmwarePlugin::vehicleImageCompass(const Vehicle* vehicle) const
     return QStringLiteral("/qmlimages/compassInstrumentArrow.svg");
 }
 
-QVariantList& FirmwarePlugin::toolBarIndicators(const Vehicle* vehicle)
+const QVariantList &FirmwarePlugin::toolBarIndicators(const Vehicle* vehicle)
 {
     Q_UNUSED(vehicle);
     //-- Default list of indicators for all vehicles.

src/FirmwarePlugin/FirmwarePlugin.h

@@ -259,7 +259,7 @@ public:
 
     /// Allows the core plugin to override the toolbar indicators
     /// @return A list of QUrl with the indicators (see MainToolBarIndicators.qml)
-    virtual QVariantList& toolBarIndicators(const Vehicle* vehicle);
+    virtual const QVariantList& toolBarIndicators(const Vehicle* vehicle);
 
     /// Returns a list of CameraMetaData objects for available cameras on the vehicle.
     virtual const QVariantList& cameraList(const Vehicle* vehicle);
@@ -267,10 +267,8 @@ public:
     // FIXME: Hack workaround for non pluginize FollowMe support
     static const char* px4FollowMeFlightMode;
 
-protected:
-    QVariantList _toolBarIndicatorList;
-
 private:
+    QVariantList _toolBarIndicatorList;
     static QVariantList _cameraList;    ///< Standard QGC camera list
 
 };

src/Vehicle/Vehicle.cc

@@ -2375,7 +2375,7 @@ QString Vehicle::vehicleImageCompass() const
         return QString();
 }
 
-QVariantList& Vehicle::toolBarIndicators()
+const QVariantList& Vehicle::toolBarIndicators()
 {
     if(_firmwarePlugin) {
         return _firmwarePlugin->toolBarIndicators(this);

src/Vehicle/Vehicle.h

@@ -653,8 +653,8 @@ public:
     QString vehicleImageOutline () const;
     QString vehicleImageCompass () const;
 
-    QVariantList& toolBarIndicators();
-    const QVariantList& cameraList(void) const;
+    const QVariantList& toolBarIndicators   ();
+    const QVariantList& cameraList          (void) const;
 
 
 public slots: