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

Project: Improve fromMap() error reporting interface

Browse Source 
Instead of just a bool, return a tristate of: Ok, Error and UserAbort.
Also add a out parameter errorMessgge.

Change-Id: Icb076de49998e9372839d0631c2776e905e4a0f6
Task-number: QTCREATORBUG-13223
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-05-18 16:57:29 +02:00
parent 2d12884f2e
commit edad1ba516
15 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/project.cpp
View File

@@ -312,15 +312,15 @@ void Project::saveSettings()
d->m_accessor->saveSettings(toMap(), Core::ICore::mainWindow());
}
bool Project::restoreSettings()
Project::RestoreResult Project::restoreSettings(QString *errorMessage)
{
if (!d->m_accessor)
d->m_accessor = new Internal::UserFileAccessor(this);
QVariantMap map(d->m_accessor->restoreSettings(Core::ICore::mainWindow()));
bool ok = fromMap(map);
if (ok)
RestoreResult result = fromMap(map, errorMessage);
if (result == RestoreResult::Ok)
emit settingsLoaded();
return ok;
return result;
}
@@ -364,7 +364,7 @@ Utils::FileName Project::projectDirectory(const Utils::FileName &top)
}
bool Project::fromMap(const QVariantMap &map)
Project::RestoreResult Project::fromMap(const QVariantMap &map, QString *errorMessage)
{
if (map.contains(QLatin1String(EDITOR_SETTINGS_KEY))) {
QVariantMap values(map.value(QLatin1String(EDITOR_SETTINGS_KEY)).toMap());
@@ -385,8 +385,9 @@ bool Project::fromMap(const QVariantMap &map)
for (int i = 0; i < maxI; ++i) {
const QString key(QString::fromLatin1(TARGET_KEY_PREFIX) + QString::number(i));
if (!map.contains(key)) {
qWarning() << key << "was not found in data.";
return false;
if (errorMessage)
*errorMessage = tr("Target key %1 was not found in project settings.").arg(key);
return RestoreResult::Error;
}
QVariantMap targetMap = map.value(key).toMap();
@@ -399,7 +400,7 @@ bool Project::fromMap(const QVariantMap &map)
setActiveTarget(t);
}
return true;
return RestoreResult::Ok;
}
EditorConfiguration *Project::editorConfiguration() const