From 706bfa499a1fadae4094831b639ba4ed68ea4a80 Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Mon, 27 Feb 2017 12:47:01 +0100 Subject: Fix "zero as null pointer constant" warning qsqlrelationaldelegate.h:60:52: error: zero as null pointer constant [-Werror=zero-as-null-pointer-constant] explicit QSqlRelationalDelegate(QObject *aParent = 0) qsqlrelationaldelegate.h:72:87: error: zero as null pointer constant [-Werror=zero-as-null-pointer-constant] QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : 0; qsqlrelationaldelegate.h:93:87: error: zero as null pointer constant [-Werror=zero-as-null-pointer-constant] QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : 0; Change-Id: I6e7de3cccf705b74018f522165886104194bf9be Reviewed-by: Marc Mutz --- src/sql/models/qsqlrelationaldelegate.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sql') diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index f295de7396..32c994363e 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -56,7 +56,7 @@ class QSqlRelationalDelegate: public QItemDelegate { public: -explicit QSqlRelationalDelegate(QObject *aParent = 0) +explicit QSqlRelationalDelegate(QObject *aParent = nullptr) : QItemDelegate(aParent) {} @@ -68,7 +68,7 @@ QWidget *createEditor(QWidget *aParent, const QModelIndex &index) const override { const QSqlRelationalTableModel *sqlModel = qobject_cast(index.model()); - QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : 0; + QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : nullptr; if (!childModel) return QItemDelegate::createEditor(aParent, option, index); @@ -86,7 +86,7 @@ void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex return; QSqlRelationalTableModel *sqlModel = qobject_cast(model); - QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : 0; + QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : nullptr; QComboBox *combo = qobject_cast(editor); if (!sqlModel || !childModel || !combo) { QItemDelegate::setModelData(editor, model, index); -- cgit v1.2.3