From 693fe9b8fd53bd076521d01a20fda6975d8717b6 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 17 Feb 2015 10:13:44 -0500 Subject: [PATCH] ColPriority - Made the acceptance of lower-case priorities explicitly either lower or upper case, but converted to upper case. This eliminates the dependency on text.cpp upperCase(), which is not UTF8-safe. --- src/columns/ColPriority.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/columns/ColPriority.cpp b/src/columns/ColPriority.cpp index 1f71c3bee..381a578ad 100644 --- a/src/columns/ColPriority.cpp +++ b/src/columns/ColPriority.cpp @@ -53,17 +53,14 @@ ColumnPriority::~ColumnPriority () } //////////////////////////////////////////////////////////////////////////////// +// Allow lower case, but implicitly convert. bool ColumnPriority::validate (std::string& value) { - value = upperCase (value); + if (value == "h") { value = "H"; return true; } + else if (value == "m") { value = "M"; return true; } + else if (value == "l") { value = "L"; return true; } - if (value == "H" || - value == "M" || - value == "L" || - value == "") - return true; - - return false; + return value == "H" || value == "M" || value == "L" || value == ""; } //////////////////////////////////////////////////////////////////////////////// @@ -120,7 +117,11 @@ void ColumnPriority::render ( //////////////////////////////////////////////////////////////////////////////// std::string ColumnPriority::modify (std::string& value) { - return upperCase (value); + if (value == "h") value = "H"; + else if (value == "m") value = "M"; + else if (value == "l") value = "L"; + + return value; } ////////////////////////////////////////////////////////////////////////////////