From be48a3faffd39689ecd019b94c69ac4042bbdbdc Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 16 Jan 2013 15:22:58 +0100 Subject: Use Core::Id for IOptionsPage::m_id Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca Reviewed-by: Christian Kandeler --- src/plugins/texteditor/behaviorsettingspage.h | 2 +- src/plugins/texteditor/displaysettingspage.h | 2 +- src/plugins/texteditor/fontsettingspage.cpp | 8 ++++---- src/plugins/texteditor/fontsettingspage.h | 4 +--- .../texteditor/generichighlighter/highlightersettingspage.cpp | 8 ++++---- .../texteditor/generichighlighter/highlightersettingspage.h | 2 +- src/plugins/texteditor/snippets/snippetssettingspage.cpp | 10 +++++----- src/plugins/texteditor/snippets/snippetssettingspage.h | 2 +- src/plugins/texteditor/texteditorsettings.cpp | 10 +++++----- 9 files changed, 23 insertions(+), 25 deletions(-) (limited to 'src/plugins/texteditor') diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h index d57d95327e..69d17ec270 100644 --- a/src/plugins/texteditor/behaviorsettingspage.h +++ b/src/plugins/texteditor/behaviorsettingspage.h @@ -47,7 +47,7 @@ class CodeStylePool; class BehaviorSettingsPageParameters { public: - QString id; + Core::Id id; QString displayName; QString settingsPrefix; }; diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h index ac0185c2ed..1cf5daa031 100644 --- a/src/plugins/texteditor/displaysettingspage.h +++ b/src/plugins/texteditor/displaysettingspage.h @@ -41,7 +41,7 @@ class DisplaySettings; class DisplaySettingsPageParameters { public: - QString id; + Core::Id id; QString displayName; QString settingsPrefix; }; diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 69a02ba73d..cbe3fec29c 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -117,13 +117,13 @@ class FontSettingsPagePrivate { public: FontSettingsPagePrivate(const TextEditor::FormatDescriptions &fd, - const QString &id, + Core::Id id, const QString &displayName, const QString &category); ~FontSettingsPagePrivate(); public: - const QString m_id; + const Core::Id m_id; const QString m_displayName; const QString m_settingsGroup; @@ -174,7 +174,7 @@ static QString createColorSchemeFileName(const QString &pattern) // ------- FontSettingsPagePrivate FontSettingsPagePrivate::FontSettingsPagePrivate(const TextEditor::FormatDescriptions &fd, - const QString &id, + Core::Id id, const QString &displayName, const QString &category) : m_id(id), @@ -313,7 +313,7 @@ QColor FormatDescription::background() const // ------------ FontSettingsPage FontSettingsPage::FontSettingsPage(const FormatDescriptions &fd, - const QString &id, + Core::Id id, QObject *parent) : TextEditorOptionsPage(parent), d_ptr(new FontSettingsPagePrivate(fd, id, tr("Font && Colors"), category().toString())) diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index b15357821c..baff774a59 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -88,9 +88,7 @@ class TEXTEDITOR_EXPORT FontSettingsPage : public TextEditorOptionsPage Q_OBJECT public: - FontSettingsPage(const FormatDescriptions &fd, - const QString &id, - QObject *parent = 0); + FontSettingsPage(const FormatDescriptions &fd, Core::Id id, QObject *parent = 0); ~FontSettingsPage(); diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp index d526bd8795..577bce5830 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp @@ -43,11 +43,11 @@ using namespace Internal; struct HighlighterSettingsPage::HighlighterSettingsPagePrivate { - explicit HighlighterSettingsPagePrivate(const QString &id); + explicit HighlighterSettingsPagePrivate(Core::Id id); void ensureInitialized(); bool m_initialized; - const QString m_id; + const Core::Id m_id; const QString m_displayName; const QString m_settingsPrefix; @@ -59,7 +59,7 @@ struct HighlighterSettingsPage::HighlighterSettingsPagePrivate }; HighlighterSettingsPage::HighlighterSettingsPagePrivate:: -HighlighterSettingsPagePrivate(const QString &id) : +HighlighterSettingsPagePrivate(Core::Id id) : m_initialized(false), m_id(id), m_displayName(tr("Generic Highlighter")), @@ -75,7 +75,7 @@ void HighlighterSettingsPage::HighlighterSettingsPagePrivate::ensureInitialized( m_settings.fromSettings(m_settingsPrefix, Core::ICore::settings()); } -HighlighterSettingsPage::HighlighterSettingsPage(const QString &id, QObject *parent) : +HighlighterSettingsPage::HighlighterSettingsPage(Core::Id id, QObject *parent) : TextEditorOptionsPage(parent), m_requestMimeTypeRegistration(false), m_d(new HighlighterSettingsPagePrivate(id)) diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h index 682a6bcd83..7f2c237f43 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h @@ -49,7 +49,7 @@ class HighlighterSettingsPage : public TextEditorOptionsPage Q_OBJECT public: - HighlighterSettingsPage(const QString &id, QObject *parent); + HighlighterSettingsPage(Core::Id id, QObject *parent); ~HighlighterSettingsPage(); QWidget *createPage(QWidget *parent); diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index f8ad8cdf2d..3d9f55fe58 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp @@ -268,10 +268,10 @@ class SnippetsSettingsPagePrivate : public QObject { Q_OBJECT public: - SnippetsSettingsPagePrivate(const QString &id); + SnippetsSettingsPagePrivate(Core::Id id); ~SnippetsSettingsPagePrivate() { delete m_model; } - const QString &id() const { return m_id; } + Core::Id id() const { return m_id; } const QString &displayName() const { return m_displayName; } bool isKeyword(const QString &s) const { return m_keywords.contains(s, Qt::CaseInsensitive); } void configureUi(QWidget *parent); @@ -301,7 +301,7 @@ private: bool settingsChanged() const; void writeSettings(); - const QString m_id; + const Core::Id m_id; const QString m_displayName; const QString m_settingsPrefix; SnippetsTableModel *m_model; @@ -311,7 +311,7 @@ private: Ui::SnippetsSettingsPage m_ui; }; -SnippetsSettingsPagePrivate::SnippetsSettingsPagePrivate(const QString &id) : +SnippetsSettingsPagePrivate::SnippetsSettingsPagePrivate(Core::Id id) : m_id(id), m_displayName(tr("Snippets")), m_settingsPrefix(QLatin1String("Text")), @@ -557,7 +557,7 @@ void SnippetsSettingsPagePrivate::decorateEditors(const TextEditor::FontSettings } // SnippetsSettingsPage -SnippetsSettingsPage::SnippetsSettingsPage(const QString &id, QObject *parent) : +SnippetsSettingsPage::SnippetsSettingsPage(Core::Id id, QObject *parent) : TextEditorOptionsPage(parent), d(new SnippetsSettingsPagePrivate(id)) { diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.h b/src/plugins/texteditor/snippets/snippetssettingspage.h index 24667488d0..c3398e1a7c 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.h +++ b/src/plugins/texteditor/snippets/snippetssettingspage.h @@ -42,7 +42,7 @@ class SnippetsSettingsPage : public TextEditorOptionsPage Q_OBJECT public: - SnippetsSettingsPage(const QString &id, QObject *parent); + SnippetsSettingsPage(Core::Id id, QObject *parent); ~SnippetsSettingsPage(); bool matches(const QString &s) const; diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index e761795d35..a4c506e706 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -256,31 +256,31 @@ TextEditorSettings::TextEditorSettings(QObject *parent) "(in diff editor)."), Qt::blue)); m_d->m_fontSettingsPage = new FontSettingsPage(formatDescr, - QLatin1String(Constants::TEXT_EDITOR_FONT_SETTINGS), + Constants::TEXT_EDITOR_FONT_SETTINGS, this); ExtensionSystem::PluginManager::addObject(m_d->m_fontSettingsPage); // Add the GUI used to configure the tab, storage and interaction settings TextEditor::BehaviorSettingsPageParameters behaviorSettingsPageParameters; - behaviorSettingsPageParameters.id = QLatin1String(Constants::TEXT_EDITOR_BEHAVIOR_SETTINGS); + behaviorSettingsPageParameters.id = Constants::TEXT_EDITOR_BEHAVIOR_SETTINGS; behaviorSettingsPageParameters.displayName = tr("Behavior"); behaviorSettingsPageParameters.settingsPrefix = QLatin1String("text"); m_d->m_behaviorSettingsPage = new BehaviorSettingsPage(behaviorSettingsPageParameters, this); ExtensionSystem::PluginManager::addObject(m_d->m_behaviorSettingsPage); TextEditor::DisplaySettingsPageParameters displaySettingsPageParameters; - displaySettingsPageParameters.id = QLatin1String(Constants::TEXT_EDITOR_DISPLAY_SETTINGS), + displaySettingsPageParameters.id = Constants::TEXT_EDITOR_DISPLAY_SETTINGS; displaySettingsPageParameters.displayName = tr("Display"); displaySettingsPageParameters.settingsPrefix = QLatin1String("text"); m_d->m_displaySettingsPage = new DisplaySettingsPage(displaySettingsPageParameters, this); ExtensionSystem::PluginManager::addObject(m_d->m_displaySettingsPage); m_d->m_highlighterSettingsPage = - new HighlighterSettingsPage(QLatin1String(Constants::TEXT_EDITOR_HIGHLIGHTER_SETTINGS), this); + new HighlighterSettingsPage(Constants::TEXT_EDITOR_HIGHLIGHTER_SETTINGS, this); ExtensionSystem::PluginManager::addObject(m_d->m_highlighterSettingsPage); m_d->m_snippetsSettingsPage = - new SnippetsSettingsPage(QLatin1String(Constants::TEXT_EDITOR_SNIPPETS_SETTINGS), this); + new SnippetsSettingsPage(Constants::TEXT_EDITOR_SNIPPETS_SETTINGS, this); ExtensionSystem::PluginManager::addObject(m_d->m_snippetsSettingsPage); connect(m_d->m_fontSettingsPage, SIGNAL(changed(TextEditor::FontSettings)), -- cgit v1.2.3