1 files changed, 15 insertions, 64 deletions

diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index 8a341c8555..952b88bafb 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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) 2016 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 QCACHE_H
 #define QCACHE_H
@@ -64,8 +28,8 @@ class QCache
         }
         Value &operator=(Value &&other) noexcept
         {
-            qSwap(t, other.t);
-            qSwap(cost, other.cost);
+            qt_ptr_swap(t, other.t);
+            std::swap(cost, other.cost);
             return *this;
         }
         ~Value() { delete t; }
@@ -109,23 +73,6 @@ class QCache
         {
             value = Value(o, cost);
         }
-        static Node create(const Key &k, Value &&t) noexcept(std::is_nothrow_move_assignable_v<Key> && std::is_nothrow_move_assignable_v<T>)
-        {
-            return Node(k, std::move(t));
-        }
-        void replace(const Value &t) noexcept(std::is_nothrow_assignable_v<T, T>)
-        {
-            value = t;
-        }
-        void replace(Value &&t) noexcept(std::is_nothrow_move_assignable_v<T>)
-        {
-            value = std::move(t);
-        }
-        Value takeValue() noexcept(std::is_nothrow_move_constructible_v<T>)
-        {
-            return std::move(value);
-        }
-        bool valuesEqual(const Node *other) const { return value == other->value; }
 
         Node(Node &&other)
             : Chain(other),
@@ -155,11 +102,13 @@ class QCache
         n->prev->next = n->next;
         n->next->prev = n->prev;
         total -= n->value.cost;
-        auto it = d.find(n->key);
+        auto it = d.findBucket(n->key);
         d.erase(it);
     }
     T *relink(const Key &key) const noexcept
     {
+        if (isEmpty())
+            return nullptr;
         Node *n = d.findNode(key);
         if (!n)
             return nullptr;
@@ -179,11 +128,9 @@ class QCache
 
     void trim(qsizetype m) noexcept(std::is_nothrow_destructible_v<Node>)
     {
-        Chain *n = chain.prev;
-        while (n != &chain && total > m) {
-            Node *u = static_cast<Node *>(n);
-            n = n->prev;
-            unlink(u);
+        while (chain.prev != &chain && total > m) {
+            Node *n = static_cast<Node *>(chain.prev);
+            unlink(n);
         }
     }
 
@@ -269,11 +216,13 @@ public:
     }
     inline bool contains(const Key &key) const noexcept
     {
-        return d.findNode(key) != nullptr;
+        return !isEmpty() && d.findNode(key) != nullptr;
     }
 
     bool remove(const Key &key) noexcept(std::is_nothrow_destructible_v<Node>)
     {
+        if (isEmpty())
+            return false;
         Node *n = d.findNode(key);
         if (!n) {
             return false;
@@ -285,6 +234,8 @@ public:
 
     T *take(const Key &key) noexcept(std::is_nothrow_destructible_v<Key>)
     {
+        if (isEmpty())
+            return nullptr;
         Node *n = d.findNode(key);
         if (!n)
             return nullptr;