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

C++11: Cleaned up program framework with range-based for

Browse Source
This commit is contained in:
Paul Beckingham
2015-05-11 17:50:53 -04:00
parent 5a57dfd70d
commit e74c6963a9
28 changed files with 937 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/legacy.cpp
View File

@@ -63,7 +63,7 @@ void legacyColumnMap (std::string& name)
}
// If a legacy column was used, complain about it, but modify it anyway.
std::map <std::string, std::string>::iterator found = legacyMap.find (name);
auto found = legacyMap.find (name);
if (found != legacyMap.end ())
{
context.footnote (format (STRING_LEGACY_PRIORITY, name, found->second));
@@ -95,7 +95,7 @@ void legacySortColumnMap (std::string& name)
}
// If a legacy column was used, complain about it, but modify it anyway.
std::map <std::string, std::string>::iterator found = legacyMap.find (name);
auto found = legacyMap.find (name);
if (found != legacyMap.end ())
{
context.footnote (format (STRING_LEGACY_PRIORITY, name, found->second));
@@ -115,25 +115,24 @@ std::string legacyCheckForDeprecatedColor ()
std::string legacyCheckForDeprecatedVariables ()
{
std::vector <std::string> deprecated;
std::map <std::string, std::string>::const_iterator it;
for (it = context.config.begin (); it != context.config.end (); ++it)
for (auto& it : context.config)
{
// 2014-07-04: report.*.limit removed.
// report.*.annotations
if (it->first.length () > 19 &&
it->first.substr (0, 7) == "report." &&
it->first.substr (it->first.length () - 12) == ".annotations")
deprecated.push_back (it->first);
if (it.first.length () > 19 &&
it.first.substr (0, 7) == "report." &&
it.first.substr (it.first.length () - 12) == ".annotations")
deprecated.push_back (it.first);
if (it->first == "next" ||
it->first == "annotations" ||
it->first == "export.ical.class")
deprecated.push_back (it->first);
if (it.first == "next" ||
it.first == "annotations" ||
it.first == "export.ical.class")
deprecated.push_back (it.first);
// Deprecated іn 2.4.0.
if (it->first == "alias._query")
deprecated.push_back (it->first);
if (it.first == "alias._query")
deprecated.push_back (it.first);
}
std::stringstream out;
@@ -142,9 +141,8 @@ std::string legacyCheckForDeprecatedVariables ()
out << STRING_CONFIG_DEPRECATED_VAR
<< "\n";
std::vector <std::string>::iterator it2;
for (it2 = deprecated.begin (); it2 != deprecated.end (); ++it2)
out << " " << *it2 << "\n";
for (auto& dep : deprecated)
out << " " << dep << "\n";
out << "\n";
}
@@ -156,16 +154,15 @@ std::string legacyCheckForDeprecatedVariables ()
std::string legacyCheckForDeprecatedColumns ()
{
std::vector <std::string> deprecated;
std::map <std::string, std::string>::const_iterator it;
for (it = context.config.begin (); it != context.config.end (); ++it)
for (auto& it : context.config)
{
if (it->first.find ("report") == 0)
if (it.first.find ("report") == 0)
{
std::string value = context.config.get (it->first);
std::string value = context.config.get (it.first);
if (value.find ("entry_time") != std::string::npos ||
value.find ("start_time") != std::string::npos ||
value.find ("end_time") != std::string::npos)
deprecated.push_back (it->first);
deprecated.push_back (it.first);
}
}
@@ -177,9 +174,8 @@ std::string legacyCheckForDeprecatedColumns ()
out << STRING_CONFIG_DEPRECATED_COL
<< "\n";
std::vector <std::string>::iterator it2;
for (it2 = deprecated.begin (); it2 != deprecated.end (); ++it2)
out << " " << *it2 << "=" << context.config.get (*it2) << "\n";
for (auto& dep : deprecated)
out << " " << dep << "=" << context.config.get (dep) << "\n";
out << "\n";
}