make the styles' doJustify methods stop returning the string length as this is no...

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 2dd6af7049f07993011e2b925e490c88a7eec192..5b4acdf001009f2bf96b6f752c1e26a97158e157 100644 (file)
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -442,7 +442,7 @@ void Basemenu::move(int x, int y) {
 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 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   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;

diff --git a/src/Screen.hh b/src/Screen.hh
index 0fabe9a461fa688da37acce94edb71e52d2ea53b..60418cd708eeb4ae569f2952a900c1545ba589ce 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -71,8 +71,8 @@ struct WindowStyle {
 
   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 @@ struct ToolbarStyle {
 
   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 {

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 0018e43ff96c73972f648c17f35acf45096ec46e..f6ff130a8d633bdf6f381d7e6c982e90d19c2bd3 100644 (file)
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -1172,9 +1172,9 @@ void Toolbarmenu::Placementmenu::itemSelected(int button, unsigned int index) {
 }
 
 
-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 @@ int ToolbarStyle::doJustify(const std::string &text, int &start_pos,
   default:
     break;
   }
-
-  return text_len;
 }

diff --git a/src/Window.cc b/src/Window.cc
index e179824365885361661ea9dee601236a28c5b21b..803cd9af12a3c3f08620e885bfa1b262fb0352c8 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3542,9 +3542,9 @@ void BlackboxWindow::constrain(Corner anchor, int *pw, int *ph) {
 }
 
 
-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 @@ int WindowStyle::doJustify(const std::string &text, int &start_pos,
   default:
     break;
   }
-
-  return text_len;
 }