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/cpptools/cpptoolssettings.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/cpptools/cpptoolssettings.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolssettings.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp index 877b86da62..08f1890e34 100644 --- a/src/plugins/cpptools/cpptoolssettings.cpp +++ b/src/plugins/cpptools/cpptoolssettings.cpp @@ -101,7 +101,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent) d->m_globalCodeStyle = new CppCodeStylePreferences(this); d->m_globalCodeStyle->setDelegatingPool(pool); d->m_globalCodeStyle->setDisplayName(tr("Global", "Settings")); - d->m_globalCodeStyle->setId(QLatin1String(idKey)); + d->m_globalCodeStyle->setId(idKey); pool->addCodeStyle(d->m_globalCodeStyle); TextEditorSettings::registerCodeStyle(CppTools::Constants::CPP_SETTINGS_ID, d->m_globalCodeStyle); @@ -133,7 +133,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent) // built-in settings // Qt style CppCodeStylePreferences *qtCodeStyle = new CppCodeStylePreferences(); - qtCodeStyle->setId(QLatin1String("qt")); + qtCodeStyle->setId("qt"); qtCodeStyle->setDisplayName(tr("Qt")); qtCodeStyle->setReadOnly(true); TabSettings qtTabSettings; @@ -146,7 +146,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent) // GNU style CppCodeStylePreferences *gnuCodeStyle = new CppCodeStylePreferences(); - gnuCodeStyle->setId(QLatin1String("gnu")); + gnuCodeStyle->setId("gnu"); gnuCodeStyle->setDisplayName(tr("GNU")); gnuCodeStyle->setReadOnly(true); TabSettings gnuTabSettings; @@ -208,8 +208,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent) QVariant v; v.setValue(legacyCodeStyleSettings); TextEditor::ICodeStylePreferences *oldCreator = pool->createCodeStyle( - QLatin1String("legacy"), legacyTabSettings, - v, tr("Old Creator")); + "legacy", legacyTabSettings, v, tr("Old Creator")); // change the current delegate and save d->m_globalCodeStyle->setCurrentDelegate(oldCreator); |