moved StringUtil to FbTk

2 files changed, 9 insertions, 8 deletions

diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 1e40bfc..18e394a 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -12,14 +12,17 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
         ImageControl.hh ImageControl.cc \
         MacroCommand.hh MacroCommand.cc \
-        Menu.hh Menu.cc MenuItem.hh MenuItem.cc MenuTheme.hh MenuTheme.cc NotCopyable.hh \
+        Menu.hh Menu.cc MenuItem.hh MenuItem.cc \
+        MenuTheme.hh MenuTheme.cc NotCopyable.hh \
         RefCount.hh SimpleCommand.hh SignalHandler.cc SignalHandler.hh \
         Text.hh Text.cc \
-        Texture.cc Texture.hh TextureRender.hh TextureRender.cc Theme.hh Theme.cc Timer.hh Timer.cc \
+        Texture.cc Texture.hh TextureRender.hh TextureRender.cc \
+        Theme.hh Theme.cc Timer.hh Timer.cc \
         XFontImp.cc XFontImp.hh \
         Button.hh Button.cc \
         Layer.hh LayerItem.hh MultLayers.cc MultLayers.hh \
         XLayer.cc XLayer.hh XLayerItem.cc XLayerItem.hh \
+        StringUtil.hh StringUtil.cc \
         Subject.hh Subject.cc Observer.hh Observer.cc \
         Transparent.hh Transparent.cc \
         FbPixmap.hh FbPixmap.cc \
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 431b598..6a3ffed 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -1,5 +1,5 @@
 // XmbFontImp.cc for FbTk fluxbox toolkit
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XmbFontImp.cc,v 1.5 2003/02/17 23:36:43 fluxgen Exp $
+// $Id: XmbFontImp.cc,v 1.6 2003/04/26 18:57:51 fluxgen Exp $
 
 #include "XmbFontImp.hh"
 
 #include "App.hh"
-
-//!! TODO: Change this
-#include "../StringUtil.hh"
+#include "StringUtil.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -104,7 +102,7 @@ const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...) {
     buf[bufsiz-1] = 0;
     buf[bufsiz-2] = '*';
     while((v = va_arg(va, char *)) != 0) {
-        p = StringUtil::strcasestr(pattern, v);
+        p = FbTk::StringUtil::strcasestr(pattern, v);
         if (p) {
             std::strncpy(buf, p+1, bufsiz-2);
             p2 = strchr(buf, '-');