diff options
Diffstat (limited to 'src/plugins')
38 files changed, 616 insertions, 616 deletions
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index b588459078..d87f33d447 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -743,7 +743,7 @@ bool EditorManager::closeAllEditors(bool askAboutModifiedEditors) { d->m_editorModel->removeAllRestoredEditors(); if (closeEditors(openedEditors(), askAboutModifiedEditors)) { -// m_d->clearNavigationHistory(); +// d->clearNavigationHistory(); return true; } return false; diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp index d69471dcba..0e5af5c32d 100644 --- a/src/plugins/coreplugin/mimedatabase.cpp +++ b/src/plugins/coreplugin/mimedatabase.cpp @@ -1799,26 +1799,26 @@ void MimeDatabasePrivate::debug(QTextStream &str) const } MimeDatabase::MimeDatabase() : - m_d(new MimeDatabasePrivate) + d(new MimeDatabasePrivate) { } MimeDatabase::~MimeDatabase() { - delete m_d; + delete d; } MimeType MimeDatabase::findByType(const QString &typeOrAlias) const { m_mutex.lock(); - const MimeType rc = m_d->findByType(typeOrAlias); + const MimeType rc = d->findByType(typeOrAlias); m_mutex.unlock(); return rc; } MimeType MimeDatabase::findByFileUnlocked(const QFileInfo &f) const { - return m_d->findByFile(f); + return d->findByFile(f); } MimeType MimeDatabase::findByFile(const QFileInfo &f) const @@ -1832,7 +1832,7 @@ MimeType MimeDatabase::findByFile(const QFileInfo &f) const MimeType MimeDatabase::findByData(const QByteArray &data) const { m_mutex.lock(); - const MimeType rc = m_d->findByData(data); + const MimeType rc = d->findByData(data); m_mutex.unlock(); return rc; } @@ -1840,7 +1840,7 @@ MimeType MimeDatabase::findByData(const QByteArray &data) const bool MimeDatabase::addMimeType(const MimeType &mt) { m_mutex.lock(); - const bool rc = m_d->addMimeType(mt); + const bool rc = d->addMimeType(mt); m_mutex.unlock(); return rc; } @@ -1848,7 +1848,7 @@ bool MimeDatabase::addMimeType(const MimeType &mt) bool MimeDatabase::addMimeTypes(const QString &fileName, QString *errorMessage) { m_mutex.lock(); - const bool rc = m_d->addMimeTypes(fileName, errorMessage); + const bool rc = d->addMimeTypes(fileName, errorMessage); m_mutex.unlock(); return rc; } @@ -1856,7 +1856,7 @@ bool MimeDatabase::addMimeTypes(const QString &fileName, QString *errorMessage) bool MimeDatabase::addMimeTypes(QIODevice *device, QString *errorMessage) { m_mutex.lock(); - const bool rc = m_d->addMimeTypes(device, errorMessage); + const bool rc = d->addMimeTypes(device, errorMessage); m_mutex.unlock(); return rc; } @@ -1864,7 +1864,7 @@ bool MimeDatabase::addMimeTypes(QIODevice *device, QString *errorMessage) QStringList MimeDatabase::suffixes() const { m_mutex.lock(); - const QStringList rc = m_d->suffixes(); + const QStringList rc = d->suffixes(); m_mutex.unlock(); return rc; } @@ -1872,7 +1872,7 @@ QStringList MimeDatabase::suffixes() const QStringList MimeDatabase::filterStrings() const { m_mutex.lock(); - const QStringList rc = m_d->filterStrings(); + const QStringList rc = d->filterStrings(); m_mutex.unlock(); return rc; } @@ -1903,7 +1903,7 @@ QString MimeDatabase::allFiltersString(QString *allFilesFilter) const QList<MimeGlobPattern> MimeDatabase::globPatterns() const { m_mutex.lock(); - const QList<MimeGlobPattern> rc = m_d->globPatterns(); + const QList<MimeGlobPattern> rc = d->globPatterns(); m_mutex.unlock(); return rc; } @@ -1912,14 +1912,14 @@ void MimeDatabase::setGlobPatterns(const QString &typeOrAlias, const QList<MimeGlobPattern> &globPatterns) { m_mutex.lock(); - m_d->setGlobPatterns(typeOrAlias, globPatterns); + d->setGlobPatterns(typeOrAlias, globPatterns); m_mutex.unlock(); } MimeDatabase::IMagicMatcherList MimeDatabase::magicMatchers() const { m_mutex.lock(); - const IMagicMatcherList rc = m_d->magicMatchers(); + const IMagicMatcherList rc = d->magicMatchers(); m_mutex.unlock(); return rc; } @@ -1928,14 +1928,14 @@ void MimeDatabase::setMagicMatchers(const QString &typeOrAlias, const IMagicMatcherList &matchers) { m_mutex.lock(); - m_d->setMagicMatchers(typeOrAlias, matchers); + d->setMagicMatchers(typeOrAlias, matchers); m_mutex.unlock(); } QList<MimeType> MimeDatabase::mimeTypes() const { m_mutex.lock(); - const QList<MimeType> &mimeTypes = m_d->mimeTypes(); + const QList<MimeType> &mimeTypes = d->mimeTypes(); m_mutex.unlock(); return mimeTypes; } @@ -1943,14 +1943,14 @@ QList<MimeType> MimeDatabase::mimeTypes() const void MimeDatabase::syncUserModifiedMimeTypes() { m_mutex.lock(); - m_d->syncUserModifiedMimeTypes(); + d->syncUserModifiedMimeTypes(); m_mutex.unlock(); } void MimeDatabase::clearUserModifiedMimeTypes() { m_mutex.lock(); - m_d->clearUserModifiedMimeTypes(); + d->clearUserModifiedMimeTypes(); m_mutex.unlock(); } @@ -1981,7 +1981,7 @@ QString MimeDatabase::preferredSuffixByFile(const QFileInfo &f) const bool MimeDatabase::setPreferredSuffix(const QString &typeOrAlias, const QString &suffix) { m_mutex.lock(); - const bool rc = m_d->setPreferredSuffix(typeOrAlias, suffix); + const bool rc = d->setPreferredSuffix(typeOrAlias, suffix); m_mutex.unlock(); return rc; } @@ -2001,7 +2001,7 @@ QDebug operator<<(QDebug d, const MimeDatabase &mt) QString s; { QTextStream str(&s); - mt.m_d->debug(str); + mt.d->debug(str); } d << s; return d; diff --git a/src/plugins/coreplugin/mimedatabase.h b/src/plugins/coreplugin/mimedatabase.h index 2ae1792325..b99df3c235 100644 --- a/src/plugins/coreplugin/mimedatabase.h +++ b/src/plugins/coreplugin/mimedatabase.h @@ -316,7 +316,7 @@ public: private: MimeType findByFileUnlocked(const QFileInfo &f) const; - MimeDatabasePrivate *m_d; + MimeDatabasePrivate *d; mutable QMutex m_mutex; }; diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index aada1ab344..63351cbb57 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -548,11 +548,13 @@ void MimeTypeSettingsPrivate::resetMimeTypes() // MimeTypeSettingsPage MimeTypeSettings::MimeTypeSettings(QObject *parent) : IOptionsPage(parent) - , m_d(new MimeTypeSettingsPrivate) + , d(new MimeTypeSettingsPrivate) {} MimeTypeSettings::~MimeTypeSettings() -{} +{ + delete d; +} QString MimeTypeSettings::id() const { @@ -581,43 +583,43 @@ QIcon MimeTypeSettings::categoryIcon() const bool MimeTypeSettings::matches(const QString &s) const { - return m_d->m_keywords.contains(s, Qt::CaseInsensitive); + return d->m_keywords.contains(s, Qt::CaseInsensitive); } QWidget *MimeTypeSettings::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); - m_d->configureUi(w); + d->configureUi(w); return w; } void MimeTypeSettings::apply() { - if (!m_d->m_modifiedMimeTypes.isEmpty()) { + if (!d->m_modifiedMimeTypes.isEmpty()) { const QModelIndex &modelIndex = - m_d->m_ui.mimeTypesTableView->selectionModel()->currentIndex(); + d->m_ui.mimeTypesTableView->selectionModel()->currentIndex(); if (modelIndex.isValid()) { - if (m_d->m_mimeForPatternSync == modelIndex.row()) - m_d->syncMimePattern(); - if (m_d->m_mimeForMagicSync == modelIndex.row()) - m_d->syncMimeMagic(); + if (d->m_mimeForPatternSync == modelIndex.row()) + d->syncMimePattern(); + if (d->m_mimeForMagicSync == modelIndex.row()) + d->syncMimeMagic(); } - m_d->clearSyncData(); + d->clearSyncData(); } - if (!m_d->m_persist) - m_d->m_persist = true; + if (!d->m_persist) + d->m_persist = true; } void MimeTypeSettings::finish() { - if (m_d->m_persist) { - if (m_d->m_reset) + if (d->m_persist) { + if (d->m_reset) ICore::instance()->mimeDatabase()->clearUserModifiedMimeTypes(); else - m_d->updateMimeDatabase(); + d->updateMimeDatabase(); } - m_d->resetState(); + d->resetState(); } } // Internal diff --git a/src/plugins/coreplugin/mimetypesettings.h b/src/plugins/coreplugin/mimetypesettings.h index cec646a98a..a63e9f925e 100644 --- a/src/plugins/coreplugin/mimetypesettings.h +++ b/src/plugins/coreplugin/mimetypesettings.h @@ -35,8 +35,6 @@ #include "ioptionspage.h" -#include <QtCore/QScopedPointer> - namespace Core { namespace Internal { @@ -62,7 +60,7 @@ public: virtual void finish(); private: - QScopedPointer<MimeTypeSettingsPrivate> m_d; + MimeTypeSettingsPrivate *d; }; } // Internal diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index efebef3f1f..7ecb99946d 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -89,15 +89,15 @@ struct EditorConfigurationPrivate QMap<QString, IFallbackPreferences *> m_languageCodeStylePreferences; }; -EditorConfiguration::EditorConfiguration() : m_d(new EditorConfigurationPrivate) +EditorConfiguration::EditorConfiguration() : d(new EditorConfigurationPrivate) { TextEditor::TextEditorSettings *textEditorSettings = TextEditor::TextEditorSettings::instance(); QList<TabPreferences *> tabFallbacks; tabFallbacks << textEditorSettings->tabPreferences(); - m_d->m_tabPreferences = new TabPreferences(tabFallbacks, this); - m_d->m_tabPreferences->setFallbackEnabled(textEditorSettings->tabPreferences(), false); - m_d->m_tabPreferences->setDisplayName(tr("Project", "Settings")); - m_d->m_tabPreferences->setId(kId); + d->m_tabPreferences = new TabPreferences(tabFallbacks, this); + d->m_tabPreferences->setFallbackEnabled(textEditorSettings->tabPreferences(), false); + d->m_tabPreferences->setDisplayName(tr("Project", "Settings")); + d->m_tabPreferences->setId(kId); CodeStylePreferencesManager *manager = CodeStylePreferencesManager::instance(); @@ -119,7 +119,7 @@ EditorConfiguration::EditorConfiguration() : m_d(new EditorConfigurationPrivate) preferences->setFallbackEnabled(fallbacks.at(i), false); preferences->setId(languageId + QLatin1String("Project")); preferences->setCurrentFallback(originalPreferences); - m_d->m_languageTabPreferences.insert(languageId, preferences); + d->m_languageTabPreferences.insert(languageId, preferences); } const QMap<QString, IFallbackPreferences *> languageCodeStylePreferences = settings->languageCodeStylePreferences(); @@ -135,86 +135,87 @@ EditorConfiguration::EditorConfiguration() : m_d(new EditorConfigurationPrivate) preferences->setId(languageId + QLatin1String("Project")); preferences->setDisplayName(tr("Project %1", "Settings, %1 is a language (C++ or QML)").arg(factory->displayName())); preferences->setCurrentFallback(originalPreferences); - m_d->m_languageCodeStylePreferences.insert(languageId, preferences); + d->m_languageCodeStylePreferences.insert(languageId, preferences); } } EditorConfiguration::~EditorConfiguration() { - qDeleteAll(m_d->m_languageTabPreferences.values()); - qDeleteAll(m_d->m_languageCodeStylePreferences.values()); + qDeleteAll(d->m_languageTabPreferences.values()); + qDeleteAll(d->m_languageCodeStylePreferences.values()); + delete d; } bool EditorConfiguration::useGlobalSettings() const { - return m_d->m_useGlobal; + return d->m_useGlobal; } void EditorConfiguration::cloneGlobalSettings() { - m_d->m_tabPreferences->setSettings(TextEditorSettings::instance()->tabPreferences()->settings()); + d->m_tabPreferences->setSettings(TextEditorSettings::instance()->tabPreferences()->settings()); setStorageSettings(TextEditorSettings::instance()->storageSettings()); setBehaviorSettings(TextEditorSettings::instance()->behaviorSettings()); setExtraEncodingSettings(TextEditorSettings::instance()->extraEncodingSettings()); - m_d->m_textCodec = Core::EditorManager::instance()->defaultTextCodec(); + d->m_textCodec = Core::EditorManager::instance()->defaultTextCodec(); } QTextCodec *EditorConfiguration::textCodec() const { - return m_d->m_textCodec; + return d->m_textCodec; } TabPreferences *EditorConfiguration::tabPreferences() const { - return m_d->m_tabPreferences; + return d->m_tabPreferences; } const StorageSettings &EditorConfiguration::storageSettings() const { - return m_d->m_storageSettings; + return d->m_storageSettings; } const BehaviorSettings &EditorConfiguration::behaviorSettings() const { - return m_d->m_behaviorSettings; + return d->m_behaviorSettings; } const ExtraEncodingSettings &EditorConfiguration::extraEncodingSettings() const { - return m_d->m_extraEncodingSettings; + return d->m_extraEncodingSettings; } TabPreferences *EditorConfiguration::tabPreferences(const QString &languageId) const { - TabPreferences *prefs = m_d->m_languageTabPreferences.value(languageId); + TabPreferences *prefs = d->m_languageTabPreferences.value(languageId); if (!prefs) - prefs = m_d->m_tabPreferences; + prefs = d->m_tabPreferences; return prefs; } QMap<QString, TabPreferences *> EditorConfiguration::languageTabPreferences() const { - return m_d->m_languageTabPreferences; + return d->m_languageTabPreferences; } IFallbackPreferences *EditorConfiguration::codeStylePreferences(const QString &languageId) const { - return m_d->m_languageCodeStylePreferences.value(languageId); + return d->m_languageCodeStylePreferences.value(languageId); } QMap<QString, IFallbackPreferences *> EditorConfiguration::languageCodeStylePreferences() const { - return m_d->m_languageCodeStylePreferences; + return d->m_languageCodeStylePreferences; } QVariantMap EditorConfiguration::toMap() const { QVariantMap map; - map.insert(kUseGlobal, m_d->m_useGlobal); - map.insert(kCodec, m_d->m_textCodec->name()); + map.insert(kUseGlobal, d->m_useGlobal); + map.insert(kCodec, d->m_textCodec->name()); - map.insert(kTabCount, m_d->m_languageTabPreferences.count()); - QMapIterator<QString, TabPreferences *> itTab(m_d->m_languageTabPreferences); + map.insert(kTabCount, d->m_languageTabPreferences.count()); + QMapIterator<QString, TabPreferences *> itTab(d->m_languageTabPreferences); int i = 0; while (itTab.hasNext()) { itTab.next(); @@ -227,8 +228,8 @@ QVariantMap EditorConfiguration::toMap() const i++; } - map.insert(kCodeStyleCount, m_d->m_languageCodeStylePreferences.count()); - QMapIterator<QString, IFallbackPreferences *> itCodeStyle(m_d->m_languageCodeStylePreferences); + map.insert(kCodeStyleCount, d->m_languageCodeStylePreferences.count()); + QMapIterator<QString, IFallbackPreferences *> itCodeStyle(d->m_languageCodeStylePreferences); i = 0; while (itCodeStyle.hasNext()) { itCodeStyle.next(); @@ -241,22 +242,22 @@ QVariantMap EditorConfiguration::toMap() const i++; } - m_d->m_tabPreferences->toMap(kPrefix, &map); - m_d->m_storageSettings.toMap(kPrefix, &map); - m_d->m_behaviorSettings.toMap(kPrefix, &map); - m_d->m_extraEncodingSettings.toMap(kPrefix, &map); + d->m_tabPreferences->toMap(kPrefix, &map); + d->m_storageSettings.toMap(kPrefix, &map); + d->m_behaviorSettings.toMap(kPrefix, &map); + d->m_extraEncodingSettings.toMap(kPrefix, &map); return map; } void EditorConfiguration::fromMap(const QVariantMap &map) { - m_d->m_useGlobal = map.value(kUseGlobal, m_d->m_useGlobal).toBool(); + d->m_useGlobal = map.value(kUseGlobal, d->m_useGlobal).toBool(); - const QByteArray &codecName = map.value(kCodec, m_d->m_textCodec->name()).toByteArray(); - m_d->m_textCodec = QTextCodec::codecForName(codecName); - if (!m_d->m_textCodec) - m_d->m_textCodec = Core::EditorManager::instance()->defaultTextCodec(); + const QByteArray &codecName = map.value(kCodec, d->m_textCodec->name()).toByteArray(); + d->m_textCodec = QTextCodec::codecForName(codecName); + if (!d->m_textCodec) + d->m_textCodec = Core::EditorManager::instance()->defaultTextCodec(); const int tabCount = map.value(kTabCount, 0).toInt(); for (int i = 0; i < tabCount; ++i) { @@ -267,7 +268,7 @@ void EditorConfiguration::fromMap(const QVariantMap &map) } QString languageId = settingsIdMap.value(QLatin1String("language")).toString(); QVariantMap value = settingsIdMap.value(QLatin1String("value")).toMap(); - TabPreferences *preferences = m_d->m_languageTabPreferences.value(languageId); + TabPreferences *preferences = d->m_languageTabPreferences.value(languageId); if (preferences) { preferences->fromMap(QString(), value); } @@ -282,18 +283,18 @@ void EditorConfiguration::fromMap(const QVariantMap &map) } QString languageId = settingsIdMap.value(QLatin1String("language")).toString(); QVariantMap value = settingsIdMap.value(QLatin1String("value")).toMap(); - IFallbackPreferences *preferences = m_d->m_languageCodeStylePreferences.value(languageId); + IFallbackPreferences *preferences = d->m_languageCodeStylePreferences.value(languageId); if (preferences) { preferences->fromMap(QString(), value); } } - m_d->m_tabPreferences->fromMap(kPrefix, map); - m_d->m_tabPreferences->setCurrentFallback(m_d->m_useGlobal + d->m_tabPreferences->fromMap(kPrefix, map); + d->m_tabPreferences->setCurrentFallback(d->m_useGlobal ? TextEditorSettings::instance()->tabPreferences() : 0); - m_d->m_storageSettings.fromMap(kPrefix, map); - m_d->m_behaviorSettings.fromMap(kPrefix, map); - m_d->m_extraEncodingSettings.fromMap(kPrefix, map); + d->m_storageSettings.fromMap(kPrefix, map); + d->m_behaviorSettings.fromMap(kPrefix, map); + d->m_extraEncodingSettings.fromMap(kPrefix, map); } void EditorConfiguration::configureEditor(ITextEditor *textEditor) const @@ -301,8 +302,8 @@ void EditorConfiguration::configureEditor(ITextEditor *textEditor) const BaseTextEditorWidget *baseTextEditor = qobject_cast<BaseTextEditorWidget *>(textEditor->widget()); baseTextEditor->setTabPreferences(tabPreferences(baseTextEditor->languageSettingsId())); baseTextEditor->setCodeStylePreferences(codeStylePreferences(baseTextEditor->languageSettingsId())); - if (!m_d->m_useGlobal) { - textEditor->setTextCodec(m_d->m_textCodec, ITextEditor::TextCodecFromProjectSetting); + if (!d->m_useGlobal) { + textEditor->setTextCodec(d->m_textCodec, ITextEditor::TextCodecFromProjectSetting); if (baseTextEditor) switchSettings(baseTextEditor); } @@ -310,8 +311,8 @@ void EditorConfiguration::configureEditor(ITextEditor *textEditor) const void EditorConfiguration::setUseGlobalSettings(bool use) { - m_d->m_useGlobal = use; - m_d->m_tabPreferences->setCurrentFallback(m_d->m_useGlobal + d->m_useGlobal = use; + d->m_tabPreferences->setCurrentFallback(d->m_useGlobal ? TextEditorSettings::instance()->tabPreferences() : 0); const SessionManager *session = ProjectExplorerPlugin::instance()->session(); QList<Core::IEditor *> opened = Core::EditorManager::instance()->openedEditors(); @@ -326,7 +327,7 @@ void EditorConfiguration::setUseGlobalSettings(bool use) void EditorConfiguration::switchSettings(BaseTextEditorWidget *baseTextEditor) const { - if (m_d->m_useGlobal) + if (d->m_useGlobal) switchSettings_helper(TextEditorSettings::instance(), this, baseTextEditor); else switchSettings_helper(this, TextEditorSettings::instance(), baseTextEditor); @@ -358,25 +359,25 @@ void EditorConfiguration::switchSettings_helper(const NewSenderT *newSender, void EditorConfiguration::setStorageSettings(const TextEditor::StorageSettings &settings) { - m_d->m_storageSettings = settings; - emit storageSettingsChanged(m_d->m_storageSettings); + d->m_storageSettings = settings; + emit storageSettingsChanged(d->m_storageSettings); } void EditorConfiguration::setBehaviorSettings(const TextEditor::BehaviorSettings &settings) { - m_d->m_behaviorSettings = settings; - emit behaviorSettingsChanged(m_d->m_behaviorSettings); + d->m_behaviorSettings = settings; + emit behaviorSettingsChanged(d->m_behaviorSettings); } void EditorConfiguration::setExtraEncodingSettings(const TextEditor::ExtraEncodingSettings &settings) { - m_d->m_extraEncodingSettings = settings; - emit extraEncodingSettingsChanged(m_d->m_extraEncodingSettings); + d->m_extraEncodingSettings = settings; + emit extraEncodingSettingsChanged(d->m_extraEncodingSettings); } void EditorConfiguration::setTextCodec(QTextCodec *textCodec) { - m_d->m_textCodec = textCodec; + d->m_textCodec = textCodec; } TabSettings actualTabSettings(const QString &fileName, diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h index 3e8e8bf1a3..073c595f25 100644 --- a/src/plugins/projectexplorer/editorconfiguration.h +++ b/src/plugins/projectexplorer/editorconfiguration.h @@ -37,7 +37,6 @@ #include <QtCore/QObject> #include <QtCore/QVariantMap> -#include <QtCore/QScopedPointer> namespace TextEditor { class ITextEditor; @@ -104,7 +103,7 @@ private: const OldSenderT *oldSender, TextEditor::BaseTextEditorWidget *baseTextEditor) const; - QScopedPointer<EditorConfigurationPrivate> m_d; + EditorConfigurationPrivate *d; }; // Return the editor settings in the case it's not null. Otherwise, try to find the project diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp index 1b144684c1..e90a9ace34 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp +++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp @@ -68,24 +68,24 @@ public: // -------------------------------------------------------------------------- ToolChainConfigWidget::ToolChainConfigWidget(ToolChain *tc) : - m_d(new Internal::ToolChainConfigWidgetPrivate(tc)) + d(new Internal::ToolChainConfigWidgetPrivate(tc)) { } void ToolChainConfigWidget::setDisplayName(const QString &name) { - m_d->m_toolChain->setDisplayName(name); + d->m_toolChain->setDisplayName(name); } ToolChain *ToolChainConfigWidget::toolChain() const { - return m_d->m_toolChain; + return d->m_toolChain; } void ToolChainConfigWidget::makeReadOnly() { - if (m_d->m_debuggerPathChooser) - m_d->m_debuggerPathChooser->setEnabled(false); + if (d->m_debuggerPathChooser) + d->m_debuggerPathChooser->setEnabled(false); } void ToolChainConfigWidget::emitDirty() @@ -97,7 +97,7 @@ void ToolChainConfigWidget::addDebuggerCommandControls(QFormLayout *lt, const QStringList &versionArguments) { ensureDebuggerPathChooser(versionArguments); - lt->addRow(tr("&Debugger:"), m_d->m_debuggerPathChooser); + lt->addRow(tr("&Debugger:"), d->m_debuggerPathChooser); } void ToolChainConfigWidget::addDebuggerCommandControls(QGridLayout *lt, @@ -106,76 +106,76 @@ void ToolChainConfigWidget::addDebuggerCommandControls(QGridLayout *lt, { ensureDebuggerPathChooser(versionArguments); QLabel *label = new QLabel(tr("&Debugger:")); - label->setBuddy(m_d->m_debuggerPathChooser); + label->setBuddy(d->m_debuggerPathChooser); lt->addWidget(label, row, column); - lt->addWidget(m_d->m_debuggerPathChooser, row, column + 1); + lt->addWidget(d->m_debuggerPathChooser, row, column + 1); } void ToolChainConfigWidget::ensureDebuggerPathChooser(const QStringList &versionArguments) { - if (m_d->m_debuggerPathChooser) + if (d->m_debuggerPathChooser) return; - m_d->m_debuggerPathChooser = new Utils::PathChooser; - m_d->m_debuggerPathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); + d->m_debuggerPathChooser = new Utils::PathChooser; + d->m_debuggerPathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); if (!versionArguments.isEmpty()) - m_d->m_debuggerPathChooser->setCommandVersionArguments(versionArguments); - connect(m_d->m_debuggerPathChooser, SIGNAL(changed(QString)), this, SLOT(emitDirty())); + d->m_debuggerPathChooser->setCommandVersionArguments(versionArguments); + connect(d->m_debuggerPathChooser, SIGNAL(changed(QString)), this, SLOT(emitDirty())); } void ToolChainConfigWidget::addDebuggerAutoDetection(QObject *receiver, const char *autoDetectSlot) { - QTC_ASSERT(m_d->m_debuggerPathChooser, return; ) - m_d->m_debuggerPathChooser->addButton(tr("Autodetect"), receiver, autoDetectSlot); + QTC_ASSERT(d->m_debuggerPathChooser, return; ) + d->m_debuggerPathChooser->addButton(tr("Autodetect"), receiver, autoDetectSlot); } QString ToolChainConfigWidget::debuggerCommand() const { - QTC_ASSERT(m_d->m_debuggerPathChooser, return QString(); ) - return m_d->m_debuggerPathChooser->path(); + QTC_ASSERT(d->m_debuggerPathChooser, return QString(); ) + return d->m_debuggerPathChooser->path(); } -void ToolChainConfigWidget::setDebuggerCommand(const QString &d) +void ToolChainConfigWidget::setDebuggerCommand(const QString &debugger) { - QTC_ASSERT(m_d->m_debuggerPathChooser, return; ) - m_d->m_debuggerPathChooser->setPath(d); + QTC_ASSERT(d->m_debuggerPathChooser, return; ) + d->m_debuggerPathChooser->setPath(debugger); } void ToolChainConfigWidget::addErrorLabel(QFormLayout *lt) { - if (!m_d->m_errorLabel) { - m_d->m_errorLabel = new QLabel; - m_d->m_errorLabel->setVisible(false); + if (!d->m_errorLabel) { + d->m_errorLabel = new QLabel; + d->m_errorLabel->setVisible(false); } - lt->addRow(m_d->m_errorLabel); + lt->addRow(d->m_errorLabel); } void ToolChainConfigWidget::addErrorLabel(QGridLayout *lt, int row, int column, int colSpan) { - if (!m_d->m_errorLabel) { - m_d->m_errorLabel = new QLabel; - m_d->m_errorLabel->setVisible(false); + if (!d->m_errorLabel) { + d->m_errorLabel = new QLabel; + d->m_errorLabel->setVisible(false); } - lt->addWidget(m_d->m_errorLabel, row, column, 1, colSpan); + lt->addWidget(d->m_errorLabel, row, column, 1, colSpan); } void ToolChainConfigWidget::setErrorMessage(const QString &m) { - QTC_ASSERT(m_d->m_errorLabel, return; ) + QTC_ASSERT(d->m_errorLabel, return; ) if (m.isEmpty()) { clearErrorMessage(); } else { - m_d->m_errorLabel->setText(m); - m_d->m_errorLabel->setStyleSheet(QLatin1String("background-color: \"red\"")); - m_d->m_errorLabel->setVisible(true); + d->m_errorLabel->setText(m); + d->m_errorLabel->setStyleSheet(QLatin1String("background-color: \"red\"")); + d->m_errorLabel->setVisible(true); } } void ToolChainConfigWidget::clearErrorMessage() { - QTC_ASSERT(m_d->m_errorLabel, return; ) - m_d->m_errorLabel->clear(); - m_d->m_errorLabel->setStyleSheet(QString()); - m_d->m_errorLabel->setVisible(false); + QTC_ASSERT(d->m_errorLabel, return; ) + d->m_errorLabel->clear(); + d->m_errorLabel->setStyleSheet(QString()); + d->m_errorLabel->setVisible(false); } } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h index 7432446d89..be6644db4c 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.h +++ b/src/plugins/projectexplorer/toolchainconfigwidget.h @@ -62,11 +62,10 @@ public: void setDisplayName(const QString &); virtual void apply() = 0; virtual void discard() = 0; + virtual bool isDirty() const = 0; ProjectExplorer::ToolChain *toolChain() const; - virtual bool isDirty() const = 0; - virtual void makeReadOnly(); signals: @@ -88,12 +87,12 @@ protected: void addErrorLabel(QGridLayout *lt, int row = 0, int column = 0, int colSpan = 1); QString debuggerCommand() const; - void setDebuggerCommand(const QString &d); + void setDebuggerCommand(const QString &debugger); private: void ensureDebuggerPathChooser(const QStringList &versionArguments); - Internal::ToolChainConfigWidgetPrivate *m_d; + Internal::ToolChainConfigWidgetPrivate *d; }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index c61de00f50..f22399cc7a 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -90,7 +90,7 @@ ToolChainManager *ToolChainManager::instance() ToolChainManager::ToolChainManager(QObject *parent) : QObject(parent), - m_d(new Internal::ToolChainManagerPrivate) + d(new Internal::ToolChainManagerPrivate) { Q_ASSERT(!m_instance); m_instance = this; @@ -127,11 +127,11 @@ void ToolChainManager::restoreToolChains() ToolChainManager::~ToolChainManager() { // Deregister tool chains - QList<ToolChain *> copy = m_d->m_toolChains; + QList<ToolChain *> copy = d->m_toolChains; foreach (ToolChain *tc, copy) deregisterToolChain(tc); - delete m_d; + delete d; m_instance = 0; } @@ -141,7 +141,7 @@ void ToolChainManager::saveToolChains() writer.saveValue(QLatin1String(TOOLCHAIN_FILE_VERSION_KEY), 1); int count = 0; - foreach (ToolChain *tc, m_d->m_toolChains) { + foreach (ToolChain *tc, d->m_toolChains) { if (!tc->isAutoDetected() && tc->isValid()) { QVariantMap tmp = tc->toMap(); if (tmp.isEmpty()) @@ -177,7 +177,7 @@ void ToolChainManager::restoreToolChains(const QString &fileName, bool autoDetec const QString pathKey = QString::fromLatin1(DEFAULT_DEBUGGER_PATH_KEY) + QString::number(i); if (!data.contains(pathKey)) continue; - m_d->m_abiToDebugger.insert(data.value(abiKey).toString(), data.value(pathKey).toString()); + d->m_abiToDebugger.insert(data.value(abiKey).toString(), data.value(pathKey).toString()); } ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); @@ -212,13 +212,13 @@ void ToolChainManager::restoreToolChains(const QString &fileName, bool autoDetec QList<ToolChain *> ToolChainManager::toolChains() const { - return m_d->m_toolChains; + return d->m_toolChains; } QList<ToolChain *> ToolChainManager::findToolChains(const Abi &abi) const { QList<ToolChain *> result; - foreach (ToolChain *tc, m_d->m_toolChains) { + foreach (ToolChain *tc, d->m_toolChains) { Abi targetAbi = tc->targetAbi(); if (targetAbi.isCompatibleWith(abi)) result.append(tc); @@ -228,7 +228,7 @@ QList<ToolChain *> ToolChainManager::findToolChains(const Abi &abi) const ToolChain *ToolChainManager::findToolChain(const QString &id) const { - foreach (ToolChain *tc, m_d->m_toolChains) { + foreach (ToolChain *tc, d->m_toolChains) { if (tc->id() == id) return tc; } @@ -237,35 +237,35 @@ ToolChain *ToolChainManager::findToolChain(const QString &id) const QString ToolChainManager::defaultDebugger(const Abi &abi) const { - return m_d->m_abiToDebugger.value(abi.toString()); + return d->m_abiToDebugger.value(abi.toString()); } void ToolChainManager::notifyAboutUpdate(ProjectExplorer::ToolChain *tc) { - if (!tc || !m_d->m_toolChains.contains(tc)) + if (!tc || !d->m_toolChains.contains(tc)) return; emit toolChainUpdated(tc); } bool ToolChainManager::registerToolChain(ToolChain *tc) { - if (!tc || m_d->m_toolChains.contains(tc)) + if (!tc || d->m_toolChains.contains(tc)) return true; - foreach (ToolChain *current, m_d->m_toolChains) { + foreach (ToolChain *current, d->m_toolChains) { if (*tc == *current) return false; } - m_d->m_toolChains.append(tc); + d->m_toolChains.append(tc); emit toolChainAdded(tc); return true; } void ToolChainManager::deregisterToolChain(ToolChain *tc) { - if (!tc || !m_d->m_toolChains.contains(tc)) + if (!tc || !d->m_toolChains.contains(tc)) return; - m_d->m_toolChains.removeOne(tc); + d->m_toolChains.removeOne(tc); emit toolChainRemoved(tc); delete tc; } diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h index 04acb59a4b..f9a3847be3 100644 --- a/src/plugins/projectexplorer/toolchainmanager.h +++ b/src/plugins/projectexplorer/toolchainmanager.h @@ -93,7 +93,7 @@ private: void notifyAboutUpdate(ProjectExplorer::ToolChain *); - Internal::ToolChainManagerPrivate *const m_d; + Internal::ToolChainManagerPrivate *const d; static ToolChainManager *m_instance; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp index 8677641c6b..25040944f1 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp @@ -44,18 +44,18 @@ struct S60CertificateDetailsDialogPrivate S60CertificateDetailsDialog::S60CertificateDetailsDialog(QWidget *parent) : QDialog(parent), - m_d(new S60CertificateDetailsDialogPrivate) + d(new S60CertificateDetailsDialogPrivate) { - m_d->m_ui.setupUi(this); - connect(m_d->m_ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(close())); + d->m_ui.setupUi(this); + connect(d->m_ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(close())); } S60CertificateDetailsDialog::~S60CertificateDetailsDialog() { - delete m_d; + delete d; } void S60CertificateDetailsDialog::setText(const QString &text) { - m_d->m_ui.textBrowser->setText(text); + d->m_ui.textBrowser->setText(text); } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h index 74c0fd70c0..02803e69c5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h @@ -51,7 +51,7 @@ public: void setText(const QString &text); private: - S60CertificateDetailsDialogPrivate *m_d; + S60CertificateDetailsDialogPrivate *d; }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp index bdc22a1847..20ce0d049e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp @@ -739,12 +739,12 @@ AlternativeName create_alt_name(const Data_Store& info) // ======== S60SymbianCertificate -S60SymbianCertificate::S60SymbianCertificate(const QString &filename) : m_d(0) +S60SymbianCertificate::S60SymbianCertificate(const QString &filename) : d(0) { S60SymbianCertificatePrivate *certificate = 0; try { certificate = new S60SymbianCertificatePrivate(filename.toLatin1()); - m_d = certificate; + d = certificate; certificate = 0; } catch (Botan::Exception &e) { m_errorString = QLatin1String(e.what()); @@ -754,12 +754,12 @@ S60SymbianCertificate::S60SymbianCertificate(const QString &filename) : m_d(0) S60SymbianCertificate::~S60SymbianCertificate() { - delete m_d; + delete d; } bool S60SymbianCertificate::isValid() const { - return m_d != 0; + return d != 0; } QString S60SymbianCertificate::errorString() const @@ -769,11 +769,11 @@ QString S60SymbianCertificate::errorString() const QStringList S60SymbianCertificate::subjectInfo(const QString &name) { - Q_ASSERT(m_d); + Q_ASSERT(d); QStringList result; try { std::vector<std::string> subjectInfo = - m_d->subjectInfo(name.toLatin1().constData()); + d->subjectInfo(name.toLatin1().constData()); std::vector<std::string>::const_iterator i; for (i = subjectInfo.begin(); i != subjectInfo.end(); ++i) result << QString::fromLatin1(i->c_str()); @@ -785,11 +785,11 @@ QStringList S60SymbianCertificate::subjectInfo(const QString &name) QStringList S60SymbianCertificate::issuerInfo(const QString &name) { - Q_ASSERT(m_d); + Q_ASSERT(d); QStringList result; try { std::vector<std::string> issuerInfo = - m_d->issuerInfo(name.toLatin1().constData()); + d->issuerInfo(name.toLatin1().constData()); std::vector<std::string>::const_iterator i; for (i = issuerInfo.begin(); i != issuerInfo.end(); ++i) @@ -816,22 +816,22 @@ QDateTime S60SymbianCertificate::parseTime(const QByteArray &time) QDateTime S60SymbianCertificate::startTime() { - Q_ASSERT(m_d); - return parseTime(m_d->startTime().c_str()); + Q_ASSERT(d); + return parseTime(d->startTime().c_str()); } QDateTime S60SymbianCertificate::endTime() { - Q_ASSERT(m_d); - return parseTime(m_d->endTime().c_str()); + Q_ASSERT(d); + return parseTime(d->endTime().c_str()); } quint32 S60SymbianCertificate::certificateVersion() { - Q_ASSERT(m_d); + Q_ASSERT(d); quint32 version = 0; try { - version = static_cast<quint32>(m_d->x509Version()); + version = static_cast<quint32>(d->x509Version()); } catch (Botan::Exception &e) { m_errorString = QString::fromLatin1(e.what()); } @@ -840,16 +840,16 @@ quint32 S60SymbianCertificate::certificateVersion() bool S60SymbianCertificate::isSelfSigned() { - Q_ASSERT(m_d); - return m_d->isSelfSigned(); + Q_ASSERT(d); + return d->isSelfSigned(); } bool S60SymbianCertificate::isCaCert() { - Q_ASSERT(m_d); + Q_ASSERT(d); bool isCaCertificate = false; try { - isCaCertificate = m_d->isCaCert(); + isCaCertificate = d->isCaCert(); } catch (Botan::Exception &e) { m_errorString = QString::fromLatin1(e.what()); } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h index d22cae3055..d7d04bc740 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h @@ -66,7 +66,7 @@ private: QDateTime parseTime(const QByteArray &time); protected: - S60SymbianCertificatePrivate const *m_d; + S60SymbianCertificatePrivate const *d; QString m_errorString; }; diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp index 5d8be23e59..68252a6b05 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp @@ -50,32 +50,32 @@ class Html5AppWizardOptionsPagePrivate Html5AppWizardOptionsPage::Html5AppWizardOptionsPage(QWidget *parent) : QWizardPage(parent) - , m_d(new Html5AppWizardOptionsPagePrivate) + , d(new Html5AppWizardOptionsPagePrivate) { - m_d->ui.setupUi(this); - m_d->ui.importLineEdit->setExpectedKind(Utils::PathChooser::File); - m_d->ui.importLineEdit->setPromptDialogFilter(QLatin1String("*.html")); - m_d->ui.importLineEdit->setPromptDialogTitle(tr("Select HTML File")); - connect(m_d->ui.importLineEdit, SIGNAL(changed(QString)), SIGNAL(completeChanged())); - connect(m_d->ui.importRadioButton, + d->ui.setupUi(this); + d->ui.importLineEdit->setExpectedKind(Utils::PathChooser::File); + d->ui.importLineEdit->setPromptDialogFilter(QLatin1String("*.html")); + d->ui.importLineEdit->setPromptDialogTitle(tr("Select HTML File")); + connect(d->ui.importLineEdit, SIGNAL(changed(QString)), SIGNAL(completeChanged())); + connect(d->ui.importRadioButton, SIGNAL(toggled(bool)), SIGNAL(completeChanged())); - connect(m_d->ui.generateRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); - connect(m_d->ui.importRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); - connect(m_d->ui.urlRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); - m_d->ui.generateRadioButton->setChecked(true); + connect(d->ui.generateRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); + connect(d->ui.importRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); + connect(d->ui.urlRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); + d->ui.generateRadioButton->setChecked(true); } Html5AppWizardOptionsPage::~Html5AppWizardOptionsPage() { - delete m_d; + delete d; } Html5App::Mode Html5AppWizardOptionsPage::mainHtmlMode() const { Html5App::Mode result = Html5App::ModeGenerate; - if (m_d->ui.importRadioButton->isChecked()) + if (d->ui.importRadioButton->isChecked()) result = Html5App::ModeImport; - else if (m_d->ui.urlRadioButton->isChecked()) + else if (d->ui.urlRadioButton->isChecked()) result = Html5App::ModeUrl; return result; } @@ -83,8 +83,8 @@ Html5App::Mode Html5AppWizardOptionsPage::mainHtmlMode() const QString Html5AppWizardOptionsPage::mainHtmlData() const { switch (mainHtmlMode()) { - case Html5App::ModeImport: return m_d->ui.importLineEdit->path(); - case Html5App::ModeUrl: return m_d->ui.urlLineEdit->text(); + case Html5App::ModeImport: return d->ui.importLineEdit->path(); + case Html5App::ModeUrl: return d->ui.urlLineEdit->text(); default: case Html5App::ModeGenerate: return QString(); } @@ -92,23 +92,23 @@ QString Html5AppWizardOptionsPage::mainHtmlData() const void Html5AppWizardOptionsPage::setTouchOptimizationEndabled(bool enabled) { - m_d->ui.touchOptimizationCheckBox->setChecked(enabled); + d->ui.touchOptimizationCheckBox->setChecked(enabled); } bool Html5AppWizardOptionsPage::touchOptimizationEndabled() const { - return m_d->ui.touchOptimizationCheckBox->isChecked(); + return d->ui.touchOptimizationCheckBox->isChecked(); } bool Html5AppWizardOptionsPage::isComplete() const { - return mainHtmlMode() != Html5App::ModeImport || m_d->ui.importLineEdit->isValid(); + return mainHtmlMode() != Html5App::ModeImport || d->ui.importLineEdit->isValid(); } void Html5AppWizardOptionsPage::setLineEditsEnabled() { - m_d->ui.importLineEdit->setEnabled(m_d->ui.importRadioButton->isChecked()); - m_d->ui.urlLineEdit->setEnabled(m_d->ui.urlRadioButton->isChecked()); + d->ui.importLineEdit->setEnabled(d->ui.importRadioButton->isChecked()); + d->ui.urlLineEdit->setEnabled(d->ui.urlRadioButton->isChecked()); } } // namespace Internal diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h index 1c073316b5..a617d39afb 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h @@ -57,7 +57,7 @@ private slots: void setLineEditsEnabled(); private: - class Html5AppWizardOptionsPagePrivate *m_d; + class Html5AppWizardOptionsPagePrivate *d; }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp index ec2721413d..d999e5b5ec 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp @@ -78,25 +78,25 @@ class MobileAppWizardHarmattanOptionsPagePrivate MobileAppWizardGenericOptionsPage::MobileAppWizardGenericOptionsPage(QWidget *parent) : QWizardPage(parent) - , m_d(new MobileAppWizardGenericOptionsPagePrivate) + , d(new MobileAppWizardGenericOptionsPagePrivate) { - m_d->ui.setupUi(this); - m_d->ui.orientationBehaviorComboBox->addItem(tr("Automatically Rotate Orientation"), + d->ui.setupUi(this); + d->ui.orientationBehaviorComboBox->addItem(tr("Automatically Rotate Orientation"), AbstractMobileApp::ScreenOrientationAuto); - m_d->ui.orientationBehaviorComboBox->addItem(tr("Lock to Landscape Orientation"), + d->ui.orientationBehaviorComboBox->addItem(tr("Lock to Landscape Orientation"), AbstractMobileApp::ScreenOrientationLockLandscape); - m_d->ui.orientationBehaviorComboBox->addItem(tr("Lock to Portrait Orientation"), + d->ui.orientationBehaviorComboBox->addItem(tr("Lock to Portrait Orientation"), AbstractMobileApp::ScreenOrientationLockPortrait); } MobileAppWizardGenericOptionsPage::~MobileAppWizardGenericOptionsPage() { - delete m_d; + delete d; } void MobileAppWizardGenericOptionsPage::setOrientation(AbstractMobileApp::ScreenOrientation orientation) { - QComboBox *const comboBox = m_d->ui.orientationBehaviorComboBox; + QComboBox *const comboBox = d->ui.orientationBehaviorComboBox; for (int i = 0; i < comboBox->count(); ++i) { if (comboBox->itemData(i).toInt() == static_cast<int>(orientation)) { comboBox->setCurrentIndex(i); @@ -107,7 +107,7 @@ void MobileAppWizardGenericOptionsPage::setOrientation(AbstractMobileApp::Screen AbstractMobileApp::ScreenOrientation MobileAppWizardGenericOptionsPage::orientation() const { - QComboBox *const comboBox = m_d->ui.orientationBehaviorComboBox; + QComboBox *const comboBox = d->ui.orientationBehaviorComboBox; const int index = comboBox->currentIndex(); return static_cast<AbstractMobileApp::ScreenOrientation>(comboBox->itemData(index).toInt()); } @@ -115,22 +115,22 @@ AbstractMobileApp::ScreenOrientation MobileAppWizardGenericOptionsPage::orientat MobileAppWizardSymbianOptionsPage::MobileAppWizardSymbianOptionsPage(QWidget *parent) : QWizardPage(parent) - , m_d(new MobileAppWizardSymbianOptionsPagePrivate) + , d(new MobileAppWizardSymbianOptionsPagePrivate) { - m_d->ui.setupUi(this); + d->ui.setupUi(this); const QIcon open = QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon); - m_d->ui.appIconLoadToolButton->setIcon(open); - connect(m_d->ui.appIconLoadToolButton, SIGNAL(clicked()), SLOT(openSvgIcon())); + d->ui.appIconLoadToolButton->setIcon(open); + connect(d->ui.appIconLoadToolButton, SIGNAL(clicked()), SLOT(openSvgIcon())); } MobileAppWizardSymbianOptionsPage::~MobileAppWizardSymbianOptionsPage() { - delete m_d; + delete d; } QString MobileAppWizardSymbianOptionsPage::svgIcon() const { - return m_d->svgIcon; + return d->svgIcon; } void MobileAppWizardSymbianOptionsPage::setSvgIcon(const QString &icon) @@ -140,36 +140,36 @@ void MobileAppWizardSymbianOptionsPage::setSvgIcon(const QString &icon) const int symbianIconSize = 44; if (iconPixmap.height() > symbianIconSize || iconPixmap.width() > symbianIconSize) iconPixmap = iconPixmap.scaledToHeight(symbianIconSize, Qt::SmoothTransformation); - m_d->ui.appIconPreview->setPixmap(iconPixmap); - m_d->svgIcon = icon; + d->ui.appIconPreview->setPixmap(iconPixmap); + d->svgIcon = icon; } } QString MobileAppWizardSymbianOptionsPage::symbianUid() const { - return m_d->ui.uid3LineEdit->text(); + return d->ui.uid3LineEdit->text(); } void MobileAppWizardSymbianOptionsPage::setSymbianUid(const QString &uid) { - m_d->ui.uid3LineEdit->setText(uid); + d->ui.uid3LineEdit->setText(uid); } void MobileAppWizardSymbianOptionsPage::setNetworkEnabled(bool enableIt) { - m_d->ui.enableNetworkCheckBox->setChecked(enableIt); + d->ui.enableNetworkCheckBox->setChecked(enableIt); } bool MobileAppWizardSymbianOptionsPage::networkEnabled() const { - return m_d->ui.enableNetworkCheckBox->isChecked(); + return d->ui.enableNetworkCheckBox->isChecked(); } void MobileAppWizardSymbianOptionsPage::openSvgIcon() { const QString svgIcon = QFileDialog::getOpenFileName( this, - m_d->ui.appIconLabel->text(), + d->ui.appIconLabel->text(), QDesktopServices::storageLocation(QDesktopServices::PicturesLocation), QLatin1String("*.svg")); if (!svgIcon.isEmpty()) @@ -178,22 +178,22 @@ void MobileAppWizardSymbianOptionsPage::openSvgIcon() MobileAppWizardMaemoOptionsPage::MobileAppWizardMaemoOptionsPage(QWidget *parent) : QWizardPage(parent) - , m_d(new MobileAppWizardMaemoOptionsPagePrivate) + , d(new MobileAppWizardMaemoOptionsPagePrivate) { - m_d->ui.setupUi(this); - m_d->iconSize = QSize(64, 64); - m_d->ui.pngIconButton->setIconSize(m_d->iconSize); - connect(m_d->ui.pngIconButton, SIGNAL(clicked()), this, SLOT(openPngIcon())); + d->ui.setupUi(this); + d->iconSize = QSize(64, 64); + d->ui.pngIconButton->setIconSize(d->iconSize); + connect(d->ui.pngIconButton, SIGNAL(clicked()), this, SLOT(openPngIcon())); } MobileAppWizardMaemoOptionsPage::~MobileAppWizardMaemoOptionsPage() { - delete m_d; + delete d; } QString MobileAppWizardMaemoOptionsPage::pngIcon() const { - return m_d->pngIcon; + return d->pngIcon; } @@ -247,7 +247,7 @@ private: void MobileAppWizardMaemoOptionsPage::setPngIcon(const QString &icon) { QString actualIconPath; - PngIconScaler scaler(m_d->iconSize, icon); + PngIconScaler scaler(d->iconSize, icon); if (scaler.hasRightSize()) { actualIconPath = icon; } else { @@ -255,14 +255,14 @@ void MobileAppWizardMaemoOptionsPage::setPngIcon(const QString &icon) return; } - m_d->ui.pngIconButton->setIcon(scaler.pixmap()); - m_d->pngIcon = actualIconPath; + d->ui.pngIconButton->setIcon(scaler.pixmap()); + d->pngIcon = actualIconPath; } void MobileAppWizardMaemoOptionsPage::openPngIcon() { const QString iconPath = QFileDialog::getOpenFileName(this, - m_d->ui.appIconLabel->text(), m_d->pngIcon, + d->ui.appIconLabel->text(), d->pngIcon, QLatin1String("*.png")); if (!iconPath.isEmpty()) setPngIcon(iconPath); @@ -270,28 +270,28 @@ void MobileAppWizardMaemoOptionsPage::openPngIcon() MobileAppWizardHarmattanOptionsPage::MobileAppWizardHarmattanOptionsPage(QWidget *parent) : QWizardPage(parent) - , m_d(new MobileAppWizardHarmattanOptionsPagePrivate) + , d(new MobileAppWizardHarmattanOptionsPagePrivate) { - m_d->ui.setupUi(this); - m_d->iconSize = QSize(80, 80); - m_d->ui.pngIconButton->setIconSize(m_d->iconSize); - connect(m_d->ui.pngIconButton, SIGNAL(clicked()), this, SLOT(openPngIcon())); + d->ui.setupUi(this); + d->iconSize = QSize(80, 80); + d->ui.pngIconButton->setIconSize(d->iconSize); + connect(d->ui.pngIconButton, SIGNAL(clicked()), this, SLOT(openPngIcon())); } MobileAppWizardHarmattanOptionsPage::~MobileAppWizardHarmattanOptionsPage() { - delete m_d; + delete d; } QString MobileAppWizardHarmattanOptionsPage::pngIcon() const { - return m_d->pngIcon; + return d->pngIcon; } void MobileAppWizardHarmattanOptionsPage::setPngIcon(const QString &icon) { QString actualIconPath; - PngIconScaler scaler(m_d->iconSize, icon); + PngIconScaler scaler(d->iconSize, icon); if (scaler.hasRightSize()) { actualIconPath = icon; } else { @@ -299,14 +299,14 @@ void MobileAppWizardHarmattanOptionsPage::setPngIcon(const QString &icon) return; } - m_d->ui.pngIconButton->setIcon(scaler.pixmap()); - m_d->pngIcon = actualIconPath; + d->ui.pngIconButton->setIcon(scaler.pixmap()); + d->pngIcon = actualIconPath; } void MobileAppWizardHarmattanOptionsPage::openPngIcon() { const QString iconPath = QFileDialog::getOpenFileName(this, - m_d->ui.appIconLabel->text(), m_d->pngIcon, + d->ui.appIconLabel->text(), d->pngIcon, QLatin1String("*.png")); if (!iconPath.isEmpty()) setPngIcon(iconPath); @@ -314,13 +314,13 @@ void MobileAppWizardHarmattanOptionsPage::openPngIcon() void MobileAppWizardHarmattanOptionsPage::setBoosterOptionEnabled(bool enable) { - m_d->ui.makeBoostableCheckBox->setEnabled(enable); - m_d->ui.makeBoostableCheckBox->setChecked(enable); + d->ui.makeBoostableCheckBox->setEnabled(enable); + d->ui.makeBoostableCheckBox->setChecked(enable); } bool MobileAppWizardHarmattanOptionsPage::supportsBooster() const { - return m_d->ui.makeBoostableCheckBox->isChecked(); + return d->ui.makeBoostableCheckBox->isChecked(); } } // namespace Internal diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h index 029108c3fc..8d0d904a40 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h @@ -52,7 +52,7 @@ public: AbstractMobileApp::ScreenOrientation orientation() const; private: - class MobileAppWizardGenericOptionsPagePrivate *m_d; + class MobileAppWizardGenericOptionsPagePrivate *d; }; class MobileAppWizardSymbianOptionsPage : public QWizardPage @@ -74,7 +74,7 @@ private slots: void openSvgIcon(); // Via file open dialog private: - class MobileAppWizardSymbianOptionsPagePrivate *m_d; + class MobileAppWizardSymbianOptionsPagePrivate *d; }; class MobileAppWizardMaemoOptionsPage : public QWizardPage @@ -92,7 +92,7 @@ private slots: void openPngIcon(); private: - class MobileAppWizardMaemoOptionsPagePrivate *m_d; + class MobileAppWizardMaemoOptionsPagePrivate *d; }; class MobileAppWizardHarmattanOptionsPage : public QWizardPage @@ -113,7 +113,7 @@ private slots: void openPngIcon(); private: - class MobileAppWizardHarmattanOptionsPagePrivate *m_d; + class MobileAppWizardHarmattanOptionsPagePrivate *d; }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp index 84d1a3af5d..4b95a7fe14 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp @@ -53,56 +53,56 @@ class MobileLibraryWizardOptionPagePrivate MobileLibraryWizardOptionPage::MobileLibraryWizardOptionPage(QWidget *parent) : QWizardPage(parent) - , m_d(new MobileLibraryWizardOptionPagePrivate) + , d(new MobileLibraryWizardOptionPagePrivate) { - m_d->ui.setupUi(this); + d->ui.setupUi(this); } MobileLibraryWizardOptionPage::~MobileLibraryWizardOptionPage() { - delete m_d; + delete d; } QString MobileLibraryWizardOptionPage::symbianUid() const { - return m_d->ui.symbianTargetUid3LineEdit->text(); + return d->ui.symbianTargetUid3LineEdit->text(); } void MobileLibraryWizardOptionPage::setSymbianUid(const QString &uid) { - m_d->ui.symbianTargetUid3LineEdit->setText(uid); + d->ui.symbianTargetUid3LineEdit->setText(uid); } void MobileLibraryWizardOptionPage::setNetworkEnabled(bool enableIt) { - m_d->ui.symbianEnableNetworkCheckBox->setChecked(enableIt); + d->ui.symbianEnableNetworkCheckBox->setChecked(enableIt); } bool MobileLibraryWizardOptionPage::networkEnabled() const { - return m_d->ui.symbianEnableNetworkCheckBox->isChecked(); + return d->ui.symbianEnableNetworkCheckBox->isChecked(); } QString MobileLibraryWizardOptionPage::qtPluginDirectory() const { - return m_d->ui.qtPluginLocationLineEdit->text(); + return d->ui.qtPluginLocationLineEdit->text(); } void MobileLibraryWizardOptionPage::setQtPluginDirectory(const QString &directory) { - m_d->ui.qtPluginLocationLineEdit->setText(directory); + d->ui.qtPluginLocationLineEdit->setText(directory); } void MobileLibraryWizardOptionPage::setLibraryType(int type) { - m_d->libraryType = static_cast<QtProjectParameters::Type>(type); + d->libraryType = static_cast<QtProjectParameters::Type>(type); if (type != QtProjectParameters::Qt4Plugin) { - m_d->ui.qtPluginLocationLineEdit->setVisible(false); - m_d->ui.qtPluginLocationLabel->setVisible(false); - m_d->ui.formLayout_2->removeItem(m_d->ui.horizontalLayout_2); - delete m_d->ui.horizontalLayout_2; - m_d->ui.horizontalLayout_2 = 0; + d->ui.qtPluginLocationLineEdit->setVisible(false); + d->ui.qtPluginLocationLabel->setVisible(false); + d->ui.formLayout_2->removeItem(d->ui.horizontalLayout_2); + delete d->ui.horizontalLayout_2; + d->ui.horizontalLayout_2 = 0; } } diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h index 678d7b1cd6..d856d18175 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h +++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h @@ -55,7 +55,7 @@ public: void setLibraryType(int type); private: - class MobileLibraryWizardOptionPagePrivate *m_d; + class MobileLibraryWizardOptionPagePrivate *d; }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp index e71a50c5f2..3f7580ca49 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp @@ -50,37 +50,37 @@ class QtQuickComponentSetOptionsPagePrivate QtQuickComponentSetOptionsPage::QtQuickComponentSetOptionsPage(QWidget *parent) : QWizardPage(parent) - , m_d(new QtQuickComponentSetOptionsPagePrivate) + , d(new QtQuickComponentSetOptionsPagePrivate) { - m_d->ui.setupUi(this); + d->ui.setupUi(this); - m_d->ui.importLineEdit->setExpectedKind(Utils::PathChooser::File); - m_d->ui.importLineEdit->setPromptDialogFilter(QLatin1String("*.qml")); - m_d->ui.importLineEdit->setPromptDialogTitle(tr("Select QML File")); - connect(m_d->ui.importLineEdit, SIGNAL(changed(QString)), SIGNAL(completeChanged())); - connect(m_d->ui.importRadioButton, + d->ui.importLineEdit->setExpectedKind(Utils::PathChooser::File); + d->ui.importLineEdit->setPromptDialogFilter(QLatin1String("*.qml")); + d->ui.importLineEdit->setPromptDialogTitle(tr("Select QML File")); + connect(d->ui.importLineEdit, SIGNAL(changed(QString)), SIGNAL(completeChanged())); + connect(d->ui.importRadioButton, SIGNAL(toggled(bool)), SIGNAL(completeChanged())); - connect(m_d->ui.importRadioButton, SIGNAL(toggled(bool)), - m_d->ui.importLineEdit, SLOT(setEnabled(bool))); + connect(d->ui.importRadioButton, SIGNAL(toggled(bool)), + d->ui.importLineEdit, SLOT(setEnabled(bool))); - m_d->ui.buttonGroup->setId(m_d->ui.qtquick10RadioButton, 0); - m_d->ui.buttonGroup->setId(m_d->ui.symbian10RadioButton, 1); - m_d->ui.buttonGroup->setId(m_d->ui.meego10RadioButton, 2); - m_d->ui.buttonGroup->setId(m_d->ui.importRadioButton, 3); - connect(m_d->ui.buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(radioButtonChecked(int))); + d->ui.buttonGroup->setId(d->ui.qtquick10RadioButton, 0); + d->ui.buttonGroup->setId(d->ui.symbian10RadioButton, 1); + d->ui.buttonGroup->setId(d->ui.meego10RadioButton, 2); + d->ui.buttonGroup->setId(d->ui.importRadioButton, 3); + connect(d->ui.buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(radioButtonChecked(int))); setTitle(tr("Qt Quick Application Type")); } QtQuickComponentSetOptionsPage::~QtQuickComponentSetOptionsPage() { - delete m_d; + delete d; } QtQuickApp::ComponentSet QtQuickComponentSetOptionsPage::componentSet() const { - switch (m_d->ui.buttonGroup->checkedId()) { + switch (d->ui.buttonGroup->checkedId()) { case 2: return QtQuickApp::Meego10Components; case 1: return QtQuickApp::Symbian10Components; case 0: @@ -91,34 +91,34 @@ QtQuickApp::ComponentSet QtQuickComponentSetOptionsPage::componentSet() const void QtQuickComponentSetOptionsPage::setComponentSet(QtQuickApp::ComponentSet componentSet) { switch (componentSet) { - case QtQuickApp::Meego10Components: m_d->ui.meego10RadioButton->click(); break; - case QtQuickApp::Symbian10Components: m_d->ui.symbian10RadioButton->click(); break; + case QtQuickApp::Meego10Components: d->ui.meego10RadioButton->click(); break; + case QtQuickApp::Symbian10Components: d->ui.symbian10RadioButton->click(); break; case QtQuickApp::QtQuick10Components: - default: m_d->ui.qtquick10RadioButton->click(); break; + default: d->ui.qtquick10RadioButton->click(); break; } } void QtQuickComponentSetOptionsPage::radioButtonChecked(int index) { - m_d->ui.descriptionStackedWidget->setCurrentIndex(index); + d->ui.descriptionStackedWidget->setCurrentIndex(index); } QtQuickApp::Mode QtQuickComponentSetOptionsPage::mainQmlMode() const { - return m_d->ui.importRadioButton->isChecked() ? QtQuickApp::ModeImport - : QtQuickApp::ModeGenerate; + return d->ui.importRadioButton->isChecked() ? QtQuickApp::ModeImport + : QtQuickApp::ModeGenerate; } QString QtQuickComponentSetOptionsPage::mainQmlFile() const { return mainQmlMode() == QtQuickApp::ModeImport ? - m_d->ui.importLineEdit->path() : QString(); + d->ui.importLineEdit->path() : QString(); } bool QtQuickComponentSetOptionsPage::isComplete() const { return mainQmlMode() != QtQuickApp::ModeImport - || m_d->ui.importLineEdit->isValid(); + || d->ui.importLineEdit->isValid(); } } // namespace Internal diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h index 2555ecb6da..e30ee76371 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h @@ -33,9 +33,10 @@ #ifndef QTQUICKAPPWIZARDPAGES_H #define QTQUICKAPPWIZARDPAGES_H -#include <QtGui/QWizardPage> #include "qtquickapp.h" +#include <QtGui/QWizardPage> + namespace Qt4ProjectManager { namespace Internal { @@ -58,7 +59,7 @@ private slots: void radioButtonChecked(int index); private: - class QtQuickComponentSetOptionsPagePrivate *m_d; + class QtQuickComponentSetOptionsPagePrivate *d; }; } // namespace Internal 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 { /** |