Move, don't copy construct

3 files changed, 5 insertions, 5 deletions

diff --git a/include/mbgl/style/conversion.hpp b/include/mbgl/style/conversion.hpp
index 26cccacd33..41ccbf0ff2 100644
--- a/include/mbgl/style/conversion.hpp
+++ b/include/mbgl/style/conversion.hpp
@@ -247,12 +247,12 @@ private:
             },
             [] (const Storage& s, const char * key) {
                 optional<T> member = Traits::objectMember(reinterpret_cast<const T&>(s), key);
-                if (member) return optional<Convertible>(*member);
+                if (member) return optional<Convertible>(std::move(*member));
                 return optional<Convertible>();
             },
             [] (const Storage& s, const std::function<optional<Error> (const std::string&, const Convertible&)>& fn) {
-                return Traits::eachMember(reinterpret_cast<const T&>(s), [&](const std::string& k, const T& v) {
-                    return fn(k, Convertible(v));
+                return Traits::eachMember(reinterpret_cast<const T&>(s), [&](const std::string& k, const T&& v) {
+                    return fn(k, Convertible(std::move(v)));
                 });
             },
             [] (const Storage& s) {
diff --git a/platform/node/src/node_conversion.hpp b/platform/node/src/node_conversion.hpp
index ed457c1a39..7c5bbf4386 100644
--- a/platform/node/src/node_conversion.hpp
+++ b/platform/node/src/node_conversion.hpp
@@ -66,7 +66,7 @@ public:
         for (uint32_t i = 0; i < names->Length(); ++i) {
             v8::Local<v8::Value> k = Nan::Get(names, i).ToLocalChecked();
             v8::Local<v8::Value> v = Nan::Get(Nan::To<v8::Object>(value).ToLocalChecked(), k).ToLocalChecked();
-            optional<Error> result = fn(*Nan::Utf8String(k), v);
+            optional<Error> result = fn(*Nan::Utf8String(k), std::move(v));
             if (result) {
                 return result;
             }
diff --git a/platform/qt/src/qt_conversion.hpp b/platform/qt/src/qt_conversion.hpp
index eaeb391db0..19b0cb54fc 100644
--- a/platform/qt/src/qt_conversion.hpp
+++ b/platform/qt/src/qt_conversion.hpp
@@ -59,7 +59,7 @@ public:
         auto iter = map.constBegin();
 
         while (iter != map.constEnd()) {
-            optional<Error> result = fn(iter.key().toStdString(), iter.value());
+            optional<Error> result = fn(iter.key().toStdString(), QVariant(iter.value()));
             if (result) {
                 return result;
             }