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

Portability

Browse Source 
- Added missing include.
- Apparently, you cannot have a string name 'major' or 'minor', which
  clashes with gnu_version_major etc.
This commit is contained in:
Paul Beckingham
2010-11-24 23:14:48 +00:00
parent 955634c35b
commit fd27fe3392
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/burndown.cpp
View File

@@ -28,6 +28,7 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include <math.h> #include <math.h>
#include <string.h>
#include <Context.h> #include <Context.h>
#include <Date.h> #include <Date.h>
@@ -52,8 +53,8 @@ public:
public: public:
int offset; // from left of chart int offset; // from left of chart
std::string major; // x-axis label, major (year/-/month) std::string major_label; // x-axis label, major (year/-/month)
std::string minor; // x-axis label, minor (month/week/day) std::string minor_label; // x-axis label, minor (month/week/day)
int pending; // Number of pending tasks in period int pending; // Number of pending tasks in period
int started; // Number of started tasks in period int started; // Number of started tasks in period
int done; // Number of done tasks in period int done; // Number of done tasks in period
@@ -64,8 +65,8 @@ public:
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Bar::Bar () Bar::Bar ()
: offset (0) : offset (0)
, major ("") , major_label ("")
, minor ("") , minor_label ("")
, pending (0) , pending (0)
, started (0) , started (0)
, done (0) , done (0)
@@ -86,8 +87,8 @@ Bar& Bar::operator= (const Bar& other)
if (this != &other) if (this != &other)
{ {
offset = other.offset; offset = other.offset;
major = other.major; major_label = other.major_label;
minor = other.minor; minor_label = other.minor_label;
pending = other.pending; pending = other.pending;
started = other.started; started = other.started;
done = other.done; done = other.done;
@@ -474,7 +475,7 @@ std::string Chart::render ()
std::sort (bars_in_sequence.begin (), bars_in_sequence.end ()); std::sort (bars_in_sequence.begin (), bars_in_sequence.end ());
std::vector <time_t>::iterator seq; std::vector <time_t>::iterator seq;
std::string major; std::string major_label;
for (seq = bars_in_sequence.begin (); seq != bars_in_sequence.end (); ++seq) for (seq = bars_in_sequence.begin (); seq != bars_in_sequence.end (); ++seq)
{ {
Bar bar = bars[*seq]; Bar bar = bars[*seq];
@@ -482,12 +483,12 @@ std::string Chart::render ()
// If it fits within the allowed space. // If it fits within the allowed space.
if (bar.offset < actual_bars) if (bar.offset < actual_bars)
{ {
grid.replace (LOC (height - 5, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), bar.minor.length (), bar.minor); grid.replace (LOC (height - 5, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), bar.minor_label.length (), bar.minor_label);
if (major != bar.major) if (major_label != bar.major_label)
grid.replace (LOC (height - 4, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), bar.major.length (), bar.major); grid.replace (LOC (height - 4, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), bar.major_label.length (), bar.major_label);
major = bar.major; major_label = bar.major_label;
} }
} }
@@ -709,27 +710,27 @@ void Chart::generateBars ()
case 'D': // month/day case 'D': // month/day
{ {
std::string month = Date::monthName (cursor.month ()); std::string month = Date::monthName (cursor.month ());
bar.major = month.substr (0, 3); bar.major_label = month.substr (0, 3);
sprintf (str, "%02d", cursor.day ()); sprintf (str, "%02d", cursor.day ());
bar.minor = str; bar.minor_label = str;
} }
break; break;
case 'W': // year/week case 'W': // year/week
sprintf (str, "%d", cursor.year ()); sprintf (str, "%d", cursor.year ());
bar.major = str; bar.major_label = str;
sprintf (str, "%02d", cursor.weekOfYear (0)); sprintf (str, "%02d", cursor.weekOfYear (0));
bar.minor = str; bar.minor_label = str;
break; break;
case 'M': // year/month case 'M': // year/month
sprintf (str, "%d", cursor.year ()); sprintf (str, "%d", cursor.year ());
bar.major = str; bar.major_label = str;
sprintf (str, "%02d", cursor.month ()); sprintf (str, "%02d", cursor.month ());
bar.minor = str; bar.minor_label = str;
break; break;
} }