more style

Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115
Reviewed-by: hjk <qthjk@ovi.com>

15 files changed, 322 insertions, 322 deletions

diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp
index 7ff561b280..3b57cb4294 100644
--- a/src/plugins/texteditor/behaviorsettingspage.cpp
+++ b/src/plugins/texteditor/behaviorsettingspage.cpp
@@ -86,50 +86,50 @@ void BehaviorSettingsPage::BehaviorSettingsPagePrivate::init()
 BehaviorSettingsPage::BehaviorSettingsPage(const BehaviorSettingsPageParameters &p,
                                            QObject *parent)
   : TextEditorOptionsPage(parent),
-    m_d(new BehaviorSettingsPagePrivate(p))
+    d(new BehaviorSettingsPagePrivate(p))
 {
-    m_d->m_tabPreferences = new TabPreferences(QList<IFallbackPreferences *>(), this);
-    m_d->m_tabPreferences->setDisplayName(tr("Global", "Settings"));
-    m_d->m_tabPreferences->setId(Constants::GLOBAL_SETTINGS_ID);
-    m_d->init();
+    d->m_tabPreferences = new TabPreferences(QList<IFallbackPreferences *>(), this);
+    d->m_tabPreferences->setDisplayName(tr("Global", "Settings"));
+    d->m_tabPreferences->setId(Constants::GLOBAL_SETTINGS_ID);
+    d->init();
 }
 
 BehaviorSettingsPage::~BehaviorSettingsPage()
 {
-    delete m_d;
+    delete d;
 }
 
 QString BehaviorSettingsPage::id() const
 {
-    return m_d->m_parameters.id;
+    return d->m_parameters.id;
 }
 
 QString BehaviorSettingsPage::displayName() const
 {
-    return m_d->m_parameters.displayName;
+    return d->m_parameters.displayName;
 }
 
 QWidget *BehaviorSettingsPage::createPage(QWidget *parent)
 {
     QWidget *w = new QWidget(parent);
-    m_d->m_page = new Ui::BehaviorSettingsPage;
-    m_d->m_page->setupUi(w);
-    m_d->m_pageTabPreferences = new TabPreferences(m_d->m_tabPreferences->fallbacks(), w);
-    m_d->m_pageTabPreferences->setSettings(m_d->m_tabPreferences->settings());
-    m_d->m_pageTabPreferences->setCurrentFallback(m_d->m_tabPreferences->currentFallback());
-    m_d->m_page->behaviorWidget->setTabPreferences(m_d->m_pageTabPreferences);
+    d->m_page = new Ui::BehaviorSettingsPage;
+    d->m_page->setupUi(w);
+    d->m_pageTabPreferences = new TabPreferences(d->m_tabPreferences->fallbacks(), w);
+    d->m_pageTabPreferences->setSettings(d->m_tabPreferences->settings());
+    d->m_pageTabPreferences->setCurrentFallback(d->m_tabPreferences->currentFallback());
+    d->m_page->behaviorWidget->setTabPreferences(d->m_pageTabPreferences);
 
     settingsToUI();
 
-    if (m_d->m_searchKeywords.isEmpty())
-        m_d->m_searchKeywords = m_d->m_page->behaviorWidget->collectUiKeywords();
+    if (d->m_searchKeywords.isEmpty())
+        d->m_searchKeywords = d->m_page->behaviorWidget->collectUiKeywords();
 
     return w;
 }
 
 void BehaviorSettingsPage::apply()
 {
-    if (!m_d->m_page) // page was never shown
+    if (!d->m_page) // page was never shown
         return;
 
     StorageSettings newStorageSettings;
@@ -141,45 +141,45 @@ void BehaviorSettingsPage::apply()
 
     QSettings *s = Core::ICore::instance()->settings();
 
-    if (m_d->m_tabPreferences->settings() != m_d->m_pageTabPreferences->settings()) {
-        m_d->m_tabPreferences->setSettings(m_d->m_pageTabPreferences->settings());
+    if (d->m_tabPreferences->settings() != d->m_pageTabPreferences->settings()) {
+        d->m_tabPreferences->setSettings(d->m_pageTabPreferences->settings());
         if (s)
-            m_d->m_tabPreferences->toSettings(m_d->m_parameters.settingsPrefix, s);
+            d->m_tabPreferences->toSettings(d->m_parameters.settingsPrefix, s);
     }
 
-    if (m_d->m_tabPreferences->currentFallback() != m_d->m_pageTabPreferences->currentFallback()) {
-        m_d->m_tabPreferences->setCurrentFallback(m_d->m_pageTabPreferences->currentFallback());
+    if (d->m_tabPreferences->currentFallback() != d->m_pageTabPreferences->currentFallback()) {
+        d->m_tabPreferences->setCurrentFallback(d->m_pageTabPreferences->currentFallback());
         if (s)
-            m_d->m_tabPreferences->toSettings(m_d->m_parameters.settingsPrefix, s);
+            d->m_tabPreferences->toSettings(d->m_parameters.settingsPrefix, s);
     }
 
-    if (newStorageSettings != m_d->m_storageSettings) {
-        m_d->m_storageSettings = newStorageSettings;
+    if (newStorageSettings != d->m_storageSettings) {
+        d->m_storageSettings = newStorageSettings;
         if (s)
-            m_d->m_storageSettings.toSettings(m_d->m_parameters.settingsPrefix, s);
+            d->m_storageSettings.toSettings(d->m_parameters.settingsPrefix, s);
 
         emit storageSettingsChanged(newStorageSettings);
     }
 
-    if (newBehaviorSettings != m_d->m_behaviorSettings) {
-        m_d->m_behaviorSettings = newBehaviorSettings;
+    if (newBehaviorSettings != d->m_behaviorSettings) {
+        d->m_behaviorSettings = newBehaviorSettings;
         if (s)
-            m_d->m_behaviorSettings.toSettings(m_d->m_parameters.settingsPrefix, s);
+            d->m_behaviorSettings.toSettings(d->m_parameters.settingsPrefix, s);
 
         emit behaviorSettingsChanged(newBehaviorSettings);
     }
 
-    if (newExtraEncodingSettings != m_d->m_extraEncodingSettings) {
-        m_d->m_extraEncodingSettings = newExtraEncodingSettings;
+    if (newExtraEncodingSettings != d->m_extraEncodingSettings) {
+        d->m_extraEncodingSettings = newExtraEncodingSettings;
         if (s)
-            m_d->m_extraEncodingSettings.toSettings(m_d->m_parameters.settingsPrefix, s);
+            d->m_extraEncodingSettings.toSettings(d->m_parameters.settingsPrefix, s);
 
         emit extraEncodingSettingsChanged(newExtraEncodingSettings);
     }
 
     if (s) {
         s->setValue(QLatin1String(Core::Constants::SETTINGS_DEFAULTTEXTENCODING),
-                    m_d->m_page->behaviorWidget->assignedCodec()->name());
+                    d->m_page->behaviorWidget->assignedCodec()->name());
     }
 }
 
@@ -187,49 +187,49 @@ void BehaviorSettingsPage::settingsFromUI(StorageSettings *storageSettings,
                                           BehaviorSettings *behaviorSettings,
                                           ExtraEncodingSettings *extraEncodingSettings) const
 {
-    m_d->m_page->behaviorWidget->assignedStorageSettings(storageSettings);
-    m_d->m_page->behaviorWidget->assignedBehaviorSettings(behaviorSettings);
-    m_d->m_page->behaviorWidget->assignedExtraEncodingSettings(extraEncodingSettings);
+    d->m_page->behaviorWidget->assignedStorageSettings(storageSettings);
+    d->m_page->behaviorWidget->assignedBehaviorSettings(behaviorSettings);
+    d->m_page->behaviorWidget->assignedExtraEncodingSettings(extraEncodingSettings);
 }
 
 void BehaviorSettingsPage::settingsToUI()
 {
-    m_d->m_page->behaviorWidget->setAssignedStorageSettings(m_d->m_storageSettings);
-    m_d->m_page->behaviorWidget->setAssignedBehaviorSettings(m_d->m_behaviorSettings);
-    m_d->m_page->behaviorWidget->setAssignedExtraEncodingSettings(m_d->m_extraEncodingSettings);
-    m_d->m_page->behaviorWidget->setAssignedCodec(
+    d->m_page->behaviorWidget->setAssignedStorageSettings(d->m_storageSettings);
+    d->m_page->behaviorWidget->setAssignedBehaviorSettings(d->m_behaviorSettings);
+    d->m_page->behaviorWidget->setAssignedExtraEncodingSettings(d->m_extraEncodingSettings);
+    d->m_page->behaviorWidget->setAssignedCodec(
         Core::EditorManager::instance()->defaultTextCodec());
 }
 
 void BehaviorSettingsPage::finish()
 {
-    if (!m_d->m_page) // page was never shown
+    if (!d->m_page) // page was never shown
         return;
-    delete m_d->m_page;
-    m_d->m_page = 0;
+    delete d->m_page;
+    d->m_page = 0;
 }
 
 const StorageSettings &BehaviorSettingsPage::storageSettings() const
 {
-    return m_d->m_storageSettings;
+    return d->m_storageSettings;
 }
 
 const BehaviorSettings &BehaviorSettingsPage::behaviorSettings() const
 {
-    return m_d->m_behaviorSettings;
+    return d->m_behaviorSettings;
 }
 
 const ExtraEncodingSettings &BehaviorSettingsPage::extraEncodingSettings() const
 {
-    return m_d->m_extraEncodingSettings;
+    return d->m_extraEncodingSettings;
 }
 
 TabPreferences *BehaviorSettingsPage::tabPreferences() const
 {
-    return m_d->m_tabPreferences;
+    return d->m_tabPreferences;
 }
 
 bool BehaviorSettingsPage::matches(const QString &s) const
 {
-    return m_d->m_searchKeywords.contains(s, Qt::CaseInsensitive);
+    return d->m_searchKeywords.contains(s, Qt::CaseInsensitive);
 }
diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h
index 3c394fe28c..fa575c68f4 100644
--- a/src/plugins/texteditor/behaviorsettingspage.h
+++ b/src/plugins/texteditor/behaviorsettingspage.h
@@ -90,7 +90,7 @@ private:
 
     QList<QTextCodec *> m_codecs;
     struct BehaviorSettingsPagePrivate;
-    BehaviorSettingsPagePrivate *m_d;
+    BehaviorSettingsPagePrivate *d;
 };
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp
index 46f222df23..5835d6eafd 100644
--- a/src/plugins/texteditor/behaviorsettingswidget.cpp
+++ b/src/plugins/texteditor/behaviorsettingswidget.cpp
@@ -57,9 +57,9 @@ struct BehaviorSettingsWidgetPrivate
 
 BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent)
     : QWidget(parent)
-    , m_d(new BehaviorSettingsWidgetPrivate)
+    , d(new BehaviorSettingsWidgetPrivate)
 {
-    m_d->m_ui.setupUi(this);
+    d->m_ui.setupUi(this);
 
     QList<int> mibs = QTextCodec::availableMibs();
     qSort(mibs);
@@ -74,48 +74,48 @@ BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent)
             compoundName += QLatin1String(" / ");
             compoundName += QString::fromLatin1(alias);
         }
-        m_d->m_ui.encodingBox->addItem(compoundName);
-        m_d->m_codecs.append(codec);
+        d->m_ui.encodingBox->addItem(compoundName);
+        d->m_codecs.append(codec);
     }
 
-    connect(m_d->m_ui.cleanWhitespace, SIGNAL(clicked(bool)),
+    connect(d->m_ui.cleanWhitespace, SIGNAL(clicked(bool)),
             this, SLOT(slotStorageSettingsChanged()));
-    connect(m_d->m_ui.inEntireDocument, SIGNAL(clicked(bool)),
+    connect(d->m_ui.inEntireDocument, SIGNAL(clicked(bool)),
             this, SLOT(slotStorageSettingsChanged()));
-    connect(m_d->m_ui.addFinalNewLine, SIGNAL(clicked(bool)),
+    connect(d->m_ui.addFinalNewLine, SIGNAL(clicked(bool)),
             this, SLOT(slotStorageSettingsChanged()));
-    connect(m_d->m_ui.cleanIndentation, SIGNAL(clicked(bool)),
+    connect(d->m_ui.cleanIndentation, SIGNAL(clicked(bool)),
             this, SLOT(slotStorageSettingsChanged()));
-    connect(m_d->m_ui.mouseNavigation, SIGNAL(clicked()),
+    connect(d->m_ui.mouseNavigation, SIGNAL(clicked()),
             this, SLOT(slotBehaviorSettingsChanged()));
-    connect(m_d->m_ui.scrollWheelZooming, SIGNAL(clicked(bool)),
+    connect(d->m_ui.scrollWheelZooming, SIGNAL(clicked(bool)),
             this, SLOT(slotBehaviorSettingsChanged()));
-    connect(m_d->m_ui.constrainTooltips, SIGNAL(clicked()),
+    connect(d->m_ui.constrainTooltips, SIGNAL(clicked()),
             this, SLOT(slotBehaviorSettingsChanged()));
-    connect(m_d->m_ui.utf8BomBox, SIGNAL(currentIndexChanged(int)),
+    connect(d->m_ui.utf8BomBox, SIGNAL(currentIndexChanged(int)),
             this, SLOT(slotExtraEncodingChanged()));
-    connect(m_d->m_ui.encodingBox, SIGNAL(currentIndexChanged(int)),
+    connect(d->m_ui.encodingBox, SIGNAL(currentIndexChanged(int)),
             this, SLOT(slotEncodingBoxChanged(int)));
 }
 
 BehaviorSettingsWidget::~BehaviorSettingsWidget()
 {
-    delete m_d;
+    delete d;
 }
 
 void BehaviorSettingsWidget::setActive(bool active)
 {
-    m_d->m_ui.tabPreferencesWidget->setEnabled(active);
-    m_d->m_ui.groupBoxEncodings->setEnabled(active);
-    m_d->m_ui.groupBoxMouse->setEnabled(active);
-    m_d->m_ui.groupBoxStorageSettings->setEnabled(active);
+    d->m_ui.tabPreferencesWidget->setEnabled(active);
+    d->m_ui.groupBoxEncodings->setEnabled(active);
+    d->m_ui.groupBoxMouse->setEnabled(active);
+    d->m_ui.groupBoxStorageSettings->setEnabled(active);
 }
 
 void BehaviorSettingsWidget::setAssignedCodec(QTextCodec *codec)
 {
-    for (int i = 0; i < m_d->m_codecs.size(); ++i) {
-        if (codec == m_d->m_codecs.at(i)) {
-            m_d->m_ui.encodingBox->setCurrentIndex(i);
+    for (int i = 0; i < d->m_codecs.size(); ++i) {
+        if (codec == d->m_codecs.at(i)) {
+            d->m_ui.encodingBox->setCurrentIndex(i);
             break;
         }
     }
@@ -123,55 +123,55 @@ void BehaviorSettingsWidget::setAssignedCodec(QTextCodec *codec)
 
 QTextCodec *BehaviorSettingsWidget::assignedCodec() const
 {
-    return m_d->m_codecs.at(m_d->m_ui.encodingBox->currentIndex());
+    return d->m_codecs.at(d->m_ui.encodingBox->currentIndex());
 }
 
 void BehaviorSettingsWidget::setTabPreferences(TabPreferences *tabPreferences)
 {
-    m_d->m_ui.tabPreferencesWidget->setTabPreferences(tabPreferences);
+    d->m_ui.tabPreferencesWidget->setTabPreferences(tabPreferences);
 }
 
 void BehaviorSettingsWidget::setAssignedStorageSettings(const StorageSettings &storageSettings)
 {
-    m_d->m_ui.cleanWhitespace->setChecked(storageSettings.m_cleanWhitespace);
-    m_d->m_ui.inEntireDocument->setChecked(storageSettings.m_inEntireDocument);
-    m_d->m_ui.cleanIndentation->setChecked(storageSettings.m_cleanIndentation);
-    m_d->m_ui.addFinalNewLine->setChecked(storageSettings.m_addFinalNewLine);
+    d->m_ui.cleanWhitespace->setChecked(storageSettings.m_cleanWhitespace);
+    d->m_ui.inEntireDocument->setChecked(storageSettings.m_inEntireDocument);
+    d->m_ui.cleanIndentation->setChecked(storageSettings.m_cleanIndentation);
+    d->m_ui.addFinalNewLine->setChecked(storageSettings.m_addFinalNewLine);
 }
 
 void BehaviorSettingsWidget::assignedStorageSettings(StorageSettings *storageSettings) const
 {
-    storageSettings->m_cleanWhitespace = m_d->m_ui.cleanWhitespace->isChecked();
-    storageSettings->m_inEntireDocument = m_d->m_ui.inEntireDocument->isChecked();
-    storageSettings->m_cleanIndentation = m_d->m_ui.cleanIndentation->isChecked();
-    storageSettings->m_addFinalNewLine = m_d->m_ui.addFinalNewLine->isChecked();
+    storageSettings->m_cleanWhitespace = d->m_ui.cleanWhitespace->isChecked();
+    storageSettings->m_inEntireDocument = d->m_ui.inEntireDocument->isChecked();
+    storageSettings->m_cleanIndentation = d->m_ui.cleanIndentation->isChecked();
+    storageSettings->m_addFinalNewLine = d->m_ui.addFinalNewLine->isChecked();
 }
 
 void BehaviorSettingsWidget::setAssignedBehaviorSettings(const BehaviorSettings &behaviorSettings)
 {
-    m_d->m_ui.mouseNavigation->setChecked(behaviorSettings.m_mouseNavigation);
-    m_d->m_ui.scrollWheelZooming->setChecked(behaviorSettings.m_scrollWheelZooming);
-    m_d->m_ui.constrainTooltips->setChecked(behaviorSettings.m_constrainTooltips);
+    d->m_ui.mouseNavigation->setChecked(behaviorSettings.m_mouseNavigation);
+    d->m_ui.scrollWheelZooming->setChecked(behaviorSettings.m_scrollWheelZooming);
+    d->m_ui.constrainTooltips->setChecked(behaviorSettings.m_constrainTooltips);
 }
 
 void BehaviorSettingsWidget::assignedBehaviorSettings(BehaviorSettings *behaviorSettings) const
 {
-    behaviorSettings->m_mouseNavigation = m_d->m_ui.mouseNavigation->isChecked();
-    behaviorSettings->m_scrollWheelZooming = m_d->m_ui.scrollWheelZooming->isChecked();
-    behaviorSettings->m_constrainTooltips = m_d->m_ui.constrainTooltips->isChecked();
+    behaviorSettings->m_mouseNavigation = d->m_ui.mouseNavigation->isChecked();
+    behaviorSettings->m_scrollWheelZooming = d->m_ui.scrollWheelZooming->isChecked();
+    behaviorSettings->m_constrainTooltips = d->m_ui.constrainTooltips->isChecked();
 }
 
 void BehaviorSettingsWidget::setAssignedExtraEncodingSettings(
     const ExtraEncodingSettings &encodingSettings)
 {
-    m_d->m_ui.utf8BomBox->setCurrentIndex(encodingSettings.m_utf8BomSetting);
+    d->m_ui.utf8BomBox->setCurrentIndex(encodingSettings.m_utf8BomSetting);
 }
 
 void BehaviorSettingsWidget::assignedExtraEncodingSettings(
     ExtraEncodingSettings *encodingSettings) const
 {
     encodingSettings->m_utf8BomSetting =
-        (ExtraEncodingSettings::Utf8BomSetting)m_d->m_ui.utf8BomBox->currentIndex();
+        (ExtraEncodingSettings::Utf8BomSetting)d->m_ui.utf8BomBox->currentIndex();
 }
 
 QString BehaviorSettingsWidget::collectUiKeywords() const
@@ -179,26 +179,26 @@ QString BehaviorSettingsWidget::collectUiKeywords() const
     static const QLatin1Char sep(' ');
     QString keywords;
     QTextStream(&keywords)
-        << sep << m_d->m_ui.tabPreferencesWidget->searchKeywords()
-        << sep << m_d->m_ui.cleanWhitespace->text()
-        << sep << m_d->m_ui.inEntireDocument->text()
-        << sep << m_d->m_ui.cleanIndentation->text()
-        << sep << m_d->m_ui.addFinalNewLine->text()
-        << sep << m_d->m_ui.encodingLabel->text()
-        << sep << m_d->m_ui.utf8BomLabel->text()
-        << sep << m_d->m_ui.mouseNavigation->text()
-        << sep << m_d->m_ui.scrollWheelZooming->text()
-        << sep << m_d->m_ui.constrainTooltips->text()
-        << sep << m_d->m_ui.groupBoxStorageSettings->title()
-        << sep << m_d->m_ui.groupBoxEncodings->title()
-        << sep << m_d->m_ui.groupBoxMouse->title();
+        << sep << d->m_ui.tabPreferencesWidget->searchKeywords()
+        << sep << d->m_ui.cleanWhitespace->text()
+        << sep << d->m_ui.inEntireDocument->text()
+        << sep << d->m_ui.cleanIndentation->text()
+        << sep << d->m_ui.addFinalNewLine->text()
+        << sep << d->m_ui.encodingLabel->text()
+        << sep << d->m_ui.utf8BomLabel->text()
+        << sep << d->m_ui.mouseNavigation->text()
+        << sep << d->m_ui.scrollWheelZooming->text()
+        << sep << d->m_ui.constrainTooltips->text()
+        << sep << d->m_ui.groupBoxStorageSettings->title()
+        << sep << d->m_ui.groupBoxEncodings->title()
+        << sep << d->m_ui.groupBoxMouse->title();
     keywords.remove(QLatin1Char('&'));
     return keywords;
 }
 
 void BehaviorSettingsWidget::setFallbacksVisible(bool on)
 {
-    m_d->m_ui.tabPreferencesWidget->setFallbacksVisible(on);
+    d->m_ui.tabPreferencesWidget->setFallbacksVisible(on);
 }
 
 void BehaviorSettingsWidget::slotStorageSettingsChanged()
@@ -224,7 +224,7 @@ void BehaviorSettingsWidget::slotExtraEncodingChanged()
 
 void BehaviorSettingsWidget::slotEncodingBoxChanged(int index)
 {
-    emit textCodecChanged(m_d->m_codecs.at(index));
+    emit textCodecChanged(d->m_codecs.at(index));
 }
 
 } // TextEditor
diff --git a/src/plugins/texteditor/behaviorsettingswidget.h b/src/plugins/texteditor/behaviorsettingswidget.h
index e2553551ae..31133a977a 100644
--- a/src/plugins/texteditor/behaviorsettingswidget.h
+++ b/src/plugins/texteditor/behaviorsettingswidget.h
@@ -91,7 +91,7 @@ private slots:
     void slotEncodingBoxChanged(int index);
 
 private:
-    BehaviorSettingsWidgetPrivate *m_d;
+    BehaviorSettingsWidgetPrivate *d;
 };
 
 } // TextEditor
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index ad7e66591b..42487639f6 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -157,7 +157,8 @@ CodeAssistantPrivate::CodeAssistantPrivate(CodeAssistant *assistant)
 }
 
 CodeAssistantPrivate::~CodeAssistantPrivate()
-{}
+{
+}
 
 void CodeAssistantPrivate::configure(BaseTextEditor *textEditor)
 {
@@ -481,40 +482,42 @@ bool CodeAssistantPrivate::eventFilter(QObject *o, QEvent *e)
 // -------------
 // CodeAssistant
 // -------------
-CodeAssistant::CodeAssistant() : m_d(new CodeAssistantPrivate(this))
+CodeAssistant::CodeAssistant() : d(new CodeAssistantPrivate(this))
 {}
 
 CodeAssistant::~CodeAssistant()
-{}
+{
+    delete d;
+}
 
 void CodeAssistant::configure(BaseTextEditor *textEditor)
 {
-    m_d->configure(textEditor);
+    d->configure(textEditor);
 }
 
 void CodeAssistant::process()
 {
-    m_d->process();
+    d->process();
 }
 
 void CodeAssistant::notifyChange()
 {
-    m_d->notifyChange();
+    d->notifyChange();
 }
 
 bool CodeAssistant::hasContext() const
 {
-    return m_d->hasContext();
+    return d->hasContext();
 }
 
 void CodeAssistant::destroyContext()
 {
-    m_d->destroyContext();
+    d->destroyContext();
 }
 
 void CodeAssistant::invoke(AssistKind kind, IAssistProvider *provider)
 {
-    m_d->invoke(kind, provider);
+    d->invoke(kind, provider);
 }
 
 #include "codeassistant.moc"
diff --git a/src/plugins/texteditor/codeassist/codeassistant.h b/src/plugins/texteditor/codeassist/codeassistant.h
index ec7eb00f9a..eb77b819fb 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.h
+++ b/src/plugins/texteditor/codeassist/codeassistant.h
@@ -37,8 +37,6 @@
 
 #include <texteditor/texteditor_global.h>
 
-#include <QtCore/QScopedPointer>
-
 namespace TextEditor {
 
 class CodeAssistantPrivate;
@@ -61,7 +59,7 @@ public:
     void invoke(AssistKind assistKind, IAssistProvider *provider = 0);
 
 private:
-    QScopedPointer<CodeAssistantPrivate> m_d;
+    CodeAssistantPrivate *d;
 };
 
 } //TextEditor
diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
index f355365b43..04acd04785 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
@@ -89,7 +89,7 @@ FunctionHintProposalWidgetPrivate::FunctionHintProposalWidgetPrivate()
 // HintProposalWidget
 // ------------------
 FunctionHintProposalWidget::FunctionHintProposalWidget()
-    : m_d(new FunctionHintProposalWidgetPrivate)
+    : d(new FunctionHintProposalWidgetPrivate)
 {
     QToolButton *downArrow = new QToolButton;
     downArrow->setArrowType(Qt::DownArrow);
@@ -101,18 +101,18 @@ FunctionHintProposalWidget::FunctionHintProposalWidget()
     upArrow->setFixedSize(16, 16);
     upArrow->setAutoRaise(true);
 
-    QHBoxLayout *pagerLayout = new QHBoxLayout(m_d->m_pager);
+    QHBoxLayout *pagerLayout = new QHBoxLayout(d->m_pager);
     pagerLayout->setMargin(0);
     pagerLayout->setSpacing(0);
     pagerLayout->addWidget(upArrow);
-    pagerLayout->addWidget(m_d->m_numberLabel);
+    pagerLayout->addWidget(d->m_numberLabel);
     pagerLayout->addWidget(downArrow);
 
-    QHBoxLayout *popupLayout = new QHBoxLayout(m_d->m_popupFrame);
+    QHBoxLayout *popupLayout = new QHBoxLayout(d->m_popupFrame);
     popupLayout->setMargin(0);
     popupLayout->setSpacing(0);
-    popupLayout->addWidget(m_d->m_pager);
-    popupLayout->addWidget(m_d->m_hintLabel);
+    popupLayout->addWidget(d->m_pager);
+    popupLayout->addWidget(d->m_hintLabel);
 
     connect(upArrow, SIGNAL(clicked()), SLOT(previousPage()));
     connect(downArrow, SIGNAL(clicked()), SLOT(nextPage()));
@@ -124,12 +124,13 @@ FunctionHintProposalWidget::FunctionHintProposalWidget()
 
 FunctionHintProposalWidget::~FunctionHintProposalWidget()
 {
-    delete m_d->m_model;
+    delete d->m_model;
+    delete d;
 }
 
 void FunctionHintProposalWidget::setAssistant(CodeAssistant *assistant)
 {
-    m_d->m_assistant = assistant;
+    d->m_assistant = assistant;
 }
 
 void FunctionHintProposalWidget::setReason(AssistReason)
@@ -140,17 +141,17 @@ void FunctionHintProposalWidget::setKind(AssistKind)
 
 void FunctionHintProposalWidget::setUnderlyingWidget(const QWidget *underlyingWidget)
 {
-    m_d->m_underlyingWidget = underlyingWidget;
+    d->m_underlyingWidget = underlyingWidget;
 }
 
 void FunctionHintProposalWidget::setModel(IAssistProposalModel *model)
 {
-    m_d->m_model = static_cast<IFunctionHintProposalModel *>(model);
+    d->m_model = static_cast<IFunctionHintProposalModel *>(model);
 }
 
 void FunctionHintProposalWidget::setDisplayRect(const QRect &rect)
 {
-    m_d->m_displayRect = rect;
+    d->m_displayRect = rect;
 }
 
 void FunctionHintProposalWidget::setIsSynchronized(bool)
@@ -158,18 +159,18 @@ void FunctionHintProposalWidget::setIsSynchronized(bool)
 
 void FunctionHintProposalWidget::showProposal(const QString &prefix)
 {
-    m_d->m_totalHints = m_d->m_model->size();
-    if (m_d->m_totalHints == 0) {
+    d->m_totalHints = d->m_model->size();
+    if (d->m_totalHints == 0) {
         abort();
         return;
     }
-    m_d->m_pager->setVisible(m_d->m_totalHints > 1);
-    m_d->m_currentHint = 0;
+    d->m_pager->setVisible(d->m_totalHints > 1);
+    d->m_currentHint = 0;
     if (!updateAndCheck(prefix)) {
         abort();
         return;
     }
-    m_d->m_popupFrame->show();
+    d->m_popupFrame->show();
 }
 
 void FunctionHintProposalWidget::updateProposal(const QString &prefix)
@@ -184,8 +185,8 @@ void FunctionHintProposalWidget::closeProposal()
 
 void FunctionHintProposalWidget::abort()
 {
-    if (m_d->m_popupFrame->isVisible())
-        m_d->m_popupFrame->close();
+    if (d->m_popupFrame->isVisible())
+        d->m_popupFrame->close();
     deleteLater();
 }
 
@@ -194,14 +195,14 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e)
     switch (e->type()) {
     case QEvent::ShortcutOverride:
         if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) {
-            m_d->m_escapePressed = true;
+            d->m_escapePressed = true;
         }
         break;
     case QEvent::KeyPress:
         if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) {
-            m_d->m_escapePressed = true;
+            d->m_escapePressed = true;
         }
-        if (m_d->m_model->size() > 1) {
+        if (d->m_model->size() > 1) {
             QKeyEvent *ke = static_cast<QKeyEvent*>(e);
             if (ke->key() == Qt::Key_Up) {
                 previousPage();
@@ -214,15 +215,15 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e)
         }
         break;
     case QEvent::KeyRelease:
-        if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape && m_d->m_escapePressed) {
+        if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape && d->m_escapePressed) {
             abort();
             return false;
         }
-        m_d->m_assistant->notifyChange();
+        d->m_assistant->notifyChange();
         break;
     case QEvent::WindowDeactivate:
     case QEvent::FocusOut:
-        if (obj != m_d->m_underlyingWidget) {
+        if (obj != d->m_underlyingWidget) {
             break;
         }
         abort();
@@ -245,27 +246,27 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e)
 
 void FunctionHintProposalWidget::nextPage()
 {
-    m_d->m_currentHint = (m_d->m_currentHint + 1) % m_d->m_totalHints;
+    d->m_currentHint = (d->m_currentHint + 1) % d->m_totalHints;
     updateContent();
 }
 
 void FunctionHintProposalWidget::previousPage()
 {
-    if (m_d->m_currentHint == 0)
-        m_d->m_currentHint = m_d->m_totalHints - 1;
+    if (d->m_currentHint == 0)
+        d->m_currentHint = d->m_totalHints - 1;
     else
-        --m_d->m_currentHint;
+        --d->m_currentHint;
     updateContent();
 }
 
 bool FunctionHintProposalWidget::updateAndCheck(const QString &prefix)
 {
-    const int activeArgument = m_d->m_model->activeArgument(prefix);
+    const int activeArgument = d->m_model->activeArgument(prefix);
     if (activeArgument == -1) {
         abort();
         return false;
-    } else if (activeArgument != m_d->m_currentArgument) {
-        m_d->m_currentArgument = activeArgument;
+    } else if (activeArgument != d->m_currentArgument) {
+        d->m_currentArgument = activeArgument;
         updateContent();
     }
 
@@ -274,8 +275,8 @@ bool FunctionHintProposalWidget::updateAndCheck(const QString &prefix)
 
 void FunctionHintProposalWidget::updateContent()
 {
-    m_d->m_hintLabel->setText(m_d->m_model->text(m_d->m_currentHint));
-    m_d->m_numberLabel->setText(tr("%1 of %2").arg(m_d->m_currentHint + 1).arg(m_d->m_totalHints));
+    d->m_hintLabel->setText(d->m_model->text(d->m_currentHint));
+    d->m_numberLabel->setText(tr("%1 of %2").arg(d->m_currentHint + 1).arg(d->m_totalHints));
     updatePosition();
 }
 
@@ -283,33 +284,33 @@ void FunctionHintProposalWidget::updatePosition()
 {
     const QDesktopWidget *desktop = QApplication::desktop();
 #ifdef Q_WS_MAC
-    const QRect &screen = desktop->availableGeometry(desktop->screenNumber(m_d->m_underlyingWidget));
+    const QRect &screen = desktop->availableGeometry(desktop->screenNumber(d->m_underlyingWidget));
 #else
-    const QRect &screen = desktop->screenGeometry(desktop->screenNumber(m_d->m_underlyingWidget));
+    const QRect &screen = desktop->screenGeometry(desktop->screenNumber(d->m_underlyingWidget));
 #endif
 
-    m_d->m_pager->setFixedWidth(m_d->m_pager->minimumSizeHint().width());
+    d->m_pager->setFixedWidth(d->m_pager->minimumSizeHint().width());
 
-    m_d->m_hintLabel->setWordWrap(false);
+    d->m_hintLabel->setWordWrap(false);
     const int maxDesiredWidth = screen.width() - 10;
-    const QSize &minHint = m_d->m_popupFrame->minimumSizeHint();
+    const QSize &minHint = d->m_popupFrame->minimumSizeHint();
     if (minHint.width() > maxDesiredWidth) {
-        m_d->m_hintLabel->setWordWrap(true);
-        m_d->m_popupFrame->setFixedWidth(maxDesiredWidth);
-        const int extra = m_d->m_popupFrame->contentsMargins().bottom() +
-            m_d->m_popupFrame->contentsMargins().top();
-        m_d->m_popupFrame->setFixedHeight(
-            m_d->m_hintLabel->heightForWidth(maxDesiredWidth - m_d->m_pager->width()) + extra);
+        d->m_hintLabel->setWordWrap(true);
+        d->m_popupFrame->setFixedWidth(maxDesiredWidth);
+        const int extra = d->m_popupFrame->contentsMargins().bottom() +
+            d->m_popupFrame->contentsMargins().top();
+        d->m_popupFrame->setFixedHeight(
+            d->m_hintLabel->heightForWidth(maxDesiredWidth - d->m_pager->width()) + extra);
     } else {
-        m_d->m_popupFrame->setFixedSize(minHint);
+        d->m_popupFrame->setFixedSize(minHint);
     }
 
-    const QSize &sz = m_d->m_popupFrame->size();
-    QPoint pos = m_d->m_displayRect.topLeft();
+    const QSize &sz = d->m_popupFrame->size();
+    QPoint pos = d->m_displayRect.topLeft();
     pos.setY(pos.y() - sz.height() - 1);
     if (pos.x() + sz.width() > screen.right())
         pos.setX(screen.right() - sz.width());
-    m_d->m_popupFrame->move(pos);
+    d->m_popupFrame->move(pos);
 }
 
 } // TextEditor
diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
index f3dc0611ac..a772ce3261 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
@@ -35,8 +35,6 @@
 
 #include "iassistproposalwidget.h"
 
-#include <QtCore/QScopedPointer>
-
 namespace TextEditor {
 
 struct FunctionHintProposalWidgetPrivate;
@@ -75,7 +73,7 @@ private:
     void abort();
 
 private:
-    QScopedPointer<FunctionHintProposalWidgetPrivate> m_d;
+    FunctionHintProposalWidgetPrivate *d;
 };
 
 } // TextEditor
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
index 6cece65adf..df5e5d4450 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
@@ -304,30 +304,30 @@ void GenericProposalWidgetPrivate::maybeShowInfoTip()
 // GenericProposalWidget
 // ------------------------
 GenericProposalWidget::GenericProposalWidget()
-    : m_d(new GenericProposalWidgetPrivate(this))
+    : d(new GenericProposalWidgetPrivate(this))
 {
 #ifdef Q_WS_MAC
-    if (m_d->m_completionListView->horizontalScrollBar())
-        m_d->m_completionListView->horizontalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
-    if (m_d->m_completionListView->verticalScrollBar())
-        m_d->m_completionListView->verticalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
+    if (d->m_completionListView->horizontalScrollBar())
+        d->m_completionListView->horizontalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
+    if (d->m_completionListView->verticalScrollBar())
+        d->m_completionListView->verticalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
 #else
     // This improves the look with QGTKStyle.
-    setFrameStyle(m_d->m_completionListView->frameStyle());
+    setFrameStyle(d->m_completionListView->frameStyle());
 #endif
-    m_d->m_completionListView->setFrameStyle(QFrame::NoFrame);
-    m_d->m_completionListView->setAttribute(Qt::WA_MacShowFocusRect, false);
-    m_d->m_completionListView->setUniformItemSizes(true);
-    m_d->m_completionListView->setSelectionBehavior(QAbstractItemView::SelectItems);
-    m_d->m_completionListView->setSelectionMode(QAbstractItemView::SingleSelection);
-    m_d->m_completionListView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_d->m_completionListView->setMinimumSize(1, 1);
+    d->m_completionListView->setFrameStyle(QFrame::NoFrame);
+    d->m_completionListView->setAttribute(Qt::WA_MacShowFocusRect, false);
+    d->m_completionListView->setUniformItemSizes(true);
+    d->m_completionListView->setSelectionBehavior(QAbstractItemView::SelectItems);
+    d->m_completionListView->setSelectionMode(QAbstractItemView::SingleSelection);
+    d->m_completionListView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    d->m_completionListView->setMinimumSize(1, 1);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(0);
-    layout->addWidget(m_d->m_completionListView);
+    layout->addWidget(d->m_completionListView);
 
-    m_d->m_completionListView->installEventFilter(this);
+    d->m_completionListView->installEventFilter(this);
 
     setObjectName(QLatin1String("m_popupFrame"));
     setMinimumSize(1, 1);
@@ -335,62 +335,63 @@ GenericProposalWidget::GenericProposalWidget()
 
 GenericProposalWidget::~GenericProposalWidget()
 {
-    delete m_d->m_model;
+    delete d->m_model;
+    delete d;
 }
 
 void GenericProposalWidget::setAssistant(CodeAssistant *assistant)
 {
-    m_d->m_assistant = assistant;
+    d->m_assistant = assistant;
 }
 
 void GenericProposalWidget::setReason(AssistReason reason)
 {
-    m_d->m_reason = reason;
-    if (m_d->m_reason == ExplicitlyInvoked)
-        m_d->m_justInvoked = true;
+    d->m_reason = reason;
+    if (d->m_reason == ExplicitlyInvoked)
+        d->m_justInvoked = true;
 }
 
 void GenericProposalWidget::setKind(AssistKind kind)
 {
-    m_d->m_kind = kind;
+    d->m_kind = kind;
 }
 
 void GenericProposalWidget::setUnderlyingWidget(const QWidget *underlyingWidget)
 {
     setFont(underlyingWidget->font());
-    m_d->m_underlyingWidget = underlyingWidget;
+    d->m_underlyingWidget = underlyingWidget;
 }
 
 void GenericProposalWidget::setModel(IAssistProposalModel *model)
 {
-    delete m_d->m_model;
-    m_d->m_model = static_cast<IGenericProposalModel *>(model);
-    m_d->m_completionListView->setModel(new ModelAdapter(m_d->m_model, m_d->m_completionListView));
+    delete d->m_model;
+    d->m_model = static_cast<IGenericProposalModel *>(model);
+    d->m_completionListView->setModel(new ModelAdapter(d->m_model, d->m_completionListView));
 
-    connect(m_d->m_completionListView->selectionModel(),
+    connect(d->m_completionListView->selectionModel(),
             SIGNAL(currentChanged(QModelIndex,QModelIndex)),
-            &m_d->m_infoTimer,
+            &d->m_infoTimer,
             SLOT(start()));
 }
 
 void GenericProposalWidget::setDisplayRect(const QRect &rect)
 {
-    m_d->m_displayRect = rect;
+    d->m_displayRect = rect;
 }
 
 void GenericProposalWidget::setIsSynchronized(bool isSync)
 {
-    m_d->m_isSynchronized = isSync;
+    d->m_isSynchronized = isSync;
 }
 
 void GenericProposalWidget::showProposal(const QString &prefix)
 {
     ensurePolished();
-    m_d->m_model->removeDuplicates();
+    d->m_model->removeDuplicates();
     if (!updateAndCheck(prefix))
         return;
     show();
-    m_d->m_completionListView->setFocus();
+    d->m_completionListView->setFocus();
 }
 
 void GenericProposalWidget::updateProposal(const QString &prefix)
@@ -408,7 +409,7 @@ void GenericProposalWidget::closeProposal()
 void GenericProposalWidget::notifyActivation(int index)
 {
     abort();
-    emit proposalItemActivated(m_d->m_model->proposalItem(index));
+    emit proposalItemActivated(d->m_model->proposalItem(index));
 }
 
 void GenericProposalWidget::abort()
@@ -422,62 +423,62 @@ bool GenericProposalWidget::updateAndCheck(const QString &prefix)
 {
     // Keep track in the case there has been an explicit selection.
     int preferredItemId = -1;
-    if (m_d->m_explicitlySelected)
+    if (d->m_explicitlySelected)
         preferredItemId =
-                m_d->m_model->persistentId(m_d->m_completionListView->currentIndex().row());
+                d->m_model->persistentId(d->m_completionListView->currentIndex().row());
 
     // Filter, sort, etc.
-    m_d->m_model->reset();
+    d->m_model->reset();
     if (!prefix.isEmpty())
-        m_d->m_model->filter(prefix);
-    if (m_d->m_model->size() == 0
-            || (!m_d->m_model->keepPerfectMatch(m_d->m_reason)
-                && isPerfectMatch(prefix, m_d->m_model))) {
+        d->m_model->filter(prefix);
+    if (d->m_model->size() == 0
+            || (!d->m_model->keepPerfectMatch(d->m_reason)
+                && isPerfectMatch(prefix, d->m_model))) {
         abort();
         return false;
     }
-    if (m_d->m_model->isSortable())
-        m_d->m_model->sort();
-    m_d->m_completionListView->reset();
+    if (d->m_model->isSortable())
+        d->m_model->sort();
+    d->m_completionListView->reset();
 
     // Try to find the previosly explicit selection (if any). If we can find the item set it
     // as the current. Otherwise (it might have been filtered out) select the first row.
-    if (m_d->m_explicitlySelected) {
+    if (d->m_explicitlySelected) {
         Q_ASSERT(preferredItemId != -1);
-        for (int i = 0; i < m_d->m_model->size(); ++i) {
-            if (m_d->m_model->persistentId(i) == preferredItemId) {
-                m_d->m_completionListView->selectRow(i);
+        for (int i = 0; i < d->m_model->size(); ++i) {
+            if (d->m_model->persistentId(i) == preferredItemId) {
+                d->m_completionListView->selectRow(i);
                 break;
             }
         }
     }
-    if (!m_d->m_completionListView->currentIndex().isValid()) {
-        m_d->m_completionListView->selectFirstRow();
-        if (m_d->m_explicitlySelected)
-            m_d->m_explicitlySelected = false;
+    if (!d->m_completionListView->currentIndex().isValid()) {
+        d->m_completionListView->selectFirstRow();
+        if (d->m_explicitlySelected)
+            d->m_explicitlySelected = false;
     }
 
     if (TextEditorSettings::instance()->completionSettings().m_partiallyComplete
-            && m_d->m_kind == Completion
-            && m_d->m_justInvoked
-            && m_d->m_isSynchronized) {
-        if (m_d->m_model->size() == 1) {
-            IAssistProposalItem *item = m_d->m_model->proposalItem(0);
+            && d->m_kind == Completion
+            && d->m_justInvoked
+            && d->m_isSynchronized) {
+        if (d->m_model->size() == 1) {
+            IAssistProposalItem *item = d->m_model->proposalItem(0);
             if (item->implicitlyApplies()) {
                 abort();
                 emit proposalItemActivated(item);
                 return false;
             }
         }
-        if (m_d->m_model->supportsPrefixExpansion()) {
-            const QString &proposalPrefix = m_d->m_model->proposalPrefix();
+        if (d->m_model->supportsPrefixExpansion()) {
+            const QString &proposalPrefix = d->m_model->proposalPrefix();
             if (proposalPrefix.length() > prefix.length())
                 emit prefixExpanded(proposalPrefix);
         }
     }
 
-    if (m_d->m_justInvoked)
-        m_d->m_justInvoked = false;
+    if (d->m_justInvoked)
+        d->m_justInvoked = false;
 
     updatePositionAndSize();
     return true;
@@ -485,7 +486,7 @@ bool GenericProposalWidget::updateAndCheck(const QString &prefix)
 
 void GenericProposalWidget::updatePositionAndSize()
 {
-    const QSize &shint = m_d->m_completionListView->calculateSize();
+    const QSize &shint = d->m_completionListView->calculateSize();
     const int fw = frameWidth();
     const int width = shint.width() + fw * 2 + 30;
     const int height = shint.height() + fw * 2;
@@ -493,15 +494,15 @@ void GenericProposalWidget::updatePositionAndSize()
     // Determine the position, keeping the popup on the screen
     const QDesktopWidget *desktop = QApplication::desktop();
 #ifdef Q_WS_MAC
-    const QRect screen = desktop->availableGeometry(desktop->screenNumber(m_d->m_underlyingWidget));
+    const QRect screen = desktop->availableGeometry(desktop->screenNumber(d->m_underlyingWidget));
 #else
-    const QRect screen = desktop->screenGeometry(desktop->screenNumber(m_d->m_underlyingWidget));
+    const QRect screen = desktop->screenGeometry(desktop->screenNumber(d->m_underlyingWidget));
 #endif
 
-    QPoint pos = m_d->m_displayRect.bottomLeft();
+    QPoint pos = d->m_displayRect.bottomLeft();
     pos.rx() -= 16 + fw;    // Space for the icons
     if (pos.y() + height > screen.bottom())
-        pos.setY(m_d->m_displayRect.top() - height);
+        pos.setY(d->m_displayRect.top() - height);
     if (pos.x() + width > screen.right())
         pos.setX(screen.right() - width);
     setGeometry(pos.x(), pos.y(), width, height);
@@ -516,13 +517,13 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
         if (fe->reason() == Qt::OtherFocusReason) {
             // Qt/carbon workaround
             // focus out is received before the key press event.
-            if (m_d->m_completionListView->currentIndex().isValid())
-                emit proposalItemActivated(m_d->m_model->proposalItem(
-                                              m_d->m_completionListView->currentIndex().row()));
+            if (d->m_completionListView->currentIndex().isValid())
+                emit proposalItemActivated(d->m_model->proposalItem(
+                                              d->m_completionListView->currentIndex().row()));
         }
 #endif
-        if (m_d->m_infoFrame)
-            m_d->m_infoFrame->close();
+        if (d->m_infoFrame)
+            d->m_infoFrame->close();
         return true;
     } else if (e->type() == QEvent::ShortcutOverride) {
         QKeyEvent *ke = static_cast<QKeyEvent *>(e);
@@ -544,14 +545,14 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
         case Qt::Key_N:
         case Qt::Key_P:
             // select next/previous completion
-            m_d->m_explicitlySelected = true;
+            d->m_explicitlySelected = true;
             if (ke->modifiers() == Qt::ControlModifier) {
                 int change = (ke->key() == Qt::Key_N) ? 1 : -1;
-                int nrows = m_d->m_model->size();
-                int row = m_d->m_completionListView->currentIndex().row();
+                int nrows = d->m_model->size();
+                int row = d->m_completionListView->currentIndex().row();
                 int newRow = (row + change + nrows) % nrows;
                 if (newRow == row + change || !ke->isAutoRepeat())
-                    m_d->m_completionListView->selectRow(newRow);
+                    d->m_completionListView->selectRow(newRow);
                 return true;
             }
             break;
@@ -560,24 +561,24 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
         case Qt::Key_Return:
 #if defined(QT_MAC_USE_COCOA) || !defined(Q_OS_DARWIN)
             abort();
-            if (m_d->m_completionListView->currentIndex().isValid())
-                emit proposalItemActivated(m_d->m_model->proposalItem(
-                                              m_d->m_completionListView->currentIndex().row()));
+            if (d->m_completionListView->currentIndex().isValid())
+                emit proposalItemActivated(d->m_model->proposalItem(
+                                              d->m_completionListView->currentIndex().row()));
 #endif
             return true;
 
         case Qt::Key_Up:
-            m_d->m_explicitlySelected = true;
-            if (!ke->isAutoRepeat() && m_d->m_completionListView->isFirstRowSelected()) {
-                m_d->m_completionListView->selectLastRow();
+            d->m_explicitlySelected = true;
+            if (!ke->isAutoRepeat() && d->m_completionListView->isFirstRowSelected()) {
+                d->m_completionListView->selectLastRow();
                 return true;
             }
             return false;
 
         case Qt::Key_Down:
-            m_d->m_explicitlySelected = true;
-            if (!ke->isAutoRepeat() && m_d->m_completionListView->isLastRowSelected()) {
-                m_d->m_completionListView->selectFirstRow();
+            d->m_explicitlySelected = true;
+            if (!ke->isAutoRepeat() && d->m_completionListView->isLastRowSelected()) {
+                d->m_completionListView->selectFirstRow();
                 return true;
             }
             return false;
@@ -603,22 +604,22 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
         }
 
         if (ke->text().length() == 1
-                && m_d->m_completionListView->currentIndex().isValid()
+                && d->m_completionListView->currentIndex().isValid()
                 && qApp->focusWidget() == o) {
             const QChar &typedChar = ke->text().at(0);
             IAssistProposalItem *item =
-                m_d->m_model->proposalItem(m_d->m_completionListView->currentIndex().row());
+                d->m_model->proposalItem(d->m_completionListView->currentIndex().row());
             if (item->prematurelyApplies(typedChar)
-                    && (m_d->m_reason == ExplicitlyInvoked || item->text().endsWith(typedChar))) {
+                    && (d->m_reason == ExplicitlyInvoked || item->text().endsWith(typedChar))) {
                 abort();
                 emit proposalItemActivated(item);
                 return true;
             }
         }
 
-        QApplication::sendEvent(const_cast<QWidget *>(m_d->m_underlyingWidget), e);
+        QApplication::sendEvent(const_cast<QWidget *>(d->m_underlyingWidget), e);
         if (isVisible())
-            m_d->m_assistant->notifyChange();
+            d->m_assistant->notifyChange();
 
         return true;
     }
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h
index 9246665a55..47528f0568 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h
@@ -35,16 +35,14 @@
 
 #include "iassistproposalwidget.h"
 
-#include <QtCore/QScopedPointer>
-
 namespace TextEditor {
 
 class GenericProposalWidgetPrivate;
 
 class GenericProposalWidget : public IAssistProposalWidget
 {
-    friend class GenericProposalWidgetPrivate;
     Q_OBJECT
+    friend class GenericProposalWidgetPrivate;
 
 public:
     GenericProposalWidget();
@@ -72,7 +70,7 @@ protected:
     virtual bool eventFilter(QObject *o, QEvent *e);
 
 private:
-    QScopedPointer<GenericProposalWidgetPrivate> m_d;
+    GenericProposalWidgetPrivate *d;
 };
 
 } // TextEditor
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index 23f40ef1ef..003000e3f3 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -63,49 +63,49 @@ DisplaySettingsPage::DisplaySettingsPagePrivate::DisplaySettingsPagePrivate
 DisplaySettingsPage::DisplaySettingsPage(const DisplaySettingsPageParameters &p,
                                          QObject *parent)
   : TextEditorOptionsPage(parent),
-    m_d(new DisplaySettingsPagePrivate(p))
+    d(new DisplaySettingsPagePrivate(p))
 {
 }
 
 DisplaySettingsPage::~DisplaySettingsPage()
 {
-    delete m_d;
+    delete d;
 }
 
 QString DisplaySettingsPage::id() const
 {
-    return m_d->m_parameters.id;
+    return d->m_parameters.id;
 }
 
 QString DisplaySettingsPage::displayName() const
 {
-    return m_d->m_parameters.displayName;
+    return d->m_parameters.displayName;
 }
 
 QWidget *DisplaySettingsPage::createPage(QWidget *parent)
 {
     QWidget *w = new QWidget(parent);
-    m_d->m_page = new Ui::DisplaySettingsPage;
-    m_d->m_page->setupUi(w);
+    d->m_page = new Ui::DisplaySettingsPage;
+    d->m_page->setupUi(w);
     settingsToUI();
-    if (m_d->m_searchKeywords.isEmpty()) {
-        QTextStream(&m_d->m_searchKeywords) << m_d->m_page->displayLineNumbers->text()
-          << ' ' << m_d->m_page->highlightCurrentLine->text()
-          << ' ' << m_d->m_page->displayFoldingMarkers->text()
-          << ' ' << m_d->m_page->highlightBlocks->text()
-          << ' ' << m_d->m_page->visualizeWhitespace->text()
-          << ' ' << m_d->m_page->animateMatchingParentheses->text()
-          << ' ' << m_d->m_page->enableTextWrapping->text()
-          << ' ' << m_d->m_page->autoFoldFirstComment->text()
-          << ' ' << m_d->m_page->centerOnScroll->text();
-        m_d->m_searchKeywords.remove(QLatin1Char('&'));
+    if (d->m_searchKeywords.isEmpty()) {
+        QTextStream(&d->m_searchKeywords) << d->m_page->displayLineNumbers->text()
+          << ' ' << d->m_page->highlightCurrentLine->text()
+          << ' ' << d->m_page->displayFoldingMarkers->text()
+          << ' ' << d->m_page->highlightBlocks->text()
+          << ' ' << d->m_page->visualizeWhitespace->text()
+          << ' ' << d->m_page->animateMatchingParentheses->text()
+          << ' ' << d->m_page->enableTextWrapping->text()
+          << ' ' << d->m_page->autoFoldFirstComment->text()
+          << ' ' << d->m_page->centerOnScroll->text();
+        d->m_searchKeywords.remove(QLatin1Char('&'));
     }
     return w;
 }
 
 void DisplaySettingsPage::apply()
 {
-    if (!m_d->m_page) // page was never shown
+    if (!d->m_page) // page was never shown
         return;
     DisplaySettings newDisplaySettings;
 
@@ -115,57 +115,57 @@ void DisplaySettingsPage::apply()
 
 void DisplaySettingsPage::finish()
 {
-    if (!m_d->m_page) // page was never shown
+    if (!d->m_page) // page was never shown
         return;
-    delete m_d->m_page;
-    m_d->m_page = 0;
+    delete d->m_page;
+    d->m_page = 0;
 }
 
 void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings) const
 {
-    displaySettings.m_displayLineNumbers = m_d->m_page->displayLineNumbers->isChecked();
-    displaySettings.m_textWrapping = m_d->m_page->enableTextWrapping->isChecked();
-    displaySettings.m_showWrapColumn = m_d->m_page->showWrapColumn->isChecked();
-    displaySettings.m_wrapColumn = m_d->m_page->wrapColumn->value();
-    displaySettings.m_visualizeWhitespace = m_d->m_page->visualizeWhitespace->isChecked();
-    displaySettings.m_displayFoldingMarkers = m_d->m_page->displayFoldingMarkers->isChecked();
-    displaySettings.m_highlightCurrentLine = m_d->m_page->highlightCurrentLine->isChecked();
-    displaySettings.m_highlightBlocks = m_d->m_page->highlightBlocks->isChecked();
-    displaySettings.m_animateMatchingParentheses = m_d->m_page->animateMatchingParentheses->isChecked();
-    displaySettings.m_markTextChanges = m_d->m_page->markTextChanges->isChecked();
-    displaySettings.m_autoFoldFirstComment = m_d->m_page->autoFoldFirstComment->isChecked();
-    displaySettings.m_centerCursorOnScroll = m_d->m_page->centerOnScroll->isChecked();
+    displaySettings.m_displayLineNumbers = d->m_page->displayLineNumbers->isChecked();
+    displaySettings.m_textWrapping = d->m_page->enableTextWrapping->isChecked();
+    displaySettings.m_showWrapColumn = d->m_page->showWrapColumn->isChecked();
+    displaySettings.m_wrapColumn = d->m_page->wrapColumn->value();
+    displaySettings.m_visualizeWhitespace = d->m_page->visualizeWhitespace->isChecked();
+    displaySettings.m_displayFoldingMarkers = d->m_page->displayFoldingMarkers->isChecked();
+    displaySettings.m_highlightCurrentLine = d->m_page->highlightCurrentLine->isChecked();
+    displaySettings.m_highlightBlocks = d->m_page->highlightBlocks->isChecked();
+    displaySettings.m_animateMatchingParentheses = d->m_page->animateMatchingParentheses->isChecked();
+    displaySettings.m_markTextChanges = d->m_page->markTextChanges->isChecked();
+    displaySettings.m_autoFoldFirstComment = d->m_page->autoFoldFirstComment->isChecked();
+    displaySettings.m_centerCursorOnScroll = d->m_page->centerOnScroll->isChecked();
 }
 
 void DisplaySettingsPage::settingsToUI()
 {
-    const DisplaySettings &displaySettings = m_d->m_displaySettings;
-    m_d->m_page->displayLineNumbers->setChecked(displaySettings.m_displayLineNumbers);
-    m_d->m_page->enableTextWrapping->setChecked(displaySettings.m_textWrapping);
-    m_d->m_page->showWrapColumn->setChecked(displaySettings.m_showWrapColumn);
-    m_d->m_page->wrapColumn->setValue(displaySettings.m_wrapColumn);
-    m_d->m_page->visualizeWhitespace->setChecked(displaySettings.m_visualizeWhitespace);
-    m_d->m_page->displayFoldingMarkers->setChecked(displaySettings.m_displayFoldingMarkers);
-    m_d->m_page->highlightCurrentLine->setChecked(displaySettings.m_highlightCurrentLine);
-    m_d->m_page->highlightBlocks->setChecked(displaySettings.m_highlightBlocks);
-    m_d->m_page->animateMatchingParentheses->setChecked(displaySettings.m_animateMatchingParentheses);
-    m_d->m_page->markTextChanges->setChecked(displaySettings.m_markTextChanges);
-    m_d->m_page->autoFoldFirstComment->setChecked(displaySettings.m_autoFoldFirstComment);
-    m_d->m_page->centerOnScroll->setChecked(displaySettings.m_centerCursorOnScroll);
+    const DisplaySettings &displaySettings = d->m_displaySettings;
+    d->m_page->displayLineNumbers->setChecked(displaySettings.m_displayLineNumbers);
+    d->m_page->enableTextWrapping->setChecked(displaySettings.m_textWrapping);
+    d->m_page->showWrapColumn->setChecked(displaySettings.m_showWrapColumn);
+    d->m_page->wrapColumn->setValue(displaySettings.m_wrapColumn);
+    d->m_page->visualizeWhitespace->setChecked(displaySettings.m_visualizeWhitespace);
+    d->m_page->displayFoldingMarkers->setChecked(displaySettings.m_displayFoldingMarkers);
+    d->m_page->highlightCurrentLine->setChecked(displaySettings.m_highlightCurrentLine);
+    d->m_page->highlightBlocks->setChecked(displaySettings.m_highlightBlocks);
+    d->m_page->animateMatchingParentheses->setChecked(displaySettings.m_animateMatchingParentheses);
+    d->m_page->markTextChanges->setChecked(displaySettings.m_markTextChanges);
+    d->m_page->autoFoldFirstComment->setChecked(displaySettings.m_autoFoldFirstComment);
+    d->m_page->centerOnScroll->setChecked(displaySettings.m_centerCursorOnScroll);
 }
 
 const DisplaySettings &DisplaySettingsPage::displaySettings() const
 {
-    return m_d->m_displaySettings;
+    return d->m_displaySettings;
 }
 
 void DisplaySettingsPage::setDisplaySettings(const DisplaySettings &newDisplaySettings)
 {
-    if (newDisplaySettings != m_d->m_displaySettings) {
-        m_d->m_displaySettings = newDisplaySettings;
+    if (newDisplaySettings != d->m_displaySettings) {
+        d->m_displaySettings = newDisplaySettings;
         Core::ICore *core = Core::ICore::instance();
         if (QSettings *s = core->settings())
-            m_d->m_displaySettings.toSettings(m_d->m_parameters.settingsPrefix, s);
+            d->m_displaySettings.toSettings(d->m_parameters.settingsPrefix, s);
 
         emit displaySettingsChanged(newDisplaySettings);
     }
@@ -173,5 +173,5 @@ void DisplaySettingsPage::setDisplaySettings(const DisplaySettings &newDisplaySe
 
 bool DisplaySettingsPage::matches(const QString &s) const
 {
-    return m_d->m_searchKeywords.contains(s, Qt::CaseInsensitive);
+    return d->m_searchKeywords.contains(s, Qt::CaseInsensitive);
 }
diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h
index ffd077747a..7c3abe1dd2 100644
--- a/src/plugins/texteditor/displaysettingspage.h
+++ b/src/plugins/texteditor/displaysettingspage.h
@@ -64,7 +64,7 @@ public:
     QWidget *createPage(QWidget *parent);
     void apply();
     void finish();
-    virtual bool matches(const QString &s) const;
+    bool matches(const QString &s) const;
 
     const DisplaySettings &displaySettings() const;
 
@@ -77,7 +77,7 @@ private:
     void setDisplaySettings(const DisplaySettings &);
 
     struct DisplaySettingsPagePrivate;
-    DisplaySettingsPagePrivate *m_d;
+    DisplaySettingsPagePrivate *d;
 };
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index 10e1e8347f..5bc2933dcb 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -564,44 +564,44 @@ void SnippetsSettingsPagePrivate::decorateEditors(const TextEditor::FontSettings
 // SnippetsSettingsPage
 SnippetsSettingsPage::SnippetsSettingsPage(const QString &id, QObject *parent) :
     TextEditorOptionsPage(parent),
-    m_d(new SnippetsSettingsPagePrivate(id))
+    d(new SnippetsSettingsPagePrivate(id))
 {}
 
 SnippetsSettingsPage::~SnippetsSettingsPage()
 {
-    delete m_d;
+    delete d;
 }
 
 QString SnippetsSettingsPage::id() const
 {
-    return m_d->id();
+    return d->id();
 }
 
 QString SnippetsSettingsPage::displayName() const
 {
-    return m_d->displayName();
+    return d->displayName();
 }
 
 bool SnippetsSettingsPage::matches(const QString &s) const
 {
-    return m_d->isKeyword(s);
+    return d->isKeyword(s);
 }
 
 QWidget *SnippetsSettingsPage::createPage(QWidget *parent)
 {
     QWidget *w = new QWidget(parent);
-    m_d->configureUi(w);
+    d->configureUi(w);
     return w;
 }
 
 void SnippetsSettingsPage::apply()
 {
-    m_d->apply();
+    d->apply();
 }
 
 void SnippetsSettingsPage::finish()
 {
-    m_d->finish();
+    d->finish();
 }
 
 } // Internal
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.h b/src/plugins/texteditor/snippets/snippetssettingspage.h
index f04b48fa87..b3c33d7c49 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.h
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.h
@@ -43,6 +43,7 @@ class SnippetsSettingsPagePrivate;
 class SnippetsSettingsPage : public TextEditorOptionsPage
 {
     Q_OBJECT
+
 public:
     SnippetsSettingsPage(const QString &id, QObject *parent);
     virtual ~SnippetsSettingsPage();
@@ -55,7 +56,7 @@ public:
     virtual void finish();
 
 private:
-    SnippetsSettingsPagePrivate *m_d;
+    SnippetsSettingsPagePrivate *d;
 };
 
 } // Internal
diff --git a/src/plugins/texteditor/texteditoroptionspage.h b/src/plugins/texteditor/texteditoroptionspage.h
index 1e30b925b9..222c4cfcb3 100644
--- a/src/plugins/texteditor/texteditoroptionspage.h
+++ b/src/plugins/texteditor/texteditoroptionspage.h
@@ -33,10 +33,10 @@
 #ifndef TEXTEDITOROPTIONSPAGE_H
 #define TEXTEDITOROPTIONSPAGE_H
 
-#include <coreplugin/dialogs/ioptionspage.h>
-
 #include "texteditor_global.h"
 
+#include <coreplugin/dialogs/ioptionspage.h>
+
 namespace TextEditor {
 
 /**