diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-03 12:27:14 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-04-05 11:49:17 +0200 |
commit | 3ceabcd3ec91dbd9458d3c5b78fb12c3182636e1 (patch) | |
tree | b8be2ac790afce844178a314b42683ab9d06f744 /platform/node | |
parent | d7aaf83421261087a99d18d92eca9637c1bf72f8 (diff) | |
download | qtlocation-mapboxgl-3ceabcd3ec91dbd9458d3c5b78fb12c3182636e1.tar.gz |
[core] clang-tidy fixes
Diffstat (limited to 'platform/node')
-rw-r--r-- | platform/node/src/node_expression.cpp | 12 | ||||
-rw-r--r-- | platform/node/src/node_feature.cpp | 4 | ||||
-rw-r--r-- | platform/node/src/node_map.cpp | 6 |
3 files changed, 11 insertions, 11 deletions
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 |