diff options
Diffstat (limited to 'sources/shiboken6/tests/libsample/strlist.cpp')
| -rw-r--r-- | sources/shiboken6/tests/libsample/strlist.cpp | 56 |
1 files changed, 12 insertions, 44 deletions
diff --git a/sources/shiboken6/tests/libsample/strlist.cpp b/sources/shiboken6/tests/libsample/strlist.cpp index e523522f3..5840a0516 100644 --- a/sources/shiboken6/tests/libsample/strlist.cpp +++ b/sources/shiboken6/tests/libsample/strlist.cpp @@ -1,55 +1,23 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of Qt for Python. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "strlist.h" -bool -StrList::operator==(const std::list<Str>& other) const +#include <algorithm> + +bool StrList::operator==(const std::list<Str> &other) const { - if (size() != other.size()) - return false; - StrList::const_iterator this_it = begin(); - StrList::const_iterator other_it = begin(); - while (this_it != end()) { - if (!((*this_it) == (*other_it))) - return false; - ++this_it; - ++other_it; - } - return true; + return size() == other.size() + && std::equal(begin(), end(), other.begin()); } -Str -StrList::join(const Str& sep) const +Str StrList::join(const Str &sep) const { Str result; - for (StrList::const_iterator it = begin(); it != end(); ++it) { - if (it != begin()) + const auto i1 = begin(); + const auto i2 = end(); + for (auto it = i1; i1 != i2; ++it) { + if (it != i1) result.append(sep); result.append(*it); } |