From 19cc9177b91f7a369d1520195ade7f3447b97d76 Mon Sep 17 00:00:00 2001
From: Scott Kostyshak <skostysh@princeton.edu>
Date: Wed, 9 Jan 2013 01:48:40 -0500
Subject: [PATCH] Code Cleanup

- 'measure' now accepts unsigned ints for 'minimum' and 'maximum' args.
---
 src/ViewTask.cpp               | 8 +++-----
 src/ViewText.cpp               | 8 +++-----
 src/columns/ColDate.cpp        | 2 +-
 src/columns/ColDate.h          | 2 +-
 src/columns/ColDepends.cpp     | 4 ++--
 src/columns/ColDepends.h       | 2 +-
 src/columns/ColDescription.cpp | 4 ++--
 src/columns/ColDescription.h   | 2 +-
 src/columns/ColDue.cpp         | 2 +-
 src/columns/ColDue.h           | 2 +-
 src/columns/ColID.cpp          | 2 +-
 src/columns/ColID.h            | 2 +-
 src/columns/ColIMask.cpp       | 2 +-
 src/columns/ColIMask.h         | 2 +-
 src/columns/ColMask.cpp        | 2 +-
 src/columns/ColMask.h          | 2 +-
 src/columns/ColParent.cpp      | 2 +-
 src/columns/ColParent.h        | 2 +-
 src/columns/ColPriority.cpp    | 2 +-
 src/columns/ColPriority.h      | 2 +-
 src/columns/ColProject.cpp     | 2 +-
 src/columns/ColProject.h       | 2 +-
 src/columns/ColRecur.cpp       | 2 +-
 src/columns/ColRecur.h         | 2 +-
 src/columns/ColScheduled.cpp   | 2 +-
 src/columns/ColScheduled.h     | 2 +-
 src/columns/ColStart.cpp       | 2 +-
 src/columns/ColStart.h         | 2 +-
 src/columns/ColStatus.cpp      | 2 +-
 src/columns/ColStatus.h        | 2 +-
 src/columns/ColString.cpp      | 2 +-
 src/columns/ColString.h        | 2 +-
 src/columns/ColTags.cpp        | 7 +++++--
 src/columns/ColTags.h          | 2 +-
 src/columns/ColUDA.cpp         | 2 +-
 src/columns/ColUDA.h           | 2 +-
 src/columns/ColUUID.cpp        | 2 +-
 src/columns/ColUUID.h          | 2 +-
 src/columns/ColUrgency.cpp     | 2 +-
 src/columns/ColUrgency.h       | 2 +-
 src/columns/Column.cpp         | 4 ++--
 src/columns/Column.h           | 4 ++--
 42 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 83f977570..395a91cd0 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -136,11 +136,9 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
         break;
 
       // Determine minimum and ideal width for this column.
-      int min_;
-      int ideal_;
-      (*i)->measure (data[sequence[s]], min_, ideal_);
-      unsigned int min = min_;
-      unsigned int ideal = ideal_;
+      unsigned int min;
+      unsigned int ideal;
+      (*i)->measure (data[sequence[s]], min, ideal);
 
       if (min   > global_min)   global_min = min;
       if (ideal > global_ideal) global_ideal = ideal;
diff --git a/src/ViewText.cpp b/src/ViewText.cpp
index e57b82cbf..348bf3a42 100644
--- a/src/ViewText.cpp
+++ b/src/ViewText.cpp
@@ -128,11 +128,9 @@ std::string ViewText::render ()
     for (unsigned int row = 0; row < _data.size (); ++row)
     {
       // Determine minimum and ideal width for this column.
-      int min_;
-      int ideal_;
-      _columns[col]->measure (_data[row][col], min_, ideal_);
-      unsigned int min = min_;
-      unsigned int ideal = ideal_;
+      unsigned int min;
+      unsigned int ideal;
+      _columns[col]->measure (_data[row][col], min, ideal);
 
       if (min   > global_min)   global_min = min;
       if (ideal > global_ideal) global_ideal = ideal;
diff --git a/src/columns/ColDate.cpp b/src/columns/ColDate.cpp
index 04532b168..82facfe3b 100644
--- a/src/columns/ColDate.cpp
+++ b/src/columns/ColDate.cpp
@@ -74,7 +74,7 @@ bool ColumnDate::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnDate::measure (Task& task, int& minimum, int& maximum)
+void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
 
diff --git a/src/columns/ColDate.h b/src/columns/ColDate.h
index 86cf32acf..baea5c56d 100644
--- a/src/columns/ColDate.h
+++ b/src/columns/ColDate.h
@@ -42,7 +42,7 @@ public:
   ~ColumnDate ();
 
   virtual bool validate (std::string&);
-  virtual void measure (Task&, int&, int&);
+  virtual void measure (Task&, unsigned int&, unsigned int&);
   virtual void render (std::vector <std::string>&, Task&, int, Color&);
 };
 
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index e83c93c76..820c0e0a3 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -79,7 +79,7 @@ void ColumnDepends::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnDepends::measure (Task& task, int& minimum, int& maximum)
+void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   std::vector <Task> blocking;
   dependencyGetBlocking (task, blocking);
@@ -101,7 +101,7 @@ void ColumnDepends::measure (Task& task, int& minimum, int& maximum)
       join (all, " ", blocking_ids);
       maximum = all.length ();
 
-      int length;
+      unsigned int length;
       for (i = blocking.begin (); i != blocking.end (); ++i)
       {
         length = format (i->id).length ();
diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h
index c91e77250..07d30ebd1 100644
--- a/src/columns/ColDepends.h
+++ b/src/columns/ColDepends.h
@@ -43,7 +43,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 55ebdae5a..0e9646771 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -88,7 +88,7 @@ bool ColumnDescription::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnDescription::measure (Task& task, int& minimum, int& maximum)
+void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   std::string description = task.get (_name);
 
@@ -113,7 +113,7 @@ void ColumnDescription::measure (Task& task, int& minimum, int& maximum)
     std::map <std::string, std::string>::iterator i;
     for (i = annos.begin (); i != annos.end (); i++)
     {
-      int len = min_anno + 1 + i->second.length ();
+      unsigned int len = min_anno + 1 + i->second.length ();
       if (len > maximum)
         maximum = len;
     }
diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h
index 2183f9c2e..44ceaf1dc 100644
--- a/src/columns/ColDescription.h
+++ b/src/columns/ColDescription.h
@@ -42,7 +42,7 @@ public:
   ~ColumnDescription ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 0bea97d89..8287e2e68 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -74,7 +74,7 @@ void ColumnDue::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnDue::measure (Task& task, int& minimum, int& maximum)
+void ColumnDue::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
 
diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h
index 3864416af..da57ec5f9 100644
--- a/src/columns/ColDue.h
+++ b/src/columns/ColDue.h
@@ -39,7 +39,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 };
 
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 827240c3f..369cf0bf6 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -62,7 +62,7 @@ bool ColumnID::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnID::measure (Task& task, int& minimum, int& maximum)
+void ColumnID::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   int length;
 
diff --git a/src/columns/ColID.h b/src/columns/ColID.h
index 7884ae8a9..24c92548b 100644
--- a/src/columns/ColID.h
+++ b/src/columns/ColID.h
@@ -42,7 +42,7 @@ public:
   ~ColumnID ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 6d8698e32..740fba2a2 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -62,7 +62,7 @@ bool ColumnIMask::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnIMask::measure (Task& task, int& minimum, int& maximum)
+void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = task.get ("imask").length ();
 
diff --git a/src/columns/ColIMask.h b/src/columns/ColIMask.h
index cfaaace2a..0aee7e7ec 100644
--- a/src/columns/ColIMask.h
+++ b/src/columns/ColIMask.h
@@ -42,7 +42,7 @@ public:
   ~ColumnIMask ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index ced4321c3..71cf9debc 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -62,7 +62,7 @@ bool ColumnMask::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnMask::measure (Task& task, int& minimum, int& maximum)
+void ColumnMask::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = task.get ("mask").length ();
 
diff --git a/src/columns/ColMask.h b/src/columns/ColMask.h
index 00a6d1ab5..a06afe47c 100644
--- a/src/columns/ColMask.h
+++ b/src/columns/ColMask.h
@@ -42,7 +42,7 @@ public:
   ~ColumnMask ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index 942e93ce0..94988e77b 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -64,7 +64,7 @@ bool ColumnParent::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnParent::measure (Task&, int& minimum, int& maximum)
+void ColumnParent::measure (Task&, unsigned int& minimum, unsigned int& maximum)
 {
        if (_style == "default" || _style == "long") minimum = maximum = 36;
   else if (_style == "short")                       minimum = maximum = 8;
diff --git a/src/columns/ColParent.h b/src/columns/ColParent.h
index b53ae4ac5..60be608f2 100644
--- a/src/columns/ColParent.h
+++ b/src/columns/ColParent.h
@@ -42,7 +42,7 @@ public:
   ~ColumnParent ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColPriority.cpp b/src/columns/ColPriority.cpp
index 8f9cb8472..43142f969 100644
--- a/src/columns/ColPriority.cpp
+++ b/src/columns/ColPriority.cpp
@@ -81,7 +81,7 @@ void ColumnPriority::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnPriority::measure (Task& task, int& minimum, int& maximum)
+void ColumnPriority::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   std::string priority = task.get (_name);
 
diff --git a/src/columns/ColPriority.h b/src/columns/ColPriority.h
index 244413613..794876f42 100644
--- a/src/columns/ColPriority.h
+++ b/src/columns/ColPriority.h
@@ -43,7 +43,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index a5e1bf6cd..d2bbdbd1c 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -67,7 +67,7 @@ bool ColumnProject::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnProject::measure (Task& task, int& minimum, int& maximum)
+void ColumnProject::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   std::string project = task.get (_name);
 
diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h
index ba8208097..751883fda 100644
--- a/src/columns/ColProject.h
+++ b/src/columns/ColProject.h
@@ -42,7 +42,7 @@ public:
   ~ColumnProject ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 1d9a1ac24..34dcac042 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -78,7 +78,7 @@ void ColumnRecur::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnRecur::measure (Task& task, int& minimum, int& maximum)
+void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   if (_style == "default" ||
       _style == "duration")
diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h
index 3091b57fd..70a292a55 100644
--- a/src/columns/ColRecur.h
+++ b/src/columns/ColRecur.h
@@ -43,7 +43,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index 3897f5bd0..ae11d436d 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -74,7 +74,7 @@ void ColumnScheduled::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnScheduled::measure (Task& task, int& minimum, int& maximum)
+void ColumnScheduled::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
 
diff --git a/src/columns/ColScheduled.h b/src/columns/ColScheduled.h
index 594969697..08959c3e9 100644
--- a/src/columns/ColScheduled.h
+++ b/src/columns/ColScheduled.h
@@ -39,7 +39,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 };
 
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 9dfc0c8c9..d6eca7d4c 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -69,7 +69,7 @@ void ColumnStart::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnStart::measure (Task& task, int& minimum, int& maximum)
+void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
 
diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h
index fb967563e..6adf4c941 100644
--- a/src/columns/ColStart.h
+++ b/src/columns/ColStart.h
@@ -39,7 +39,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 };
 
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 7817c31c6..0c3c9435a 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -73,7 +73,7 @@ void ColumnStatus::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnStatus::measure (Task& task, int& minimum, int& maximum)
+void ColumnStatus::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   Task::status status = task.getStatus ();
 
diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h
index a2f9c087d..7531da75c 100644
--- a/src/columns/ColStatus.h
+++ b/src/columns/ColStatus.h
@@ -43,7 +43,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColString.cpp b/src/columns/ColString.cpp
index 9c90479ed..185f1de8d 100644
--- a/src/columns/ColString.cpp
+++ b/src/columns/ColString.cpp
@@ -71,7 +71,7 @@ void ColumnString::setReport (const std::string& value)
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
 //
-void ColumnString::measure (const std::string& value, int& minimum, int& maximum)
+void ColumnString::measure (const std::string& value, unsigned int& minimum, unsigned int& maximum)
 {
   if (_style == "left"  ||
       _style == "right" ||
diff --git a/src/columns/ColString.h b/src/columns/ColString.h
index ff1a4edfe..67d7e63ca 100644
--- a/src/columns/ColString.h
+++ b/src/columns/ColString.h
@@ -42,7 +42,7 @@ public:
   ~ColumnString ();
 
   void setReport (const std::string&);
-  void measure (const std::string&, int&, int&);
+  void measure (const std::string&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, const std::string&, int, Color&);
 
 private:
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index f6012b4e6..2d6ac5634 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -83,7 +83,7 @@ void ColumnTags::setStyle (const std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnTags::measure (Task& task, int& minimum, int& maximum)
+void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
 
        if (_style == "indicator") minimum = maximum = context.config.get ("tag.indicator").length ();
@@ -101,8 +101,11 @@ void ColumnTags::measure (Task& task, int& minimum, int& maximum)
       split (all, tags, ',');
       std::vector <std::string>::iterator i;
       for (i = all.begin (); i != all.end (); ++i)
-        if ((int)i->length () > minimum)
+      {
+        unsigned int length_ = i->length ();
+        if (length_ > minimum)
           minimum = i->length () + 1;
+      }
     }
   }
   else
diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h
index d2a832178..627eae6ba 100644
--- a/src/columns/ColTags.h
+++ b/src/columns/ColTags.h
@@ -43,7 +43,7 @@ public:
 
   bool validate (std::string&);
   void setStyle (const std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 9f00cc895..facd44b17 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -77,7 +77,7 @@ bool ColumnUDA::validate (std::string& value)
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
 //
-void ColumnUDA::measure (Task& task, int& minimum, int& maximum)
+void ColumnUDA::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
 
diff --git a/src/columns/ColUDA.h b/src/columns/ColUDA.h
index 29ff9a80b..fd4b838d6 100644
--- a/src/columns/ColUDA.h
+++ b/src/columns/ColUDA.h
@@ -42,7 +42,7 @@ public:
   ~ColumnUDA ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 public:
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 3b4e3cd1a..bfecb9720 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -64,7 +64,7 @@ bool ColumnUUID::validate (std::string& value)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnUUID::measure (Task&, int& minimum, int& maximum)
+void ColumnUUID::measure (Task&, unsigned int& minimum, unsigned int& maximum)
 {
        if (_style == "default" || _style == "long") minimum = maximum = 36;
   else if (_style == "short")                       minimum = maximum = 8;
diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h
index 63049228a..909015fe7 100644
--- a/src/columns/ColUUID.h
+++ b/src/columns/ColUUID.h
@@ -42,7 +42,7 @@ public:
   ~ColumnUUID ();
 
   bool validate (std::string&);
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 755531965..52a232df0 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -56,7 +56,7 @@ ColumnUrgency::~ColumnUrgency ()
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnUrgency::measure (Task& task, int& minimum, int& maximum)
+void ColumnUrgency::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   if (_style == "default" ||
       _style == "real")
diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h
index 5ad044e7c..5ef734cf3 100644
--- a/src/columns/ColUrgency.h
+++ b/src/columns/ColUrgency.h
@@ -41,7 +41,7 @@ public:
   ColumnUrgency ();
   ~ColumnUrgency ();
 
-  void measure (Task&, int&, int&);
+  void measure (Task&, unsigned int&, unsigned int&);
   void render (std::vector <std::string>&, Task&, int, Color&);
 
 private:
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 8f2c7d46b..be91e942f 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -299,14 +299,14 @@ bool Column::validate (std::string& input)
 
 ////////////////////////////////////////////////////////////////////////////////
 // No L10N.
-void Column::measure (const std::string&, int&, int&)
+void Column::measure (const std::string&, unsigned int&, unsigned int&)
 {
   throw std::string ("Virtual method Column::measure not overriden.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // No L10N.
-void Column::measure (Task&, int&, int&)
+void Column::measure (Task&, unsigned int&, unsigned int&)
 {
   throw std::string ("Virtual method Column::measure not overriden.");
 }
diff --git a/src/columns/Column.h b/src/columns/Column.h
index 38ee856bb..3ba4deef5 100644
--- a/src/columns/Column.h
+++ b/src/columns/Column.h
@@ -60,8 +60,8 @@ public:
   virtual void setReport (const std::string& value) { _report = value; }
 
   virtual bool validate (std::string&);
-  virtual void measure (const std::string&, int&, int&);
-  virtual void measure (Task&, int&, int&);
+  virtual void measure (const std::string&, unsigned int&, unsigned int&);
+  virtual void measure (Task&, unsigned int&, unsigned int&);
   virtual void renderHeader (std::vector <std::string>&, int, Color&);
   virtual void render (std::vector <std::string>&, const std::string&, int, Color&);
   virtual void render (std::vector <std::string>&, Task&, int, Color&);