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

CMakeProjectManager: Modernize

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

Change-Id: I6a272bc3b75835840b3d6cbe83be6f50f94bbedb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2018-11-04 23:09:41 +01:00
parent 5873612767
commit 17f169c291
21 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -62,7 +62,7 @@ const char CONFIGURATION_KEY[] = "CMake.Configuration";
CMakeBuildConfiguration::CMakeBuildConfiguration(Target *parent, Core::Id id)
: BuildConfiguration(parent, id)
{
CMakeProject *project = static_cast<CMakeProject *>(target()->project());
auto project = static_cast<const CMakeProject *>(target()->project());
setBuildDirectory(shadowBuildDirectory(project->projectFilePath(),
target()->kit(),
displayName(), BuildConfiguration::Unknown));
@@ -80,7 +80,7 @@ void CMakeBuildConfiguration::initialize(const BuildInfo *info)
cleanSteps->appendStep(new CMakeBuildStep(cleanSteps));
if (info->buildDirectory.isEmpty()) {
CMakeProject *project = static_cast<CMakeProject *>(target()->project());
auto project = static_cast<const CMakeProject *>(target()->project());
setBuildDirectory(CMakeBuildConfiguration::shadowBuildDirectory(project->projectFilePath(),
target()->kit(),
info->displayName, info->buildType));
@@ -167,8 +167,8 @@ FileName CMakeBuildConfiguration::shadowBuildDirectory(const FileName &projectFi
void CMakeBuildConfiguration::buildTarget(const QString &buildTarget)
{
const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD;
CMakeBuildStep *cmBs
= qobject_cast<CMakeBuildStep *>(Utils::findOrDefault(stepList(buildStep)->steps(),
auto cmBs = qobject_cast<CMakeBuildStep *>(Utils::findOrDefault(
stepList(buildStep)->steps(),
[](const ProjectExplorer::BuildStep *bs) {
return bs->id() == Constants::CMAKE_BUILD_STEP_ID;
}));

6
src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
View File

@@ -69,7 +69,7 @@ static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex
QAbstractItemModel *model = view->model();
QModelIndex result = idx;
while (QSortFilterProxyModel *proxy = qobject_cast<QSortFilterProxyModel *>(model)) {
while (auto proxy = qobject_cast<const QSortFilterProxyModel *>(model)) {
result = proxy->mapToSource(result);
model = proxy->sourceModel();
}
@@ -412,7 +412,7 @@ void CMakeBuildSettingsWidget::updateSelection(const QModelIndex &current, const
QAction *CMakeBuildSettingsWidget::createForceAction(int type, const QModelIndex &idx)
{
ConfigModel::DataItem::Type t = static_cast<ConfigModel::DataItem::Type>(type);
auto t = static_cast<ConfigModel::DataItem::Type>(type);
QString typeString;
switch (type) {
case ConfigModel::DataItem::BOOLEAN:
@@ -448,7 +448,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
if (!idx.isValid())
return false;
QMenu *menu = new QMenu(this);
auto menu = new QMenu(this);
connect(menu, &QMenu::triggered, menu, &QMenu::deleteLater);
QAction *action = nullptr;

2
src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h
View File

@@ -69,7 +69,7 @@ private:
void updateSelection(const QModelIndex &current, const QModelIndex &previous);
QAction *createForceAction(int type, const QModelIndex &idx);
bool eventFilter(QObject *target, QEvent *event);
bool eventFilter(QObject *target, QEvent *event) override;
CMakeBuildConfiguration *m_buildConfiguration;
QTreeView *m_configView;

2
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -530,7 +530,7 @@ void CMakeBuildStepConfigWidget::updateDetails()
param.setEnvironment(bc->environment());
param.setWorkingDirectory(bc->buildDirectory().toString());
param.setCommand(m_buildStep->cmakeCommand());
param.setArguments(m_buildStep->allArguments(0));
param.setArguments(m_buildStep->allArguments(nullptr));
setSummaryText(param.summary(displayName()));
}

2
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -42,7 +42,7 @@ namespace CMakeProjectManager {
CMakeConfigItem::CMakeConfigItem() = default;
CMakeConfigItem::CMakeConfigItem(const CMakeConfigItem &other) :
CMakeConfigItem::CMakeConfigItem(const CMakeConfigItem &other) : // What about inCMakeCache?
key(other.key), type(other.type), isAdvanced(other.isAdvanced),
isUnset(other.isUnset), value(other.value),
documentation(other.documentation), values(other.values)

2
src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp
View File

@@ -107,7 +107,7 @@ void CMakeKitConfigWidget::makeReadOnly()
void CMakeKitConfigWidget::refresh()
{
CMakeTool *tool = CMakeKitInformation::cmakeTool(m_kit);
m_comboBox->setCurrentIndex(tool == 0 ? -1 : indexOf(tool->id()));
m_comboBox->setCurrentIndex(tool ? indexOf(tool->id()) : -1);
}
QWidget *CMakeKitConfigWidget::mainWidget() const

2
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -140,7 +140,7 @@ void CMakeKitInformation::fix(Kit *k)
KitInformation::ItemList CMakeKitInformation::toUserOutput(const Kit *k) const
{
const CMakeTool *const tool = cmakeTool(k);
return ItemList() << qMakePair(tr("CMake"), tool == 0 ? tr("Unconfigured") : tool->displayName());
return ItemList() << qMakePair(tr("CMake"), tool ? tool->displayName() : tr("Unconfigured"));
}
KitConfigWidget *CMakeKitInformation::createConfigWidget(Kit *k) const

2
src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
View File

@@ -62,7 +62,7 @@ void CMakeLocatorFilter::prepareSearch(const QString &entry)
m_result.clear();
const QList<Project *> projects = SessionManager::projects();
for (Project *p : projects) {
CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(p);
auto cmakeProject = qobject_cast<const CMakeProject *>(p);
if (!cmakeProject)
continue;
const QStringList buildTargetTitles = cmakeProject->buildTargetTitles();

2
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -329,7 +329,7 @@ void CMakeProject::updateQmlJSCodeModel()
projectInfo.importPaths.clear();
QString cmakeImports;
CMakeBuildConfiguration *bc = qobject_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
auto bc = qobject_cast<const CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
if (!bc)
return;

2
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -350,7 +350,7 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const
QList<BuildInfo *> CMakeProjectImporter::buildInfoListForKit(const Kit *k, void *directoryData) const
{
QList<BuildInfo *> result;
DirectoryData *data = static_cast<DirectoryData *>(directoryData);
auto data = static_cast<const DirectoryData *>(directoryData);
auto factory = qobject_cast<CMakeBuildConfigurationFactory *>(
IBuildConfigurationFactory::find(k, projectFilePath().toString()));
if (!factory)

6
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -117,7 +117,7 @@ void CMakeManager::updateCmakeActions()
void CMakeManager::clearCMakeCache(Project *project)
{
CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(project);
auto cmakeProject = qobject_cast<CMakeProject *>(project);
if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
return;
@@ -126,7 +126,7 @@ void CMakeManager::clearCMakeCache(Project *project)
void CMakeManager::runCMake(Project *project)
{
CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(project);
auto cmakeProject = qobject_cast<CMakeProject *>(project);
if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
return;
@@ -138,7 +138,7 @@ void CMakeManager::runCMake(Project *project)
void CMakeManager::rescanProject(Project *project)
{
CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(project);
auto cmakeProject = qobject_cast<CMakeProject *>(project);
if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
return;

4
src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
View File

@@ -47,7 +47,7 @@ public:
bool showInSimpleTree() const final;
bool supportsAction(ProjectExplorer::ProjectAction action, const Node *node) const override;
virtual Utils::optional<Utils::FileName> visibleAfterAddFileAction() const override;
Utils::optional<Utils::FileName> visibleAfterAddFileAction() const override;
};
class CMakeProjectNode : public ProjectExplorer::ProjectNode
@@ -75,7 +75,7 @@ public:
bool supportsAction(ProjectExplorer::ProjectAction action, const Node *node) const override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded) override;
virtual Utils::optional<Utils::FileName> visibleAfterAddFileAction() const override;
Utils::optional<Utils::FileName> visibleAfterAddFileAction() const override;
private:
QString m_tooltip;

4
src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
View File

@@ -144,10 +144,10 @@ void CMakeProjectPlugin::updateContextActions()
{
Project *project = ProjectTree::currentProject();
const Node *node = ProjectTree::findCurrentNode();
const CMakeTargetNode *targetNode = dynamic_cast<const CMakeTargetNode *>(node);
auto targetNode = dynamic_cast<const CMakeTargetNode *>(node);
// as targetNode can be deleted while the menu is open, we keep only the
const QString targetDisplayName = targetNode ? targetNode->displayName() : QString();
CMakeProject *cmProject = dynamic_cast<CMakeProject *>(project);
auto cmProject = dynamic_cast<CMakeProject *>(project);
// Build Target:
disconnect(d->m_actionConnect);

20
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -115,7 +115,7 @@ public:
CMakeToolItemModel *model() const { return static_cast<CMakeToolItemModel *>(TreeItem::model()); }
QVariant data(int column, int role) const
QVariant data(int column, int role) const override
{
switch (role) {
case Qt::DisplayRole:
@@ -172,7 +172,7 @@ QModelIndex CMakeToolItemModel::addCMakeTool(const QString &name, const FileName
const bool autoRun, const bool autoCreate,
const bool isAutoDetected)
{
CMakeToolTreeItem *item = new CMakeToolTreeItem(name, executable, autoRun, autoCreate, isAutoDetected);
auto item = new CMakeToolTreeItem(name, executable, autoRun, autoCreate, isAutoDetected);
if (isAutoDetected)
autoGroupItem()->appendChild(item);
else
@@ -188,7 +188,7 @@ void CMakeToolItemModel::addCMakeTool(const CMakeTool *item, bool changed)
if (cmakeToolItem(item->id()))
return;
CMakeToolTreeItem *treeItem = new CMakeToolTreeItem(item, changed);
auto treeItem = new CMakeToolTreeItem(item, changed);
if (item->isAutoDetected())
autoGroupItem()->appendChild(treeItem);
else
@@ -362,7 +362,7 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model)
m_autoCreateBuildDirectoryCheckBox->setText(tr("Auto-create build directories"));
m_autoCreateBuildDirectoryCheckBox->setToolTip(tr("Automatically create build directories for CMake projects."));
QFormLayout *formLayout = new QFormLayout(this);
auto formLayout = new QFormLayout(this);
formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
formLayout->addRow(new QLabel(tr("Name:")), m_displayNameLineEdit);
formLayout->addRow(new QLabel(tr("Path:")), m_binaryChooser);
@@ -448,7 +448,7 @@ public:
header->setSectionResizeMode(0, QHeaderView::ResizeToContents);
header->setSectionResizeMode(1, QHeaderView::Stretch);
QVBoxLayout *buttonLayout = new QVBoxLayout();
auto buttonLayout = new QVBoxLayout();
buttonLayout->setContentsMargins(0, 0, 0, 0);
buttonLayout->addWidget(m_addButton);
buttonLayout->addWidget(m_cloneButton);
@@ -456,11 +456,11 @@ public:
buttonLayout->addWidget(m_makeDefButton);
buttonLayout->addItem(new QSpacerItem(10, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
QVBoxLayout *verticalLayout = new QVBoxLayout();
auto verticalLayout = new QVBoxLayout();
verticalLayout->addWidget(m_cmakeToolsView);
verticalLayout->addWidget(m_container);
QHBoxLayout *horizontalLayout = new QHBoxLayout(this);
auto horizontalLayout = new QHBoxLayout(this);
horizontalLayout->addLayout(verticalLayout);
horizontalLayout->addLayout(buttonLayout);
@@ -528,10 +528,10 @@ void CMakeToolConfigWidget::removeCMakeTool()
{
bool delDef = m_model.defaultItemId() == m_currentItem->m_id;
m_model.removeCMakeTool(m_currentItem->m_id);
m_currentItem = 0;
m_currentItem = nullptr;
if (delDef) {
CMakeToolTreeItem *it = static_cast<CMakeToolTreeItem *>(m_model.autoGroupItem()->firstChild());
auto it = static_cast<CMakeToolTreeItem *>(m_model.autoGroupItem()->firstChild());
if (!it)
it = static_cast<CMakeToolTreeItem *>(m_model.manualGroupItem()->firstChild());
if (it)
@@ -593,7 +593,7 @@ void CMakeSettingsPage::apply()
void CMakeSettingsPage::finish()
{
delete m_widget;
m_widget = 0;
m_widget = nullptr;
}
} // namespace Internal

2
src/plugins/cmakeprojectmanager/cmakesettingspage.h
View File

@@ -49,7 +49,7 @@ public:
void finish() override;
private:
CMakeToolConfigWidget *m_widget = 0;
CMakeToolConfigWidget *m_widget = nullptr;
};
} // namespace Internal

2
src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h
View File

@@ -40,7 +40,7 @@ class CMakeSpecificSettingWidget : public QWidget
Q_OBJECT
public:
explicit CMakeSpecificSettingWidget(QWidget *parent = 0);
explicit CMakeSpecificSettingWidget(QWidget *parent = nullptr);
void setSettings(const CMakeSpecificSettings &settings);
CMakeSpecificSettings settings() const;

2
src/plugins/cmakeprojectmanager/cmaketool.h
View File

@@ -76,7 +76,7 @@ public:
bool matches(const QString &n, const QString &ex) const;
};
typedef std::function<Utils::FileName (const Utils::FileName &)> PathMapper;
using PathMapper = std::function<Utils::FileName (const Utils::FileName &)>;
explicit CMakeTool(Detection d, const Core::Id &id);
explicit CMakeTool(const QVariantMap &map, bool fromSdk);

4
src/plugins/cmakeprojectmanager/configmodel.cpp
View File

@@ -51,7 +51,7 @@ ConfigModel::ConfigModel(QObject *parent) : Utils::TreeModel<>(parent)
QVariant ConfigModel::data(const QModelIndex &idx, int role) const
{
// Hide/show groups according to "isAdvanced" setting:
Utils::TreeItem *item = static_cast<Utils::TreeItem *>(idx.internalPointer());
auto item = static_cast<const Utils::TreeItem *>(idx.internalPointer());
if (role == ItemIsAdvancedRole && item->childCount() > 0) {
const bool hasNormalChildren = item->findAnyChild([](const Utils::TreeItem *ti) {
if (auto cmti = dynamic_cast<const Internal::ConfigModelTreeItem*>(ti))
@@ -341,7 +341,7 @@ void ConfigModel::generateTree()
for (InternalDataItem &di : m_configuration)
prefixes[prefix(di.key)].append(new Internal::ConfigModelTreeItem(&di));
Utils::TreeItem *root = new Utils::TreeItem;
auto root = new Utils::TreeItem;
for (const QString &p : qAsConst(prefixList)) {
const QList<Utils::TreeItem *> &prefixItemList = prefixes.value(p);

2
src/plugins/cmakeprojectmanager/configmodel.h
View File

@@ -120,7 +120,7 @@ class ConfigModelTreeItem : public Utils::TreeItem
{
public:
ConfigModelTreeItem(ConfigModel::InternalDataItem *di = nullptr) : dataItem(di) {}
virtual ~ConfigModelTreeItem() override;
~ConfigModelTreeItem() override;
QVariant data(int column, int role) const final;
bool setData(int column, const QVariant &data, int role) final;

2
src/plugins/cmakeprojectmanager/tealeafreader.cpp
View File

@@ -287,7 +287,7 @@ void TeaLeafReader::generateProjectTree(CMakeProjectNode *root, const QList<cons
QSet<FileName> toAdd = toWatch;
toAdd.subtract(currentWatched);
foreach (const FileName &fn, toAdd) {
CMakeFile *cm = new CMakeFile(this, fn);
auto cm = new CMakeFile(this, fn);
DocumentManager::addDocument(cm);
m_watchedFiles.insert(cm);
}

2
src/plugins/cmakeprojectmanager/treescanner.h
View File

@@ -55,7 +55,7 @@ public:
using FileTypeFactory = std::function<ProjectExplorer::FileType(const Utils::MimeType &, const Utils::FileName &)>;
explicit TreeScanner(QObject *parent = nullptr);
~TreeScanner();
~TreeScanner() override;
// Start scanning in given directory
bool asyncScanForFiles(const Utils::FileName& directory);