From 19c15ab557728247ea900118aaace1e45763baf4 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 12 May 2017 16:19:05 +0300 Subject: [PATCH] [tidy] modernize-loop-convert --- src/csscolorparser/csscolorparser.cpp | 6 +++--- src/mbgl/style/style.cpp | 4 ++-- src/mbgl/text/glyph_atlas.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/csscolorparser/csscolorparser.cpp b/src/csscolorparser/csscolorparser.cpp index 5658f2b63..4d1c6a3d6 100644 --- a/src/csscolorparser/csscolorparser.cpp +++ b/src/csscolorparser/csscolorparser.cpp @@ -186,9 +186,9 @@ optional parse(const std::string& css_str) { std::transform(str.begin(), str.end(), str.begin(), ::tolower); - for (size_t i = 0; i < namedColorCount; i++) { - if (str == namedColors[i].name) { - return { namedColors[i].color }; + for (const auto& namedColor : namedColors) { + if (str == namedColor.name) { + return { namedColor.color }; } } diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 97d30b249..9cd8cda1e 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -583,8 +583,8 @@ RenderData Style::getRenderData(MapDebugOptions debugOptions, float angle) const } std::vector> sortedTilesForInsertion; - for (auto tileIt = sortedTiles.begin(); tileIt != sortedTiles.end(); ++tileIt) { - auto& tile = tileIt->get(); + for (auto& sortedTile : sortedTiles) { + auto& tile = sortedTile.get(); if (!tile.tile.isRenderable()) { continue; } diff --git a/src/mbgl/text/glyph_atlas.cpp b/src/mbgl/text/glyph_atlas.cpp index 4feaab01f..b43971f70 100644 --- a/src/mbgl/text/glyph_atlas.cpp +++ b/src/mbgl/text/glyph_atlas.cpp @@ -207,8 +207,8 @@ Rect GlyphAtlas::addGlyph(GlyphValue& value) { } void GlyphAtlas::removeGlyphValues(GlyphRequestor& requestor, std::map& values) { - for (auto it = values.begin(); it != values.end(); it++) { - GlyphValue& value = it->second; + for (auto& it : values) { + GlyphValue& value = it.second; if (value.ids.erase(&requestor) && value.ids.empty() && value.rect) { const Rect& rect = *value.rect; @@ -228,8 +228,8 @@ void GlyphAtlas::removeGlyphValues(GlyphRequestor& requestor, std::map& ranges) { - for (auto it = ranges.begin(); it != ranges.end(); it++) { - it->second.requestors.erase(&requestor); + for (auto& range : ranges) { + range.second.requestors.erase(&requestor); } }