diff options
Diffstat (limited to 'libtests')
| -rw-r--r-- | libtests/json.cc | 6 | ||||
| -rw-r--r-- | libtests/numrange.cc | 6 | ||||
| -rw-r--r-- | libtests/qutil.cc | 17 |
3 files changed, 10 insertions, 19 deletions
diff --git a/libtests/json.cc b/libtests/json.cc index 17a5d574..43f2b3c6 100644 --- a/libtests/json.cc +++ b/libtests/json.cc @@ -130,10 +130,8 @@ check_schema( std::list<std::string> errors; std::cout << "--- " << description << std::endl; assert(exp == obj.checkSchema(schema, flags, errors)); - for (std::list<std::string>::iterator iter = errors.begin(); - iter != errors.end(); - ++iter) { - std::cout << *iter << std::endl; + for (auto const& error: errors) { + std::cout << error << std::endl; } std::cout << "---" << std::endl; } diff --git a/libtests/numrange.cc b/libtests/numrange.cc index d1548fe9..c0bf5bd7 100644 --- a/libtests/numrange.cc +++ b/libtests/numrange.cc @@ -9,10 +9,8 @@ test_numrange(char const* range) } else { std::vector<int> result = QUtil::parse_numrange(range, 15); std::cout << "numeric range " << range << " ->"; - for (std::vector<int>::iterator iter = result.begin(); - iter != result.end(); - ++iter) { - std::cout << " " << *iter; + for (int i: result) { + std::cout << " " << i; } std::cout << std::endl; } diff --git a/libtests/qutil.cc b/libtests/qutil.cc index eb16bf0b..017f371b 100644 --- a/libtests/qutil.cc +++ b/libtests/qutil.cc @@ -229,12 +229,10 @@ print_utf8(unsigned long val) // Emacs has trouble with utf-8 encoding files with characters // outside the 16-bit portion, so just show the character // values. - for (std::string::iterator iter = result.begin(); iter != result.end(); - ++iter) { + for (auto const& ch: result) { std::cout << " " << QUtil::int_to_string_base( - static_cast<int>( - static_cast<unsigned char>(*iter)), + static_cast<int>(static_cast<unsigned char>(ch)), 16, 2); } @@ -289,11 +287,10 @@ print_utf16(unsigned long val) { std::string result = QUtil::toUTF16(val); std::cout << "0x" << QUtil::uint_to_string_base(val, 16) << " ->"; - for (std::string::iterator iter = result.begin(); iter != result.end(); - ++iter) { + for (auto const& ch: result) { std::cout << " " << QUtil::int_to_string_base( - static_cast<int>(static_cast<unsigned char>(*iter)), + static_cast<int>(static_cast<unsigned char>(ch)), 16, 2); } @@ -516,10 +513,8 @@ void read_from_file_test() { std::list<std::string> lines = QUtil::read_lines_from_file("other-file"); - for (std::list<std::string>::iterator iter = lines.begin(); - iter != lines.end(); - ++iter) { - std::cout << *iter << std::endl; + for (auto const& line: lines) { + std::cout << line << std::endl; } // Test the other versions and make sure we get the same results { |