GenericProject: Cleanup and modernize

* Use nullptr instead 0
* Remove QLatin1{String|Char} where possible
* Use C++11 list init and auto
* Add some const as drive-by-change

Change-Id: Ife4c9c7b0869bcf2c864b88b8061ac6b7c3f33c0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/genericprojectmanager/filesselectionwizardpage.h

@@ -41,7 +41,7 @@ class FilesSelectionWizardPage : public QWizardPage
     Q_OBJECT
 
 public:
-    FilesSelectionWizardPage(GenericProjectWizardDialog *genericProjectWizard, QWidget *parent = 0);
+    FilesSelectionWizardPage(GenericProjectWizardDialog *genericProjectWizard, QWidget *parent = nullptr);
     bool isComplete() const override;
     void initializePage() override;
     void cleanupPage() override;

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

@@ -118,7 +118,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(Target *parent, con
     QTC_ASSERT(info->kitId == parent->kit()->id(), return 0);
     QTC_ASSERT(!info->displayName.isEmpty(), return 0);
 
-    GenericBuildConfiguration *bc = new GenericBuildConfiguration(parent);
+    auto bc = new GenericBuildConfiguration(parent);
     bc->setDisplayName(info->displayName);
     bc->setDefaultDisplayName(info->displayName);
     bc->setBuildDirectory(info->buildDirectory);
@@ -127,14 +127,14 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(Target *parent, con
     BuildStepList *cleanSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
 
     Q_ASSERT(buildSteps);
-    GenericMakeStep *makeStep = new GenericMakeStep(buildSteps);
+    auto makeStep = new GenericMakeStep(buildSteps);
     buildSteps->insertStep(0, makeStep);
-    makeStep->setBuildTarget(QLatin1String("all"), /* on = */ true);
+    makeStep->setBuildTarget("all", /* on = */ true);
 
     Q_ASSERT(cleanSteps);
-    GenericMakeStep *cleanMakeStep = new GenericMakeStep(cleanSteps);
+    auto cleanMakeStep = new GenericMakeStep(cleanSteps);
     cleanSteps->insertStep(0, cleanMakeStep);
-    cleanMakeStep->setBuildTarget(QLatin1String("clean"), /* on = */ true);
+    cleanMakeStep->setBuildTarget("clean", /* on = */ true);
     cleanMakeStep->setClean(true);
 
     return bc;
@@ -165,7 +165,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::restore(Target *parent, co
 {
     if (!canRestore(parent, map))
         return 0;
-    GenericBuildConfiguration *bc(new GenericBuildConfiguration(parent));
+    auto bc = new GenericBuildConfiguration(parent);
     if (bc->fromMap(map))
         return bc;
     delete bc;
@@ -182,7 +182,7 @@ bool GenericBuildConfigurationFactory::canHandle(const Target *t) const
 BuildInfo *GenericBuildConfigurationFactory::createBuildInfo(const Kit *k,
                                                              const Utils::FileName &buildDir) const
 {
-    BuildInfo *info = new BuildInfo(this);
+    auto info = new BuildInfo(this);
     info->typeName = tr("Build");
     info->buildDirectory = buildDir;
     info->kitId = k->id();
@@ -201,13 +201,13 @@ BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const
 GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericBuildConfiguration *bc)
     : m_buildConfiguration(0)
 {
-    QFormLayout *fl = new QFormLayout(this);
+    auto fl = new QFormLayout(this);
     fl->setContentsMargins(0, -1, 0, -1);
     fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     // build directory
     m_pathChooser = new Utils::PathChooser(this);
-    m_pathChooser->setHistoryCompleter(QLatin1String("Generic.BuildDir.History"));
+    m_pathChooser->setHistoryCompleter("Generic.BuildDir.History");
     m_pathChooser->setEnabled(true);
     fl->addRow(tr("Build directory:"), m_pathChooser);
     connect(m_pathChooser, &Utils::PathChooser::rawPathChanged,

src/plugins/genericprojectmanager/genericbuildconfiguration.h

@@ -64,7 +64,7 @@ class GenericBuildConfigurationFactory : public ProjectExplorer::IBuildConfigura
     Q_OBJECT
 
 public:
-    explicit GenericBuildConfigurationFactory(QObject *parent = 0);
+    explicit GenericBuildConfigurationFactory(QObject *parent = nullptr);
     ~GenericBuildConfigurationFactory();
 
     int priority(const ProjectExplorer::Target *parent) const override;

src/plugins/genericprojectmanager/genericmakestep.cpp

@@ -142,19 +142,19 @@ QVariantMap GenericMakeStep::toMap() const
 {
     QVariantMap map(AbstractProcessStep::toMap());
 
-    map.insert(QLatin1String(BUILD_TARGETS_KEY), m_buildTargets);
+    map.insert(BUILD_TARGETS_KEY, m_buildTargets);
-    map.insert(QLatin1String(MAKE_ARGUMENTS_KEY), m_makeArguments);
+    map.insert(MAKE_ARGUMENTS_KEY, m_makeArguments);
-    map.insert(QLatin1String(MAKE_COMMAND_KEY), m_makeCommand);
+    map.insert(MAKE_COMMAND_KEY, m_makeCommand);
-    map.insert(QLatin1String(CLEAN_KEY), m_clean);
+    map.insert(CLEAN_KEY, m_clean);
     return map;
 }
 
 bool GenericMakeStep::fromMap(const QVariantMap &map)
 {
-    m_buildTargets = map.value(QLatin1String(BUILD_TARGETS_KEY)).toStringList();
+    m_buildTargets = map.value(BUILD_TARGETS_KEY).toStringList();
-    m_makeArguments = map.value(QLatin1String(MAKE_ARGUMENTS_KEY)).toString();
+    m_makeArguments = map.value(MAKE_ARGUMENTS_KEY).toString();
-    m_makeCommand = map.value(QLatin1String(MAKE_COMMAND_KEY)).toString();
+    m_makeCommand = map.value(MAKE_COMMAND_KEY).toString();
-    m_clean = map.value(QLatin1String(CLEAN_KEY)).toBool();
+    m_clean = map.value(CLEAN_KEY).toBool();
 
     return BuildStep::fromMap(map);
 }
@@ -174,7 +174,7 @@ QString GenericMakeStep::makeCommand(const Utils::Environment &environment) cons
         if (tc)
             command = tc->makeCommand(environment);
         else
-            command = QLatin1String("make");
+            command = "make";
     }
     return command;
 }
@@ -220,9 +220,10 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
     m_ui = new Ui::GenericMakeStep;
     m_ui->setupUi(this);
 
-    GenericProject *pro = static_cast<GenericProject *>(m_makeStep->target()->project());
+    const auto pro = static_cast<GenericProject *>(m_makeStep->target()->project());
-    foreach (const QString &target, pro->buildTargets()) {
+    const auto buildTargets = pro->buildTargets();
-        QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList);
+    for (const QString &target : buildTargets) {
+        auto item = new QListWidgetItem(target, m_ui->targetsList);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
         item->setCheckState(m_makeStep->buildsTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
     }
@@ -333,19 +334,19 @@ QList<BuildStepInfo> GenericMakeStepFactory::availableSteps(BuildStepList *paren
 BuildStep *GenericMakeStepFactory::create(BuildStepList *parent, const Id id)
 {
     Q_UNUSED(id)
-    GenericMakeStep *step = new GenericMakeStep(parent);
+    auto step = new GenericMakeStep(parent);
     if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
         step->setClean(true);
-        step->setBuildTarget(QLatin1String("clean"), /* on = */ true);
+        step->setBuildTarget("clean", /* on = */ true);
     } else if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD) {
-        step->setBuildTarget(QLatin1String("all"), /* on = */ true);
+        step->setBuildTarget("all", /* on = */ true);
     }
     return step;
 }
 
 BuildStep *GenericMakeStepFactory::clone(BuildStepList *parent, BuildStep *source)
 {
-    GenericMakeStep *old(qobject_cast<GenericMakeStep *>(source));
+    auto old = qobject_cast<GenericMakeStep *>(source);
     Q_ASSERT(old);
     return new GenericMakeStep(parent, old);
 }

src/plugins/genericprojectmanager/genericmakestep.h

@@ -104,7 +104,7 @@ class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory
     Q_OBJECT
 
 public:
-    explicit GenericMakeStepFactory(QObject *parent = 0);
+    explicit GenericMakeStepFactory(QObject *parent = nullptr);
 
     QList<ProjectExplorer::BuildStepInfo>
         availableSteps(ProjectExplorer::BuildStepList *parent) const override;

src/plugins/genericprojectmanager/genericproject.cpp

@@ -74,13 +74,13 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
     setProjectContext(Context(GenericProjectManager::Constants::PROJECTCONTEXT));
     setProjectLanguages(Context(ProjectExplorer::Constants::LANG_CXX));
 
-    QFileInfo fileInfo = projectFilePath().toFileInfo();
+    const QFileInfo fileInfo = projectFilePath().toFileInfo();
-    QDir dir = fileInfo.dir();
+    const QDir dir = fileInfo.dir();
 
     m_projectName      = fileInfo.completeBaseName();
-    m_filesFileName    = QFileInfo(dir, m_projectName + QLatin1String(".files")).absoluteFilePath();
+    m_filesFileName    = QFileInfo(dir, m_projectName + ".files").absoluteFilePath();
-    m_includesFileName = QFileInfo(dir, m_projectName + QLatin1String(".includes")).absoluteFilePath();
+    m_includesFileName = QFileInfo(dir, m_projectName + ".includes").absoluteFilePath();
-    m_configFileName   = QFileInfo(dir, m_projectName + QLatin1String(".config")).absoluteFilePath();
+    m_configFileName   = QFileInfo(dir, m_projectName + ".config").absoluteFilePath();
 
     m_filesIDocument    = new GenericProjectFile(this, m_filesFileName, GenericProject::Files);
     m_includesIDocument = new GenericProjectFile(this, m_includesFileName, GenericProject::Configuration);
@@ -91,20 +91,19 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
     DocumentManager::addDocument(m_includesIDocument);
     DocumentManager::addDocument(m_configIDocument);
 
-    FileNode *projectFilesNode = new FileNode(Utils::FileName::fromString(m_filesFileName),
+    auto projectFilesNode = new FileNode(Utils::FileName::fromString(m_filesFileName),
-                                              FileType::Project,
+                                         FileType::Project,
-                                              /* generated = */ false);
+                                         /* generated = */ false);
 
-    FileNode *projectIncludesNode = new FileNode(Utils::FileName::fromString(m_includesFileName),
+    auto projectIncludesNode = new FileNode(Utils::FileName::fromString(m_includesFileName),
-                                                 FileType::Project,
+                                            FileType::Project,
-                                                 /* generated = */ false);
+                                            /* generated = */ false);
 
-    FileNode *projectConfigNode = new FileNode(Utils::FileName::fromString(m_configFileName),
+    auto projectConfigNode = new FileNode(Utils::FileName::fromString(m_configFileName),
-                                               FileType::Project,
+                                          FileType::Project,
-                                               /* generated = */ false);
+                                          /* generated = */ false);
 
-    rootProjectNode()->addFileNodes(QList<FileNode *>() << projectFilesNode
+    rootProjectNode()->addFileNodes({ projectFilesNode, projectIncludesNode, projectConfigNode });
-                                    << projectIncludesNode << projectConfigNode);
 
     projectManager()->registerProject(this);
 }
@@ -138,7 +137,7 @@ static QStringList readLines(const QString &absoluteFileName)
     if (file.open(QFile::ReadOnly)) {
         QTextStream stream(&file);
 
-        forever {
+        for (;;) {
             const QString line = stream.readLine();
             if (line.isNull())
                 break;
@@ -164,8 +163,8 @@ bool GenericProject::saveRawList(const QStringList &rawList, const QString &file
     Utils::FileSaver saver(fileName, QIODevice::Text);
     if (!saver.hasError()) {
         QTextStream stream(saver.file());
-        foreach (const QString &filePath, rawList)
+        for (const QString &filePath : rawList)
-            stream << filePath << QLatin1Char('\n');
+            stream << filePath << '\n';
         saver.setResult(&stream);
     }
     bool result = saver.finalize(ICore::mainWindow());
@@ -182,24 +181,25 @@ bool GenericProject::addFiles(const QStringList &filePaths)
 {
     QStringList newList = m_rawFileList;
 
-    QDir baseDir(projectDirectory().toString());
+    const QDir baseDir(projectDirectory().toString());
-    foreach (const QString &filePath, filePaths)
+    for (const QString &filePath : filePaths)
         insertSorted(&newList, baseDir.relativeFilePath(filePath));
 
-    QSet<QString> includes = projectIncludePaths().toSet();
+    const QSet<QString> includes = projectIncludePaths().toSet();
     QSet<QString> toAdd;
 
-    foreach (const QString &filePath, filePaths) {
+    for (const QString &filePath : filePaths) {
         const QString directory = QFileInfo(filePath).absolutePath();
         if (!includes.contains(directory) && !toAdd.contains(directory))
             toAdd << directory;
     }
 
     const QDir dir(projectDirectory().toString());
-    foreach (const QString &path, toAdd) {
+    const auto candidates = toAdd;
+    for (const QString &path : candidates) {
         QString relative = dir.relativeFilePath(path);
         if (relative.isEmpty())
-            relative = QLatin1Char('.');
+            relative = '.';
         m_rawProjectIncludePaths.append(relative);
     }
 
@@ -214,7 +214,7 @@ bool GenericProject::removeFiles(const QStringList &filePaths)
 {
     QStringList newList = m_rawFileList;
 
-    foreach (const QString &filePath, filePaths) {
+    for (const QString &filePath : filePaths) {
         QHash<QString, QString>::iterator i = m_rawListEntries.find(filePath);
         if (i != m_rawListEntries.end())
             newList.removeOne(i.value());
@@ -227,7 +227,7 @@ bool GenericProject::setFiles(const QStringList &filePaths)
 {
     QStringList newList;
     QDir baseDir(projectDirectory().toString());
-    foreach (const QString &filePath, filePaths)
+    for (const QString &filePath : filePaths)
         newList.append(baseDir.relativeFilePath(filePath));
     Utils::sort(newList);
 
@@ -278,7 +278,7 @@ void GenericProject::refresh(RefreshOptions options)
     if (options & Files) {
         QList<FileNode *> fileNodes = Utils::transform(files(), [](const QString &f) {
             FileType fileType = FileType::Source; // ### FIXME
-            if (f.endsWith(QLatin1String(".qrc")))
+            if (f.endsWith(".qrc"))
                 fileType = FileType::Resource;
             return new FileNode(Utils::FileName::fromString(f), fileType, false);
         });
@@ -307,7 +307,7 @@ QStringList GenericProject::processEntries(const QStringList &paths,
 
     QFileInfo fileInfo;
     QStringList absolutePaths;
-    foreach (const QString &path, paths) {
+    for (const QString &path : paths) {
         QString trimmedPath = path.trimmed();
         if (trimmedPath.isEmpty())
             continue;
@@ -351,7 +351,7 @@ void GenericProject::refreshCppCodeModel()
     ppBuilder.setConfigFileName(configFileName());
 
     const QList<Id> languages = ppBuilder.createProjectPartsForFiles(files());
-    foreach (Id language, languages)
+    for (Id language : languages)
         setProjectLanguage(language, true);
 
     m_codeModelFuture = modelManager->updateProjectInfo(pInfo);
@@ -385,15 +385,13 @@ QStringList GenericProject::files(FilesMode fileMode) const
 
 QStringList GenericProject::buildTargets() const
 {
-    QStringList targets;
+    const QStringList targets = { "all", "clean" };
-    targets.append(QLatin1String("all"));
-    targets.append(QLatin1String("clean"));
     return targets;
 }
 
 Project::RestoreResult GenericProject::fromMap(const QVariantMap &map, QString *errorMessage)
 {
-    RestoreResult result = Project::fromMap(map, errorMessage);
+    const RestoreResult result = Project::fromMap(map, errorMessage);
     if (result != RestoreResult::Ok)
         return result;
 
@@ -402,11 +400,11 @@ Project::RestoreResult GenericProject::fromMap(const QVariantMap &map, QString *
         addTarget(createTarget(defaultKit));
 
     // Sanity check: We need both a buildconfiguration and a runconfiguration!
-    QList<Target *> targetList = targets();
+    const QList<Target *> targetList = targets();
     if (targetList.isEmpty())
         return RestoreResult::Error;
 
-    foreach (Target *t, targetList) {
+    for (Target *t : targetList) {
         if (!t->activeBuildConfiguration()) {
             removeTarget(t);
             continue;
@@ -431,7 +429,7 @@ GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName,
       m_options(options)
 {
     setId("Generic.ProjectFile");
-    setMimeType(QLatin1String(Constants::GENERICMIMETYPE));
+    setMimeType(Constants::GENERICMIMETYPE);
     setFilePath(Utils::FileName::fromString(fileName));
 }
 

src/plugins/genericprojectmanager/genericproject.h

@@ -85,7 +85,7 @@ private:
     bool saveRawList(const QStringList &rawList, const QString &fileName);
     void parseProject(RefreshOptions options);
     QStringList processEntries(const QStringList &paths,
-                               QHash<QString, QString> *map = 0) const;
+                               QHash<QString, QString> *map = nullptr) const;
 
     void refreshCppCodeModel();
 

src/plugins/genericprojectmanager/genericprojectnodes.cpp

@@ -61,11 +61,11 @@ QHash<QString, QStringList> sortFilesIntoPaths(const QString &base, const QSet<Q
         } else {
             // `file' is not part of the project.
             relativeFilePath = baseDir.relativeFilePath(absoluteFilePath.toString());
-            if (relativeFilePath.endsWith(QLatin1Char('/')))
+            if (relativeFilePath.endsWith('/'))
                 relativeFilePath.chop(1);
         }
 
-        if (relativeFilePath == QLatin1String("."))
+        if (relativeFilePath == ".")
             relativeFilePath.clear();
 
         filesInPath[relativeFilePath].append(absoluteFileName);
@@ -81,12 +81,13 @@ bool GenericProjectNode::showInSimpleTree() const
 QList<ProjectAction> GenericProjectNode::supportedActions(Node *node) const
 {
     Q_UNUSED(node);
-    return QList<ProjectAction>()
+    return {
-        << AddNewFile
+        AddNewFile,
-        << AddExistingFile
+        AddExistingFile,
-        << AddExistingDirectory
+        AddExistingDirectory,
-        << RemoveFile
+        RemoveFile,
-        << Rename;
+        Rename
+    };
 }
 
 bool GenericProjectNode::addFiles(const QStringList &filePaths, QStringList *notAdded)

src/plugins/genericprojectmanager/genericprojectplugin.cpp

@@ -58,7 +58,7 @@ namespace Internal {
 bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage)
 {
     Q_UNUSED(errorMessage)
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":genericproject/GenericProjectManager.mimetypes.xml"));
+    Utils::MimeDatabase::addMimeTypes(":genericproject/GenericProjectManager.mimetypes.xml");
 
     addAutoReleasedObject(new Manager);
     addAutoReleasedObject(new ProjectFilesFactory);