From 1c02848a4d76b60b1ec61c10d2a1497da3a328ef Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 16 Jan 2017 09:44:16 +0100 Subject: [PATCH] Use nullptr everywhere Differential Revision: https://phabricator.kde.org/D3987 --- autotests/kdescendantsproxymodel_smoketest.cpp | 4 ++-- autotests/kextracolumnsproxymodeltest.cpp | 2 +- autotests/klinkitemselectionmodeltest.cpp | 10 +++++----- autotests/krecursivefilterproxymodeltest.cpp | 4 ++-- autotests/kselectionproxymodeltest.cpp | 2 +- autotests/kselectionproxymodeltestsuite.h | 10 +++++----- .../proxymodeltestsuite/dynamictreemodel.h | 16 ++++++++-------- .../proxymodeltestsuite/dynamictreewidget.h | 2 +- .../eventloggerregister.cpp | 2 +- autotests/proxymodeltestsuite/indexfinder.h | 2 +- .../proxymodeltestsuite/modelcommander.cpp | 2 +- .../proxymodeltestsuite/modeleventlogger.cpp | 2 +- .../proxymodeltestsuite/modeleventlogger.h | 6 +++--- .../proxymodeltestsuite/modelselector.cpp | 6 +++--- autotests/proxymodeltestsuite/modelselector.h | 6 +++--- autotests/proxymodeltestsuite/modelspy.cpp | 4 ++-- autotests/proxymodeltestsuite/modeltest.h | 4 ++-- .../proxymodeltestsuite/proxymodeltest.cpp | 18 +++++++++--------- autotests/proxymodeltestsuite/proxymodeltest.h | 4 ++-- src/kbreadcrumbselectionmodel.h | 4 ++-- src/kcheckableproxymodel.cpp | 2 +- src/kcheckableproxymodel.h | 2 +- src/kconcatenaterowsproxymodel.cpp | 4 ++-- src/kconcatenaterowsproxymodel.h | 2 +- src/kdescendantsproxymodel.h | 2 +- src/kextracolumnsproxymodel.h | 2 +- src/klinkitemselectionmodel.h | 2 +- src/kmodelindexproxymapper.h | 2 +- src/krearrangecolumnsproxymodel.h | 2 +- src/krecursivefilterproxymodel.h | 2 +- src/kselectionproxymodel.cpp | 8 ++++---- src/kselectionproxymodel.h | 2 +- src/kvoidpointerfactory_p.h | 8 ++++---- .../breadcrumbdirectionwidget.h | 2 +- .../breadcrumbnavigationwidget.h | 12 ++++++------ tests/proxymodeltestapp/breadcrumbswidget.h | 4 ++-- tests/proxymodeltestapp/checkablewidget.h | 2 +- tests/proxymodeltestapp/descendantpmwidget.h | 2 +- .../kidentityproxymodelwidget.h | 2 +- .../kreparentingproxymodel.cpp | 2 +- .../proxymodeltestapp/kreparentingproxymodel.h | 2 +- tests/proxymodeltestapp/lessthanwidget.cpp | 2 +- tests/proxymodeltestapp/lessthanwidget.h | 4 ++-- tests/proxymodeltestapp/matchcheckingwidget.h | 2 +- tests/proxymodeltestapp/modelcommanderwidget.h | 2 +- .../proxyitemselectionwidget.h | 2 +- tests/proxymodeltestapp/proxymodeltestwidget.h | 2 +- .../recursivefilterpmwidget.h | 4 ++-- tests/proxymodeltestapp/reparentingpmwidget.h | 2 +- .../scriptablereparentingwidget.h | 4 ++-- tests/proxymodeltestapp/selectioninqmlwidget.h | 2 +- tests/proxymodeltestapp/selectionpmwidget.h | 2 +- 52 files changed, 103 insertions(+), 103 deletions(-) diff --git a/autotests/kdescendantsproxymodel_smoketest.cpp b/autotests/kdescendantsproxymodel_smoketest.cpp index eefb53d..e1da245 100644 --- a/autotests/kdescendantsproxymodel_smoketest.cpp +++ b/autotests/kdescendantsproxymodel_smoketest.cpp @@ -29,7 +29,7 @@ class TestData : public ProxyModelTestData { Q_OBJECT public: - TestData(ProxyModelTest *parent = 0) + TestData(ProxyModelTest *parent = nullptr) : ProxyModelTestData(parent) { @@ -216,7 +216,7 @@ class DescendantsProxyModelTest : public ProxyModelTest { Q_OBJECT public: - DescendantsProxyModelTest(QObject *parent = 0) + DescendantsProxyModelTest(QObject *parent = nullptr) : ProxyModelTest(parent) { } diff --git a/autotests/kextracolumnsproxymodeltest.cpp b/autotests/kextracolumnsproxymodeltest.cpp index 6428ebd..ad3022d 100644 --- a/autotests/kextracolumnsproxymodeltest.cpp +++ b/autotests/kextracolumnsproxymodeltest.cpp @@ -395,7 +395,7 @@ private Q_SLOTS: QCOMPARE(QModelIndex(persistentIndex), proxy.mapFromSource(sourcePersistentIndex)); }); - ModelMoveLayoutChangeCommand layoutChangeCommand(&model, 0); + ModelMoveLayoutChangeCommand layoutChangeCommand(&model, nullptr); layoutChangeCommand.setAncestorRowNumbers({0, 0, 0}); layoutChangeCommand.setStartRow(0); diff --git a/autotests/klinkitemselectionmodeltest.cpp b/autotests/klinkitemselectionmodeltest.cpp index 8e32d06..a5c270b 100644 --- a/autotests/klinkitemselectionmodeltest.cpp +++ b/autotests/klinkitemselectionmodeltest.cpp @@ -48,13 +48,13 @@ void KLinkItemSelectionModelTest::init() void KLinkItemSelectionModelTest::cleanup() { delete m_mainSelectionModel; - m_mainSelectionModel = 0; + m_mainSelectionModel = nullptr; delete m_mainModel; - m_mainModel = 0; + m_mainModel = nullptr; delete m_subSelectionModel; - m_subSelectionModel = 0; + m_subSelectionModel = nullptr; delete m_subModel; - m_subModel = 0; + m_subModel = nullptr; } void KLinkItemSelectionModelTest::testToggle() @@ -170,7 +170,7 @@ void KLinkItemSelectionModelTest::testChangeLinkedSelectionModel() QCOMPARE(m_mainSelectionModel->selection().indexes().first().row(), 6); QCOMPARE(m_subSelectionModel->selection().indexes().first().row(), 1); - QItemSelectionModel replacementSelectionModel(m_mainModel, 0); + QItemSelectionModel replacementSelectionModel(m_mainModel, nullptr); { auto idx = m_mainModel->index(7, 0); replacementSelectionModel.select(idx, QItemSelectionModel::Select); diff --git a/autotests/krecursivefilterproxymodeltest.cpp b/autotests/krecursivefilterproxymodeltest.cpp index e730143..5d8b73a 100644 --- a/autotests/krecursivefilterproxymodeltest.cpp +++ b/autotests/krecursivefilterproxymodeltest.cpp @@ -131,7 +131,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); @@ -623,7 +623,7 @@ private Q_SLOTS: private: QStandardItem *itemByText(const QStandardItemModel& model, const QString &text) const { QModelIndexList list = model.match(model.index(0, 0), Qt::DisplayRole, text, 1, Qt::MatchRecursive); - return list.isEmpty() ? 0 : model.itemFromIndex(list.first()); + return list.isEmpty() ? nullptr : model.itemFromIndex(list.first()); } }; diff --git a/autotests/kselectionproxymodeltest.cpp b/autotests/kselectionproxymodeltest.cpp index 68c8678..fec92cf 100644 --- a/autotests/kselectionproxymodeltest.cpp +++ b/autotests/kselectionproxymodeltest.cpp @@ -36,7 +36,7 @@ class KSelectionProxyModelTest : public QObject { Q_OBJECT public: - KSelectionProxyModelTest(QObject* parent = 0) + KSelectionProxyModelTest(QObject* parent = nullptr) : QObject(parent), days({ QStringLiteral("Monday"), diff --git a/autotests/kselectionproxymodeltestsuite.h b/autotests/kselectionproxymodeltestsuite.h index 72ae4d5..afa8c1c 100644 --- a/autotests/kselectionproxymodeltestsuite.h +++ b/autotests/kselectionproxymodeltestsuite.h @@ -29,10 +29,10 @@ class SelectionProxyModelTest : public ProxyModelTest { Q_OBJECT public: - SelectionProxyModelTest(QObject *parent = 0) + SelectionProxyModelTest(QObject *parent = nullptr) : ProxyModelTest(parent), - m_selectionModel(0), - m_modelSelector(0) + m_selectionModel(nullptr), + m_modelSelector(nullptr) { } @@ -66,7 +66,7 @@ private Q_SLOTS: { doCleanupTestCase(); delete m_modelSelector; - m_modelSelector = 0; + m_modelSelector = nullptr; } void cleanup() @@ -162,7 +162,7 @@ template< int num1 = 0, class ImmediateSelectionStrategy : public ModelSelector { public: - ImmediateSelectionStrategy(ProxyModelTest *parent = 0) + ImmediateSelectionStrategy(ProxyModelTest *parent = nullptr) : ModelSelector(parent) { if (num1 > 0) { diff --git a/autotests/proxymodeltestsuite/dynamictreemodel.h b/autotests/proxymodeltestsuite/dynamictreemodel.h index 4e60348..30abc96 100644 --- a/autotests/proxymodeltestsuite/dynamictreemodel.h +++ b/autotests/proxymodeltestsuite/dynamictreemodel.h @@ -45,7 +45,7 @@ public: LastRole }; - explicit DynamicTreeModel(QObject *parent = 0); + explicit DynamicTreeModel(QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; @@ -110,7 +110,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelChangeCommand : public QObject Q_OBJECT public: - ModelChangeCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelChangeCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelChangeCommand() {} @@ -226,7 +226,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelInsertCommand : public ModelChangeCommand public: - explicit ModelInsertCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelInsertCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelInsertCommand() {} void interpret(const QString &treeString); @@ -248,7 +248,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelInsertAndRemoveQueuedCommand : public Mode public: - explicit ModelInsertAndRemoveQueuedCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelInsertAndRemoveQueuedCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelInsertAndRemoveQueuedCommand() {} void doCommand() Q_DECL_OVERRIDE; @@ -273,7 +273,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelRemoveCommand : public ModelChangeCommand { Q_OBJECT public: - explicit ModelRemoveCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelRemoveCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelRemoveCommand() {} void doCommand() Q_DECL_OVERRIDE; @@ -285,7 +285,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelDataChangeCommand : public ModelChangeComm { Q_OBJECT public: - explicit ModelDataChangeCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelDataChangeCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelDataChangeCommand() {} @@ -364,7 +364,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelResetCommand : public ModelChangeCommand { Q_OBJECT public: - ModelResetCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelResetCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelResetCommand(); void setInitialTree(const QString &treeString); @@ -378,7 +378,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelLayoutChangeCommand : public ModelChangeCo { Q_OBJECT public: - ModelLayoutChangeCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelLayoutChangeCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelLayoutChangeCommand(); struct PersistentChange { diff --git a/autotests/proxymodeltestsuite/dynamictreewidget.h b/autotests/proxymodeltestsuite/dynamictreewidget.h index 5cb85c2..8b36fc8 100644 --- a/autotests/proxymodeltestsuite/dynamictreewidget.h +++ b/autotests/proxymodeltestsuite/dynamictreewidget.h @@ -37,7 +37,7 @@ class PROXYMODELTESTSUITE_EXPORT DynamicTreeWidget : public QWidget { Q_OBJECT public: - DynamicTreeWidget(DynamicTreeModel *rootModel, QWidget *parent = 0, Qt::WindowFlags f = 0); + DynamicTreeWidget(DynamicTreeModel *rootModel, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); void setInitialTree(const QString &treeString); diff --git a/autotests/proxymodeltestsuite/eventloggerregister.cpp b/autotests/proxymodeltestsuite/eventloggerregister.cpp index 1ea50df..cac1532 100644 --- a/autotests/proxymodeltestsuite/eventloggerregister.cpp +++ b/autotests/proxymodeltestsuite/eventloggerregister.cpp @@ -29,7 +29,7 @@ EventLoggerRegister::~EventLoggerRegister() { } -EventLoggerRegister *EventLoggerRegister::s_instance = 0; +EventLoggerRegister *EventLoggerRegister::s_instance = nullptr; std::auto_ptr EventLoggerRegister::s_destroyer; EventLoggerRegister *EventLoggerRegister::instance(Behaviour behaviour) diff --git a/autotests/proxymodeltestsuite/indexfinder.h b/autotests/proxymodeltestsuite/indexfinder.h index 32f1c61..48155cd 100644 --- a/autotests/proxymodeltestsuite/indexfinder.h +++ b/autotests/proxymodeltestsuite/indexfinder.h @@ -25,7 +25,7 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA class IndexFinder { public: - IndexFinder(QList rows = QList()) : m_rows(rows), m_model(0) {} + IndexFinder(QList rows = QList()) : m_rows(rows), m_model(nullptr) {} IndexFinder(const QAbstractItemModel *model, QList rows = QList()) : m_rows(rows), m_model(model) diff --git a/autotests/proxymodeltestsuite/modelcommander.cpp b/autotests/proxymodeltestsuite/modelcommander.cpp index d6b972d..87d98fc 100644 --- a/autotests/proxymodeltestsuite/modelcommander.cpp +++ b/autotests/proxymodeltestsuite/modelcommander.cpp @@ -250,7 +250,7 @@ void ModelCommander::execute(ModelChangeCommand *command) m_currentCommand = command; command->doCommand(); delete command; - command = 0; + command = nullptr; } ModelChangeCommand *ModelCommander::currentCommand() diff --git a/autotests/proxymodeltestsuite/modeleventlogger.cpp b/autotests/proxymodeltestsuite/modeleventlogger.cpp index 569aee7..6a9df02 100644 --- a/autotests/proxymodeltestsuite/modeleventlogger.cpp +++ b/autotests/proxymodeltestsuite/modeleventlogger.cpp @@ -68,7 +68,7 @@ public: class ModelWrapper : public QAbstractItemModel { public: - ModelWrapper(QAbstractItemModel */*model*/, QObject *parent = 0) + ModelWrapper(QAbstractItemModel */*model*/, QObject *parent = nullptr) : QAbstractItemModel(parent) { diff --git a/autotests/proxymodeltestsuite/modeleventlogger.h b/autotests/proxymodeltestsuite/modeleventlogger.h index 9de8f62..444cc88 100644 --- a/autotests/proxymodeltestsuite/modeleventlogger.h +++ b/autotests/proxymodeltestsuite/modeleventlogger.h @@ -37,7 +37,7 @@ class PROXYMODELTESTSUITE_EXPORT PersistentChange : public QObject Q_PROPERTY(QString newPath READ getNewPath) public: - PersistentChange(QObject *parent = 0) + PersistentChange(QObject *parent = nullptr) : QObject(parent) { @@ -95,7 +95,7 @@ private: Q_PROPERTY(QVariantList changes READ changes) public: - ModelEvent(QObject *parent = 0); + ModelEvent(QObject *parent = nullptr); // Type type() const; QString type() const; @@ -150,7 +150,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelEventLogger : public QObject { Q_OBJECT public: - ModelEventLogger(QAbstractItemModel *model, QObject *parent = 0); + ModelEventLogger(QAbstractItemModel *model, QObject *parent = nullptr); void writeLog(); virtual ~ModelEventLogger(); diff --git a/autotests/proxymodeltestsuite/modelselector.cpp b/autotests/proxymodeltestsuite/modelselector.cpp index 8879503..b4b3575 100644 --- a/autotests/proxymodeltestsuite/modelselector.cpp +++ b/autotests/proxymodeltestsuite/modelselector.cpp @@ -21,9 +21,9 @@ ModelSelector::ModelSelector(ProxyModelTest *parent) : ProxyModelTestData(parent), - m_model(0), - m_selectionModel(0), - m_rootModel(0) + m_model(nullptr), + m_selectionModel(nullptr), + m_rootModel(nullptr) { Q_ASSERT(parent); } diff --git a/autotests/proxymodeltestsuite/modelselector.h b/autotests/proxymodeltestsuite/modelselector.h index 05650bb..7bbd228 100644 --- a/autotests/proxymodeltestsuite/modelselector.h +++ b/autotests/proxymodeltestsuite/modelselector.h @@ -36,7 +36,7 @@ class PROXYMODELTESTSUITE_EXPORT ModelSelector : public ProxyModelTestData { Q_OBJECT public: - ModelSelector(ProxyModelTest *ProxyModelTest = 0); + ModelSelector(ProxyModelTest *ProxyModelTest = nullptr); void setWatchedModel(QAbstractItemModel *model); @@ -128,8 +128,8 @@ public Q_SLOTS: protected Q_SLOTS: void modelDestroyed() { - m_model = 0; - m_selectionModel = 0; + m_model = nullptr; + m_selectionModel = nullptr; } protected: diff --git a/autotests/proxymodeltestsuite/modelspy.cpp b/autotests/proxymodeltestsuite/modelspy.cpp index 01ff124..8e311ca 100644 --- a/autotests/proxymodeltestsuite/modelspy.cpp +++ b/autotests/proxymodeltestsuite/modelspy.cpp @@ -22,7 +22,7 @@ #include ModelSpy::ModelSpy(QObject *parent) - : QObject(parent), QList(), m_model(0), m_isSpying(false), m_lazyPersist(false) + : QObject(parent), QList(), m_model(nullptr), m_isSpying(false), m_lazyPersist(false) { } @@ -169,7 +169,7 @@ void ModelSpy::modelReset() void ModelSpy::modelDestroyed() { stopSpying(); - m_model = 0; + m_model = nullptr; } void ModelSpy::rowsAboutToBeMoved(const QModelIndex &srcParent, int start, int end, const QModelIndex &destParent, int destStart) diff --git a/autotests/proxymodeltestsuite/modeltest.h b/autotests/proxymodeltestsuite/modeltest.h index 9f378e4..e0d99ec 100644 --- a/autotests/proxymodeltestsuite/modeltest.h +++ b/autotests/proxymodeltestsuite/modeltest.h @@ -36,8 +36,8 @@ public: Pedantic }; - ModelTest( QAbstractItemModel *model, QObject *parent = 0 ); - ModelTest( QAbstractItemModel *model, Mode testType, QObject *parent = 0 ); + ModelTest( QAbstractItemModel *model, QObject *parent = nullptr ); + ModelTest( QAbstractItemModel *model, Mode testType, QObject *parent = nullptr ); private Q_SLOTS: void nonDestructiveBasicTest(); diff --git a/autotests/proxymodeltestsuite/proxymodeltest.cpp b/autotests/proxymodeltestsuite/proxymodeltest.cpp index 6a5528f..cc32466 100644 --- a/autotests/proxymodeltestsuite/proxymodeltest.cpp +++ b/autotests/proxymodeltestsuite/proxymodeltest.cpp @@ -30,8 +30,8 @@ ProxyModelTest::ProxyModelTest(QObject *parent) : QObject(parent), m_rootModel(new DynamicTreeModel(this)), m_sourceModel(m_rootModel), - m_proxyModel(0), - m_intermediateProxyModel(0), + m_proxyModel(nullptr), + m_intermediateProxyModel(nullptr), m_modelSpy(new ModelSpy(this)), m_modelCommander(new ModelCommander(m_rootModel, this)) { @@ -108,7 +108,7 @@ void ProxyModelTest::init() const char *currentTest = QTest::currentTestFunction(); const char *currentTag = QTest::currentDataTag(); - QVERIFY(currentTest != 0); + QVERIFY(currentTest != nullptr); initRootModel(m_rootModel, currentTest, currentTag); Q_ASSERT(sourceModel()); @@ -143,10 +143,10 @@ void ProxyModelTest::cleanup() { QVERIFY(m_modelSpy->isEmpty()); m_modelSpy->stopSpying(); - m_modelSpy->setModel(0); - m_proxyModel->setSourceModel(0); + m_modelSpy->setModel(nullptr); + m_proxyModel->setSourceModel(nullptr); delete m_proxyModel; - m_proxyModel = 0; + m_proxyModel = nullptr; QVERIFY(m_modelSpy->isEmpty()); } @@ -160,7 +160,7 @@ void ProxyModelTest::cleanupTestCase() m_sourceModel = m_rootModel; delete m_intermediateProxyModel; - m_intermediateProxyModel = 0; + m_intermediateProxyModel = nullptr; m_modelSpy->clear(); } @@ -320,7 +320,7 @@ void ProxyModelTest::testSourceReset() testMappings(); m_rootModel->clear(); // Resets the model. testMappings(); // Calls some rowCount() etc which should test internal structures in the proxy. - m_proxyModel->setSourceModel(0); + m_proxyModel->setSourceModel(nullptr); m_modelSpy->startSpying(); } @@ -352,7 +352,7 @@ void ProxyModelTest::testDestroyModel() if (proxyModel->hasChildren()) { m_modelSpy->startSpying(); delete m_sourceModel; - m_sourceModel = 0; + m_sourceModel = nullptr; m_modelSpy->stopSpying(); testMappings(); // QCOMPARE(m_modelSpy->size(), 1); diff --git a/autotests/proxymodeltestsuite/proxymodeltest.h b/autotests/proxymodeltestsuite/proxymodeltest.h index 9a88e9c..dd8f190 100644 --- a/autotests/proxymodeltestsuite/proxymodeltest.h +++ b/autotests/proxymodeltestsuite/proxymodeltest.h @@ -122,7 +122,7 @@ class PROXYMODELTESTSUITE_EXPORT ProxyModelTest : public QObject, protected Buil { Q_OBJECT public: - ProxyModelTest(QObject *parent = 0); + ProxyModelTest(QObject *parent = nullptr); virtual ~ProxyModelTest() {} void setLazyPersistence(Persistence persistence); @@ -359,7 +359,7 @@ class PROXYMODELTESTSUITE_EXPORT ProxyModelTestData : public QObject, BuiltinTes { Q_OBJECT public: - ProxyModelTestData(ProxyModelTest *parent = 0) + ProxyModelTestData(ProxyModelTest *parent = nullptr) : QObject(parent), m_proxyModelTest(parent) { } diff --git a/src/kbreadcrumbselectionmodel.h b/src/kbreadcrumbselectionmodel.h index 8230283..0680a83 100644 --- a/src/kbreadcrumbselectionmodel.h +++ b/src/kbreadcrumbselectionmodel.h @@ -115,8 +115,8 @@ public: MakeBreadcrumbSelectionInSelf }; - explicit KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, QObject *parent = 0); - KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, BreadcrumbTarget target, QObject *parent = 0); + explicit KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); + KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, BreadcrumbTarget target, QObject *parent = nullptr); virtual ~KBreadcrumbSelectionModel(); /** diff --git a/src/kcheckableproxymodel.cpp b/src/kcheckableproxymodel.cpp index b284e7f..a882283 100644 --- a/src/kcheckableproxymodel.cpp +++ b/src/kcheckableproxymodel.cpp @@ -28,7 +28,7 @@ class KCheckableProxyModelPrivate KCheckableProxyModelPrivate(KCheckableProxyModel *checkableModel) : q_ptr(checkableModel), - m_itemSelectionModel(0) + m_itemSelectionModel(nullptr) { } diff --git a/src/kcheckableproxymodel.h b/src/kcheckableproxymodel.h index 7ed1951..334b6b8 100644 --- a/src/kcheckableproxymodel.h +++ b/src/kcheckableproxymodel.h @@ -65,7 +65,7 @@ class KITEMMODELS_EXPORT KCheckableProxyModel : public QIdentityProxyModel { Q_OBJECT public: - KCheckableProxyModel(QObject *parent = 0); + KCheckableProxyModel(QObject *parent = nullptr); ~KCheckableProxyModel(); void setSelectionModel(QItemSelectionModel *itemSelectionModel); diff --git a/src/kconcatenaterowsproxymodel.cpp b/src/kconcatenaterowsproxymodel.cpp index 465c09b..ded00f8 100644 --- a/src/kconcatenaterowsproxymodel.cpp +++ b/src/kconcatenaterowsproxymodel.cpp @@ -206,7 +206,7 @@ void KConcatenateRowsProxyModel::addSourceModel(QAbstractItemModel *sourceModel) void KConcatenateRowsProxyModel::removeSourceModel(QAbstractItemModel *sourceModel) { Q_ASSERT(d->m_models.contains(sourceModel)); - disconnect(sourceModel, 0, this, 0); + disconnect(sourceModel, nullptr, this, nullptr); const int rowsRemoved = sourceModel->rowCount(); const int rowsPrior = d->computeRowsPrior(sourceModel); // location of removed section @@ -397,7 +397,7 @@ int KConcatenateRowsProxyModelPrivate::computeRowsPrior(const QAbstractItemModel QAbstractItemModel *KConcatenateRowsProxyModelPrivate::sourceModelForRow(int row, int *sourceRow) const { int rowCount = 0; - QAbstractItemModel *selection = NULL; + QAbstractItemModel *selection = nullptr; foreach (QAbstractItemModel *model, m_models) { const int subRowCount = model->rowCount(); if (rowCount + subRowCount > row) { diff --git a/src/kconcatenaterowsproxymodel.h b/src/kconcatenaterowsproxymodel.h index 9247d08..ab2112c 100644 --- a/src/kconcatenaterowsproxymodel.h +++ b/src/kconcatenaterowsproxymodel.h @@ -64,7 +64,7 @@ public: * Creates a KConcatenateRowsProxyModel. * @param parent optional parent */ - KConcatenateRowsProxyModel(QObject *parent = 0); + KConcatenateRowsProxyModel(QObject *parent = nullptr); /** * Destructor. */ diff --git a/src/kdescendantsproxymodel.h b/src/kdescendantsproxymodel.h index 35e67de..8177382 100644 --- a/src/kdescendantsproxymodel.h +++ b/src/kdescendantsproxymodel.h @@ -77,7 +77,7 @@ public: * * @param parent The parent object. */ - explicit KDescendantsProxyModel(QObject *parent = 0); + explicit KDescendantsProxyModel(QObject *parent = nullptr); /** * Destroys the descendant entities proxy model. diff --git a/src/kextracolumnsproxymodel.h b/src/kextracolumnsproxymodel.h index c220cda..0f49dff 100644 --- a/src/kextracolumnsproxymodel.h +++ b/src/kextracolumnsproxymodel.h @@ -54,7 +54,7 @@ public: * Base class constructor. * Remember to call setSourceModel afterwards, and appendColumn. */ - explicit KExtraColumnsProxyModel(QObject *parent = 0); + explicit KExtraColumnsProxyModel(QObject *parent = nullptr); /** * Destructor. */ diff --git a/src/klinkitemselectionmodel.h b/src/klinkitemselectionmodel.h index 2788a1a..ce4878b 100644 --- a/src/klinkitemselectionmodel.h +++ b/src/klinkitemselectionmodel.h @@ -103,7 +103,7 @@ public: /** Constructor. */ - KLinkItemSelectionModel(QAbstractItemModel *targetModel, QItemSelectionModel *linkedItemSelectionModel, QObject *parent = 0); + KLinkItemSelectionModel(QAbstractItemModel *targetModel, QItemSelectionModel *linkedItemSelectionModel, QObject *parent = nullptr); explicit KLinkItemSelectionModel(QObject *parent = Q_NULLPTR); diff --git a/src/kmodelindexproxymapper.h b/src/kmodelindexproxymapper.h index 95510b7..0caed89 100644 --- a/src/kmodelindexproxymapper.h +++ b/src/kmodelindexproxymapper.h @@ -95,7 +95,7 @@ public: /** * Constructor */ - KModelIndexProxyMapper(const QAbstractItemModel *leftModel, const QAbstractItemModel *rightModel, QObject *parent = 0); + KModelIndexProxyMapper(const QAbstractItemModel *leftModel, const QAbstractItemModel *rightModel, QObject *parent = nullptr); ~KModelIndexProxyMapper(); diff --git a/src/krearrangecolumnsproxymodel.h b/src/krearrangecolumnsproxymodel.h index 12ed8a6..bd955c6 100644 --- a/src/krearrangecolumnsproxymodel.h +++ b/src/krearrangecolumnsproxymodel.h @@ -47,7 +47,7 @@ public: * Creates a KRearrangeColumnsProxyModel proxy. * Remember to call setSourceModel afterwards. */ - explicit KRearrangeColumnsProxyModel(QObject *parent = 0); + explicit KRearrangeColumnsProxyModel(QObject *parent = nullptr); /** * Destructor. */ diff --git a/src/krecursivefilterproxymodel.h b/src/krecursivefilterproxymodel.h index 3f6b236..fe660ba 100644 --- a/src/krecursivefilterproxymodel.h +++ b/src/krecursivefilterproxymodel.h @@ -90,7 +90,7 @@ public: /** Constructor */ - explicit KRecursiveFilterProxyModel(QObject *parent = 0); + explicit KRecursiveFilterProxyModel(QObject *parent = nullptr); /** Destructor diff --git a/src/kselectionproxymodel.cpp b/src/kselectionproxymodel.cpp index d0ff4a1..70f9179 100644 --- a/src/kselectionproxymodel.cpp +++ b/src/kselectionproxymodel.cpp @@ -408,7 +408,7 @@ class KSelectionProxyModelPrivate public: KSelectionProxyModelPrivate(KSelectionProxyModel *model) : q_ptr(model), - m_indexMapper(0), + m_indexMapper(nullptr), m_startWithChildTrees(false), m_omitChildren(false), m_omitDescendants(false), @@ -423,7 +423,7 @@ public: m_layoutChanging(false), m_ignoreNextLayoutAboutToBeChanged(false), m_ignoreNextLayoutChanged(false), - m_selectionModel(0), + m_selectionModel(nullptr), m_filterBehavior(KSelectionProxyModel::InvalidBehavior) { } @@ -2013,7 +2013,7 @@ KSelectionProxyModel::KSelectionProxyModel(QItemSelectionModel *selectionModel, } KSelectionProxyModel::KSelectionProxyModel() - : QAbstractProxyModel(0), d_ptr(new KSelectionProxyModelPrivate(this)) + : QAbstractProxyModel(nullptr), d_ptr(new KSelectionProxyModelPrivate(this)) { } @@ -2169,7 +2169,7 @@ QModelIndex KSelectionProxyModel::mapToSource(const QModelIndex &proxyIndex) con Q_ASSERT(proxyIndex.model() == this); - if (proxyIndex.internalPointer() == 0) { + if (proxyIndex.internalPointer() == nullptr) { return d->mapTopLevelToSource(proxyIndex.row(), proxyIndex.column()); } diff --git a/src/kselectionproxymodel.h b/src/kselectionproxymodel.h index c0e8246..0b1d627 100644 --- a/src/kselectionproxymodel.h +++ b/src/kselectionproxymodel.h @@ -96,7 +96,7 @@ public: @p selectionModel The selection model used to filter what is presented by the proxy. */ // KF6: Remove the selectionModel from the constructor here. - explicit KSelectionProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); + explicit KSelectionProxyModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); /** Default constructor. Allow the creation of a KSelectionProxyModel in QML diff --git a/src/kvoidpointerfactory_p.h b/src/kvoidpointerfactory_p.h index c7830ae..ece0663 100644 --- a/src/kvoidpointerfactory_p.h +++ b/src/kvoidpointerfactory_p.h @@ -51,8 +51,8 @@ class KVoidPointerFactory public: KVoidPointerFactory() - : m_previousPointer(0), - m_finalPointer(0) + : m_previousPointer(nullptr), + m_finalPointer(nullptr) { } @@ -82,8 +82,8 @@ public: free(*it); } m_blocks.clear(); - m_finalPointer = 0; - m_previousPointer = 0; + m_finalPointer = nullptr; + m_previousPointer = nullptr; } void *createPointer() const diff --git a/tests/proxymodeltestapp/breadcrumbdirectionwidget.h b/tests/proxymodeltestapp/breadcrumbdirectionwidget.h index e26a60b..b0ad102 100644 --- a/tests/proxymodeltestapp/breadcrumbdirectionwidget.h +++ b/tests/proxymodeltestapp/breadcrumbdirectionwidget.h @@ -28,7 +28,7 @@ class BreadcrumbDirectionWidget : public QWidget { Q_OBJECT public: - BreadcrumbDirectionWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + BreadcrumbDirectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); protected: bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; diff --git a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h index 3d78111..aadf397 100644 --- a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h +++ b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h @@ -34,7 +34,7 @@ class CurrentItemLabel : public QLabel { Q_OBJECT public: - CurrentItemLabel(QAbstractItemModel *model, QWidget *parent = 0, Qt::WindowFlags f = 0); + CurrentItemLabel(QAbstractItemModel *model, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void rowsInserted(const QModelIndex &parent, int start, int end); @@ -50,7 +50,7 @@ class KBreadcrumbNavigationProxyModel : public KSelectionProxyModel { Q_OBJECT public: - KBreadcrumbNavigationProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); + KBreadcrumbNavigationProxyModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); void setShowHiddenAscendantData(bool showHiddenAscendantData); bool showHiddenAscendantData() const; @@ -66,7 +66,7 @@ class KNavigatingProxyModel : public KSelectionProxyModel { Q_OBJECT public: - KNavigatingProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); + KNavigatingProxyModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; @@ -94,8 +94,8 @@ public: Forward, Reverse }; - KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = 0); - KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, Direction direction, QObject *parent = 0); + KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = nullptr); + KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, Direction direction, QObject *parent = nullptr); void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE; void select(const QItemSelection &selection, SelectionFlags command) Q_DECL_OVERRIDE; @@ -112,7 +112,7 @@ class BreadcrumbNavigationWidget : public QWidget { Q_OBJECT public: - BreadcrumbNavigationWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + BreadcrumbNavigationWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff --git a/tests/proxymodeltestapp/breadcrumbswidget.h b/tests/proxymodeltestapp/breadcrumbswidget.h index 67bc76e..287b806 100644 --- a/tests/proxymodeltestapp/breadcrumbswidget.h +++ b/tests/proxymodeltestapp/breadcrumbswidget.h @@ -34,7 +34,7 @@ class MultiSelectionModel : public QItemSelectionModel { Q_OBJECT public: - MultiSelectionModel(QAbstractItemModel *model, QList selectionModels, QObject *parent = 0); + MultiSelectionModel(QAbstractItemModel *model, QList selectionModels, QObject *parent = nullptr); public: void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE; @@ -48,7 +48,7 @@ class BreadcrumbsWidget : public QWidget { Q_OBJECT public: - BreadcrumbsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + BreadcrumbsWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff --git a/tests/proxymodeltestapp/checkablewidget.h b/tests/proxymodeltestapp/checkablewidget.h index df8d134..ba9148c 100644 --- a/tests/proxymodeltestapp/checkablewidget.h +++ b/tests/proxymodeltestapp/checkablewidget.h @@ -28,7 +28,7 @@ class CheckableWidget : public QWidget { Q_OBJECT public: - CheckableWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + CheckableWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff --git a/tests/proxymodeltestapp/descendantpmwidget.h b/tests/proxymodeltestapp/descendantpmwidget.h index d6bf553..262cbdf 100644 --- a/tests/proxymodeltestapp/descendantpmwidget.h +++ b/tests/proxymodeltestapp/descendantpmwidget.h @@ -38,7 +38,7 @@ class DescendantProxyModelWidget : public QWidget { Q_OBJECT public: - DescendantProxyModelWidget(QWidget *parent = 0); + DescendantProxyModelWidget(QWidget *parent = nullptr); virtual ~DescendantProxyModelWidget(); protected Q_SLOTS: diff --git a/tests/proxymodeltestapp/kidentityproxymodelwidget.h b/tests/proxymodeltestapp/kidentityproxymodelwidget.h index 2c505b3..fdd66aa 100644 --- a/tests/proxymodeltestapp/kidentityproxymodelwidget.h +++ b/tests/proxymodeltestapp/kidentityproxymodelwidget.h @@ -28,7 +28,7 @@ class KIdentityProxyModelWidget : public QWidget { Q_OBJECT public: - KIdentityProxyModelWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + KIdentityProxyModelWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; #endif diff --git a/tests/proxymodeltestapp/kreparentingproxymodel.cpp b/tests/proxymodeltestapp/kreparentingproxymodel.cpp index 19223ab..1a32c5c 100644 --- a/tests/proxymodeltestapp/kreparentingproxymodel.cpp +++ b/tests/proxymodeltestapp/kreparentingproxymodel.cpp @@ -68,7 +68,7 @@ class KReparentingProxyModelPrivate If @p model is 0, the sourceModel is used Returns an invalid index if there is no index below @p index. */ - QModelIndex getIndexBelow(const QModelIndex &index, QAbstractItemModel *model = 0) const; + QModelIndex getIndexBelow(const QModelIndex &index, QAbstractItemModel *model = nullptr) const; /** Returns the last descendant of @p index or itself if it has no children diff --git a/tests/proxymodeltestapp/kreparentingproxymodel.h b/tests/proxymodeltestapp/kreparentingproxymodel.h index 9076810..c13db50 100644 --- a/tests/proxymodeltestapp/kreparentingproxymodel.h +++ b/tests/proxymodeltestapp/kreparentingproxymodel.h @@ -100,7 +100,7 @@ class KReparentingProxyModel : public QAbstractProxyModel { Q_OBJECT public: - KReparentingProxyModel(QObject *parent = 0); + KReparentingProxyModel(QObject *parent = nullptr); virtual ~KReparentingProxyModel(); diff --git a/tests/proxymodeltestapp/lessthanwidget.cpp b/tests/proxymodeltestapp/lessthanwidget.cpp index 8ec1f98..1ea519c 100644 --- a/tests/proxymodeltestapp/lessthanwidget.cpp +++ b/tests/proxymodeltestapp/lessthanwidget.cpp @@ -27,7 +27,7 @@ ColoredTreeModel::ColoredTreeModel(QObject *parent) : DynamicTreeModel(parent), - m_selectionModel(0), + m_selectionModel(nullptr), m_lessThanColour(Qt::yellow), m_greaterThanColour(Qt::red) { diff --git a/tests/proxymodeltestapp/lessthanwidget.h b/tests/proxymodeltestapp/lessthanwidget.h index 4384897..3fe21c5 100644 --- a/tests/proxymodeltestapp/lessthanwidget.h +++ b/tests/proxymodeltestapp/lessthanwidget.h @@ -31,7 +31,7 @@ class ColoredTreeModel : public DynamicTreeModel { Q_OBJECT public: - ColoredTreeModel(QObject *parent = 0); + ColoredTreeModel(QObject *parent = nullptr); /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; @@ -50,7 +50,7 @@ class LessThanWidget : public QWidget { Q_OBJECT public: - LessThanWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + LessThanWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); void insertGrid(QList address); private: diff --git a/tests/proxymodeltestapp/matchcheckingwidget.h b/tests/proxymodeltestapp/matchcheckingwidget.h index 95de5ef..98b9035 100644 --- a/tests/proxymodeltestapp/matchcheckingwidget.h +++ b/tests/proxymodeltestapp/matchcheckingwidget.h @@ -32,7 +32,7 @@ class MatchCheckingWidget : public QWidget { Q_OBJECT public: - MatchCheckingWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + MatchCheckingWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void matchChanged(const QString &matchData); diff --git a/tests/proxymodeltestapp/modelcommanderwidget.h b/tests/proxymodeltestapp/modelcommanderwidget.h index a7821c6..1319a85 100644 --- a/tests/proxymodeltestapp/modelcommanderwidget.h +++ b/tests/proxymodeltestapp/modelcommanderwidget.h @@ -33,7 +33,7 @@ class ModelCommanderWidget : public QWidget { Q_OBJECT public: - ModelCommanderWidget(DynamicTreeModel *dynamicTreeModel, QWidget *parent = 0, Qt::WindowFlags f = 0); + ModelCommanderWidget(DynamicTreeModel *dynamicTreeModel, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void initTest(QTreeWidgetItem *item); diff --git a/tests/proxymodeltestapp/proxyitemselectionwidget.h b/tests/proxymodeltestapp/proxyitemselectionwidget.h index c2a94bd..7fb951c 100644 --- a/tests/proxymodeltestapp/proxyitemselectionwidget.h +++ b/tests/proxymodeltestapp/proxyitemselectionwidget.h @@ -28,7 +28,7 @@ class ProxyItemSelectionWidget : public QWidget { Q_OBJECT public: - ProxyItemSelectionWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + ProxyItemSelectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff --git a/tests/proxymodeltestapp/proxymodeltestwidget.h b/tests/proxymodeltestapp/proxymodeltestwidget.h index b90e881..59e9e0d 100644 --- a/tests/proxymodeltestapp/proxymodeltestwidget.h +++ b/tests/proxymodeltestapp/proxymodeltestwidget.h @@ -32,7 +32,7 @@ class ProxyModelTestWidget : public QWidget { Q_OBJECT public: - explicit ProxyModelTestWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit ProxyModelTestWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private: DynamicTreeModel *m_rootModel; diff --git a/tests/proxymodeltestapp/recursivefilterpmwidget.h b/tests/proxymodeltestapp/recursivefilterpmwidget.h index fc5a171..b212a96 100644 --- a/tests/proxymodeltestapp/recursivefilterpmwidget.h +++ b/tests/proxymodeltestapp/recursivefilterpmwidget.h @@ -38,7 +38,7 @@ class KRecursiveFilterProxyModelSubclass : public KRecursiveFilterProxyModel { Q_OBJECT public: - KRecursiveFilterProxyModelSubclass(QObject *parent = 0) + KRecursiveFilterProxyModelSubclass(QObject *parent = nullptr) : KRecursiveFilterProxyModel(parent) { @@ -67,7 +67,7 @@ class RecursiveFilterProxyWidget : public QWidget { Q_OBJECT public: - RecursiveFilterProxyWidget(QWidget *parent = 0); + RecursiveFilterProxyWidget(QWidget *parent = nullptr); protected Q_SLOTS: void reset(); diff --git a/tests/proxymodeltestapp/reparentingpmwidget.h b/tests/proxymodeltestapp/reparentingpmwidget.h index 7abadee..07c2db1 100644 --- a/tests/proxymodeltestapp/reparentingpmwidget.h +++ b/tests/proxymodeltestapp/reparentingpmwidget.h @@ -32,7 +32,7 @@ class ReparentingProxyModelWidget : public QWidget { Q_OBJECT public: - ReparentingProxyModelWidget(QWidget *parent = 0); + ReparentingProxyModelWidget(QWidget *parent = nullptr); private: DynamicTreeModel *m_rootModel; diff --git a/tests/proxymodeltestapp/scriptablereparentingwidget.h b/tests/proxymodeltestapp/scriptablereparentingwidget.h index 9c0086e..6c61ed8 100644 --- a/tests/proxymodeltestapp/scriptablereparentingwidget.h +++ b/tests/proxymodeltestapp/scriptablereparentingwidget.h @@ -34,7 +34,7 @@ class ScriptableReparentingProxyModel : public KReparentingProxyModel { Q_OBJECT public: - ScriptableReparentingProxyModel(QObject *parent = 0); + ScriptableReparentingProxyModel(QObject *parent = nullptr); /* reimp */ bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const Q_DECL_OVERRIDE; @@ -49,7 +49,7 @@ class ScriptableReparentingWidget : public QWidget { Q_OBJECT public: - ScriptableReparentingWidget(QAbstractItemModel *rootModel, QWidget *parent = 0, Qt::WindowFlags f = 0); + ScriptableReparentingWidget(QAbstractItemModel *rootModel, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void textChanged(); diff --git a/tests/proxymodeltestapp/selectioninqmlwidget.h b/tests/proxymodeltestapp/selectioninqmlwidget.h index 36c6549..21eedce 100644 --- a/tests/proxymodeltestapp/selectioninqmlwidget.h +++ b/tests/proxymodeltestapp/selectioninqmlwidget.h @@ -31,7 +31,7 @@ class DynamicTreeModel; class SelectionInQmlWidget : public QWidget { public: - SelectionInQmlWidget(QWidget *parent = 0); + SelectionInQmlWidget(QWidget *parent = nullptr); private: DynamicTreeModel *m_rootModel; diff --git a/tests/proxymodeltestapp/selectionpmwidget.h b/tests/proxymodeltestapp/selectionpmwidget.h index 656afda..4233a25 100644 --- a/tests/proxymodeltestapp/selectionpmwidget.h +++ b/tests/proxymodeltestapp/selectionpmwidget.h @@ -31,7 +31,7 @@ class DynamicTreeModel; class SelectionProxyWidget : public QWidget { public: - SelectionProxyWidget(QWidget *parent = 0); + SelectionProxyWidget(QWidget *parent = nullptr); protected: QTreeView *createLabelledView(const QString &labelText, QWidget *parent);