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

ProjectExplorer: Follow up on too-much-magic in IProjectManager

Browse Source 
Use a ProjectManager::registerProjectType<Project>(MimeType) function,
removing cryptic IProjectManager object ownership.

Change-Id: I212cd25bd4ee757022a8cb0decb4b8de3a112d12
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-03-03 18:16:34 +01:00
parent 57144e28da
commit c1bfc5d8ec
54 changed files with 152 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
View File

@@ -26,10 +26,10 @@
#include "jsonkitspage.h"
#include "jsonwizard.h"
#include "../iprojectmanager.h"
#include "../kit.h"
#include "../project.h"
#include "../projectexplorer.h"
#include "../projectmanager.h"
#include <coreplugin/featureprovider.h>
@@ -102,19 +102,16 @@ void JsonKitsPage::setPreferredFeatures(const QVariant &data)
void JsonKitsPage::setupProjectFiles(const JsonWizard::GeneratorFiles &files)
{
Project *project = nullptr;
for (const JsonWizard::GeneratorFile &f : files) {
if (f.file.attributes() & GeneratedFile::OpenProjectAttribute) {
const QFileInfo fi(f.file.path());
const QString path = fi.absoluteFilePath();
IProjectManager *manager = IProjectManager::managerForMimeType(Utils::mimeTypeForFile(fi));
project = manager ? manager->openProject(path) : nullptr;
Project *project = ProjectManager::openProject(Utils::mimeTypeForFile(fi),
Utils::FileName::fromString(path));
if (project) {
if (setupProject(project))
project->saveSettings();
delete project;
project = nullptr;
}
}
}