GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code Cleanup

Browse source 
- 'uft8_length' and 'utf8_text_length' now return unsigned ints.
This commit is contained in:
Scott Kostyshak 2013-01-07 03:32:30 -05:00 • committed by Paul Beckingham
parent 4ca5c85054
commit 3583e2ff58
4 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ViewTask.cpp
View file

@ -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;
int global_ideal = global_min;
unsigned int global_min = 0;
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 ideal;
(*i)->measure (data[sequence[s]], min, ideal);
int min_;
int 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);

12
src/ViewText.cpp
View file

@ -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 ());
int global_ideal = global_min;
unsigned int global_min = utf8_length (_columns[col]->label ());
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 ideal;
_columns[col]->measure (_data[row][col], min, ideal);
int min_;
int 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;

4
src/utf8.cpp
View file

@ -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;

4
src/utf8.h
View file

@ -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&);
int utf8_text_length (const std::string&);
unsigned int utf8_length (const std::string&);
unsigned int utf8_text_length (const std::string&);
#endif