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

GenericProjectManager: Modernize

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

Change-Id: I67c9895f46efe8646176718949561240c7175c53
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2018-11-09 00:36:21 +01:00
parent cce6975fd8
commit 951eb885af
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/genericprojectmanager/filesselectionwizardpage.cpp
View File

@@ -44,7 +44,7 @@ FilesSelectionWizardPage::FilesSelectionWizardPage(GenericProjectWizardDialog *g
m_genericProjectWizardDialog(genericProjectWizard), m_genericProjectWizardDialog(genericProjectWizard),
m_filesWidget(new ProjectExplorer::SelectableFilesWidget(this)) m_filesWidget(new ProjectExplorer::SelectableFilesWidget(this))
{ {
QVBoxLayout *layout = new QVBoxLayout(this); auto layout = new QVBoxLayout(this);
layout->addWidget(m_filesWidget); layout->addWidget(m_filesWidget);
m_filesWidget->setBaseDirEditable(false); m_filesWidget->setBaseDirEditable(false);

6
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -89,9 +89,7 @@ GenericBuildConfigurationFactory::GenericBuildConfigurationFactory()
setSupportedProjectMimeTypeName(Constants::GENERICMIMETYPE); setSupportedProjectMimeTypeName(Constants::GENERICMIMETYPE);
} }
GenericBuildConfigurationFactory::~GenericBuildConfigurationFactory() GenericBuildConfigurationFactory::~GenericBuildConfigurationFactory() = default;
{
}
QList<BuildInfo *> GenericBuildConfigurationFactory::availableBuilds(const Target *parent) const QList<BuildInfo *> GenericBuildConfigurationFactory::availableBuilds(const Target *parent) const
{ {
@@ -136,7 +134,7 @@ void GenericBuildConfiguration::addToEnvironment(Utils::Environment &env) const
//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericBuildConfiguration *bc) GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericBuildConfiguration *bc)
: m_buildConfiguration(0) : m_buildConfiguration(nullptr)
{ {
auto fl = new QFormLayout(this); auto fl = new QFormLayout(this);
fl->setContentsMargins(0, -1, 0, -1); fl->setContentsMargins(0, -1, 0, -1);

2
src/plugins/genericprojectmanager/genericbuildconfiguration.h
View File

@@ -55,7 +55,7 @@ class GenericBuildConfigurationFactory : public ProjectExplorer::IBuildConfigura
public: public:
GenericBuildConfigurationFactory(); GenericBuildConfigurationFactory();
~GenericBuildConfigurationFactory(); ~GenericBuildConfigurationFactory() override;
private: private:
QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const override; QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const override;

4
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -135,12 +135,12 @@ public:
|| action == Rename; || action == Rename;
} }
bool addFiles(const QStringList &filePaths, QStringList * = 0) override bool addFiles(const QStringList &filePaths, QStringList * = nullptr) override
{ {
return m_project->addFiles(filePaths); return m_project->addFiles(filePaths);
} }
bool removeFiles(const QStringList &filePaths, QStringList * = 0) override bool removeFiles(const QStringList &filePaths, QStringList * = nullptr) override
{ {
return m_project->removeFiles(filePaths); return m_project->removeFiles(filePaths);
} }

4
src/plugins/genericprojectmanager/genericprojectwizard.cpp
View File

@@ -126,7 +126,7 @@ GenericProjectWizard::GenericProjectWizard()
Core::BaseFileWizard *GenericProjectWizard::create(QWidget *parent, Core::BaseFileWizard *GenericProjectWizard::create(QWidget *parent,
const Core::WizardDialogParameters &parameters) const const Core::WizardDialogParameters &parameters) const
{ {
GenericProjectWizardDialog *wizard = new GenericProjectWizardDialog(this, parent); auto wizard = new GenericProjectWizardDialog(this, parent);
wizard->setPath(parameters.defaultPath()); wizard->setPath(parameters.defaultPath());
@@ -141,7 +141,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
{ {
Q_UNUSED(errorMessage) Q_UNUSED(errorMessage)
const GenericProjectWizardDialog *wizard = qobject_cast<const GenericProjectWizardDialog *>(w); auto wizard = qobject_cast<const GenericProjectWizardDialog *>(w);
const QString projectPath = wizard->path(); const QString projectPath = wizard->path();
const QDir dir(projectPath); const QDir dir(projectPath);
const QString projectName = wizard->projectName(); const QString projectName = wizard->projectName();

2
src/plugins/genericprojectmanager/genericprojectwizard.h
View File

@@ -42,7 +42,7 @@ class GenericProjectWizardDialog : public Core::BaseFileWizard
Q_OBJECT Q_OBJECT
public: public:
explicit GenericProjectWizardDialog(const Core::BaseFileWizardFactory *factory, QWidget *parent = 0); explicit GenericProjectWizardDialog(const Core::BaseFileWizardFactory *factory, QWidget *parent = nullptr);
QString path() const; QString path() const;
void setPath(const QString &path); void setPath(const QString &path);