M src/Basemenu.cc → src/Basemenu.cc

@@ -442,7 +442,7 @@ 
 void Basemenu::redrawTitle(void) {
   const char *text = (! menu.label.empty()) ? getLabel() :
     i18n(BasemenuSet, BasemenuBlackboxMenu, "Blackbox Menu");
-  int dx = menu.bevel_w, len = strlen(text);
+  int dx = menu.bevel_w;
   unsigned int l;
   MenuStyle *style = screen->getMenuStyle();
 
@@ -544,7 +544,7 @@ const char *text = item->label();
   int sbl = index / menu.persub, i = index - (sbl * menu.persub);
   int item_x = (sbl * menu.item_w), item_y = (i * menu.item_h);
   int hilite_x = item_x, hilite_y = item_y, hoff_x = 0, hoff_y = 0;
-  int text_x = 0, text_y = 0, len = strlen(text), sel_x = 0, sel_y = 0;
+  int text_x = 0, text_y = 0, sel_x = 0, sel_y = 0;
   unsigned int hilite_w = menu.item_w, hilite_h = menu.item_h, text_w = 0,
     text_h = 0;
   unsigned int half_w = menu.item_h / 2, quarter_w = menu.item_h / 4;

M src/Screen.hh → src/Screen.hh

@@ -71,8 +71,8 @@ BFont *font;
 
   TextJustify justify;
 
-  int doJustify(const std::string &text, int &start_pos,
-                unsigned int max_length, unsigned int modifier) const;
+  void doJustify(const std::string &text, int &start_pos,
+                 unsigned int max_length, unsigned int modifier) const;
 };
 
 struct ToolbarStyle {
@@ -83,8 +83,8 @@ BFont *font;
 
   TextJustify justify;
 
-  int doJustify(const std::string &text, int &start_pos,
-                unsigned int max_length, unsigned int modifier) const;
+  void doJustify(const std::string &text, int &start_pos,
+                 unsigned int max_length, unsigned int modifier) const;
 };
 
 struct MenuStyle {

M src/Toolbar.cc → src/Toolbar.cc

@@ -1172,9 +1172,9 @@ getScreen()->getSlit()->reposition();
 }
 
 
-int ToolbarStyle::doJustify(const std::string &text, int &start_pos,
-                            unsigned int max_length,
-                            unsigned int modifier) const {
+void ToolbarStyle::doJustify(const std::string &text, int &start_pos,
+                             unsigned int max_length,
+                             unsigned int modifier) const {
   size_t text_len = text.size();
   unsigned int length;
 
@@ -1195,6 +1195,4 @@ case LeftJustify:
   default:
     break;
   }
-
-  return text_len;
 }

M src/Window.cc → src/Window.cc

@@ -3542,9 +3542,9 @@ frame.changing.setPos(frame.changing.x() + dx, frame.changing.y() + dy);
 }
 
 
-int WindowStyle::doJustify(const std::string &text, int &start_pos,
-                           unsigned int max_length,
-                           unsigned int modifier) const {
+void WindowStyle::doJustify(const std::string &text, int &start_pos,
+                            unsigned int max_length,
+                            unsigned int modifier) const {
   size_t text_len = text.size();
   unsigned int length;
 
@@ -3565,8 +3565,6 @@ case LeftJustify:
   default:
     break;
   }
-
-  return text_len;
 }