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

CodeStyleSettings: De-noise user code by using QByteArray ids.

Browse Source 
Change-Id: Ia7210b0ff85667951e4e5554155d89ed6925f9ec
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2013-09-20 10:35:16 +02:00
committed by David Schulz
parent e8a1b8c551
commit 09aad1ac4d
10 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljstools/qmljstoolssettings.cpp
View File

@@ -67,14 +67,14 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent)
m_globalCodeStyle = new SimpleCodeStylePreferences(this);
m_globalCodeStyle->setDelegatingPool(pool);
m_globalCodeStyle->setDisplayName(tr("Global", "Settings"));
m_globalCodeStyle->setId(QLatin1String(idKey));
m_globalCodeStyle->setId(idKey);
pool->addCodeStyle(m_globalCodeStyle);
TextEditorSettings::registerCodeStyle(QmlJSTools::Constants::QML_JS_SETTINGS_ID, m_globalCodeStyle);
// built-in settings
// Qt style
SimpleCodeStylePreferences *qtCodeStyle = new SimpleCodeStylePreferences();
qtCodeStyle->setId(QLatin1String("qt"));
qtCodeStyle->setId("qt");
qtCodeStyle->setDisplayName(tr("Qt"));
qtCodeStyle->setReadOnly(true);
TabSettings qtTabSettings;
@@ -122,8 +122,7 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent)
// create custom code style out of old settings
ICodeStylePreferences *oldCreator = pool->createCodeStyle(
QLatin1String("legacy"), legacyTabSettings,
QVariant(), tr("Old Creator"));
"legacy", legacyTabSettings, QVariant(), tr("Old Creator"));
// change the current delegate and save
m_globalCodeStyle->setCurrentDelegate(oldCreator);