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

utils, qmljstools, vcsbase: s/\bm_d\b/d/g

Browse Source 
Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-09-15 13:42:38 +02:00
committed by hjk
parent 4083880073
commit 28535f7571
22 changed files with 202 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ QmlJSToolsSettings *QmlJSToolsSettings::m_instance = 0;
QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent)
: QObject(parent)
, m_d(new Internal::QmlJSToolsSettingsPrivate)
, d(new Internal::QmlJSToolsSettingsPrivate)
{
QTC_ASSERT(!m_instance, return);
m_instance = this;
@@ -68,21 +68,21 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent)
if (const QSettings *s = Core::ICore::instance()->settings()) {
TextEditor::TextEditorSettings *textEditorSettings = TextEditor::TextEditorSettings::instance();
TextEditor::TabPreferences *tabPrefs = textEditorSettings->tabPreferences();
m_d->m_tabPreferences
d->m_tabPreferences
= new TextEditor::TabPreferences(QList<TextEditor::IFallbackPreferences *>()
<< tabPrefs, this);
m_d->m_tabPreferences->setCurrentFallback(tabPrefs);
m_d->m_tabPreferences->setFallbackEnabled(tabPrefs, false);
m_d->m_tabPreferences->fromSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID, s);
m_d->m_tabPreferences->setDisplayName(tr("Global Qt Quick", "Settings"));
m_d->m_tabPreferences->setId(idKey);
textEditorSettings->registerLanguageTabPreferences(QmlJSTools::Constants::QML_JS_SETTINGS_ID, m_d->m_tabPreferences);
d->m_tabPreferences->setCurrentFallback(tabPrefs);
d->m_tabPreferences->setFallbackEnabled(tabPrefs, false);
d->m_tabPreferences->fromSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID, s);
d->m_tabPreferences->setDisplayName(tr("Global Qt Quick", "Settings"));
d->m_tabPreferences->setId(idKey);
textEditorSettings->registerLanguageTabPreferences(QmlJSTools::Constants::QML_JS_SETTINGS_ID, d->m_tabPreferences);
}
}
QmlJSToolsSettings::~QmlJSToolsSettings()
{
delete m_d;
delete d;
m_instance = 0;
}
@@ -94,7 +94,7 @@ QmlJSToolsSettings *QmlJSToolsSettings::instance()
TextEditor::TabPreferences *QmlJSToolsSettings::tabPreferences() const
{
return m_d->m_tabPreferences;
return d->m_tabPreferences;
}