feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GenericProject: Sprinkle nullptr over the code

Browse Source 
Change-Id: I0f3a8f9c6717dff81642500e5defb3b442155165
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-04-06 17:47:11 +02:00
parent e819357bc9
commit 43d571b51b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/selectablefilesmodel.cpp
View File

@@ -94,7 +94,7 @@ void SelectableFilesModel::buildTreeFinished()
beginResetModel(); beginResetModel();
delete m_root; delete m_root;
m_root = m_rootForFuture; m_root = m_rootForFuture;
m_rootForFuture = 0; m_rootForFuture = nullptr;
endResetModel(); endResetModel();
emit parsingFinished(); emit parsingFinished();
} }
@@ -625,7 +625,7 @@ bool SelectableFilesWidget::hasFilesSelected() const
void SelectableFilesWidget::resetModel(const Utils::FileName &path, const Utils::FileNameList &files) void SelectableFilesWidget::resetModel(const Utils::FileName &path, const Utils::FileNameList &files)
{ {
m_view->setModel(0); m_view->setModel(nullptr);
delete m_model; delete m_model;
m_model = new SelectableFilesModel(this); m_model = new SelectableFilesModel(this);

8
src/plugins/projectexplorer/selectablefilesmodel.h
View File

@@ -133,14 +133,14 @@ private:
void propagateDown(const QModelIndex &index); void propagateDown(const QModelIndex &index);
void selectAllFiles(Tree *root); 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 // Used in the future thread need to all not used after calling startParsing
Utils::FileName m_baseDir; Utils::FileName m_baseDir;
QSet<Utils::FileName> m_files; QSet<Utils::FileName> m_files;
QSet<Utils::FileName> m_outOfBaseDirFiles; QSet<Utils::FileName> m_outOfBaseDirFiles;
QFutureWatcher<void> m_watcher; QFutureWatcher<void> m_watcher;
Tree *m_rootForFuture = 0; Tree *m_rootForFuture = nullptr;
int m_futureCount = 0; int m_futureCount = 0;
bool m_allFiles = true; bool m_allFiles = true;
@@ -153,9 +153,9 @@ class PROJECTEXPLORER_EXPORT SelectableFilesWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit SelectableFilesWidget(QWidget *parent = 0); explicit SelectableFilesWidget(QWidget *parent = nullptr);
SelectableFilesWidget(const Utils::FileName &path, const Utils::FileNameList &files, SelectableFilesWidget(const Utils::FileName &path, const Utils::FileNameList &files,
QWidget *parent = 0); QWidget *parent = nullptr);
void setAddFileFilter(const QString &filter); void setAddFileFilter(const QString &filter);
void setBaseDirEditable(bool edit); void setBaseDirEditable(bool edit);