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

JsonWizard: Clean up page factories

Browse Source 
Improve error reporting and remove useless setup code.

Change-Id: I97e9fba0aa1cf6bb2cba26f70d46d1ba87bbd192
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-10-15 15:08:15 +02:00
parent 72f0b52555
commit 06d7d58c88
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
View File

@@ -134,11 +134,11 @@ ProjectPageFactory::ProjectPageFactory()
Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
{ {
Q_UNUSED(wizard);
Q_UNUSED(data); Q_UNUSED(data);
QTC_ASSERT(canCreate(typeId), return 0); QTC_ASSERT(canCreate(typeId), return 0);
JsonProjectPage *page = new JsonProjectPage; JsonProjectPage *page = new JsonProjectPage;
page->setPath(wizard->value(QStringLiteral("GivenPath")).toString());
return page; return page;
} }
@@ -148,7 +148,13 @@ bool ProjectPageFactory::validateData(Core::Id typeId, const QVariant &data, QSt
Q_UNUSED(errorMessage); Q_UNUSED(errorMessage);
QTC_ASSERT(canCreate(typeId), return false); QTC_ASSERT(canCreate(typeId), return false);
return data.isNull(); if (!data.isNull() && (data.type() != QVariant::Map || !data.toMap().isEmpty())) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizard",
"\"data\" for a \"Project\" page needs to be unset or an empty object.");
return false;
}
return true;
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------