commit 6db7b24348e69639e19cd6c408388b10d6ee54fe
author Paul Stewart <pstew@chromium.org> Fri May 02 15:34:21 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat May 03 20:41:10 2014 +0000
tree 4ed9f25d67660088287ff9fa11669463691ebcf4
parent e783f1c2004e35db6eff036e5d7b3a5b99b724ff

shill: Remove trivial use of iterators

Move trivial iterations through containers from using an iterator
to using range-based for loops.  In instances where it makes sense
also use "auto" for iterators in non-trivial for loops as well.

BUG=None
TEST=Unit tests

Change-Id: I840d90fb62dc96d45f63144462b9a53b28c25ee9
Reviewed-on: https://chromium-review.googlesource.com/198051
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

profile.cc

diff --git a/profile.cc b/profile.cc
index 0ec0121..475ac31 100644
--- a/profile.cc
+++ b/profile.cc
@@ -223,8 +223,8 @@
   if (token.empty()) {
     return false;
   }
-  for (string::const_iterator it = token.begin(); it != token.end(); ++it) {
-    if (!IsAsciiAlpha(*it) && !IsAsciiDigit(*it)) {
+  for (auto chr : token) {
+    if (!IsAsciiAlpha(chr) && !IsAsciiDigit(chr)) {
       return false;
     }
   }
@@ -283,9 +283,7 @@
 
   vector<string> profile_lines;
   base::SplitStringDontTrim(profile_data, '\n', &profile_lines);
-  vector<string>::const_iterator it;
-  for (it = profile_lines.begin(); it != profile_lines.end(); ++it) {
-    const string &line = *it;
+  for (const auto &line : profile_lines) {
     if (line.empty()) {
       // This will be the case on the last line, so let's not complain about it.
       continue;
@@ -314,9 +312,8 @@
 bool Profile::SaveUserProfileList(const FilePath &path,
                                   const vector<ProfileRefPtr> &profiles) {
   vector<string> lines;
-  vector<ProfileRefPtr>::const_iterator it;
-  for (it = profiles.begin(); it != profiles.end(); ++it) {
-    Identifier &id = (*it)->name_;
+  for (const auto &profile : profiles) {
+    Identifier &id = profile->name_;
     if (id.user.empty()) {
       continue;
     }
@@ -359,15 +356,13 @@
 }
 
 vector<string> Profile::EnumerateEntries(Error */*error*/) {
-  set<string> groups(storage_->GetGroups());
   vector<string> service_groups;
 
   // Filter this list down to only entries that correspond
   // to a technology.  (wifi_*, etc)
-  for (set<string>::iterator it = groups.begin();
-       it != groups.end(); ++it) {
-    if (Technology::IdentifierFromStorageGroup(*it) != Technology::kUnknown)
-      service_groups.push_back(*it);
+  for (const auto &group : storage_->GetGroups()) {
+    if (Technology::IdentifierFromStorageGroup(group) != Technology::kUnknown)
+      service_groups.push_back(group);
   }
 
   return service_groups;