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

JsonWizard: Introduce a JsonWizard pointer into SummaryPage

Browse Source 
This stopps us from qobject_casting all over the place.

Change-Id: I703ebb48aea7d00546e48ffb7a7fda21dc28d2cf
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2014-11-10 13:48:28 +01:00
parent 9d677e3302
commit 02e3adcc25
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
View File

@@ -89,16 +89,15 @@ JsonSummaryPage::JsonSummaryPage(QWidget *parent) :
void JsonSummaryPage::initializePage()
{
JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
QTC_ASSERT(wiz, return);
m_wizard = qobject_cast<JsonWizard *>(wizard());
connect(wiz, &JsonWizard::filesReady, this, &JsonSummaryPage::triggerCommit);
connect(wiz, &JsonWizard::filesReady, this, &JsonSummaryPage::addToProject);
connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::triggerCommit);
connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::addToProject);
JsonWizard::GeneratorFiles files = wiz->fileList();
JsonWizard::GeneratorFiles files = m_wizard->fileList();
QStringList filePaths = Utils::transform(files, [](const JsonWizard::GeneratorFile &f)
{ return f.file.path(); });
IWizardFactory::WizardKind kind = wizardKind(wiz);
IWizardFactory::WizardKind kind = wizardKind(m_wizard);
bool isProject = (kind == IWizardFactory::ProjectWizard);
setFiles(filePaths);
@@ -112,7 +111,7 @@ void JsonSummaryPage::initializePage()
filePaths << f.file.path();
}
Node *contextNode = wiz->value(QLatin1String(Constants::PREFERRED_PROJECT_NODE))
Node *contextNode = m_wizard->value(QLatin1String(Constants::PREFERRED_PROJECT_NODE))
.value<Node *>();
initializeProjectTree(contextNode, filePaths, kind,
isProject ? AddSubProject : AddNewFile);
@@ -122,12 +121,9 @@ void JsonSummaryPage::initializePage()
void JsonSummaryPage::cleanupPage()
{
JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
QTC_ASSERT(wiz, return);
m_wizard->resetFileList();
wiz->resetFileList();
disconnect(wiz, &JsonWizard::filesReady, this, 0);
disconnect(m_wizard, &JsonWizard::filesReady, this, 0);
}
void JsonSummaryPage::triggerCommit(const JsonWizard::GeneratorFiles &files)
@@ -146,24 +142,21 @@ void JsonSummaryPage::triggerCommit(const JsonWizard::GeneratorFiles &files)
void JsonSummaryPage::addToProject(const JsonWizard::GeneratorFiles &files)
{
JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
QTC_ASSERT(wiz, return);
QString generatedProject = generatedProjectFilePath(files);
IWizardFactory::WizardKind kind = wizardKind(wiz);
IWizardFactory::WizardKind kind = wizardKind(m_wizard);
FolderNode *folder = currentNode();
if (!folder)
return;
if (kind == IWizardFactory::ProjectWizard) {
if (!static_cast<ProjectNode *>(folder)->addSubProjects(QStringList(generatedProject))) {
QMessageBox::critical(wizard(), tr("Failed to Add to Project"),
QMessageBox::critical(m_wizard, tr("Failed to Add to Project"),
tr("Failed to add subproject \"%1\"\nto project \"%2\".")
.arg(QDir::toNativeSeparators(generatedProject))
.arg(QDir::toNativeSeparators(folder->path())));
return;
}
wiz->removeAttributeFromAllFiles(GeneratedFile::OpenProjectAttribute);
m_wizard->removeAttributeFromAllFiles(GeneratedFile::OpenProjectAttribute);
} else {
QStringList filePaths = Utils::transform(files, [](const JsonWizard::GeneratorFile &f) {
return f.file.path();

2
src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
View File

@@ -58,6 +58,8 @@ public slots:
private:
void updateProjectData(FolderNode *node);
JsonWizard *m_wizard;
};
} // namespace ProjectExplorer