From 2a47f769cdb2cdc7b6a806afc8874f7c9114be33 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 5 Apr 2016 22:55:18 -0400 Subject: [PATCH] Cleanup: Removed 'const auto', which is implied by the container --- src/CLI.cpp | 10 +++++----- src/Database.cpp | 2 +- src/Extensions.cpp | 2 +- src/Interval.cpp | 2 +- src/Rules.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CLI.cpp b/src/CLI.cpp index 1a1e6a6e..ae5350b9 100644 --- a/src/CLI.cpp +++ b/src/CLI.cpp @@ -98,12 +98,12 @@ std::string A2::dump () const // Dump attributes. std::string atts; - for (const auto& a : _attributes) + for (auto& a : _attributes) atts += a.first + "='\033[33m" + a.second + "\033[0m' "; // Dump tags. std::string tags; - for (const auto& tag : _tags) + for (auto& tag : _tags) { if (tag == "BINARY") tags += "\033[1;37;44m" + tag + "\033[0m "; else if (tag == "CMD") tags += "\033[1;37;46m" + tag + "\033[0m "; @@ -233,7 +233,7 @@ void CLI::analyze () std::vector CLI::getWords () const { std::vector words; - for (const auto& a : _args) + for (auto& a : _args) if (! a.hasTag ("BINARY") && ! a.hasTag ("CMD") && ! a.hasTag ("HINT")) @@ -287,7 +287,7 @@ std::string CLI::getBinary () const //////////////////////////////////////////////////////////////////////////////// std::string CLI::getCommand () const { - for (const auto& a : _args) + for (auto& a : _args) if (a.hasTag ("CMD")) return a.attribute ("canonical"); @@ -316,7 +316,7 @@ std::string CLI::dump (const std::string& title) const if (_args.size ()) { out << " _args\n"; - for (const auto& a : _args) + for (auto& a : _args) out << " " << a.dump () << "\n"; } diff --git a/src/Database.cpp b/src/Database.cpp index c7e3d044..c6f16ebb 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -139,7 +139,7 @@ std::string Database::dump () const { std::stringstream out; out << "Database\n"; - for (const auto& file : _files) + for (auto& file : _files) out << " Datafile: " << file.name () << (file.name () == _current ? " (current)" : "") << "\n"; diff --git a/src/Extensions.cpp b/src/Extensions.cpp index d67d4f31..90426a02 100644 --- a/src/Extensions.cpp +++ b/src/Extensions.cpp @@ -75,7 +75,7 @@ std::string Extensions::dump () const std::stringstream out; out << "Extensions\n"; - for (const auto& script : _scripts) + for (auto& script : _scripts) out << " " << script << "\n"; return out.str (); diff --git a/src/Interval.cpp b/src/Interval.cpp index e10f216c..48849014 100644 --- a/src/Interval.cpp +++ b/src/Interval.cpp @@ -217,7 +217,7 @@ std::string Interval::dump () const << _end.toEpoch () << "' _tags"; - for (const auto& tag : _tags) + for (auto& tag : _tags) out << " '" << tag << "'"; out << "\n"; diff --git a/src/Rules.cpp b/src/Rules.cpp index 4f442c97..0a22c651 100644 --- a/src/Rules.cpp +++ b/src/Rules.cpp @@ -152,7 +152,7 @@ void Rules::set (const std::string& key, const std::string& value) std::vector Rules::all (const std::string& stem) const { std::vector items; - for (const auto& it : _settings) + for (auto& it : _settings) if (stem == "" || it.first.find (stem) == 0) items.push_back (it.first); @@ -168,7 +168,7 @@ std::string Rules::dump () const << "\n"; out << " Settings\n"; - for (const auto& item : _settings) + for (auto& item : _settings) out << " " << item.first << "=" << item.second << "\n"; return out.str (); @@ -256,7 +256,7 @@ void Rules::parse (const std::string& input, int nest /* = 1 */) { // Extract the words from the 3rd - Nth tuple. std::vector words; - for (const auto& token : std::vector > (tokens.begin () + 2, tokens.end ())) + for (auto& token : std::vector > (tokens.begin () + 2, tokens.end ())) words.push_back (std::get <0> (token)); set (firstWord, join (" ", words));