From 1ac75a718de87fa52caefda3ff00ef437848f204 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 28 Apr 2016 18:14:59 +0300 Subject: [PATCH] [Qt] Added error handling stubs --- platform/qt/include/qquickmapboxgl.hpp | 8 ++++++++ platform/qt/src/qquickmapboxgl.cpp | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/platform/qt/include/qquickmapboxgl.hpp b/platform/qt/include/qquickmapboxgl.hpp index e49e93f32..4563d6d85 100644 --- a/platform/qt/include/qquickmapboxgl.hpp +++ b/platform/qt/include/qquickmapboxgl.hpp @@ -2,6 +2,7 @@ #define QQUICKMAPBOXGL_H #include +#include #include #include @@ -11,10 +12,13 @@ class Q_DECL_EXPORT QQuickMapboxGL : public QQuickFramebufferObject { Q_OBJECT + Q_ENUMS(QGeoServiceProvider::Error) Q_PROPERTY(qreal minimumZoomLevel READ minimumZoomLevel WRITE setMinimumZoomLevel NOTIFY minimumZoomLevelChanged) Q_PROPERTY(qreal maximumZoomLevel READ maximumZoomLevel WRITE setMaximumZoomLevel NOTIFY maximumZoomLevelChanged) Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY centerChanged) + Q_PROPERTY(QGeoServiceProvider::Error error READ error NOTIFY errorChanged) + Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QGeoShape visibleRegion READ visibleRegion WRITE setVisibleRegion) Q_PROPERTY(bool copyrightsVisible READ copyrightsVisible WRITE setCopyrightsVisible NOTIFY copyrightsVisibleChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) @@ -38,6 +42,9 @@ public: void setCenter(const QGeoCoordinate ¢er); QGeoCoordinate center() const; + QGeoServiceProvider::Error error() const; + QString errorString() const; + void setVisibleRegion(const QGeoShape &shape); QGeoShape visibleRegion() const; @@ -62,6 +69,7 @@ signals: void centerChanged(const QGeoCoordinate &coordinate); // Compatibility with Map QML Type, but no-op. + void errorChanged(); void copyrightLinkActivated(const QString &link); void copyrightsVisibleChanged(bool visible); void colorChanged(const QColor &color); diff --git a/platform/qt/src/qquickmapboxgl.cpp b/platform/qt/src/qquickmapboxgl.cpp index dd0a7c8f1..186703afe 100644 --- a/platform/qt/src/qquickmapboxgl.cpp +++ b/platform/qt/src/qquickmapboxgl.cpp @@ -102,6 +102,15 @@ QGeoCoordinate QQuickMapboxGL::center() const return m_center; } +QGeoServiceProvider::Error QQuickMapboxGL::error() const +{ + return QGeoServiceProvider::NoError; +} + +QString QQuickMapboxGL::errorString() const +{ + return QString(); +} void QQuickMapboxGL::setVisibleRegion(const QGeoShape &shape) {