Code Cleanup

- 'uft8_length' and 'utf8_text_length' now return unsigned ints.

src/ViewTask.cpp

@@ -124,8 +124,8 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
   for (i = _columns.begin (); i != _columns.end (); ++i)
   {
     // Headers factor in to width calculations.
-    int global_min = 0;
+    unsigned int global_min = 0;
-    int global_ideal = global_min;
+    unsigned int global_ideal = global_min;
 
     for (unsigned int s = 0; s < sequence.size (); ++s)
     {
@@ -136,9 +136,11 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
         break;
 
       // Determine minimum and ideal width for this column.
-      int min;
+      int min_;
-      int ideal;
+      int ideal_;
-      (*i)->measure (data[sequence[s]], min, ideal);
+      (*i)->measure (data[sequence[s]], min_, ideal_);
+      unsigned int min = min_;
+      unsigned int ideal = ideal_;
 
       if (min   > global_min)   global_min = min;
       if (ideal > global_ideal) global_ideal = ideal;
@@ -146,7 +148,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
 
     if (print_empty_columns || global_min != 0)
     {
-      int label_length = utf8_length ((*i)->label ());
+      unsigned int label_length = utf8_length ((*i)->label ());
       if (label_length > global_min) global_min = label_length;
       if (label_length > global_ideal) global_ideal = label_length;
       minimal.push_back (global_min);

src/ViewText.cpp

@@ -122,15 +122,17 @@ std::string ViewText::render ()
   for (unsigned int col = 0; col < _columns.size (); ++col)
   {
     // Headers factor in to width calculations.
-    int global_min = utf8_length (_columns[col]->label ());
+    unsigned int global_min = utf8_length (_columns[col]->label ());
-    int global_ideal = global_min;
+    unsigned int global_ideal = global_min;
 
     for (unsigned int row = 0; row < _data.size (); ++row)
     {
       // Determine minimum and ideal width for this column.
-      int min;
+      int min_;
-      int ideal;
+      int ideal_;
-      _columns[col]->measure (_data[row][col], min, ideal);
+      _columns[col]->measure (_data[row][col], min_, ideal_);
+      unsigned int min = min_;
+      unsigned int ideal = ideal_;
 
       if (min   > global_min)   global_min = min;
       if (ideal > global_ideal) global_ideal = ideal;

src/utf8.cpp

@@ -174,7 +174,7 @@ int utf8_sequence (unsigned int character)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Length of a string in characters.
-int utf8_length (const std::string& str)
+unsigned int utf8_length (const std::string& str)
 {
   int byteLength = str.length ();
   int charLength = byteLength;
@@ -193,7 +193,7 @@ int utf8_length (const std::string& str)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int utf8_text_length (const std::string& str)
+unsigned int utf8_text_length (const std::string& str)
 {
   int byteLength = str.length ();
   int charLength = byteLength;

src/utf8.h

@@ -35,8 +35,8 @@ unsigned int utf8_codepoint (const std::string&);
 unsigned int utf8_next_char (const std::string&, std::string::size_type&);
 std::string utf8_character (unsigned int);
 int utf8_sequence (unsigned int);
-int utf8_length (const std::string&);
+unsigned int utf8_length (const std::string&);
-int utf8_text_length (const std::string&);
+unsigned int utf8_text_length (const std::string&);
 
 
 #endif