Merge pull request #1534 from dogmaphobic/namingFixes

Refactoring QGCFlightDisplay and Renaming QGCMavManager.*

QGCApplication.pro

@@ -263,6 +263,7 @@ HEADERS += \
     src/QGCQuickWidget.h \
     src/QGCSingleton.h \
     src/QGCTemporaryFile.h \
+    src/QmlControls/MavManager.h \
     src/QmlControls/ParameterEditorController.h \
     src/QmlControls/ScreenTools.h \
     src/uas/QGCMAVLinkUASFactory.h \
@@ -278,7 +279,7 @@ HEADERS += \
     src/ui/configuration/SerialSettingsDialog.h \
     src/ui/configuration/terminalconsole.h \
     src/ui/DebugConsole.h \
-    src/ui/flightdisplay/QGCFlightDisplay.h \
+    src/ui/flightdisplay/FlightDisplay.h \
     src/ui/HDDisplay.h \
     src/ui/HSIDisplay.h \
     src/ui/HUD.h \
@@ -351,12 +352,11 @@ HEADERS += \
     src/ui/WaypointEditableView.h \
     src/ui/WaypointList.h \
     src/ui/WaypointViewOnlyView.h \
-    src/ViewWidgets/ParameterEditorWidget.h \
     src/ViewWidgets/CustomCommandWidget.h \
     src/ViewWidgets/CustomCommandWidgetController.h \
+    src/ViewWidgets/ParameterEditorWidget.h \
     src/ViewWidgets/ViewWidgetController.h \
     src/Waypoint.h \
-    src/QmlControls/QGCMavManager.h
 
 !AndroidBuild {
 HEADERS += \
@@ -395,6 +395,7 @@ SOURCES += \
     src/QGCQuickWidget.cc \
     src/QGCSingleton.cc \
     src/QGCTemporaryFile.cc \
+    src/QmlControls/MavManager.cc \
     src/QmlControls/ParameterEditorController.cc \
     src/QmlControls/ScreenTools.cc \
     src/uas/QGCMAVLinkUASFactory.cc \
@@ -408,7 +409,7 @@ SOURCES += \
     src/ui/configuration/SerialSettingsDialog.cc \
     src/ui/configuration/terminalconsole.cpp \
     src/ui/DebugConsole.cc \
-    src/ui/flightdisplay/QGCFlightDisplay.cc \
+    src/ui/flightdisplay/FlightDisplay.cc \
     src/ui/HDDisplay.cc \
     src/ui/HSIDisplay.cc \
     src/ui/HUD.cc \
@@ -481,12 +482,11 @@ SOURCES += \
     src/ui/WaypointEditableView.cc \
     src/ui/WaypointList.cc \
     src/ui/WaypointViewOnlyView.cc \
-    src/ViewWidgets/ParameterEditorWidget.cc \
     src/ViewWidgets/CustomCommandWidget.cc \
     src/ViewWidgets/CustomCommandWidgetController.cc \
+    src/ViewWidgets/ParameterEditorWidget.cc \
     src/ViewWidgets/ViewWidgetController.cc \
     src/Waypoint.cc \
-    src/QmlControls/QGCMavManager.cc
 
 !AndroidBuild {
 SOURCES += \

src/QGCApplication.cc

@@ -64,7 +64,7 @@
 #include "CustomCommandWidgetController.h"
 
 #include "ScreenTools.h"
-#include "QGCMavManager.h"
+#include "MavManager.h"
 
 #ifdef QGC_RTLAB_ENABLED
 #include "OpalLink.h"

src/QmlControls/QGCMavManager.cc → src/QmlControls/MavManager.cc

@@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project
 #include "MainWindow.h"
 #include "UASManager.h"
 #include "Waypoint.h"
-#include "QGCMavManager.h"
+#include "MavManager.h"
 
 #define UPDATE_TIMER 50
 #define DEFAULT_LAT  38.965767f

src/ui/MainWindow.cc

@@ -60,7 +60,7 @@ This file is part of the QGROUNDCONTROL project
 #include "Linecharts.h"
 #include "QGCTabbedInfoView.h"
 #include "UASRawStatusView.h"
-#include "QGCFlightDisplay.h"
+#include "FlightDisplay.h"
 #include "SetupView.h"
 #include "SerialSettingsDialog.h"
 #include "terminalconsole.h"
@@ -474,7 +474,7 @@ void MainWindow::_buildExperimentalPlanView(void)
 void MainWindow::_buildFlightView(void)
 {
     if (!_flightView) {
-        _flightView = new QGCFlightDisplay(this);
+        _flightView = new FlightDisplay(this);
         _flightView->setVisible(false);
     }
 }
@@ -579,7 +579,7 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
 
         widget = hddisplay;
     } else if (widgetName == _pfdDockWidgetName) {
-        widget = new QGCFlightDisplay(this);
+        widget = new FlightDisplay(this);
     } else if (widgetName == _hudDockWidgetName) {
         widget = new HUD(320,240,this);
     } else if (widgetName == _uasInfoViewDockWidgetName) {

src/ui/MainWindow.h

@@ -61,7 +61,7 @@ This file is part of the QGROUNDCONTROL project
 #include "MainToolBar.h"
 #include "LogCompressor.h"
 
-#include "QGCFlightDisplay.h"
+#include "FlightDisplay.h"
 #include "QGCMAVLinkInspector.h"
 #include "QGCMAVLinkLogPlayer.h"
 #include "MAVLinkDecoder.h"
@@ -76,7 +76,7 @@ class QGCStatusBar;
 class Linecharts;
 class QGCDataPlot2D;
 class QGCUASFileViewMulti;
-class QGCFlightDisplay;
+class FlightDisplay;
 
 /**
  * @brief Main Application Window
@@ -128,7 +128,7 @@ public:
     MainToolBar* getMainToolBar(void) { return _mainToolBar; }
 
     /// @brief Gets a pointer to the Main Flight Display
-    QGCFlightDisplay* getFlightDisplay() { return dynamic_cast<QGCFlightDisplay*>(_flightView.data()); }
+    FlightDisplay* getFlightDisplay() { return dynamic_cast<FlightDisplay*>(_flightView.data()); }
     
     QWidget* getCurrentViewWidget(void) { return _currentViewWidget; }
 

src/ui/flightdisplay/QGCFlightDisplay.cc → src/ui/flightdisplay/FlightDisplay.cc

@@ -32,12 +32,12 @@ This file is part of the QGROUNDCONTROL project
 #include <QSettings>
 
 #include "MainWindow.h"
-#include "QGCFlightDisplay.h"
+#include "FlightDisplay.h"
 #include "UASManager.h"
 
 const char* kMainFlightDisplayGroup = "MainFlightDisplay";
 
-QGCFlightDisplay::QGCFlightDisplay(QWidget *parent)
+FlightDisplay::FlightDisplay(QWidget *parent)
     : QGCQmlWidgetHolder(parent)
 {
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -56,11 +56,11 @@ QGCFlightDisplay::QGCFlightDisplay(QWidget *parent)
     setVisible(true);
 }
 
-QGCFlightDisplay::~QGCFlightDisplay()
+FlightDisplay::~FlightDisplay()
 {
 }
 
-void QGCFlightDisplay::saveSetting(const QString &name, const QString& value)
+void FlightDisplay::saveSetting(const QString &name, const QString& value)
 {
     QSettings settings;
     QString key(kMainFlightDisplayGroup);
@@ -68,7 +68,7 @@ void QGCFlightDisplay::saveSetting(const QString &name, const QString& value)
     settings.setValue(key, value);
 }
 
-QString QGCFlightDisplay::loadSetting(const QString &name, const QString& defaultValue)
+QString FlightDisplay::loadSetting(const QString &name, const QString& defaultValue)
 {
     QSettings settings;
     QString key(kMainFlightDisplayGroup);

src/ui/flightdisplay/QGCFlightDisplay.h → src/ui/flightdisplay/FlightDisplay.h

@@ -34,12 +34,12 @@ This file is part of the QGROUNDCONTROL project
 
 class UASInterface;
 
-class QGCFlightDisplay : public QGCQmlWidgetHolder
+class FlightDisplay : public QGCQmlWidgetHolder
 {
     Q_OBJECT
 public:
-    QGCFlightDisplay(QWidget* parent = NULL);
-    ~QGCFlightDisplay();
+    FlightDisplay(QWidget* parent = NULL);
+    ~FlightDisplay();
 
     /// @brief Invokes the Flight Display Options menu
     void showOptionsMenu() { emit showOptionsMenuChanged(); }

src/ui/toolbar/MainToolBar.cc

@@ -34,7 +34,7 @@ This file is part of the QGROUNDCONTROL project
 #include "MainWindow.h"
 #include "UASMessageHandler.h"
 #include "UASMessageView.h"
-#include "QGCFlightDisplay.h"
+#include "FlightDisplay.h"
 
 MainToolBar::MainToolBar(QWidget* parent)
     : QGCQmlWidgetHolder(parent)
@@ -150,7 +150,7 @@ void MainToolBar::onFlyView()
 
 void MainToolBar::onFlyViewMenu()
 {
-    QGCFlightDisplay* fdsp = MainWindow::instance()->getFlightDisplay();
+    FlightDisplay* fdsp = MainWindow::instance()->getFlightDisplay();
     if(fdsp) {
         fdsp->showOptionsMenu();
     }