6 files changed, 13 insertions, 16 deletions

diff --git a/src/AttentionNoticeHandler.cc b/src/AttentionNoticeHandler.cc
index 3f28695..a28c7fb 100644
--- a/src/AttentionNoticeHandler.cc
+++ b/src/AttentionNoticeHandler.cc
@@ -25,8 +25,8 @@
 
 #include "Window.hh"
 #include "Screen.hh"
-#include "STLUtil.hh"
 
+#include "FbTk/STLUtil.hh"
 #include "FbTk/Subject.hh"
 #include "FbTk/Timer.hh"
 #include "FbTk/Resource.hh"
@@ -50,7 +50,7 @@ private:
 
 
 AttentionNoticeHandler::~AttentionNoticeHandler() {
-    STLUtil::destroyAndClearSecond(m_attentions);
+    FbTk::STLUtil::destroyAndClearSecond(m_attentions);
 }
 
 void AttentionNoticeHandler::addAttention(Focusable &client) {
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 5f1c246..f5970fd 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -57,7 +57,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         MenuSeparator.hh MenuSeparator.cc \
         stringstream.hh \
         TypeAhead.hh SearchResult.hh SearchResult.cc ITypeAheadable.hh \
-        Select2nd.hh \
+        Select2nd.hh STLUtil.hh \
         CachedPixmap.hh CachedPixmap.cc \
         ${xpm_SOURCE} \
         ${xft_SOURCE} \
diff --git a/src/STLUtil.hh b/src/FbTk/STLUtil.hh
index a9b08e0..ec783d9 100644
--- a/src/STLUtil.hh
+++ b/src/FbTk/STLUtil.hh
@@ -1,4 +1,4 @@
-// STLUtil.cc for fluxbox
+// STLUtil.cc for FbTk
 // Copyright (c) 2006 Fluxbox Team (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -19,13 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id$
-
-
-#ifndef STLUTIL_HH
-#define STLUTIL_HH
+#ifndef FBTK_STLUTIL_HH
+#define FBTK_STLUTIL_HH
 
 /// contains useful utilities for STL 
+namespace FbTk {
 namespace STLUtil {
 
 /// calls delete on each item in the container and then clears the container
@@ -51,6 +49,7 @@ void destroyAndClearSecond(A &a) {
     a.clear();
 }
 
-};
+}; // end namespace STLUtil
+}; // end namespace FbTk
 
 #endif // STLUTIL_Hh
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index de56569..4275ec9 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -37,8 +37,8 @@
 #include "FocusControl.hh"
 #include "FbCommands.hh"
 #include "Layer.hh"
-#include "STLUtil.hh"
 
+#include "FbTk/STLUtil.hh"
 #include "FbTk/I18n.hh"
 #include "FbTk/Menu.hh"
 #include "FbTk/MenuItem.hh"
@@ -523,7 +523,7 @@ void IconbarTool::renderButton(IconButton &button, bool clear) {
 
 void IconbarTool::deleteIcons() {
     m_icon_container.removeAll();
-    STLUtil::destroyAndClearSecond(m_icons);
+    FbTk::STLUtil::destroyAndClearSecond(m_icons);
 }
 
 void IconbarTool::removeWindow(Focusable &win) {
diff --git a/src/Makefile.am b/src/Makefile.am
index b40affd..312d52a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,7 +143,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         AttentionNoticeHandler.hh AttentionNoticeHandler.cc \
         IconButton.hh IconButton.cc \
         IconbarTheme.hh IconbarTheme.cc \
-        STLUtil.hh \
         Focusable.hh FocusableList.hh FocusableList.cc \
         ${newwmspec_SOURCE} ${gnome_SOURCE} \
         ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
diff --git a/src/Screen.cc b/src/Screen.cc
index c304b7e..03d8fd2 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -37,8 +37,6 @@
 #include "FocusControl.hh"
 #include "ScreenPlacement.hh"
 
-#include "STLUtil.hh"
-
 // themes
 #include "FbWinFrameTheme.hh"
 #include "MenuTheme.hh"
@@ -79,6 +77,7 @@
 #include "FbTk/Select2nd.hh"
 #include "FbTk/Compose.hh"
 #include "FbTk/FbString.hh"
+#include "FbTk/STLUtil.hh"
 
 //use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -588,7 +587,7 @@ BScreen::~BScreen() {
         imageControl().removeImage(pos_pixmap);
 
     removeWorkspaceNames();
-    using namespace STLUtil;
+    using namespace FbTk::STLUtil;
     destroyAndClear(m_workspaces_list);
     destroyAndClear(m_managed_resources);