code deduplication by using <algorithm> and FbTk/STLUtil.hh

3 files changed, 53 insertions, 53 deletions

diff --git a/src/FbTk/Container.cc b/src/FbTk/Container.cc
index ce143ef..e1d2e07 100644
--- a/src/FbTk/Container.cc
+++ b/src/FbTk/Container.cc
@@ -26,6 +26,7 @@
 #include "TextUtils.hh"
 #include "EventManager.hh"
 #include "CompareEqual.hh"
+#include "STLUtil.hh"
 
 #include <algorithm>
 
@@ -78,7 +79,7 @@ void Container::insertItem(Item item, int pos) {
     } else if (pos == 0) {
         m_item_list.push_front(item);
     } else {
-        ItemList::iterator it = m_item_list.begin();
+        ItemList::iterator it = begin();
         for (; pos != 0; ++it, --pos)
             continue;
 
@@ -104,12 +105,10 @@ void Container::moveItem(Item item, int movement) {
     if (newindex < 0) // neg wrap
         newindex += size;
 
-    ItemList::iterator it = std::find(m_item_list.begin(),
-                                      m_item_list.end(),
-                                      item);
+    ItemList::iterator it = std::find(begin(), end(), item);
     m_item_list.erase(it);
 
-    for (it = m_item_list.begin(); newindex >= 0; ++it, --newindex) {
+    for (it = begin(); newindex >= 0; ++it, --newindex) {
         if (newindex == 0) {
             break;
         }
@@ -143,12 +142,11 @@ bool Container::moveItemTo(Item item, int x, int y) {
                                &itemwin))
         return false;
 
-    ItemList::iterator it = find_if(m_item_list.begin(),
-                                    m_item_list.end(),
+    ItemList::iterator it = find_if(begin(), end(),
                                     CompareWindow(&FbWindow::window,
                                                   itemwin));
     // not found :(
-    if (it == m_item_list.end())
+    if (it == end())
         return false;
 
     Window child_return = 0;
@@ -162,8 +160,8 @@ bool Container::moveItemTo(Item item, int x, int y) {
 }
 
 bool Container::removeItem(Item item) {
-    ItemList::iterator it = m_item_list.begin();
-    ItemList::iterator it_end = m_item_list.end();
+    ItemList::iterator it = begin();
+    ItemList::iterator it_end = end();
     for (; it != it_end && (*it) != item; ++it);
 
     if (it == it_end)
@@ -178,7 +176,7 @@ bool Container::removeItem(int index) {
     if (index < 0 || index > size())
         return false;
 
-    ItemList::iterator it = m_item_list.begin();
+    ItemList::iterator it = begin();
     for (; index != 0; ++it, --index)
         continue;
 
@@ -247,12 +245,11 @@ bool Container::tryExposeEvent(XExposeEvent &event) {
         return true;
     }
 
-    ItemList::iterator it = find_if(m_item_list.begin(),
-                                    m_item_list.end(),
+    ItemList::iterator it = find_if(begin(), end(),
                                     CompareWindow(&FbWindow::window,
                                                   event.window));
     // not found :(
-    if (it == m_item_list.end())
+    if (it == end())
         return false;
 
     (*it)->exposeEvent(event);
@@ -265,12 +262,11 @@ bool Container::tryButtonPressEvent(XButtonEvent &event) {
         return true;
     }
 
-    ItemList::iterator it = find_if(m_item_list.begin(),
-                                    m_item_list.end(),
+    ItemList::iterator it = find_if(begin(), end(),
                                     CompareWindow(&FbWindow::window,
                                                   event.window));
     // not found :(
-    if (it == m_item_list.end())
+    if (it == end())
         return false;
 
     (*it)->buttonPressEvent(event);
@@ -283,12 +279,11 @@ bool Container::tryButtonReleaseEvent(XButtonEvent &event) {
         return true;
     }
 
-    ItemList::iterator it = find_if(m_item_list.begin(),
-                                    m_item_list.end(),
+    ItemList::iterator it = find_if(begin(), end(),
                                     CompareWindow(&FbWindow::window,
                                                   event.window));
     // not found :(
-    if (it == m_item_list.end())
+    if (it == end())
         return false;
 
     (*it)->buttonReleaseEvent(event);
@@ -360,8 +355,8 @@ void Container::repositionItems() {
     }
 
 
-    ItemList::iterator it = m_item_list.begin();
-    const ItemList::iterator it_end = m_item_list.end();
+    ItemList::iterator it = begin();
+    const ItemList::iterator it_end = end();
 
     int rounding_error = 0;
 
@@ -442,41 +437,26 @@ unsigned int Container::maxWidthPerClient() const {
 }
 
 void Container::for_each(std::mem_fun_t<void, FbWindow> function) {
-    std::for_each(m_item_list.begin(),
-                  m_item_list.end(),
-                  function);
+    std::for_each(begin(), end(), function);
 }
 
 void Container::setAlpha(unsigned char alpha) {
     FbWindow::setAlpha(alpha);
-    ItemList::iterator it = m_item_list.begin();
-    ItemList::iterator it_end = m_item_list.end();
-    for (; it != it_end; ++it)
-        (*it)->setAlpha(alpha);
+    STLUtil::forAll(m_item_list, std::bind2nd(std::mem_fun(&Button::setAlpha), alpha));
 }
 
 void Container::parentMoved() {
     FbWindow::parentMoved();
-    ItemList::iterator it = m_item_list.begin();
-    ItemList::iterator it_end = m_item_list.end();
-    for (; it != it_end; ++it)
-        (*it)->parentMoved();
+    STLUtil::forAll(m_item_list, std::mem_fun(&Button::parentMoved));
 }
 
 void Container::invalidateBackground() {
     FbWindow::invalidateBackground();
-    ItemList::iterator it = m_item_list.begin();
-    ItemList::iterator it_end = m_item_list.end();
-    for (; it != it_end; ++it)
-        (*it)->invalidateBackground();
+    STLUtil::forAll(m_item_list, std::mem_fun(&Button::invalidateBackground));
 }
 
 void Container::clear() {
-    ItemList::iterator it = m_item_list.begin();
-    ItemList::iterator it_end = m_item_list.end();
-    for (; it != it_end; ++it)
-        (*it)->clear();
-
+    STLUtil::forAll(m_item_list, std::mem_fun(&Button::clear));
 }
 
 void Container::setOrientation(Orientation orient) {
@@ -484,11 +464,7 @@ void Container::setOrientation(Orientation orient) {
         return;
 
     FbWindow::invalidateBackground();
-
-    ItemList::iterator it = m_item_list.begin();
-    ItemList::iterator it_end = m_item_list.end();
-    for (; it != it_end; ++it)
-        (*it)->setOrientation(orient);
+    STLUtil::forAll(m_item_list, std::bind2nd(std::mem_fun(&Button::setOrientation), orient));
 
     if (((m_orientation == ROT0 || m_orientation == ROT180) &&
         (orient == ROT90 || orient == ROT270)) ||
diff --git a/src/FbTk/STLUtil.hh b/src/FbTk/STLUtil.hh
index e08036a..b1007f7 100644
--- a/src/FbTk/STLUtil.hh
+++ b/src/FbTk/STLUtil.hh
@@ -68,6 +68,33 @@ void destroyAndClearSecond(A &a) {
     a.clear();
 }
 
+
+template <typename C, typename F>
+F forAll(C& c, F f) {
+    typedef typename C::iterator iterator;
+    iterator i = c.begin();
+    iterator e = c.end();
+    for (; i != e; i++) {
+        f(*i);
+    }
+    return f;
+}
+
+template <typename C, typename I, typename F>
+F forAllIf(C& c, I i, F f) {
+    typedef typename C::iterator iterator;
+    iterator it = c.begin();
+    iterator end = c.end();
+    for (; it != end; it++) {
+        if (i(*it))
+            f(*it);
+    }
+    return f;
+}
+
+
+
+
 } // end namespace STLUtil
 } // end namespace FbTk
 
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index cd478fc..c92e563 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -27,6 +27,7 @@
 #include "FileUtil.hh"
 #include "I18n.hh"
 #include "Image.hh"
+#include "STLUtil.hh"
 
 #ifdef HAVE_CSTDIO
   #include <cstdio>
@@ -50,13 +51,11 @@ struct LoadThemeHelper {
     }
     void operator ()(ThemeManager::ThemeList &tmlist) {
 
-        for_each(tmlist.begin(), tmlist.end(),
-                 *this);
+        STLUtil::forAll(tmlist, *this);
         // send reconfiguration signal to theme and listeners
         ThemeManager::ThemeList::iterator it = tmlist.begin();
         ThemeManager::ThemeList::iterator it_end = tmlist.end();
         for (; it != it_end; ++it) {
-            (*it)->reconfigTheme();
             (*it)->reconfigSig().notify();
         }
     }
@@ -174,9 +173,7 @@ bool ThemeManager::load(const string &filename,
     // get list and go throu all the resources and load them
     // and then reconfigure them
     if (screen_num < 0 || screen_num > m_max_screens) {
-        for_each(m_themes.begin(),
-                 m_themes.end(),
-                 load_theme_helper);
+        STLUtil::forAll(m_themes, load_theme_helper);
     } else {
         load_theme_helper(m_themes[screen_num]);
     }