From 63edca8ee81704a1ad753b9d59dddda72146d7e4 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Tue, 1 Jul 2014 16:51:00 +0100
Subject: [PATCH] incidental simplification

---
 src/blackmisc/audiodevicelist.cpp   |  8 +++-----
 src/blackmisc/avairportlist.cpp     | 15 +++------------
 src/blackmisc/nwtextmessagelist.cpp |  7 +------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/blackmisc/audiodevicelist.cpp b/src/blackmisc/audiodevicelist.cpp
index 98ef22b72..71230684b 100644
--- a/src/blackmisc/audiodevicelist.cpp
+++ b/src/blackmisc/audiodevicelist.cpp
@@ -43,12 +43,10 @@ namespace BlackMisc
          */
         int CAudioDeviceList::count(CAudioDevice::DeviceType type) const
         {
-            int c = 0;
-            foreach(CAudioDevice device, *this)
+            return std::count_if(this->begin(), this->end(), [type](const CAudioDevice &device)
             {
-                if (device.getType() == type) c++;
-            }
-            return c;
+                return device.getType() == type;
+            });
         }
 
         /*
diff --git a/src/blackmisc/avairportlist.cpp b/src/blackmisc/avairportlist.cpp
index 8dbb02c89..c1954e817 100644
--- a/src/blackmisc/avairportlist.cpp
+++ b/src/blackmisc/avairportlist.cpp
@@ -86,19 +86,10 @@ namespace BlackMisc
          */
         void CAirportList::removeIfOutsideRange(const Geo::CCoordinateGeodetic &position, const CLength &maxDistance, bool updateValues)
         {
-            CLength d;
-            for (CAirportList::iterator i = begin(); i != end();)
+            this->removeIf([ & ](CAirport &airport)
             {
-                d = i->calculcateDistanceAndBearingToPlane(position, updateValues);
-                if (maxDistance < d)
-                {
-                    i = this->erase(i);
-                }
-                else
-                {
-                    ++i;
-                }
-            }
+                return airport.calculcateDistanceAndBearingToPlane(position, updateValues) > maxDistance;
+            });
         }
     } // namespace
 } // namespace
diff --git a/src/blackmisc/nwtextmessagelist.cpp b/src/blackmisc/nwtextmessagelist.cpp
index 7dbaeb3b4..fdff3aff5 100644
--- a/src/blackmisc/nwtextmessagelist.cpp
+++ b/src/blackmisc/nwtextmessagelist.cpp
@@ -132,12 +132,7 @@ namespace BlackMisc
         void CTextMessageList::toggleSenderRecipients()
         {
             if (this->isEmpty()) return;
-            for (int i = 0; i < this->size(); i++)
-            {
-                CTextMessage tm = (*this)[i];
-                tm.toggleSenderRecipient();
-                (*this)[i] = tm;
-            }
+            std::for_each(this->begin(), this->end(), [](CTextMessage &tm) { tm.toggleSenderRecipient(); });
         }
 
     } // namespace