1 files changed, 3 insertions, 6 deletions

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]);
     }