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

Move EditorSettings over to new save/restore scheme

Browse Source 
Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-01-14 16:24:21 +01:00
parent 533a85a62a
commit c410d268db
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ using namespace ProjectExplorer::Internal;
namespace {
const char * const PROJECT_FILE_POSTFIX(".user");
const char * const EDITOR_SETTINGS_KEY("ProjectExplorer.Project.EditorSettings");
} // namespace
// -------------------------------------------------------------------------
@@ -211,7 +212,7 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
writer.setPrefix(QString::null);
writer.saveValue("activeRunConfiguration", activeId);
writer.saveValue("defaultFileEncoding", m_editorConfiguration->defaultTextCodec()->name());
writer.saveValue(QLatin1String(EDITOR_SETTINGS_KEY), m_editorConfiguration->toMap());
}
bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
@@ -386,13 +387,11 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
}
reader.setPrefix(QString::null);
QTextCodec *codec = QTextCodec::codecForName(reader.restoreValue("defaultFileEncoding").toByteArray());
if (codec)
m_editorConfiguration->setDefaultTextCodec(codec);
if (!m_activeRunConfiguration && !m_runConfigurations.isEmpty())
setActiveRunConfiguration(m_runConfigurations.at(0));
return true;
QVariantMap tmp = reader.restoreValue(QLatin1String(EDITOR_SETTINGS_KEY)).toMap();
return m_editorConfiguration->fromMap(tmp);
}
BuildConfiguration *Project::activeBuildConfiguration() const