slideshow: replace for_each with range-based for

Replace ::std::for_each for a more readable range-based for loop in
cases in which the function object to be applied by for_each is more
readable as the body of a for loop. In addition, replace while loops
with range-based for loops when possible and complex implementations
of boost::bind with lambda expressions.

Change-Id: I6adfb18197bd1b8627719adfca2e4c36d58a0e05
Reviewed-on: https://gerrit.libreoffice.org/17786
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

1 files changed, 10 insertions, 16 deletions

diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 647bffe41078..5009dbe62681 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -26,7 +26,6 @@
 #include "activity.hxx"
 #include "activitiesqueue.hxx"
 
-#include <boost/mem_fn.hpp>
 #include <boost/shared_ptr.hpp>
 #include <algorithm>
 
@@ -51,12 +50,10 @@ namespace slideshow
             // dispose all queue entries
             try
             {
-                std::for_each( maCurrentActivitiesWaiting.begin(),
-                               maCurrentActivitiesWaiting.end(),
-                               boost::mem_fn( &Disposable::dispose ) );
-                std::for_each( maCurrentActivitiesReinsert.begin(),
-                               maCurrentActivitiesReinsert.end(),
-                               boost::mem_fn( &Disposable::dispose ) );
+                for( const auto& pActivity : maCurrentActivitiesWaiting )
+                    pActivity->dispose();
+                for( const auto& pActivity : maCurrentActivitiesReinsert )
+                    pActivity->dispose();
             }
             catch (uno::Exception &)
             {
@@ -169,9 +166,8 @@ namespace slideshow
         void ActivitiesQueue::processDequeued()
         {
             // notify all dequeued activities from last round
-            ::std::for_each( maDequeuedActivities.begin(),
-                             maDequeuedActivities.end(),
-                             ::boost::mem_fn( &Activity::dequeued ) );
+            for( const auto& pActivity : maDequeuedActivities )
+                pActivity->dequeued();
             maDequeuedActivities.clear();
         }
 
@@ -183,14 +179,12 @@ namespace slideshow
         void ActivitiesQueue::clear()
         {
             // dequeue all entries:
-            std::for_each( maCurrentActivitiesWaiting.begin(),
-                           maCurrentActivitiesWaiting.end(),
-                           boost::mem_fn( &Activity::dequeued ) );
+            for( const auto& pActivity : maCurrentActivitiesWaiting )
+                pActivity->dequeued();
             ActivityQueue().swap( maCurrentActivitiesWaiting );
 
-            std::for_each( maCurrentActivitiesReinsert.begin(),
-                           maCurrentActivitiesReinsert.end(),
-                           boost::mem_fn( &Activity::dequeued ) );
+            for( const auto& pActivity : maCurrentActivitiesReinsert )
+                pActivity->dequeued();
             ActivityQueue().swap( maCurrentActivitiesReinsert );
         }
     }