diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp index 4d2cb8a9738..53131a8d14c 100644 --- a/src/plugins/projectexplorer/selectablefilesmodel.cpp +++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp @@ -94,7 +94,7 @@ void SelectableFilesModel::buildTreeFinished() beginResetModel(); delete m_root; m_root = m_rootForFuture; - m_rootForFuture = 0; + m_rootForFuture = nullptr; endResetModel(); emit parsingFinished(); } @@ -625,7 +625,7 @@ bool SelectableFilesWidget::hasFilesSelected() const void SelectableFilesWidget::resetModel(const Utils::FileName &path, const Utils::FileNameList &files) { - m_view->setModel(0); + m_view->setModel(nullptr); delete m_model; m_model = new SelectableFilesModel(this); diff --git a/src/plugins/projectexplorer/selectablefilesmodel.h b/src/plugins/projectexplorer/selectablefilesmodel.h index caee857e095..f4de2fd2537 100644 --- a/src/plugins/projectexplorer/selectablefilesmodel.h +++ b/src/plugins/projectexplorer/selectablefilesmodel.h @@ -133,14 +133,14 @@ private: void propagateDown(const QModelIndex &index); void selectAllFiles(Tree *root); - Tree *m_root = 0; + Tree *m_root = nullptr; // Used in the future thread need to all not used after calling startParsing Utils::FileName m_baseDir; QSet m_files; QSet m_outOfBaseDirFiles; QFutureWatcher m_watcher; - Tree *m_rootForFuture = 0; + Tree *m_rootForFuture = nullptr; int m_futureCount = 0; bool m_allFiles = true; @@ -153,9 +153,9 @@ class PROJECTEXPLORER_EXPORT SelectableFilesWidget : public QWidget Q_OBJECT public: - explicit SelectableFilesWidget(QWidget *parent = 0); + explicit SelectableFilesWidget(QWidget *parent = nullptr); SelectableFilesWidget(const Utils::FileName &path, const Utils::FileNameList &files, - QWidget *parent = 0); + QWidget *parent = nullptr); void setAddFileFilter(const QString &filter); void setBaseDirEditable(bool edit);