diff options
Diffstat (limited to 'platform/default')
6 files changed, 13 insertions, 14 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 }; |