diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 13:05:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 23:02:47 +0200 |
commit | 564b59d903683b14c75b72a3e93367717f201def (patch) | |
tree | 03ffe749d83dce84429a7db484bf92795047036f /tests/auto/corelib/itemmodels | |
parent | b5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff) |
Another round of replacing 0 with nullptr
This time based on grepping to also include documentation, tests and
examples previously missed by the automatic tool.
Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/corelib/itemmodels')
3 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp index 5d384de2b2..bf44cf5fa0 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -132,8 +132,8 @@ private: class QtTestModel: public QAbstractItemModel { public: - QtTestModel(int rows, int columns, QObject *parent = 0); - QtTestModel(const QList<QList<QString> > tbl, QObject *parent = 0); + QtTestModel(int rows, int columns, QObject *parent = nullptr); + QtTestModel(const QList<QList<QString> > tbl, QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex parent(const QModelIndex &) const override; int rowCount(const QModelIndex &parent) const override; @@ -1940,7 +1940,7 @@ public: UserRole }; - CustomRoleModel(QObject *parent = 0) + CustomRoleModel(QObject *parent = nullptr) : QStringListModel(QStringList() << "a" << "b" << "c", parent) { } @@ -1991,7 +1991,7 @@ class SignalArgumentChecker : public QObject { Q_OBJECT public: - SignalArgumentChecker(const QModelIndex &p1, const QModelIndex &p2, QObject *parent = 0) + SignalArgumentChecker(const QModelIndex &p1, const QModelIndex &p2, QObject *parent = nullptr) : QObject(parent), m_p1(p1), m_p2(p2), m_p1Persistent(p1), m_p2Persistent(p2) { connect(p1.model(), SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>)), SLOT(layoutAboutToBeChanged(QList<QPersistentModelIndex>))); @@ -2165,7 +2165,7 @@ class OverrideRoleNamesAndDragActions : public QStringListModel { Q_OBJECT public: - OverrideRoleNamesAndDragActions(QObject *parent = 0) + OverrideRoleNamesAndDragActions(QObject *parent = nullptr) : QStringListModel(parent) { @@ -2204,7 +2204,7 @@ class OverrideDropActions : public QStringListModel { Q_OBJECT public: - OverrideDropActions(QObject *parent = 0) + OverrideDropActions(QObject *parent = nullptr) : QStringListModel(parent) { } @@ -2225,7 +2225,7 @@ class SignalConnectionTester : public QObject { Q_OBJECT public: - SignalConnectionTester(QObject *parent = 0) + SignalConnectionTester(QObject *parent = nullptr) : QObject(parent), testPassed(false) { diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp index 313facac81..92f9c87b9f 100644 --- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -2092,7 +2092,7 @@ class QtTestTableModel: public QAbstractTableModel { Q_OBJECT public: - QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = 0) + QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = nullptr) : QAbstractTableModel(parent) , row_count(rows) , column_count(columns) @@ -2624,7 +2624,7 @@ class SelectionObserver : public QObject { Q_OBJECT public: - SelectionObserver(QAbstractItemModel *model, QObject *parent = 0) + SelectionObserver(QAbstractItemModel *model, QObject *parent = nullptr) : QObject(parent), m_model(model), m_selectionModel(0) { connect(model, SIGNAL(modelReset()), SLOT(modelReset())); @@ -2688,7 +2688,7 @@ class DuplicateItemSelectionModel : public QItemSelectionModel { Q_OBJECT public: - DuplicateItemSelectionModel(QItemSelectionModel *target, QAbstractItemModel *model, QObject *parent = 0) + DuplicateItemSelectionModel(QItemSelectionModel *target, QAbstractItemModel *model, QObject *parent = nullptr) : QItemSelectionModel(model, parent), m_target(target) { } diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp index 35ae7f4a7f..d6a09056ae 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/tst_qsortfilterproxymodel_recursive.cpp @@ -142,7 +142,7 @@ static QString treeAsString(const QAbstractItemModel &model, const QModelIndex & static void fillModel(QStandardItemModel &model, const QString &str) { QCOMPARE(str.count('['), str.count(']')); - QStandardItem *item = 0; + QStandardItem *item = nullptr; QString data; for ( int i = 0 ; i < str.length() ; ++i ) { const QChar ch = str.at(i); |