1 files changed, 82 insertions, 114 deletions
diff --git a/src/corelib/global/qcontainerinfo.h b/src/corelib/global/qcontainerinfo.h
index e0025fcef0..14468510a5 100644
--- a/src/corelib/global/qcontainerinfo.h
+++ b/src/corelib/global/qcontainerinfo.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QCONTAINERINFO_H
 #define QCONTAINERINFO_H
@@ -45,8 +9,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QContainerTraits
-{
+namespace QContainerInfo {
 
 template<typename C>
 using value_type = typename C::value_type;
@@ -68,189 +31,194 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
 
 template<typename C, typename = void>
-constexpr bool has_value_type_v = false;
+inline constexpr bool has_value_type_v = false;
 template<typename C>
-constexpr bool has_value_type_v<C, std::void_t<value_type<C>>> = true;
+inline constexpr bool has_value_type_v<C, std::void_t<value_type<C>>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_key_type_v = false;
+inline constexpr bool has_key_type_v = false;
 template<typename C>
-constexpr bool has_key_type_v<C, std::void_t<key_type<C>>> = true;
+inline constexpr bool has_key_type_v<C, std::void_t<key_type<C>>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_mapped_type_v = false;
+inline constexpr bool has_mapped_type_v = false;
 template<typename C>
-constexpr bool has_mapped_type_v<C, std::void_t<mapped_type<C>>> = true;
+inline constexpr bool has_mapped_type_v<C, std::void_t<mapped_type<C>>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_size_v = false;
+inline constexpr bool has_size_v = false;
 template<typename C>
-constexpr bool has_size_v<C, std::void_t<decltype(C().size())>> = true;
+inline constexpr bool has_size_v<C, std::void_t<decltype(C().size())>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_clear_v = false;
+inline constexpr bool has_reserve_v = false;
 template<typename C>
-constexpr bool has_clear_v<C, std::void_t<decltype(C().clear())>> = true;
+inline constexpr bool has_reserve_v<C, std::void_t<decltype(C().reserve(0))>> = true;
+
+template<typename C, typename = void>
+inline constexpr bool has_clear_v = false;
+template<typename C>
+inline constexpr bool has_clear_v<C, std::void_t<decltype(C().clear())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_at_index_v = false;
+inline constexpr bool has_at_index_v = false;
 template<typename C>
-constexpr bool has_at_index_v<C, std::void_t<decltype(C().at(0))>> = true;
+inline constexpr bool has_at_index_v<C, std::void_t<decltype(C().at(0))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_at_key_v = false;
+inline constexpr bool has_at_key_v = false;
 template<typename C>
-constexpr bool has_at_key_v<C, std::void_t<decltype(C().at(key_type<C>()))>> = true;
+inline constexpr bool has_at_key_v<C, std::void_t<decltype(C().at(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_get_at_index_v = false;
+inline constexpr bool can_get_at_index_v = false;
 template<typename C>
-constexpr bool can_get_at_index_v<C, std::void_t<value_type<C>(decltype(C()[0]))>> = true;
+inline constexpr bool can_get_at_index_v<C, std::void_t<value_type<C>(decltype(C()[0]))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_at_index_v = false;
+inline constexpr bool can_set_at_index_v = false;
 template<typename C>
-constexpr bool can_set_at_index_v<C, std::void_t<decltype(C()[0] = value_type<C>())>> = true;
+inline constexpr bool can_set_at_index_v<C, std::void_t<decltype(C()[0] = value_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_push_front_v = false;
+inline constexpr bool has_push_front_v = false;
 template<typename C>
-constexpr bool has_push_front_v<C, std::void_t<decltype(C().push_front(value_type<C>()))>> = true;
+inline constexpr bool has_push_front_v<C, std::void_t<decltype(C().push_front(value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_push_back_v = false;
+inline constexpr bool has_push_back_v = false;
 template<typename C>
-constexpr bool has_push_back_v<C, std::void_t<decltype(C().push_back(value_type<C>()))>> = true;
+inline constexpr bool has_push_back_v<C, std::void_t<decltype(C().push_back(value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_insert_v = false;
+inline constexpr bool has_insert_v = false;
 template<typename C>
-constexpr bool has_insert_v<C, std::void_t<decltype(C().insert(value_type<C>()))>> = true;
+inline constexpr bool has_insert_v<C, std::void_t<decltype(C().insert(value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_pop_front_v = false;
+inline constexpr bool has_pop_front_v = false;
 template<typename C>
-constexpr bool has_pop_front_v<C, std::void_t<decltype(C().pop_front())>> = true;
+inline constexpr bool has_pop_front_v<C, std::void_t<decltype(C().pop_front())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_pop_back_v = false;
+inline constexpr bool has_pop_back_v = false;
 template<typename C>
-constexpr bool has_pop_back_v<C, std::void_t<decltype(C().pop_back())>> = true;
+inline constexpr bool has_pop_back_v<C, std::void_t<decltype(C().pop_back())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_iterator_v = false;
+inline constexpr bool has_iterator_v = false;
 template<typename C>
-constexpr bool has_iterator_v<C, std::void_t<iterator<C>>> = true;
+inline constexpr bool has_iterator_v<C, std::void_t<iterator<C>>> = true;
 
 template<typename, typename = void>
-constexpr bool has_const_iterator_v = false;
+inline constexpr bool has_const_iterator_v = false;
 template<typename C>
-constexpr bool has_const_iterator_v<C, std::void_t<const_iterator<C>>> = true;
+inline constexpr bool has_const_iterator_v<C, std::void_t<const_iterator<C>>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_value_at_iterator_v = false;
+inline constexpr bool can_set_value_at_iterator_v = false;
 template<typename C>
-constexpr bool can_set_value_at_iterator_v<C, std::void_t<decltype(*C().begin() = value_type<C>())>> = true;
+inline constexpr bool can_set_value_at_iterator_v<C, std::void_t<decltype(*C().begin() = value_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_mapped_at_iterator_v = false;
+inline constexpr bool can_set_mapped_at_iterator_v = false;
 template<typename C>
-constexpr bool can_set_mapped_at_iterator_v<C, std::void_t<decltype(*C().begin() = mapped_type<C>())>> = true;
+inline constexpr bool can_set_mapped_at_iterator_v<C, std::void_t<decltype(*C().begin() = mapped_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_value_at_iterator_v = false;
+inline constexpr bool can_insert_value_at_iterator_v = false;
 template<typename C>
-constexpr bool can_insert_value_at_iterator_v<C, std::void_t<decltype(C().insert(C().begin(), value_type<C>()))>> = true;
+inline constexpr bool can_insert_value_at_iterator_v<C, std::void_t<decltype(C().insert(C().begin(), value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_erase_at_iterator_v = false;
+inline constexpr bool can_erase_at_iterator_v = false;
 template<typename C>
-constexpr bool can_erase_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin()))>> = true;
+inline constexpr bool can_erase_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_erase_range_at_iterator_v = false;
+inline constexpr bool can_erase_range_at_iterator_v = false;
 template<typename C>
-constexpr bool can_erase_range_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin(), C().end()))>> = true;
+inline constexpr bool can_erase_range_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin(), C().end()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_get_at_key_v = false;
+inline constexpr bool can_get_at_key_v = false;
 template<typename C>
-constexpr bool can_get_at_key_v<C, std::void_t<mapped_type<C>(decltype(C()[key_type<C>()]))>> = true;
+inline constexpr bool can_get_at_key_v<C, std::void_t<mapped_type<C>(decltype(C()[key_type<C>()]))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_at_key_v = false;
+inline constexpr bool can_set_at_key_v = false;
 template<typename C>
-constexpr bool can_set_at_key_v<C, std::void_t<decltype(C()[key_type<C>()] = mapped_type<C>())>> = true;
+inline constexpr bool can_set_at_key_v<C, std::void_t<decltype(C()[key_type<C>()] = mapped_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool can_erase_at_key_v = false;
+inline constexpr bool can_erase_at_key_v = false;
 template<typename C>
-constexpr bool can_erase_at_key_v<C, std::void_t<decltype(C().erase(key_type<C>()))>> = true;
+inline constexpr bool can_erase_at_key_v<C, std::void_t<decltype(C().erase(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_remove_at_key_v = false;
+inline constexpr bool can_remove_at_key_v = false;
 template<typename C>
-constexpr bool can_remove_at_key_v<C, std::void_t<decltype(C().remove(key_type<C>()))>> = true;
+inline constexpr bool can_remove_at_key_v<C, std::void_t<decltype(C().remove(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_key_v = false;
+inline constexpr bool can_insert_key_v = false;
 template<typename C>
-constexpr bool can_insert_key_v<C, std::void_t<decltype(C().insert(key_type<C>()))>> = true;
+inline constexpr bool can_insert_key_v<C, std::void_t<decltype(C().insert(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_pair_v = false;
+inline constexpr bool can_insert_pair_v = false;
 template<typename C>
-constexpr bool can_insert_pair_v<C, std::void_t<decltype(C().insert({key_type<C>(), mapped_type<C>()}))>> = true;
+inline constexpr bool can_insert_pair_v<C, std::void_t<decltype(C().insert({key_type<C>(), mapped_type<C>()}))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_key_mapped_v = false;
+inline constexpr bool can_insert_key_mapped_v = false;
 template<typename C>
-constexpr bool can_insert_key_mapped_v<C, std::void_t<decltype(C().insert(key_type<C>(), mapped_type<C>()))>> = true;
+inline constexpr bool can_insert_key_mapped_v<C, std::void_t<decltype(C().insert(key_type<C>(), mapped_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_contains_v = false;
+inline constexpr bool has_contains_v = false;
 template<typename C>
-constexpr bool has_contains_v<C, std::void_t<decltype(bool(C().contains(key_type<C>())))>> = true;
+inline constexpr bool has_contains_v<C, std::void_t<decltype(bool(C().contains(key_type<C>())))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_find_v = false;
+inline constexpr bool has_find_v = false;
 template<typename C>
-constexpr bool has_find_v<C, std::void_t<decltype(C().find(key_type<C>()))>> = true;
+inline constexpr bool has_find_v<C, std::void_t<decltype(C().find(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_dereferences_to_value_v = false;
+inline constexpr bool iterator_dereferences_to_value_v = false;
 template<typename C>
-constexpr bool iterator_dereferences_to_value_v<C, std::void_t<decltype(value_type<C>(*C().begin()))>> = true;
+inline constexpr bool iterator_dereferences_to_value_v<C, std::void_t<decltype(value_type<C>(*C().begin()))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_has_key_v = false;
+inline constexpr bool iterator_has_key_v = false;
 template<typename C>
-constexpr bool iterator_has_key_v<C, std::void_t<decltype(key_type<C>(C().begin().key()))>> = true;
+inline constexpr bool iterator_has_key_v<C, std::void_t<decltype(key_type<C>(C().begin().key()))>> = true;
 
 template<typename, typename = void>
-constexpr bool value_type_has_first_v = false;
+inline constexpr bool value_type_has_first_v = false;
 template<typename C>
-constexpr bool value_type_has_first_v<C, std::void_t<decltype(key_type<C>(value_type<C>().first))>> = true;
+inline constexpr bool value_type_has_first_v<C, std::void_t<decltype(key_type<C>(value_type<C>().first))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_dereferences_to_key_v = false;
+inline constexpr bool iterator_dereferences_to_key_v = false;
 template<typename C>
-constexpr bool iterator_dereferences_to_key_v<C, std::void_t<decltype(key_type<C>(*C().begin()))>> = true;
+inline constexpr bool iterator_dereferences_to_key_v<C, std::void_t<decltype(key_type<C>(*C().begin()))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_has_value_v = false;
+inline constexpr bool iterator_has_value_v = false;
 template<typename C>
-constexpr bool iterator_has_value_v<C, std::void_t<decltype(mapped_type<C>(C().begin().value()))>> = true;
+inline constexpr bool iterator_has_value_v<C, std::void_t<decltype(mapped_type<C>(C().begin().value()))>> = true;
 
 template<typename, typename = void>
-constexpr bool value_type_has_second_v = false;
+inline constexpr bool value_type_has_second_v = false;
 template<typename C>
-constexpr bool value_type_has_second_v<C, std::void_t<decltype(mapped_type<C>(value_type<C>().second))>> = true;
+inline constexpr bool value_type_has_second_v<C, std::void_t<decltype(mapped_type<C>(value_type<C>().second))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_dereferences_to_mapped_v = false;
+inline constexpr bool iterator_dereferences_to_mapped_v = false;
 template<typename C>
-constexpr bool iterator_dereferences_to_mapped_v<C, std::void_t<decltype(mapped_type<C>(*C().begin()))>> = true;
+inline constexpr bool iterator_dereferences_to_mapped_v<C, std::void_t<decltype(mapped_type<C>(*C().begin()))>> = true;
 
 QT_WARNING_POP