From aa13acdb8782f3f2b671080342644ad6b8561973 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 5 Aug 2016 10:55:54 +0300 Subject: [Qt] Use strict signature for add{Source,Layer} --- platform/qt/include/qmapboxgl.hpp | 6 +++--- platform/qt/src/qmapboxgl.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'platform') 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> source = convert>(value, sourceID.toStdString()); + Result> source = convert>(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(before) : mbgl::optional()); } -void QMapboxGL::addLayer(const QVariant& value) +void QMapboxGL::addLayer(const QVariantMap ¶ms) { using namespace mbgl::style; using namespace mbgl::style::conversion; - Result> layer = convert>(value); + Result> layer = convert>(QVariant(params)); if (!layer) { qWarning() << "Unable to add layer:" << layer.error().message.c_str(); return; -- cgit v1.2.1