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

QbsProjectManager: Modernize

Browse Source 
modernize-use-auto
modernize-use-nullptr
modernize-use-override

Change-Id: I8a67b87e614f54554f9ca50c9f5e3f3297458ec1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alessandro Portale
2018-07-27 12:10:20 +02:00
parent da4be3fdb7
commit 11632bbedd
25 changed files with 110 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -301,7 +301,7 @@ void QbsProjectManagerPlugin::extensionsInitialized()
void QbsProjectManagerPlugin::projectWasAdded(Project *project)
{
QbsProject *qbsProject = qobject_cast<QbsProject *>(project);
auto qbsProject = qobject_cast<QbsProject *>(project);
if (!qbsProject)
return;
@@ -314,7 +314,7 @@ void QbsProjectManagerPlugin::projectWasAdded(Project *project)
void QbsProjectManagerPlugin::updateContextActions()
{
QbsProject *project = qobject_cast<Internal::QbsProject *>(ProjectTree::currentProject());
auto project = qobject_cast<Internal::QbsProject *>(ProjectTree::currentProject());
const Node *node = ProjectTree::findCurrentNode();
bool isEnabled = !BuildManager::isBuilding(project)
&& project && !project->isParsing()
@@ -322,7 +322,7 @@ void QbsProjectManagerPlugin::updateContextActions()
bool isFile = project && node && (node->nodeType() == NodeType::File);
const bool isProduct = project && node && dynamic_cast<const QbsProductNode *>(node);
const QbsProjectNode *subproject = dynamic_cast<const QbsProjectNode *>(node);
const auto subproject = dynamic_cast<const QbsProjectNode *>(node);
bool isSubproject = project && subproject && subproject != project->rootProjectNode();
m_reparseQbsCtx->setEnabled(isEnabled);
@@ -337,7 +337,7 @@ void QbsProjectManagerPlugin::updateContextActions()
void QbsProjectManagerPlugin::updateReparseQbsAction()
{
QbsProject *project = qobject_cast<QbsProject *>(SessionManager::startupProject());
auto project = qobject_cast<QbsProject *>(SessionManager::startupProject());
m_reparseQbs->setEnabled(project
&& !BuildManager::isBuilding(project)
&& !project->isParsing());
@@ -363,14 +363,14 @@ void QbsProjectManagerPlugin::updateBuildActions()
fileName = editorNode->filePath().fileName();
fileVisible = editorProject && editorNode && dynamic_cast<QbsBaseProjectNode *>(editorNode->parentProjectNode());
QbsProductNode *productNode =
dynamic_cast<QbsProductNode *>(editorNode ? editorNode->parentProjectNode() : 0);
auto productNode =
dynamic_cast<QbsProductNode *>(editorNode ? editorNode->parentProjectNode() : nullptr);
if (productNode) {
productVisible = true;
productName = productNode->displayName();
}
QbsProjectNode *subprojectNode =
dynamic_cast<QbsProjectNode *>(productNode ? productNode->parentFolderNode() : 0);
auto subprojectNode =
dynamic_cast<QbsProjectNode *>(productNode ? productNode->parentFolderNode() : nullptr);
if (subprojectNode && editorProject && subprojectNode != editorProject->rootProjectNode()) {
subprojectVisible = true;
subprojectName = subprojectNode->displayName();
@@ -404,7 +404,7 @@ void QbsProjectManagerPlugin::updateBuildActions()
void QbsProjectManagerPlugin::projectChanged()
{
QbsProject *project = qobject_cast<QbsProject *>(sender());
auto project = qobject_cast<QbsProject *>(sender());
if (!project || project == SessionManager::startupProject())
updateReparseQbsAction();
@@ -420,7 +420,7 @@ void QbsProjectManagerPlugin::buildFileContextMenu()
{
const Node *node = ProjectTree::findCurrentNode();
QTC_ASSERT(node, return);
QbsProject *project = dynamic_cast<QbsProject *>(ProjectTree::currentProject());
auto project = dynamic_cast<QbsProject *>(ProjectTree::currentProject());
QTC_ASSERT(project, return);
buildSingleFile(project, node->filePath().toString());
}
@@ -457,10 +457,10 @@ void QbsProjectManagerPlugin::runStepsForProductContextMenu(const QList<Core::Id
{
const Node *node = ProjectTree::findCurrentNode();
QTC_ASSERT(node, return);
QbsProject *project = dynamic_cast<QbsProject *>(ProjectTree::currentProject());
auto project = dynamic_cast<QbsProject *>(ProjectTree::currentProject());
QTC_ASSERT(project, return);
const QbsProductNode * const productNode = dynamic_cast<const QbsProductNode *>(node);
const auto * const productNode = dynamic_cast<const QbsProductNode *>(node);
QTC_ASSERT(productNode, return);
runStepsForProducts(project, {QbsProject::uniqueProductName(productNode->qbsProductData())},
@@ -490,7 +490,7 @@ void QbsProjectManagerPlugin::runStepsForProduct(const QList<Core::Id> &stepType
Node *node = currentEditorNode();
if (!node)
return;
QbsProductNode *product = dynamic_cast<QbsProductNode *>(node->parentProjectNode());
auto product = dynamic_cast<QbsProductNode *>(node->parentProjectNode());
if (!product)
return;
QbsProject *project = currentEditorProject();
@@ -522,10 +522,10 @@ void QbsProjectManagerPlugin::runStepsForSubprojectContextMenu(const QList<Core:
{
const Node *node = ProjectTree::findCurrentNode();
QTC_ASSERT(node, return);
QbsProject *project = dynamic_cast<QbsProject *>(ProjectTree::currentProject());
auto project = dynamic_cast<QbsProject *>(ProjectTree::currentProject());
QTC_ASSERT(project, return);
const QbsProjectNode *subProject = dynamic_cast<const QbsProjectNode *>(node);
const auto subProject = dynamic_cast<const QbsProjectNode *>(node);
QTC_ASSERT(subProject, return);
QStringList toBuild;
@@ -560,10 +560,10 @@ void QbsProjectManagerPlugin::runStepsForSubproject(const QList<Core::Id> &stepT
if (!editorNode || !editorProject)
return;
QbsProjectNode *subproject = 0;
QbsBaseProjectNode *start = dynamic_cast<QbsBaseProjectNode *>(editorNode->parentProjectNode());
QbsProjectNode *subproject = nullptr;
auto start = dynamic_cast<QbsBaseProjectNode *>(editorNode->parentProjectNode());
while (start && start != editorProject->rootProjectNode()) {
QbsProjectNode *tmp = dynamic_cast<QbsProjectNode *>(start);
auto tmp = dynamic_cast<QbsProjectNode *>(start);
if (tmp) {
subproject = tmp;
break;
@@ -590,7 +590,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList
Target *t = project->activeTarget();
if (!t)
return;
QbsBuildConfiguration *bc = qobject_cast<QbsBuildConfiguration *>(t->activeBuildConfiguration());
auto bc = qobject_cast<QbsBuildConfiguration *>(t->activeBuildConfiguration());
if (!bc)
return;
@@ -623,7 +623,7 @@ void QbsProjectManagerPlugin::runStepsForProducts(QbsProject *project,
Target *t = project->activeTarget();
if (!t)
return;
QbsBuildConfiguration *bc = qobject_cast<QbsBuildConfiguration *>(t->activeBuildConfiguration());
auto bc = qobject_cast<QbsBuildConfiguration *>(t->activeBuildConfiguration());
if (!bc)
return;