[core] Fix readability-* errors

As reported by clang-tidy-8.

10 files changed, 27 insertions, 20 deletions

diff --git a/platform/default/include/mbgl/gfx/headless_frontend.hpp b/platform/default/include/mbgl/gfx/headless_frontend.hpp
index 9b079f9333..3c49e78cd0 100644
--- a/platform/default/include/mbgl/gfx/headless_frontend.hpp
+++ b/platform/default/include/mbgl/gfx/headless_frontend.hpp
@@ -24,12 +24,12 @@ public:
     };
 
     HeadlessFrontend(float pixelRatio_,
-                     gfx::HeadlessBackend::SwapBehaviour swapBehviour = gfx::HeadlessBackend::SwapBehaviour::NoFlush,
+                     gfx::HeadlessBackend::SwapBehaviour swapBehavior = gfx::HeadlessBackend::SwapBehaviour::NoFlush,
                      gfx::ContextMode mode = gfx::ContextMode::Unique,
                      const optional<std::string>& localFontFamily = {});
     HeadlessFrontend(Size,
                      float pixelRatio_,
-                     gfx::HeadlessBackend::SwapBehaviour swapBehviour = gfx::HeadlessBackend::SwapBehaviour::NoFlush,
+                     gfx::HeadlessBackend::SwapBehaviour swapBehavior = gfx::HeadlessBackend::SwapBehaviour::NoFlush,
                      gfx::ContextMode mode = gfx::ContextMode::Unique,
                      const optional<std::string>& localFontFamily = {});
     ~HeadlessFrontend() override;
diff --git a/platform/default/src/mbgl/i18n/collator.cpp b/platform/default/src/mbgl/i18n/collator.cpp
index f04fe3eca8..fe5917c7e5 100644
--- a/platform/default/src/mbgl/i18n/collator.cpp
+++ b/platform/default/src/mbgl/i18n/collator.cpp
@@ -21,7 +21,8 @@
 namespace {
 std::string unaccent(const std::string& str) {
     std::stringstream output;
-    char const *itr = str.c_str(), *nitr;
+    char const* itr = str.c_str();
+    char const* nitr;
     char const* end = itr + str.length();
     char lo[5] = {0};
 
diff --git a/platform/default/src/mbgl/storage/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp
index 8536990a57..5eb7592965 100644
--- a/platform/default/src/mbgl/storage/http_file_source.cpp
+++ b/platform/default/src/mbgl/storage/http_file_source.cpp
@@ -71,8 +71,8 @@ public:
     void handleResult(CURLcode code);
 
 private:
-    static size_t headerCallback(char *const buffer, const size_t size, const size_t nmemb, void *userp);
-    static size_t writeCallback(void *const contents, const size_t size, const size_t nmemb, void *userp);
+    static size_t headerCallback(char *buffer, size_t size, size_t nmemb, void *userp);
+    static size_t writeCallback(void *contents, size_t size, size_t nmemb, void *userp);
 
     HTTPFileSource::Impl* context = nullptr;
     Resource resource;
@@ -328,7 +328,7 @@ size_t HTTPRequest::headerCallback(char *const buffer, const size_t size, const
         baton->response->etag = std::string(buffer + begin, length - begin - 2); // remove \r\n
     } else if ((begin = headerMatches("cache-control: ", buffer, length)) != std::string::npos) {
         const std::string value { buffer + begin, length - begin - 2 }; // remove \r\n
-        const auto cc = http::CacheControl::parse(value.c_str());
+        const auto cc = http::CacheControl::parse(value);
         baton->response->expires = cc.toTimePoint();
         baton->response->mustRevalidate = cc.mustRevalidate;
     } else if ((begin = headerMatches("expires: ", buffer, length)) != std::string::npos) {
diff --git a/platform/default/src/mbgl/storage/offline_database.cpp b/platform/default/src/mbgl/storage/offline_database.cpp
index 912b323e70..ff283ed105 100644
--- a/platform/default/src/mbgl/storage/offline_database.cpp
+++ b/platform/default/src/mbgl/storage/offline_database.cpp
@@ -97,11 +97,7 @@ bool OfflineDatabase::disabled() {
     }
 
     auto regions = listRegions();
-    if (regions && !regions.value().empty()) {
-        return false;
-    }
-
-    return true;
+    return !(regions && !regions.value().empty());
 }
 
 void OfflineDatabase::handleError(const mapbox::sqlite::Exception& ex, const char* action) {
diff --git a/platform/default/src/mbgl/storage/online_file_source.cpp b/platform/default/src/mbgl/storage/online_file_source.cpp
index bc9ee40bca..aa854933db 100644
--- a/platform/default/src/mbgl/storage/online_file_source.cpp
+++ b/platform/default/src/mbgl/storage/online_file_source.cpp
@@ -213,7 +213,7 @@ private:
     //                              firstLowPriorityRequest
 
     struct PendingRequests {
-        PendingRequests() : queue(), firstLowPriorityRequest(queue.begin()) {}
+        PendingRequests() : firstLowPriorityRequest(queue.begin()) {}
 
         std::list<OnlineFileRequest*> queue;
         std::list<OnlineFileRequest*>::iterator firstLowPriorityRequest;
diff --git a/platform/default/src/mbgl/util/string_stdlib.cpp b/platform/default/src/mbgl/util/string_stdlib.cpp
index 103444df1c..f2c554a3e9 100644
--- a/platform/default/src/mbgl/util/string_stdlib.cpp
+++ b/platform/default/src/mbgl/util/string_stdlib.cpp
@@ -8,7 +8,8 @@ namespace mbgl { namespace platform {
 std::string uppercase(const std::string& str)
 {
     std::stringstream output;
-    char const *itr = str.c_str(), *nitr;
+    char const *itr = str.c_str();
+    char const *nitr;
     char const *end = itr + str.length();
     char lo[5] = { 0 };
 
@@ -41,7 +42,8 @@ std::string uppercase(const std::string& str)
 std::string lowercase(const std::string& str)
 {
     std::stringstream output;
-    char const *itr = str.c_str(), *nitr;
+    char const *itr = str.c_str();
+    char const *nitr;
     char const *end = itr + str.length();
     char lo[5] = { 0 };
 
diff --git a/platform/glfw/glfw_gl_backend.cpp b/platform/glfw/glfw_gl_backend.cpp
index 6eb58d4fa6..6af68d83d6 100644
--- a/platform/glfw/glfw_gl_backend.cpp
+++ b/platform/glfw/glfw_gl_backend.cpp
@@ -26,7 +26,8 @@ GLFWGLBackend::GLFWGLBackend(GLFWwindow* window_, const bool capFrameRate)
     : mbgl::gl::RendererBackend(mbgl::gfx::ContextMode::Unique),
       mbgl::gfx::Renderable(
           [window_] {
-              int fbWidth, fbHeight;
+              int fbWidth;
+              int fbHeight;
               glfwGetFramebufferSize(window_, &fbWidth, &fbHeight);
               return mbgl::Size{ static_cast<uint32_t>(fbWidth), static_cast<uint32_t>(fbHeight) };
           }(),
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp
index 332ac7c0fb..f59d44bd8c 100644
--- a/platform/glfw/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -764,7 +764,7 @@ void GLFWView::onMouseMove(GLFWwindow *window, double x, double y) {
         using namespace mbgl;
         FeatureState newState;
 
-        if (result.size() > 0) {
+        if (!result.empty()) {
             FeatureIdentifier id = result[0].id;
             optional<std::string> idStr = featureIDtoString(id);
 
diff --git a/platform/node/src/node_logging.hpp b/platform/node/src/node_logging.hpp
index a12603ba6e..e01f8cbafd 100644
--- a/platform/node/src/node_logging.hpp
+++ b/platform/node/src/node_logging.hpp
@@ -20,7 +20,10 @@ public:
     ~NodeLogObserver();
 
     // Log::Observer implementation
-    virtual bool onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &msg) override;
+    virtual bool onRecord(mbgl::EventSeverity severity,
+                          mbgl::Event event,
+                          int64_t code,
+                          const std::string& text) override;
 
 private:
     Nan::Persistent<v8::Object> module;
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index 5732484e60..bbd8bcfa05 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -1086,7 +1086,8 @@ void NodeMap::SetFeatureState(const Nan::FunctionCallbackInfo<v8::Value>& info)
         return Nan::ThrowTypeError("Both arguments must be objects");
     }
 
-    std::string sourceID, featureID;
+    std::string sourceID;
+    std::string featureID;
     mbgl::optional<std::string> sourceLayerID;
     auto feature = Nan::To<v8::Object>(info[0]).ToLocalChecked();
     if (Nan::Has(feature, Nan::New("source").ToLocalChecked()).FromJust()) {
@@ -1186,7 +1187,8 @@ void NodeMap::GetFeatureState(const Nan::FunctionCallbackInfo<v8::Value>& info)
         return Nan::ThrowTypeError("Argument must be object");
     }
 
-    std::string sourceID, featureID;
+    std::string sourceID;
+    std::string featureID;
     mbgl::optional<std::string> sourceLayerID;
     auto feature = Nan::To<v8::Object>(info[0]).ToLocalChecked();
     if (Nan::Has(feature, Nan::New("source").ToLocalChecked()).FromJust()) {
@@ -1244,7 +1246,9 @@ void NodeMap::RemoveFeatureState(const Nan::FunctionCallbackInfo<v8::Value>& inf
     }
 
     std::string sourceID;
-    mbgl::optional<std::string> sourceLayerID, featureID, stateKey;
+    mbgl::optional<std::string> sourceLayerID;
+    mbgl::optional<std::string> featureID;
+    mbgl::optional<std::string> stateKey;
     auto feature = Nan::To<v8::Object>(info[0]).ToLocalChecked();
     if (Nan::Has(feature, Nan::New("source").ToLocalChecked()).FromJust()) {
         auto sourceOption = Nan::Get(feature, Nan::New("source").ToLocalChecked()).ToLocalChecked();