SQL: misc cleanup in QSqlRecord/QSqlField

Cleanup an unused function in QSqlRecordPrivate and use member
initializers for the ctors in QSqlRecord/QSqlField

Change-Id: I7d585e70c83373b3092e9f1425233af42b8c379d
Reviewed-by: Andy Shaw <andy.shaw@qt.io>

2 files changed, 19 insertions, 35 deletions

diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index a86a7ca686..c407137e7e 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -141,20 +141,20 @@ public:
         setGenerated(), setReadOnly()
 */
 QSqlField::QSqlField(const QString &fieldName, QMetaType type, const QString &table)
+    : val(QVariant(type, nullptr)),
+      d(new QSqlFieldPrivate(fieldName, type, table))
 {
-    d = new QSqlFieldPrivate(fieldName, type, table);
-    val = QVariant(QMetaType(type), nullptr);
 }
 
 /*!
     Constructs a copy of \a other.
 */
 
-QSqlField::QSqlField(const QSqlField& other)
+QSqlField::QSqlField(const QSqlField &other)
+    : val(other.val),
+      d(other.d)
 {
-    d = other.d;
     d->ref.ref();
-    val = other.val;
 }
 
 /*!
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index 74f42b2e48..a3c6a9debf 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -15,36 +15,21 @@ QT_BEGIN_NAMESPACE
 class QSqlRecordPrivate
 {
 public:
-    QSqlRecordPrivate();
-    QSqlRecordPrivate(const QSqlRecordPrivate &other);
+    QSqlRecordPrivate() = default;
+    QSqlRecordPrivate(const QSqlRecordPrivate &other)
+        : fields(other.fields)
+    {
+    }
 
-    inline bool contains(int index) { return index >= 0 && index < fields.size(); }
-    QString createField(int index, const QString &prefix) const;
+    inline bool contains(qsizetype index) const
+    {
+      return index >= 0 && index < fields.size();
+    }
 
     QList<QSqlField> fields;
-    QAtomicInt ref;
+    QAtomicInt ref{1};
 };
 
-QSqlRecordPrivate::QSqlRecordPrivate() : ref(1)
-{
-}
-
-QSqlRecordPrivate::QSqlRecordPrivate(const QSqlRecordPrivate &other): fields(other.fields), ref(1)
-{
-}
-
-/*! \internal
-    Just for compat
-*/
-QString QSqlRecordPrivate::createField(int index, const QString &prefix) const
-{
-    QString f;
-    if (!prefix.isEmpty())
-        f = prefix + u'.';
-    f += fields.at(index).name();
-    return f;
-}
-
 /*!
     \class QSqlRecord
     \brief The QSqlRecord class encapsulates a database record.
@@ -86,8 +71,8 @@ QString QSqlRecordPrivate::createField(int index, const QString &prefix) const
 */
 
 QSqlRecord::QSqlRecord()
+  : d(new QSqlRecordPrivate)
 {
-    d = new QSqlRecordPrivate();
 }
 
 /*!
@@ -98,8 +83,8 @@ QSqlRecord::QSqlRecord()
 */
 
 QSqlRecord::QSqlRecord(const QSqlRecord& other)
+  : d(other.d)
 {
-    d = other.d;
     d->ref.ref();
 }
 
@@ -337,9 +322,8 @@ bool QSqlRecord::contains(const QString& name) const
 void QSqlRecord::clearValues()
 {
     detach();
-    int count = d->fields.size();
-    for (int i = 0; i < count; ++i)
-        d->fields[i].clear();
+    for (QSqlField &f : d->fields)
+        f.clear();
 }
 
 /*!