diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-08-05 10:55:54 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-08-17 14:43:22 +0300 |
commit | aa13acdb8782f3f2b671080342644ad6b8561973 (patch) | |
tree | 637e858475fa6248b504136fca157a56717ab0a2 /platform | |
parent | 15b7612c1314b3988410f041c0ff8dab0bdb44e0 (diff) | |
download | qtlocation-mapboxgl-aa13acdb8782f3f2b671080342644ad6b8561973.tar.gz |
[Qt] Use strict signature for add{Source,Layer}
Diffstat (limited to 'platform')
-rw-r--r-- | platform/qt/include/qmapboxgl.hpp | 6 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index e95dc84550..a48073f19b 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -199,8 +199,8 @@ public: void setMargins(const QMargins &margins); QMargins margins() const; - void addSource(const QString& sourceID, const QVariant& value); - void removeSource(const QString& sourceID); + void addSource(const QString &sourceID, const QVariantMap& params); + void removeSource(const QString &sourceID); void addCustomLayer(const QString &id, QMapbox::CustomLayerInitializeFunction, @@ -208,7 +208,7 @@ public: QMapbox::CustomLayerDeinitializeFunction, void* context, char* before = NULL); - void addLayer(const QVariant &value); + void addLayer(const QVariantMap ¶ms); void removeLayer(const QString &id); void setFilter(const QString &layer, const QVariant &filter); diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index d9eb43cf05..2c40a1c79e 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -621,12 +621,12 @@ QMargins QMapboxGL::margins() const ); } -void QMapboxGL::addSource(const QString& sourceID, const QVariant& value) +void QMapboxGL::addSource(const QString &sourceID, const QVariantMap ¶ms) { using namespace mbgl::style; using namespace mbgl::style::conversion; - Result<std::unique_ptr<Source>> source = convert<std::unique_ptr<Source>>(value, sourceID.toStdString()); + Result<std::unique_ptr<Source>> source = convert<std::unique_ptr<Source>>(QVariant(params), sourceID.toStdString()); if (!source) { qWarning() << "Unable to add source:" << source.error().message.c_str(); return; @@ -658,12 +658,12 @@ void QMapboxGL::addCustomLayer(const QString &id, before ? mbgl::optional<std::string>(before) : mbgl::optional<std::string>()); } -void QMapboxGL::addLayer(const QVariant& value) +void QMapboxGL::addLayer(const QVariantMap ¶ms) { using namespace mbgl::style; using namespace mbgl::style::conversion; - Result<std::unique_ptr<Layer>> layer = convert<std::unique_ptr<Layer>>(value); + Result<std::unique_ptr<Layer>> layer = convert<std::unique_ptr<Layer>>(QVariant(params)); if (!layer) { qWarning() << "Unable to add layer:" << layer.error().message.c_str(); return; |