Changed Misc::

1 files changed, 9 insertions, 8 deletions

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 8ed35ef..bf031dd 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -33,6 +33,7 @@
 #include "fluxbox.hh"
 #include "Basemenu.hh"
 #include "Screen.hh"
+#include "StringUtil.hh"
 
 #ifdef          HAVE_STDIO_H
 #       include <stdio.h>
@@ -197,8 +198,8 @@ Basemenu::~Basemenu(void) {
 int Basemenu::insert(const char *l, int function, const char *e, int pos) {
         char *label = 0, *exec = 0;
 
-        if (l) label = Misc::strdup(l);
-        if (e) exec = Misc::strdup(e);
+        if (l) label = StringUtil::strdup(l);
+        if (e) exec = StringUtil::strdup(e);
 
         BasemenuItem *item = new BasemenuItem(label, function, exec);
         menuitems->insert(item, pos);
@@ -210,7 +211,7 @@ int Basemenu::insert(const char *l, int function, const char *e, int pos) {
 int Basemenu::insert(const char *l, Basemenu *submenu, int pos) {
         char *label = 0;
 
-        if (l) label = Misc::strdup(l);
+        if (l) label = StringUtil::strdup(l);
 
         BasemenuItem *item = new BasemenuItem(label, submenu);
         menuitems->insert(item, pos);
@@ -507,11 +508,11 @@ void Basemenu::redrawTitle(void) {
         l +=    (menu.bevel_w * 2);
 
         switch (screen->getMenuStyle()->titlefont.justify) {
-        case Misc::Font::RIGHT:
+        case DrawUtil::Font::RIGHT:
                 dx += menu.width - l;
                 break;
 
-        case Misc::Font::CENTER:
+        case DrawUtil::Font::CENTER:
                 dx += (menu.width - l) / 2;
                 break;
         default:
@@ -644,11 +645,11 @@ void Basemenu::drawItem(int index, Bool highlight, Bool clear,
                 }
                 
                 switch(screen->getMenuStyle()->framefont.justify) {
-                case Misc::Font::LEFT:
+                case DrawUtil::Font::LEFT:
                         text_x = item_x + menu.bevel_w + menu.item_h + 1;
                         break;
                         
-                case Misc::Font::RIGHT:
+                case DrawUtil::Font::RIGHT:
                         text_x = item_x + menu.item_w - (menu.item_h + menu.bevel_w + text_w);
                         break;                  
                 default: //center
@@ -789,7 +790,7 @@ void Basemenu::setLabel(const char *l) {
         if (menu.label)
                 delete [] menu.label;
 
-        if (l) menu.label = Misc::strdup(l);
+        if (l) menu.label = StringUtil::strdup(l);
         else menu.label = 0;
 }