2 files changed, 56 insertions, 1 deletions

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/FbTk/STLUtil.hh b/src/FbTk/STLUtil.hh
new file mode 100644
index 0000000..ec783d9
--- /dev/null
+++ b/src/FbTk/STLUtil.hh
@@ -0,0 +1,55 @@
+// 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
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+#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
+template <typename A>
+void destroyAndClear(A &a) {
+    typedef typename A::iterator iterator;
+    iterator it = a.begin();
+    iterator it_end = a.end();
+    for (; it != it_end; ++it)
+        delete (*it);
+
+    a.clear();
+}
+
+/// calls delete on each item value in the map and then clears the map
+template <typename A>
+void destroyAndClearSecond(A &a) {
+    typedef typename A::iterator iterator;
+    iterator it = a.begin();
+    iterator it_end = a.end();
+    for (; it != it_end; ++it)
+        delete it->second;
+    a.clear();
+}
+
+}; // end namespace STLUtil
+}; // end namespace FbTk
+
+#endif // STLUTIL_Hh