1 files changed, 22 insertions, 64 deletions

diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index bbab8df3e2..25113213c9 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.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) 2021 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 QRINGBUFFER_P_H
 #define QRINGBUFFER_P_H
@@ -65,36 +29,19 @@ class QRingChunk
 {
 public:
     // initialization and cleanup
-    inline QRingChunk() noexcept :
-        headOffset(0), tailOffset(0)
-    {
-    }
-    inline QRingChunk(const QRingChunk &other) noexcept :
-        chunk(other.chunk), headOffset(other.headOffset), tailOffset(other.tailOffset)
-    {
-    }
+    QRingChunk() noexcept = default;
     explicit inline QRingChunk(qsizetype alloc) :
-        chunk(alloc, Qt::Uninitialized), headOffset(0), tailOffset(0)
+        chunk(alloc, Qt::Uninitialized), tailOffset(0)
     {
     }
     explicit inline QRingChunk(const QByteArray &qba) noexcept :
-        chunk(qba), headOffset(0), tailOffset(qba.size())
+        chunk(qba), tailOffset(qba.size())
     {
     }
-
-    inline QRingChunk &operator=(const QRingChunk &other) noexcept
+    explicit QRingChunk(QByteArray &&qba) noexcept :
+        chunk(std::move(qba)), tailOffset(chunk.size())
     {
-        chunk = other.chunk;
-        headOffset = other.headOffset;
-        tailOffset = other.tailOffset;
-        return *this;
     }
-    inline QRingChunk(QRingChunk &&other) noexcept :
-        chunk(other.chunk), headOffset(other.headOffset), tailOffset(other.tailOffset)
-    {
-        other.headOffset = other.tailOffset = 0;
-    }
-    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QRingChunk)
 
     inline void swap(QRingChunk &other) noexcept
     {
@@ -110,7 +57,7 @@ public:
         return !chunk.isDetached();
     }
     Q_CORE_EXPORT void detach();
-    QByteArray toByteArray();
+    QByteArray toByteArray() &&;
 
     // getters
     inline qsizetype head() const
@@ -161,28 +108,38 @@ public:
         headOffset = 0;
         tailOffset = qba.size();
     }
+    void assign(QByteArray &&qba)
+    {
+        chunk = std::move(qba);
+        headOffset = 0;
+        tailOffset = chunk.size();
+    }
     inline void reset()
     {
         headOffset = tailOffset = 0;
     }
     inline void clear()
     {
-        assign(QByteArray());
+        *this = {};
     }
 
 private:
     QByteArray chunk;
-    qsizetype headOffset;
-    qsizetype tailOffset;
+    qsizetype headOffset = 0;
+    qsizetype tailOffset = 0;
 };
 Q_DECLARE_SHARED(QRingChunk)
 
 class QRingBuffer
 {
+    Q_DISABLE_COPY(QRingBuffer)
 public:
     explicit inline QRingBuffer(int growth = QRINGBUFFER_CHUNKSIZE) :
         bufferSize(0), basicBlockSize(growth) { }
 
+    QRingBuffer(QRingBuffer &&) noexcept = default;
+    QRingBuffer &operator=(QRingBuffer &&) noexcept = default;
+
     inline void setChunkSize(int size) {
         basicBlockSize = size;
     }
@@ -248,6 +205,7 @@ public:
     Q_CORE_EXPORT qint64 peek(char *data, qint64 maxLength, qint64 pos = 0) const;
     Q_CORE_EXPORT void append(const char *data, qint64 size);
     Q_CORE_EXPORT void append(const QByteArray &qba);
+    Q_CORE_EXPORT void append(QByteArray &&qba);
 
     inline qint64 skip(qint64 length) {
         qint64 bytesToSkip = qMin(length, bufferSize);