Merge pull request #3594 from NaterGator/master

Removing duplicated QGCQGeoCoordinate

qgroundcontrol.pro

@@ -297,7 +297,6 @@ HEADERS += \
     src/QmlControls/ParameterEditorController.h \
     src/QmlControls/RCChannelMonitorController.h \
     src/QmlControls/ScreenToolsController.h \
-    src/QmlControls/QGCQGeoCoordinate.h \
     src/QmlControls/QGroundControlQmlGlobal.h \
     src/QmlControls/QmlObjectListModel.h \
     src/uas/UAS.h \
@@ -456,7 +455,6 @@ SOURCES += \
     src/QmlControls/ParameterEditorController.cc \
     src/QmlControls/RCChannelMonitorController.cc \
     src/QmlControls/ScreenToolsController.cc \
-    src/QmlControls/QGCQGeoCoordinate.cc \
     src/QmlControls/QGroundControlQmlGlobal.cc \
     src/QmlControls/QmlObjectListModel.cc \
     src/uas/UAS.cc \

src/QGCApplication.cc

@@ -79,7 +79,6 @@
 #include "QGroundControlQmlGlobal.h"
 #include "HomePositionManager.h"
 #include "FlightMapSettings.h"
-#include "QGCQGeoCoordinate.h"
 #include "CoordinateVector.h"
 #include "MainToolBarController.h"
 #include "MissionController.h"
@@ -354,7 +353,6 @@ void QGCApplication::_initCommon(void)
 
     qmlRegisterUncreatableType<CoordinateVector>    ("QGroundControl",                  1, 0, "CoordinateVector",       "Reference only");
     qmlRegisterUncreatableType<MissionCommands>     ("QGroundControl",                  1, 0, "MissionCommands",        "Reference only");
-    qmlRegisterUncreatableType<QGCQGeoCoordinate>   ("QGroundControl",                  1, 0, "QGCQGeoCoordinate",      "Reference only");
     qmlRegisterUncreatableType<QmlObjectListModel>  ("QGroundControl",                  1, 0, "QmlObjectListModel",     "Reference only");
     qmlRegisterUncreatableType<VideoReceiver>       ("QGroundControl",                  1, 0, "VideoReceiver",          "Reference only");
     qmlRegisterUncreatableType<VideoSurface>        ("QGroundControl",                  1, 0, "VideoSurface",           "Reference only");

src/QmlControls/QGCQGeoCoordinate.cc

-/****************************************************************************
- *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-
-/// @file
-///     @author Don Gagne <don@thegagnes.com>
-
-#include "QGCQGeoCoordinate.h"
-
-QGCQGeoCoordinate::QGCQGeoCoordinate(QObject* parent)
-    : QObject(parent)
-{
-
-}
-
-QGCQGeoCoordinate::QGCQGeoCoordinate(const QGeoCoordinate& coordinate, QObject* parent)
-    : QObject(parent)
-    , _coordinate(coordinate)
-{
-    
-}
-
-QGCQGeoCoordinate::~QGCQGeoCoordinate()
-{
-    
-}
-
-void QGCQGeoCoordinate::setCoordinate(const QGeoCoordinate& coordinate)
-{
-    _coordinate = coordinate;
-    emit coordinateChanged(_coordinate);
-}

src/QmlControls/QGCQGeoCoordinate.h

-/****************************************************************************
- *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-
-#ifndef QGCQGeoCoordinate_H
-#define QGCQGeoCoordinate_H
-
-#include <QObject>
-#include <QGeoCoordinate>
-
-
-/// This class wraps a QGeoCoordinate in a QObject so that it can be used from within a
-/// QmlObjectListModel.
-class QGCQGeoCoordinate : public QObject
-{
-    Q_OBJECT
-    
-public:
-    QGCQGeoCoordinate(QObject* parent = NULL);
-    QGCQGeoCoordinate(const QGeoCoordinate& coordinate, QObject* parent = NULL);
-    ~QGCQGeoCoordinate();
-    
-    Q_PROPERTY(QGeoCoordinate coordinate MEMBER _coordinate NOTIFY coordinateChanged)
-    
-    void setCoordinate(const QGeoCoordinate& coordinate);
-    
-signals:
-    void coordinateChanged(QGeoCoordinate coordinate);
-    
-private:
-    QGeoCoordinate  _coordinate;
-};
-
-#endif