Revert "QML: Use QML_SINGLETON"

This reverts commit 12a551d.

Author: HTRamsey

src/AutoPilotPlugins/APM/APMSensorsComponent.qml

@@ -21,6 +21,7 @@ import QGroundControl.Controls
 import QGroundControl.ScreenTools
 import QGroundControl.Controllers
 import QGroundControl.QGCPositionManager
+import MAVLink
 
 SetupPage {
     id:             sensorsPage

src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml

@@ -17,6 +17,7 @@ import QGroundControl.ScreenTools
 import QGroundControl.Palette
 import QGroundControl.FactSystem
 import QGroundControl.FactControls
+import MAVLink
 
 BatteryIndicator {
     waitForParameters: true

src/FlightMap/MapItems/QGCMapPolygonVisuals.qml

@@ -19,6 +19,7 @@ import QGroundControl.ScreenTools
 import QGroundControl.Palette
 import QGroundControl.Controls
 import QGroundControl.FlightMap
+import QGroundControl.ShapeFileHelper
 
 /// QGCMapPolygon map visuals
 Item {

src/FlightMap/MapItems/QGCMapPolylineVisuals.qml

@@ -18,6 +18,7 @@ import QGroundControl.ScreenTools
 import QGroundControl.Palette
 import QGroundControl.Controls
 import QGroundControl.FlightMap
+import QGroundControl.ShapeFileHelper
 
 /// QGCMapPolyline map visuals
 Item {

src/MAVLink/QGCMAVLink.h

@@ -22,11 +22,12 @@ Q_DECLARE_LOGGING_CATEGORY(QGCMAVLinkLog)
 Q_DECLARE_METATYPE(MAV_TYPE)
 Q_DECLARE_METATYPE(MAV_AUTOPILOT)
 
+// TODO: Q_NAMESPACE
 class QGCMAVLink : public QObject
 {
     Q_OBJECT
-    QML_NAMED_ELEMENT(MAVLink)
-    QML_SINGLETON
+    // QML_ELEMENT
+    // QML_UNCREATABLE("")
 
 public:
     // Creating an instance of QGCMAVLink is only meant to be used for the Qml Singleton

src/QGCApplication.cc

@@ -63,6 +63,7 @@
 #include "QGroundControlQmlGlobal.h"
 #include "SettingsManager.h"
 #include "AppSettings.h"
+#include "ShapeFileHelper.h"
 #include "SyslinkComponentController.h"
 #include "UDPLink.h"
 #include "Vehicle.h"
@@ -89,6 +90,13 @@
 
 QGC_LOGGING_CATEGORY(QGCApplicationLog, "qgc.qgcapplication")
 
+// Qml Singleton factories
+
+static QObject *mavlinkSingletonFactory(QQmlEngine*, QJSEngine*)
+{
+    return new QGCMAVLink();
+}
+
 QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting, bool simpleBootTest)
     : QApplication(argc, argv)
     , _runningUnitTests(unitTesting)
@@ -297,6 +305,10 @@ void QGCApplication::init()
 #endif
     qmlRegisterType<JoystickConfigController>("QGroundControl.Controllers", 1, 0, "JoystickConfigController");
 
+    (void) qmlRegisterSingletonType<ShapeFileHelper>("QGroundControl.ShapeFileHelper", 1, 0, "ShapeFileHelper", [](QQmlEngine *, QJSEngine *) { return new ShapeFileHelper(); });
+
+    qmlRegisterSingletonType<QGCMAVLink>("MAVLink", 1, 0, "MAVLink", mavlinkSingletonFactory);
+
     // Although this should really be in _initForNormalAppBoot putting it here allowws us to create unit tests which pop up more easily
     if(QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) {
         qCWarning(QGCApplicationLog) << "Could not load /fonts/opensans font";

src/QmlControls/BatteryIndicator.qml

@@ -18,6 +18,7 @@ import QGroundControl.Palette
 import QGroundControl.FactSystem
 import QGroundControl.FactControls
 import QGroundControl.AutoPilotPlugin
+import MAVLink
 
 //-------------------------------------------------------------------------
 //-- Battery Indicator

src/QmlControls/KMLOrSHPFileDialog.qml

@@ -11,6 +11,7 @@ import QtQuick
 
 import QGroundControl
 import QGroundControl.Controls
+import QGroundControl.ShapeFileHelper
 
 QGCFileDialog {
     id:             kmlOrSHPLoadDialog

src/QmlControls/PlanView.qml

@@ -23,6 +23,7 @@ import QGroundControl.FactSystem
 import QGroundControl.FactControls
 import QGroundControl.Palette
 import QGroundControl.Controllers
+import QGroundControl.ShapeFileHelper
 import QGroundControl.FlightDisplay
 import QGroundControl.UTMSP
 

src/UI/toolbar/APMBatteryIndicator.qml

@@ -17,6 +17,7 @@ import QGroundControl.ScreenTools
 import QGroundControl.Palette
 import QGroundControl.FactSystem
 import QGroundControl.FactControls
+import MAVLink
 
 BatteryIndicator {
     waitForParameters: true