Modify consumers of UASManager and QGCUASParamManager to use new interfaces

src/uas/UAS.h

@@ -40,6 +40,7 @@ This file is part of the QGROUNDCONTROL project
 #include "QGCFlightGearLink.h"
 #include "QGCJSBSimLink.h"
 #include "QGCXPlaneLink.h"
+#include "QGCUASParamManager.h"
 
 
 /**
@@ -542,7 +543,7 @@ public:
     }
 
     /** @brief Get reference to the param manager **/
-    virtual QGCUASParamManager* getParamManager()  {
+    virtual QGCUASParamManagerInterface* getParamManager()  {
         return &paramMgr;
     }
 

src/uas/UASInterface.h

@@ -42,7 +42,7 @@ This file is part of the QGROUNDCONTROL project
 #include "ProtocolInterface.h"
 #include "UASParameterDataModel.h"
 #include "UASWaypointManager.h"
-#include "QGCUASParamManager.h"
+#include "QGCUASParamManagerInterface.h"
 #include "RadioCalibration/RadioCalibrationData.h"
 
 #ifdef QGC_PROTOBUF_ENABLED
@@ -156,7 +156,7 @@ public:
     virtual UASWaypointManager* getWaypointManager(void) = 0;
 
     /** @brief Get reference to the param manager **/
-    virtual QGCUASParamManager* getParamManager() = 0;
+    virtual QGCUASParamManagerInterface* getParamManager() = 0;
 
     /* COMMUNICATION FLAGS */
 

src/uas/UASParameterCommsMgr.cc

@@ -2,7 +2,7 @@
 
 #include <QSettings>
 
-#include "QGCUASParamManager.h"
+#include "QGCUASParamManagerInterface.h"
 #include "UASInterface.h"
 
 

src/ui/QGCBaseParamWidget.cc

@@ -3,9 +3,9 @@
 #include <QFileDialog>
 #include <QFile>
 #include <QVariant>
-#include <QTextStream>>
+#include <QTextStream>
 
-#include "QGCUASParamManager.h"
+#include "QGCUASParamManagerInterface.h"
 #include "UASInterface.h"
 
 

src/ui/QGCBaseParamWidget.h

@@ -8,7 +8,7 @@
 
 
 //forward declarations
-class QGCUASParamManager;
+class QGCUASParamManagerInterface;
 class UASInterface;
 
 
@@ -50,7 +50,7 @@ public slots:
     virtual void loadParametersFromFile();
 
 protected:
-    QGCUASParamManager* paramMgr;
+    QGCUASParamManagerInterface* paramMgr;
     UASInterface* mav;
     QString     updatingParamNameLock; ///< Name of param currently being updated-- used for reducing echo on param change
 

src/ui/QGCPX4VehicleConfig.h

@@ -276,7 +276,7 @@ protected:
 
     bool doneLoadingConfig;
     UASInterface* mav;                  ///< The current MAV
-    QGCUASParamManager* paramMgr;       ///< params mgr for the mav
+    QGCUASParamManagerInterface* paramMgr;       ///< params mgr for the mav
     static const unsigned int chanMax = 14;    ///< Maximum number of channels
     static const unsigned int chanMappedMax = 16; ///< Maximum number of mapped channels (can be higher than input channel count)
     unsigned int chanCount;               ///< Actual channels

src/ui/QGCVehicleConfig.h

@@ -158,7 +158,7 @@ protected slots:
 protected:
     bool doneLoadingConfig;
     UASInterface* mav;                  ///< The current MAV
-    QGCUASParamManager* paramMgr;       ///< params mgr for the mav
+    QGCUASParamManagerInterface* paramMgr;       ///< params mgr for the mav
     static const unsigned int chanMax = 8;    ///< Maximum number of channels
     unsigned int chanCount;               ///< Actual channels
     int rcType;                         ///< Type of the remote control

src/ui/configuration/FrameTypeConfig.h

@@ -34,10 +34,8 @@ This file is part of the QGROUNDCONTROL project
 
 #include <QWidget>
 #include "ui_FrameTypeConfig.h"
-#include "UASInterface.h"
-#include "UASManager.h"
-#include "QGCUASParamManager.h"
 #include "AP2ConfigWidget.h"
+
 class FrameTypeConfig : public AP2ConfigWidget
 {
     Q_OBJECT

src/ui/designer/QGCComboBox.h

@@ -7,7 +7,7 @@
 
 #include "QGCToolWidgetItem.h"
 
-class QGCUASParamManager;
+class QGCUASParamManagerInterface;
 
 namespace Ui
 {
@@ -52,7 +52,7 @@ protected slots:
     /** @brief Updates current parameter based on new combobox value */
     void comboBoxIndexChanged(QString val);
 protected:
-    QGCUASParamManager *paramMgr; ///< Access to parameter manager
+    QGCUASParamManagerInterface *paramMgr; ///< Access to parameter manager
     bool visibleEnabled;
     QString visibleParam;
     int visibleVal;

src/ui/map/QGCMapWidget.cc

@@ -134,7 +134,7 @@ bool QGCMapWidget::setHomeActionTriggered()
         QMessageBox::information(0,"Error","Please connect first");
         return false;
     }
-    UASManager *uasManager = UASManager::instance();
+    UASManagerInterface *uasManager = UASManager::instance();
     if (!uasManager) { return false; }
 
     // Enter an altitude

src/ui/px4_configuration/QGCPX4AirframeConfig.h

@@ -97,7 +97,7 @@ protected:
 
 private:
     UASInterface* mav;
-    QGCUASParamManager *paramMgr;
+    QGCUASParamManagerInterface *paramMgr;
     QProgressDialog* progress;
     unsigned pendingParams;
     enum CONFIG_STATE configState;