[lmi-commits] [lmi] master 2038991 15/33: Improve concinnity

[Greg Chicares]

branch: master
commit 20389914e2fa3ef518a75343c6c4d180f6ba8a41
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Improve concinnity
---
 ce_product_name.cpp          | 6 +++---
 ce_skin_name.cpp             | 6 +++---
 dbdict.cpp                   | 8 ++++----
 rate_table_tool.cpp          | 6 +++---
 wx_test_benchmark_census.cpp | 6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ce_product_name.cpp b/ce_product_name.cpp
index 9e829be..2cea0da 100644
--- a/ce_product_name.cpp
+++ b/ce_product_name.cpp
@@ -42,13 +42,13 @@ std::vector<std::string> fetch_product_names()
 {
     fs::path path(global_settings::instance().data_directory());
     std::vector<std::string> names;
-    for(auto const& de : fs::directory_iterator(path))
+    for(auto const& i : fs::directory_iterator(path))
         {
-        if(".policy" != de.path().extension() || de.is_directory())
+        if(".policy" != i.path().extension() || i.is_directory())
             {
             continue;
             }
-        names.push_back(de.path().stem().string());
+        names.push_back(i.path().stem().string());
         }
 
     if(names.empty())
diff --git a/ce_skin_name.cpp b/ce_skin_name.cpp
index b4d9ebe..1d917c6 100644
--- a/ce_skin_name.cpp
+++ b/ce_skin_name.cpp
@@ -41,13 +41,13 @@ std::vector<std::string> fetch_skin_names()
 {
     fs::path path(global_settings::instance().data_directory());
     std::vector<std::string> names;
-    for(auto const& de : fs::directory_iterator(path))
+    for(auto const& i : fs::directory_iterator(path))
         {
-        if(de.is_directory() || ".xrc" != de.path().extension())
+        if(i.is_directory() || ".xrc" != i.path().extension())
             {
             continue;
             }
-        std::string const name(de.path().filename().string());
+        std::string const name(i.path().filename().string());
         if(!begins_with(name, "skin"))
             {
             continue;
diff --git a/dbdict.cpp b/dbdict.cpp
index 89fff73..b06ff54 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -1612,17 +1612,17 @@ void DBDictionary::InitAntediluvian()
 void print_databases()
 {
     fs::path path(global_settings::instance().data_directory());
-    for(auto const& e : fs::directory_iterator(path))
+    for(auto const& i : fs::directory_iterator(path))
         {
-        if(e.is_directory() || ".database" != e.path().extension())
+        if(i.is_directory() || ".database" != i.path().extension())
             {
             continue;
             }
         try
             {
-            DBDictionary const z(e.path().string());
+            DBDictionary const z(i.path().string());
 
-            fs::path out_file{e.path()};
+            fs::path out_file{i.path()};
             out_file.replace_extension(".dbt");
             fs::ofstream os(out_file, ios_out_trunc_binary());
             for(auto const& j : z.member_names())
diff --git a/rate_table_tool.cpp b/rate_table_tool.cpp
index 760cc40..c7ae079 100644
--- a/rate_table_tool.cpp
+++ b/rate_table_tool.cpp
@@ -143,11 +143,11 @@ void merge
         // to verify than equivalence: databases created this way from
         // the same data on different machines have identical md5sums.
         std::vector<fs::path> table_names;
-        for(auto const& de : fs::directory_iterator(path_to_merge))
+        for(auto const& i : fs::directory_iterator(path_to_merge))
             {
-            if(".rates" == de.path().extension())
+            if(".rates" == i.path().extension())
                 {
-                table_names.push_back(de.path());
+                table_names.push_back(i.path());
                 }
             }
         std::sort(table_names.begin(), table_names.end());
diff --git a/wx_test_benchmark_census.cpp b/wx_test_benchmark_census.cpp
index d3d4f37..a52d4fb 100644
--- a/wx_test_benchmark_census.cpp
+++ b/wx_test_benchmark_census.cpp
@@ -135,14 +135,14 @@ class census_benchmark
 
 LMI_WX_TEST_CASE(benchmark_census)
 {
-    for(auto const& de : fs::directory_iterator(get_test_files_path()))
+    for(auto const& i : fs::directory_iterator(get_test_files_path()))
         {
-        
if(!wxString::FromUTF8(de.path().filename().string()).Matches("MSEC*.cns"))
+        
if(!wxString::FromUTF8(i.path().filename().string()).Matches("MSEC*.cns"))
             {
             continue;
             }
 
-        census_benchmark b(de.path());
+        census_benchmark b(i.path());
 
         {
         // Ensure that the window doesn't stay opened (and possibly affects