diff options
| author | hjk <hjk121@nokiamail.com> | 2013-09-20 10:35:16 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@digia.com> | 2013-09-25 09:43:22 +0200 |
| commit | 09aad1ac4d455b2e40969013d0299117e7872961 (patch) | |
| tree | 288ce9760d6bcacfe003d11a923fa7b0fc5a2f8e /src/plugins/projectexplorer/editorconfiguration.cpp | |
| parent | e8a1b8c551f98dce2884e8b54a2726410a551a6f (diff) | |
| download | qt-creator-09aad1ac4d455b2e40969013d0299117e7872961.tar.gz | |
CodeStyleSettings: De-noise user code by using QByteArray ids.
Change-Id: Ia7210b0ff85667951e4e5554155d89ed6925f9ec
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/editorconfiguration.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/editorconfiguration.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 62cada1656..6af46548a6 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -53,7 +53,6 @@ static const QLatin1String kUseGlobal("EditorConfiguration.UseGlobal"); static const QLatin1String kCodec("EditorConfiguration.Codec"); static const QLatin1String kCodeStylePrefix("EditorConfiguration.CodeStyle."); static const QLatin1String kCodeStyleCount("EditorConfiguration.CodeStyle.Count"); -static const QLatin1String kId("Project"); using namespace TextEditor; @@ -93,7 +92,7 @@ EditorConfiguration::EditorConfiguration() : d(new EditorConfigurationPrivate) ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory(languageId); ICodeStylePreferences *preferences = factory->createCodeStyle(); preferences->setDelegatingPool(TextEditorSettings::codeStylePool(languageId)); - preferences->setId(languageId.toString() + QLatin1String("Project")); + preferences->setId(languageId.name() + "Project"); preferences->setDisplayName(tr("Project %1", "Settings, %1 is a language (C++ or QML)").arg(factory->displayName())); preferences->setCurrentDelegate(originalPreferences); d->m_languageCodeStylePreferences.insert(languageId, preferences); @@ -102,7 +101,7 @@ EditorConfiguration::EditorConfiguration() : d(new EditorConfigurationPrivate) d->m_defaultCodeStyle = new SimpleCodeStylePreferences(this); d->m_defaultCodeStyle->setDelegatingPool(TextEditorSettings::codeStylePool()); d->m_defaultCodeStyle->setDisplayName(tr("Project", "Settings")); - d->m_defaultCodeStyle->setId(kId); + d->m_defaultCodeStyle->setId("Project"); d->m_defaultCodeStyle->setCurrentDelegate(d->m_useGlobal ? TextEditorSettings::codeStyle() : 0); } |