1 files changed, 24 insertions, 44 deletions

diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index 33021d1773..72ee1b797f 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui 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 QPIXMAPCACHE_H
 #define QPIXMAPCACHE_H
@@ -63,10 +27,14 @@ public:
         { return !operator==(key); }
         Key &operator =(const Key &other);
 
-        void swap(Key &other) noexcept { qSwap(d, other.d); }
+        void swap(Key &other) noexcept { qt_ptr_swap(d, other.d); }
         bool isValid() const noexcept;
 
     private:
+        friend size_t qHash(const QPixmapCache::Key &k, size_t seed = 0) noexcept
+        { return k.hash(seed); }
+        size_t hash(size_t seed) const noexcept;
+
         KeyData *d;
         friend class QPMCache;
         friend class QPixmapCache;
@@ -78,18 +46,30 @@ public:
     static bool find(const Key &key, QPixmap *pixmap);
     static bool insert(const QString &key, const QPixmap &pixmap);
     static Key insert(const QPixmap &pixmap);
+#if QT_DEPRECATED_SINCE(6, 6)
+    QT_DEPRECATED_VERSION_X_6_6("Use remove(key), followed by key = insert(pixmap).")
+    QT_GUI_INLINE_SINCE(6, 6)
     static bool replace(const Key &key, const QPixmap &pixmap);
+#endif
     static void remove(const QString &key);
     static void remove(const Key &key);
     static void clear();
-
-#ifdef Q_TEST_QPIXMAPCACHE
-    static void flushDetachedPixmaps();
-    static int totalUsed();
-#endif
 };
 Q_DECLARE_SHARED(QPixmapCache::Key)
 
+#if QT_DEPRECATED_SINCE(6, 6)
+#if QT_GUI_INLINE_IMPL_SINCE(6, 6)
+bool QPixmapCache::replace(const Key &key, const QPixmap &pixmap)
+{
+    if (!key.isValid())
+        return false;
+    remove(key);
+    const_cast<Key&>(key) = insert(pixmap);
+    return key.isValid();
+}
+#endif // QT_GUI_INLINE_IMPL_SINCE(6, 6)
+#endif // QT_DEPRECATED_SINCE(6, 6)
+
 QT_END_NAMESPACE
 
 #endif // QPIXMAPCACHE_H