2 files changed, 9 insertions, 9 deletions
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 34be010474..20adec6a3b 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -137,7 +137,7 @@ class QRelatedTableModel;
 struct QRelation
 {
     public:
-        QRelation(): model(0), m_parent(0), m_dictInitialized(false) {}
+        QRelation(): model(nullptr), m_parent(nullptr), m_dictInitialized(false) {}
         void init(QSqlRelationalTableModel *parent, const QSqlRelation &relation);
 
         void populateModel();
@@ -161,7 +161,7 @@ struct QRelation
 class QRelatedTableModel : public QSqlTableModel
 {
 public:
-    QRelatedTableModel(QRelation *rel, QObject *parent = 0, QSqlDatabase db = QSqlDatabase());
+    QRelatedTableModel(QRelation *rel, QObject *parent = nullptr, QSqlDatabase db = QSqlDatabase());
     bool select() override;
 private:
     bool firstSelect;
@@ -174,7 +174,7 @@ private:
 */
 void QRelation::init(QSqlRelationalTableModel *parent, const QSqlRelation &relation)
 {
-    Q_ASSERT(parent != NULL);
+    Q_ASSERT(parent != nullptr);
     m_parent = parent;
     rel = relation;
 }
@@ -183,7 +183,7 @@ void QRelation::populateModel()
 {
     if (!isValid())
         return;
-    Q_ASSERT(m_parent != NULL);
+    Q_ASSERT(m_parent != nullptr);
 
     if (!model) {
         model = new QRelatedTableModel(this, m_parent, m_parent->database());
@@ -202,7 +202,7 @@ void QRelation::populateDictionary()
     if (!isValid())
         return;
 
-    if (model ==  NULL)
+    if (model ==  nullptr)
         populateModel();
 
     QSqlRecord record;
@@ -234,13 +234,13 @@ void QRelation::clearDictionary()
 void QRelation::clear()
 {
     delete model;
-    model = 0;
+    model = nullptr;
     clearDictionary();
 }
 
 bool QRelation::isValid()
 {
-    return (rel.isValid() && m_parent != NULL);
+    return (rel.isValid() && m_parent != nullptr);
 }
 
 
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 4bc9a8c2f8..4b29492134 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -1305,7 +1305,7 @@ Qt::ItemFlags QSqlTableModel::flags(const QModelIndex &index) const
     Q_D(const QSqlTableModel);
     if (index.internalPointer() || index.column() < 0 || index.column() >= d->rec.count()
         || index.row() < 0)
-        return 0;
+        return { };
 
     bool editable = true;
 
@@ -1369,7 +1369,7 @@ QSqlRecord QSqlTableModel::record(int row) const
     // get generated flags from the cache
     const QSqlTableModelPrivate::ModifiedRow mrow = d->cache.value(row);
     if (mrow.op() != QSqlTableModelPrivate::None) {
-        const QSqlRecord crec = mrow.rec();
+        const QSqlRecord &crec = mrow.rec();
         for (int i = 0, cnt = rec.count(); i < cnt; ++i)
             rec.setGenerated(i, crec.isGenerated(i));
     }