From b2f60a4bf2fb95c107bb94543ba6345779970e98 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 30 Jul 2018 08:38:14 -0700 Subject: [core] Eliminate setProperty & co. --- platform/android/src/style/layers/layer.cpp | 4 ++-- platform/node/src/node_map.cpp | 4 ++-- platform/qt/src/qmapboxgl.cpp | 14 +++++++------- platform/qt/src/qmapboxgl_p.hpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'platform') diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index c7a6bcd3a3..c3ae9e40cd 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -91,7 +91,7 @@ namespace android { void Layer::setLayoutProperty(jni::JNIEnv& env, jni::String jname, jni::Object<> jvalue) { // Convert and set property - optional error = mbgl::style::conversion::setLayoutProperty(layer, jni::Make(env, jname), Value(env, jvalue)); + optional error = layer.setLayoutProperty(jni::Make(env, jname), Value(env, jvalue)); if (error) { mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make(env, jname) + " " + error->message); return; @@ -100,7 +100,7 @@ namespace android { void Layer::setPaintProperty(jni::JNIEnv& env, jni::String jname, jni::Object<> jvalue) { // Convert and set property - optional error = mbgl::style::conversion::setPaintProperty(layer, jni::Make(env, jname), Value(env, jvalue)); + optional error = layer.setPaintProperty(jni::Make(env, jname), Value(env, jvalue)); if (error) { mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make(env, jname) + " " + error->message); return; diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index 4bcd1d97bc..0cc93d7e95 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -822,7 +822,7 @@ void NodeMap::SetLayoutProperty(const Nan::FunctionCallbackInfo& info return Nan::ThrowTypeError("Second argument must be a string"); } - mbgl::optional error = setLayoutProperty(*layer, *Nan::Utf8String(info[1]), Convertible(info[2])); + mbgl::optional error = layer->setLayoutProperty(*Nan::Utf8String(info[1]), Convertible(info[2])); if (error) { return Nan::ThrowTypeError(error->message.c_str()); } @@ -854,7 +854,7 @@ void NodeMap::SetPaintProperty(const Nan::FunctionCallbackInfo& info) return Nan::ThrowTypeError("Second argument must be a string"); } - mbgl::optional error = setPaintProperty(*layer, *Nan::Utf8String(info[1]), Convertible(info[2])); + mbgl::optional error = layer->setPaintProperty(*Nan::Utf8String(info[1]), Convertible(info[2])); if (error) { return Nan::ThrowTypeError(error->message.c_str()); } diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 459eacba4b..480174810c 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -1017,7 +1017,7 @@ void QMapboxGL::removeAnnotation(QMapbox::AnnotationID id) */ bool QMapboxGL::setLayoutProperty(const QString& layer, const QString& propertyName, const QVariant& value) { - return d_ptr->setProperty(&mbgl::style::conversion::setLayoutProperty, layer, propertyName, value); + return d_ptr->setProperty(&mbgl::style::Layer::setLayoutProperty, layer, propertyName, value); } /*! @@ -1077,7 +1077,7 @@ bool QMapboxGL::setLayoutProperty(const QString& layer, const QString& propertyN bool QMapboxGL::setPaintProperty(const QString& layer, const QString& propertyName, const QVariant& value) { - return d_ptr->setProperty(&mbgl::style::conversion::setPaintProperty, layer, propertyName, value); + return d_ptr->setProperty(&mbgl::style::Layer::setPaintProperty, layer, propertyName, value); } /*! @@ -1379,7 +1379,7 @@ void QMapboxGL::addCustomLayer(const QString &id, } void initialize() { - ptr->initialize(); + ptr->initialize(); } void render(const mbgl::style::CustomLayerRenderParameters& params) { @@ -1922,16 +1922,16 @@ bool QMapboxGLPrivate::setProperty(const PropertySetter& setter, const QString& if (!document.HasParseError()) { // Treat value as a valid JSON. const mbgl::JSValue* jsonValue = &document; - result = setter(*layerObject, propertyString, jsonValue); + result = (layerObject->*setter)(propertyString, jsonValue); } else { - result = setter(*layerObject, propertyString, value); + result = (layerObject->*setter)(propertyString, value); } } else { - result = setter(*layerObject, propertyString, value); + result = (layerObject->*setter)(propertyString, value); } if (result) { - qWarning() << "Error setting paint property" << name << "on layer" << layer << ":" << QString::fromStdString(result->message); + qWarning() << "Error setting property" << name << "on layer" << layer << ":" << QString::fromStdString(result->message); return false; } diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index 80789ac8f1..b94f4de194 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -37,7 +37,7 @@ public: void render(); void setFramebufferObject(quint32 fbo, const QSize& size); - using PropertySetter = std::function(mbgl::style::Layer&, const std::string&, const mbgl::style::conversion::Convertible&)>; + using PropertySetter = mbgl::optional (mbgl::style::Layer::*)(const std::string&, const mbgl::style::conversion::Convertible&); bool setProperty(const PropertySetter& setter, const QString& layer, const QString& name, const QVariant& value); mbgl::EdgeInsets margins; -- cgit v1.2.1