diff options
| author | hjk <hjk121@nokiamail.com> | 2014-02-24 15:03:25 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-25 10:36:25 +0100 |
| commit | 6c6f47f86ccc8603da6199c1aaa1434a7379664d (patch) | |
| tree | 4e835032a42dcdf277e8f82fd1d4765098275818 /src/plugins/qmljseditor | |
| parent | 9035a9b77a215d63b094eb43ef5dd100a261e5de (diff) | |
Core: Make IEditor::id a value member and adjust users
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditor.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditoreditable.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditoreditable.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 6967362ad96..4afa47a2f41 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -183,11 +183,6 @@ IEditor *QmlJSEditor::duplicate() return newEditor->editor(); } -Id QmlJSEditor::id() const -{ - return Constants::C_QMLJSEDITOR_ID; -} - bool QmlJSEditor::open(QString *errorString, const QString &fileName, const QString &realFileName) { bool b = TextEditor::BaseTextEditor::open(errorString, fileName, realFileName); diff --git a/src/plugins/qmljseditor/qmljseditoreditable.cpp b/src/plugins/qmljseditor/qmljseditoreditable.cpp index aba39538c75..2517aae42ce 100644 --- a/src/plugins/qmljseditor/qmljseditoreditable.cpp +++ b/src/plugins/qmljseditor/qmljseditoreditable.cpp @@ -50,6 +50,7 @@ namespace Internal { QmlJSEditor::QmlJSEditor(QmlJSTextEditorWidget *editor) : BaseTextEditor(editor) { + setId(Constants::C_QMLJSEDITOR_ID); m_context.add(Constants::C_QMLJSEDITOR_ID); m_context.add(TextEditor::Constants::C_TEXTEDITOR); m_context.add(ProjectExplorer::Constants::LANG_QMLJS); diff --git a/src/plugins/qmljseditor/qmljseditoreditable.h b/src/plugins/qmljseditor/qmljseditoreditable.h index bafdfd01e72..2899fe17e72 100644 --- a/src/plugins/qmljseditor/qmljseditoreditable.h +++ b/src/plugins/qmljseditor/qmljseditoreditable.h @@ -48,7 +48,6 @@ public: bool duplicateSupported() const { return true; } Core::IEditor *duplicate(); - Core::Id id() const; bool open(QString *errorString, const QString &fileName, const QString &realFileName); bool isDesignModePreferred() const; |