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

qmakeProject: Use nullptr

Browse Source 
Change-Id: Idad0ace2ae264beff29864cb20cb1a7b67d16ac6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-10 11:52:35 +01:00
parent 58249104ad
commit bfa456072c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -694,7 +694,7 @@ static FolderNode *folderOf(FolderNode *in, const FileName &fileName)
foreach (FolderNode *folder, in->folderNodes()) foreach (FolderNode *folder, in->folderNodes())
if (FolderNode *pn = folderOf(folder, fileName)) if (FolderNode *pn = folderOf(folder, fileName))
return pn; return pn;
return 0; return nullptr;
} }
// Find the QmakeProFileNode that contains a certain file. // Find the QmakeProFileNode that contains a certain file.
@@ -709,7 +709,7 @@ static FileNode *fileNodeOf(QmakeProFileNode *in, const FileName &fileName)
} }
} }
} }
return 0; return nullptr;
} }
QStringList QmakeProject::filesGeneratedFrom(const QString &input) const QStringList QmakeProject::filesGeneratedFrom(const QString &input) const
@@ -742,7 +742,7 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFileNo
Environment env = Environment::systemEnvironment(); Environment env = Environment::systemEnvironment();
QStringList qmakeArgs; QStringList qmakeArgs;
if (!bc) if (!bc)
bc = activeTarget() ? static_cast<QmakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration()) : 0; bc = activeTarget() ? static_cast<QmakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration()) : nullptr;
if (bc) { if (bc) {
k = bc->target()->kit(); k = bc->target()->kit();

3
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -86,7 +86,8 @@ public:
void notifyChanged(const Utils::FileName &name); void notifyChanged(const Utils::FileName &name);
/// \internal /// \internal
QtSupport::ProFileReader *createProFileReader(const QmakeProFileNode *qmakeProFileNode, QmakeBuildConfiguration *bc = 0); QtSupport::ProFileReader *createProFileReader(const QmakeProFileNode *qmakeProFileNode,
QmakeBuildConfiguration *bc = nullptr);
/// \internal /// \internal
QMakeGlobals *qmakeGlobals(); QMakeGlobals *qmakeGlobals();
/// \internal /// \internal