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

KitsPage: Use constant for data keys

Browse Source 
Change-Id: I4915976a5a5e1843fd35934d167875255401fdb7
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-16 11:35:10 +02:00
parent 274f1c0e80
commit ddd2f23fe3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,8 @@ bool FilePageFactory::validateData(Core::Id typeId, const QVariant &data, QStrin
// KitsPageFactory: // KitsPageFactory:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
static const char KEY_PROJECT_FILE[] = "projectFilePath";
KitsPageFactory::KitsPageFactory() KitsPageFactory::KitsPageFactory()
{ {
setTypeIdsSuffix(QLatin1String("Kits")); setTypeIdsSuffix(QLatin1String("Kits"));
@@ -139,7 +141,7 @@ Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Core::Id typeId,
QTC_ASSERT(canCreate(typeId), return 0); QTC_ASSERT(canCreate(typeId), return 0);
JsonKitsPage *page = new JsonKitsPage; JsonKitsPage *page = new JsonKitsPage;
page->setUnexpandedProjectPath(data.toMap().value(QLatin1String("projectFilePath")).toString()); page->setUnexpandedProjectPath(data.toMap().value(QLatin1String(KEY_PROJECT_FILE)).toString());
return page; return page;
} }
@@ -155,9 +157,10 @@ bool KitsPageFactory::validateData(Core::Id typeId, const QVariant &data, QStrin
} }
QVariantMap tmp = data.toMap(); QVariantMap tmp = data.toMap();
if (tmp.value(QLatin1String("projectFilePath")).toString().isEmpty()) { if (tmp.value(QLatin1String(KEY_PROJECT_FILE)).toString().isEmpty()) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizard", *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizard",
"\"Kits\" page requires a \"projectFilePath\" set."); "\"Kits\" page requires a \"%1\" set.")
.arg(QLatin1String(KEY_PROJECT_FILE));
return false; return false;
} }