[glom] C++11: tests: More range-based for loops.



commit 8d85572d67cc030c04965cbbd919340c7cd54e2a
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Feb 8 20:23:06 2016 +0100

    C++11: tests: More range-based for loops.
    
    With help from clang-modernize-3.7.

 .../eggspreadtablemm/test_spreadtablednd.cc        |    4 ++--
 tests/import/test_parsing.cc                       |   12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc 
b/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
index f2885f5..13893b0 100644
--- a/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
+++ b/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
@@ -67,9 +67,9 @@ populate_spread_table_wrappy(Egg::SpreadTableDnd* spread_table)
     delete child;
   }
 
-  for(gsize i = 0; i < G_N_ELEMENTS (strings); ++i)
+  for(const auto& string : strings)
     {
-      auto label = Gtk::manage(new Gtk::Label(strings[i]));
+      auto label = Gtk::manage(new Gtk::Label(string));
       Gtk::Frame* frame  = Gtk::manage(new Gtk::Frame());
       auto eventbox = Gtk::manage(new Gtk::EventBox());
       label->show();
diff --git a/tests/import/test_parsing.cc b/tests/import/test_parsing.cc
index b03e45b..70b0d9b 100644
--- a/tests/import/test_parsing.cc
+++ b/tests/import/test_parsing.cc
@@ -23,13 +23,11 @@ type_tokens& get_tokens_instance()
 
 void on_line_scanned(const std::vector<Glib::ustring>& row, guint /*line_number*/)
 {
-  for(auto iter = row.begin();
-      iter != row.end();
-      ++iter)
+  for(const auto& elem : row)
   {
     //std::cout << "debug: " << G_STRFUNC << ": item=" << *iter << std::endl;
 
-    get_tokens_instance().emplace_back(*iter);
+    get_tokens_instance().emplace_back(elem);
   }
 }
 
@@ -65,11 +63,9 @@ bool check_tokens(const std::string& regex)
   if(get_tokens_instance().empty())
     return false;
 
-  for(auto iter = get_tokens_instance().begin();
-       iter != get_tokens_instance().end();
-       ++iter)
+  for(const auto& elem : get_tokens_instance())
   {
-    if(std::regex_match(*iter, check))
+    if(std::regex_match(elem, check))
       return true;
   }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]