mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
CmdCustom
- Removed unused local ::getLimits method, in favor of Context::getLimits.
This commit is contained in:
parent
0cd56932a5
commit
7ac533a82d
2 changed files with 1 additions and 44 deletions
|
@ -154,7 +154,7 @@ int CmdCustom::execute (std::string& output)
|
|||
// Report output can be limited by rows or lines.
|
||||
int maxrows = 0;
|
||||
int maxlines = 0;
|
||||
getLimits (_keyword, maxrows, maxlines);
|
||||
context.getLimits (maxrows, maxlines);
|
||||
|
||||
// Adjust for fluff in the output.
|
||||
if (maxlines)
|
||||
|
@ -220,45 +220,3 @@ void CmdCustom::validateSortColumns (std::vector <std::string>& columns)
|
|||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// A value of zero mean unlimited.
|
||||
// A value of 'page' means however many screen lines there are.
|
||||
// A value of a positive integer is a row/task limit.
|
||||
void CmdCustom::getLimits (const std::string& report, int& rows, int& lines)
|
||||
{
|
||||
rows = 0;
|
||||
lines = 0;
|
||||
|
||||
int screenheight = 0;
|
||||
|
||||
// If a report has a stated limit, use it.
|
||||
if (report != "")
|
||||
{
|
||||
std::string name = "report." + report + ".limit";
|
||||
if (context.config.get (name) == "page")
|
||||
lines = screenheight = context.getHeight ();
|
||||
else
|
||||
rows = context.config.getInteger (name);
|
||||
}
|
||||
|
||||
// If the custom report has a defined limit, then allow a numeric override.
|
||||
// This is an integer specified as a filter (limit:10).
|
||||
std::string limit = context.parser.getLimit ();
|
||||
if (limit != "")
|
||||
{
|
||||
if (limit == "page")
|
||||
{
|
||||
if (screenheight == 0)
|
||||
screenheight = context.getHeight ();
|
||||
|
||||
rows = 0;
|
||||
lines = screenheight;
|
||||
}
|
||||
else
|
||||
{
|
||||
rows = (int) strtol (limit.c_str (), NULL, 10);
|
||||
lines = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -39,7 +39,6 @@ public:
|
|||
private:
|
||||
void validateReportColumns (std::vector <std::string>&);
|
||||
void validateSortColumns (std::vector <std::string>&);
|
||||
void getLimits (const std::string&, int&, int&);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue