Rules: Replaced ::parseRuleHolidays with ::parseRuleSettings

This commit is contained in:
Paul Beckingham 2016-03-26 17:13:34 -04:00
parent f8c485b231
commit 4883f3d93d
2 changed files with 4 additions and 14 deletions

View file

@ -310,12 +310,11 @@ void Rules::parseRule (const std::string& input)
parseRuleExclusions (lines);
// define theme:
else if (tokens.size () == 2 && tokens[1] == "theme:")
parseRuleSettings (lines);
// define holidays:
else if (tokens.size () == 2 && tokens[1] == "holidays:")
parseRuleHolidays (lines);
else if (tokens.size () == 2 &&
(tokens[1] == "theme:" ||
tokens[1] == "holidays:"))
parseRuleSettings (lines);
// Error.
else
@ -399,14 +398,6 @@ void Rules::parseRuleTag (const std::vector <std::string>& lines)
}
}
////////////////////////////////////////////////////////////////////////////////
void Rules::parseRuleHolidays (const std::vector <std::string>& lines)
{
for (auto& line : lines)
{
}
}
////////////////////////////////////////////////////////////////////////////////
unsigned int Rules::getIndentation (const std::string& line)
{

View file

@ -60,7 +60,6 @@ private:
void parseRuleSettings (const std::vector <std::string>&);
void parseRuleExclusions (const std::vector <std::string>&);
void parseRuleTag (const std::vector <std::string>&);
void parseRuleHolidays (const std::vector <std::string>&);
unsigned int getIndentation (const std::string&);
std::vector <std::string> tokenizeLine (const std::string&);