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

Use Core::Id for IOptionsPage::m_id

Browse Source 
Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
hjk
2013-01-16 15:22:58 +01:00
committed by Christian Kandeler
parent 5e7cf3f062
commit be48a3faff
63 changed files with 95 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/snippets/snippetssettingspage.cpp
View File

@@ -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))
{

2
src/plugins/texteditor/snippets/snippetssettingspage.h
View File

@@ -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;