[core] clang-tidy fixes

6 files changed, 16 insertions, 14 deletions

diff --git a/platform/default/src/mbgl/storage/default_file_source.cpp b/platform/default/src/mbgl/storage/default_file_source.cpp
index 4d812044cf..1ccf999109 100644
--- a/platform/default/src/mbgl/storage/default_file_source.cpp
+++ b/platform/default/src/mbgl/storage/default_file_source.cpp
@@ -14,13 +14,14 @@
 #include <mbgl/util/stopwatch.hpp>
 
 #include <cassert>
+#include <utility>
 
 namespace mbgl {
 
 class DefaultFileSource::Impl {
 public:
     Impl(std::shared_ptr<FileSource> assetFileSource_, std::string cachePath, uint64_t maximumCacheSize)
-            : assetFileSource(assetFileSource_)
+            : assetFileSource(std::move(assetFileSource_))
             , localFileSource(std::make_unique<LocalFileSource>())
             , offlineDatabase(std::make_unique<OfflineDatabase>(cachePath, maximumCacheSize)) {
     }
diff --git a/platform/default/src/mbgl/storage/offline.cpp b/platform/default/src/mbgl/storage/offline.cpp
index fd945c724f..dd809ad129 100644
--- a/platform/default/src/mbgl/storage/offline.cpp
+++ b/platform/default/src/mbgl/storage/offline.cpp
@@ -10,6 +10,7 @@
 #include <rapidjson/writer.h>
 
 #include <cmath>
+#include <utility>
 
 namespace mbgl {
 
@@ -33,7 +34,7 @@ OfflineTilePyramidRegionDefinition::OfflineTilePyramidRegionDefinition(
 // OfflineGeometryRegionDefinition
 
 OfflineGeometryRegionDefinition::OfflineGeometryRegionDefinition(std::string styleURL_, Geometry<double> geometry_, double minZoom_, double maxZoom_, float pixelRatio_, bool includeIdeographs_)
-    : styleURL(styleURL_)
+    : styleURL(std::move(styleURL_))
     , geometry(std::move(geometry_))
     , minZoom(minZoom_)
     , maxZoom(maxZoom_)
diff --git a/platform/default/src/mbgl/text/bidi.cpp b/platform/default/src/mbgl/text/bidi.cpp
index 32a3dc23ef..6bb2d36446 100644
--- a/platform/default/src/mbgl/text/bidi.cpp
+++ b/platform/default/src/mbgl/text/bidi.cpp
@@ -180,7 +180,7 @@ std::vector<StyledText> BiDi::processStyledText(const StyledText& input, std::se
     
 std::u16string BiDi::writeReverse(const std::u16string& input, std::size_t logicalStart, std::size_t logicalEnd) {
     UErrorCode errorCode = U_ZERO_ERROR;
-    int32_t logicalLength = static_cast<int32_t>(logicalEnd - logicalStart);
+    auto logicalLength = static_cast<int32_t>(logicalEnd - logicalStart);
     std::u16string outputText(logicalLength + 1, 0);
     
     // UBIDI_DO_MIRRORING: Apply unicode mirroring of characters like parentheses
diff --git a/platform/node/src/node_expression.cpp b/platform/node/src/node_expression.cpp
index 4f1e392505..e980c464d8 100644
--- a/platform/node/src/node_expression.cpp
+++ b/platform/node/src/node_expression.cpp
@@ -173,7 +173,7 @@ struct ToValue {
             } else {
                 serializedSection.emplace("fontStack", mbgl::NullValue());
             }
-            sections.push_back(serializedSection);
+            sections.emplace_back(serializedSection);
         }
         serialized.emplace("sections", sections);
 
@@ -205,7 +205,7 @@ v8::Local<v8::Value> toJS(const Value& value) {
 }
 
 void NodeExpression::Evaluate(const Nan::FunctionCallbackInfo<v8::Value>& info) {
-    NodeExpression* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
+    auto* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
     const std::unique_ptr<Expression>& expression = nodeExpr->expression;
 
     if (info.Length() < 2 || !info[0]->IsObject()) {
@@ -246,7 +246,7 @@ void NodeExpression::Evaluate(const Nan::FunctionCallbackInfo<v8::Value>& info)
 }
 
 void NodeExpression::GetType(const Nan::FunctionCallbackInfo<v8::Value>& info) {
-    NodeExpression* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
+    auto* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
     const std::unique_ptr<Expression>& expression = nodeExpr->expression;
 
     const type::Type type = expression->getType();
@@ -255,19 +255,19 @@ void NodeExpression::GetType(const Nan::FunctionCallbackInfo<v8::Value>& info) {
 }
 
 void NodeExpression::IsFeatureConstant(const Nan::FunctionCallbackInfo<v8::Value>& info) {
-    NodeExpression* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
+    auto* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
     const std::unique_ptr<Expression>& expression = nodeExpr->expression;
     info.GetReturnValue().Set(Nan::New(isFeatureConstant(*expression)));
 }
 
 void NodeExpression::IsZoomConstant(const Nan::FunctionCallbackInfo<v8::Value>& info) {
-    NodeExpression* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
+    auto* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
     const std::unique_ptr<Expression>& expression = nodeExpr->expression;
     info.GetReturnValue().Set(Nan::New(isZoomConstant(*expression)));
 }
 
 void NodeExpression::Serialize(const Nan::FunctionCallbackInfo<v8::Value>& info) {
-    NodeExpression* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
+    auto* nodeExpr = ObjectWrap::Unwrap<NodeExpression>(info.Holder());
     const std::unique_ptr<Expression>& expression = nodeExpr->expression;
 
     const mbgl::Value serialized = expression->serialize();
diff --git a/platform/node/src/node_feature.cpp b/platform/node/src/node_feature.cpp
index ee1cdab031..2dfab686a7 100644
--- a/platform/node/src/node_feature.cpp
+++ b/platform/node/src/node_feature.cpp
@@ -47,9 +47,9 @@ public:
     }
 
 private:
-    v8::Local<v8::String> type(const char* type) {
+    v8::Local<v8::String> type(const char* type_) {
         Nan::EscapableHandleScope scope;
-        return scope.Escape(Nan::New(type).ToLocalChecked());
+        return scope.Escape(Nan::New(type_).ToLocalChecked());
     }
 };
 
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index 291dea6bb7..7156a1f1bf 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -1254,10 +1254,10 @@ std::unique_ptr<mbgl::AsyncRequest> NodeFileSource::request(const mbgl::Resource
     Nan::Set(instance, Nan::New("url").ToLocalChecked(), Nan::New(resource.url).ToLocalChecked());
     Nan::Set(instance, Nan::New("kind").ToLocalChecked(), Nan::New<v8::Integer>(resource.kind));
 
-    auto request = Nan::ObjectWrap::Unwrap<node_mbgl::NodeRequest>(instance);
-    request->Execute();
+    auto req = Nan::ObjectWrap::Unwrap<node_mbgl::NodeRequest>(instance);
+    req->Execute();
 
-    return std::make_unique<node_mbgl::NodeRequest::NodeAsyncRequest>(request);
+    return std::make_unique<node_mbgl::NodeRequest::NodeAsyncRequest>(req);
 }
 
 } // namespace node_mbgl