1 files changed, 51 insertions, 53 deletions

diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h
index 94631bafd9..aea9af7295 100644
--- a/src/sql/kernel/qsqlrecord.h
+++ b/src/sql/kernel/qsqlrecord.h
@@ -1,95 +1,91 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSql 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 QSQLRECORD_H
 #define QSQLRECORD_H
 
 #include <QtSql/qtsqlglobal.h>
+#include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 
 
 class QSqlField;
-class QStringList;
 class QVariant;
 class QSqlRecordPrivate;
+QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QSqlRecordPrivate, Q_SQL_EXPORT)
 
 class Q_SQL_EXPORT QSqlRecord
 {
 public:
     QSqlRecord();
-    QSqlRecord(const QSqlRecord& other);
-    QSqlRecord& operator=(const QSqlRecord& other);
+    QSqlRecord(const QSqlRecord &other);
+    QSqlRecord(QSqlRecord &&other) noexcept = default;
+    QSqlRecord& operator=(const QSqlRecord &other);
+    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QSqlRecord)
     ~QSqlRecord();
 
+    void swap(QSqlRecord &other) noexcept { d.swap(other.d); }
+
     bool operator==(const QSqlRecord &other) const;
     inline bool operator!=(const QSqlRecord &other) const { return !operator==(other); }
 
     QVariant value(int i) const;
-    QVariant value(const QString& name) const;
-    void setValue(int i, const QVariant& val);
-    void setValue(const QString& name, const QVariant& val);
+#if QT_SQL_REMOVED_SINCE(6, 8)
+    QVariant value(const QString &name) const;
+#endif
+    QVariant value(QAnyStringView name) const;
+    void setValue(int i, const QVariant &val);
+#if QT_SQL_REMOVED_SINCE(6, 8)
+    void setValue(const QString &name, const QVariant &val);
+#endif
+    void setValue(QAnyStringView name, const QVariant &val);
 
     void setNull(int i);
-    void setNull(const QString& name);
+#if QT_SQL_REMOVED_SINCE(6, 8)
+    void setNull(const QString &name);
+#endif
+    void setNull(QAnyStringView name);
     bool isNull(int i) const;
-    bool isNull(const QString& name) const;
+#if QT_SQL_REMOVED_SINCE(6, 8)
+    bool isNull(const QString &name) const;
+#endif
+    bool isNull(QAnyStringView name) const;
 
+#if QT_SQL_REMOVED_SINCE(6, 8)
     int indexOf(const QString &name) const;
+#endif
+    int indexOf(QAnyStringView name) const;
     QString fieldName(int i) const;
 
     QSqlField field(int i) const;
+#if QT_SQL_REMOVED_SINCE(6, 8)
     QSqlField field(const QString &name) const;
+#endif
+    QSqlField field(QAnyStringView name) const;
 
     bool isGenerated(int i) const;
-    bool isGenerated(const QString& name) const;
-    void setGenerated(const QString& name, bool generated);
+#if QT_SQL_REMOVED_SINCE(6, 8)
+    bool isGenerated(const QString &name) const;
+#endif
+    bool isGenerated(QAnyStringView name) const;
+#if QT_SQL_REMOVED_SINCE(6, 8)
+    void setGenerated(const QString &name, bool generated);
+#endif
+    void setGenerated(QAnyStringView name, bool generated);
     void setGenerated(int i, bool generated);
 
-    void append(const QSqlField& field);
-    void replace(int pos, const QSqlField& field);
-    void insert(int pos, const QSqlField& field);
+    void append(const QSqlField &field);
+    void replace(int pos, const QSqlField &field);
+    void insert(int pos, const QSqlField &field);
     void remove(int pos);
 
     bool isEmpty() const;
-    bool contains(const QString& name) const;
+#if QT_SQL_REMOVED_SINCE(6, 8)
+    bool contains(const QString &name) const;
+#endif
+    bool contains(QAnyStringView name) const;
     void clear();
     void clearValues();
     int count() const;
@@ -97,9 +93,11 @@ public:
 
 private:
     void detach();
-    QSqlRecordPrivate* d;
+    QExplicitlySharedDataPointer<QSqlRecordPrivate> d;
 };
 
+Q_DECLARE_SHARED(QSqlRecord)
+
 #ifndef QT_NO_DEBUG_STREAM
 Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlRecord &);
 #endif