Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 7 insertions, 7 deletions

diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index b0e26d7378a..4f5f00bf96a 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, const QSqlDatabase &db = QSqlDatabase());
+    QRelatedTableModel(QRelation *rel, QObject *parent = nullptr, const 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);
 }