forked from qt-creator/qt-creator
GenericProject: Sprinkle nullptr over the code
Change-Id: I0f3a8f9c6717dff81642500e5defb3b442155165 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
@@ -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);
|
||||
|
@@ -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<Utils::FileName> m_files;
|
||||
QSet<Utils::FileName> m_outOfBaseDirFiles;
|
||||
QFutureWatcher<void> 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);
|
||||
|
Reference in New Issue
Block a user