gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

sort: Greater use of auto

Browse Source
This commit is contained in:
Paul Beckingham
2017-03-02 20:30:02 -05:00
parent 4cbbaec833
commit 42e0c17de7
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/sort.cpp
View File

@@ -118,8 +118,8 @@ static bool sort_compare (int left, int right)
field == "imask" || field == "imask" ||
field == "mask") field == "mask")
{ {
const std::string& left_string = (*global_data)[left].get_ref (field); auto left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); auto right_string = (*global_data)[right].get_ref (field);
if (left_string == right_string) if (left_string == right_string)
continue; continue;
@@ -138,8 +138,8 @@ static bool sort_compare (int left, int right)
field == "modified" || field == "modified" ||
field == "scheduled") field == "scheduled")
{ {
const std::string& left_string = (*global_data)[left].get_ref (field); auto left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); auto right_string = (*global_data)[right].get_ref (field);
if (left_string != "" && right_string == "") if (left_string != "" && right_string == "")
return true; return true;
@@ -158,8 +158,8 @@ static bool sort_compare (int left, int right)
else if (field == "depends") else if (field == "depends")
{ {
// Raw data is a comma-separated list of uuids // Raw data is a comma-separated list of uuids
const std::string& left_string = (*global_data)[left].get_ref (field); auto left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); auto right_string = (*global_data)[right].get_ref (field);
if (left_string == right_string) if (left_string == right_string)
continue; continue;
@@ -184,8 +184,8 @@ static bool sort_compare (int left, int right)
// Duration. // Duration.
else if (field == "recur") else if (field == "recur")
{ {
const std::string& left_string = (*global_data)[left].get_ref (field); auto left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); auto right_string = (*global_data)[right].get_ref (field);
if (left_string == right_string) if (left_string == right_string)
continue; continue;
@@ -202,8 +202,8 @@ static bool sort_compare (int left, int right)
std::string type = column->type (); std::string type = column->type ();
if (type == "numeric") if (type == "numeric")
{ {
const float left_real = strtof (((*global_data)[left].get_ref (field)).c_str (), NULL); auto left_real = strtof (((*global_data)[left].get_ref (field)).c_str (), NULL);
const float right_real = strtof (((*global_data)[right].get_ref (field)).c_str (), NULL); auto right_real = strtof (((*global_data)[right].get_ref (field)).c_str (), NULL);
if (left_real == right_real) if (left_real == right_real)
continue; continue;
@@ -213,8 +213,8 @@ static bool sort_compare (int left, int right)
} }
else if (type == "string") else if (type == "string")
{ {
const std::string left_string = (*global_data)[left].get_ref (field); auto left_string = (*global_data)[left].get_ref (field);
const std::string right_string = (*global_data)[right].get_ref (field); auto right_string = (*global_data)[right].get_ref (field);
if (left_string == right_string) if (left_string == right_string)
continue; continue;
@@ -243,8 +243,8 @@ static bool sort_compare (int left, int right)
else if (type == "date") else if (type == "date")
{ {
const std::string& left_string = (*global_data)[left].get_ref (field); auto left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); auto right_string = (*global_data)[right].get_ref (field);
if (left_string != "" && right_string == "") if (left_string != "" && right_string == "")
return true; return true;
@@ -260,8 +260,8 @@ static bool sort_compare (int left, int right)
} }
else if (type == "duration") else if (type == "duration")
{ {
const std::string& left_string = (*global_data)[left].get_ref (field); auto left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); auto right_string = (*global_data)[right].get_ref (field);
if (left_string == right_string) if (left_string == right_string)
continue; continue;