aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-05-08 16:07:24 +0200
committerhjk <hjk121@nokiamail.com>2014-05-21 14:29:00 +0200
commit3462c5ef4256a5513f0b5f390fd6278d57d7caee (patch)
treec1ad65a6eda7af8800664389fb796db6defc98f9
parentb739ad38d453689ceea95bf6dbf653829c07012b (diff)
IEditor: Make duplicatesSupported a value member
Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
-rw-r--r--src/plugins/android/javaeditor.cpp1
-rw-r--r--src/plugins/android/javaeditor.h1
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeeditor.cpp1
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeeditor.h1
-rw-r--r--src/plugins/coreplugin/editormanager/ieditor.cpp18
-rw-r--r--src/plugins/coreplugin/editormanager/ieditor.h9
-rw-r--r--src/plugins/cppeditor/cppeditor.cpp1
-rw-r--r--src/plugins/cppeditor/cppeditor.h1
-rw-r--r--src/plugins/diffeditor/diffeditor.h1
-rw-r--r--src/plugins/genericprojectmanager/genericprojectfileseditor.cpp6
-rw-r--r--src/plugins/genericprojectmanager/genericprojectfileseditor.h1
-rw-r--r--src/plugins/glsleditor/glsleditoreditable.cpp1
-rw-r--r--src/plugins/glsleditor/glsleditoreditable.h1
-rw-r--r--src/plugins/pythoneditor/pythoneditor.cpp1
-rw-r--r--src/plugins/pythoneditor/pythoneditor.h1
-rw-r--r--src/plugins/qmakeprojectmanager/profileeditor.cpp1
-rw-r--r--src/plugins/qmakeprojectmanager/profileeditor.h1
-rw-r--r--src/plugins/qmljseditor/qmljseditoreditable.cpp1
-rw-r--r--src/plugins/qmljseditor/qmljseditoreditable.h1
-rw-r--r--src/plugins/texteditor/plaintexteditor.cpp1
-rw-r--r--src/plugins/texteditor/plaintexteditor.h1
-rw-r--r--src/plugins/texteditor/snippets/snippeteditor.h1
22 files changed, 34 insertions, 18 deletions
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 21e2e3190c8..763228fd153 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -54,6 +54,7 @@ JavaEditor::JavaEditor(JavaEditorWidget *editor)
{
setContext(Core::Context(Constants::C_JAVA_EDITOR,
TextEditor::Constants::C_TEXTEDITOR));
+ setDuplicateSupported(true);
}
Core::IEditor *JavaEditor::duplicate()
diff --git a/src/plugins/android/javaeditor.h b/src/plugins/android/javaeditor.h
index 577b00f886c..f6604296388 100644
--- a/src/plugins/android/javaeditor.h
+++ b/src/plugins/android/javaeditor.h
@@ -47,7 +47,6 @@ class JavaEditor : public TextEditor::BaseTextEditor
public:
JavaEditor(JavaEditorWidget *);
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
TextEditor::CompletionAssistProvider *completionAssistProvider();
};
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index 4b682c3c04d..3552ac7c848 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -61,6 +61,7 @@ CMakeEditor::CMakeEditor(CMakeEditorWidget *editor)
{
setContext(Core::Context(CMakeProjectManager::Constants::C_CMAKEEDITOR,
TextEditor::Constants::C_TEXTEDITOR));
+ setDuplicateSupported(true);
connect(document(), SIGNAL(changed()), this, SLOT(markAsChanged()));
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h
index be52cb50df4..412e186dc39 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.h
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h
@@ -52,7 +52,6 @@ class CMakeEditor : public TextEditor::BaseTextEditor
public:
CMakeEditor(CMakeEditorWidget *);
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
TextEditor::CompletionAssistProvider *completionAssistProvider();
diff --git a/src/plugins/coreplugin/editormanager/ieditor.cpp b/src/plugins/coreplugin/editormanager/ieditor.cpp
index f6ac60dbc77..85e44f0a85e 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.cpp
+++ b/src/plugins/coreplugin/editormanager/ieditor.cpp
@@ -56,3 +56,21 @@
\sa Core::EditorFactoryInterface Core::IContext
*/
+
+namespace Core {
+
+IEditor::IEditor(QObject *parent)
+ : IContext(parent), m_duplicateSupported(false)
+{}
+
+bool IEditor::duplicateSupported() const
+{
+ return m_duplicateSupported;
+}
+
+void IEditor::setDuplicateSupported(bool duplicatesSupported)
+{
+ m_duplicateSupported = duplicatesSupported;
+}
+
+} // namespace Core
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index 0449ee06a45..f6b2c0636db 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -44,13 +44,15 @@ class CORE_EXPORT IEditor : public IContext
Q_OBJECT
public:
- IEditor(QObject *parent = 0) : IContext(parent) {}
+ IEditor(QObject *parent = 0);
virtual ~IEditor() {}
+ bool duplicateSupported() const;
+ void setDuplicateSupported(bool duplicateSupported);
+
virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName) = 0;
virtual IDocument *document() = 0;
- virtual bool duplicateSupported() const { return false; }
virtual IEditor *duplicate() { return 0; }
virtual QByteArray saveState() const { return QByteArray(); }
@@ -63,6 +65,9 @@ public:
virtual QWidget *toolBar() = 0;
virtual bool isDesignModePreferred() const { return false; }
+
+private:
+ bool m_duplicateSupported;
};
} // namespace Core
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 36e49af5f92..b6a1d6d4b86 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -447,6 +447,7 @@ CPPEditor::CPPEditor(CPPEditorWidget *editor)
m_context.add(CppEditor::Constants::C_CPPEDITOR);
m_context.add(ProjectExplorer::Constants::LANG_CXX);
m_context.add(TextEditor::Constants::C_TEXTEDITOR);
+ setDuplicateSupported(true);
}
Q_GLOBAL_STATIC(CppTools::SymbolFinder, symbolFinder)
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 86fab946aef..bb97042eb68 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -97,7 +97,6 @@ class CPPEditor : public TextEditor::BaseTextEditor
public:
CPPEditor(CPPEditorWidget *);
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index a1228be2c2c..4c982ab13dd 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -62,7 +62,6 @@ public:
DiffEditorController *controller() const;
// Core::IEditor
- bool duplicateSupported() const { return false; }
Core::IEditor *duplicate();
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index 56e1c2b4d7e..05f285e67c9 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -80,11 +80,7 @@ ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor)
{
document()->setId(Constants::FILES_EDITOR_ID);
setContext(Core::Context(Constants::C_FILESEDITOR));
-}
-
-bool ProjectFilesEditor::duplicateSupported() const
-{
- return true;
+ setDuplicateSupported(true);
}
Core::IEditor *ProjectFilesEditor::duplicate()
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
index 149b98b6145..8c74f26dbcf 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
@@ -59,7 +59,6 @@ class ProjectFilesEditor : public TextEditor::BaseTextEditor
public:
ProjectFilesEditor(ProjectFilesEditorWidget *editorWidget);
- bool duplicateSupported() const;
Core::IEditor *duplicate();
};
diff --git a/src/plugins/glsleditor/glsleditoreditable.cpp b/src/plugins/glsleditor/glsleditoreditable.cpp
index 2f07aac6b75..f1e34ec463d 100644
--- a/src/plugins/glsleditor/glsleditoreditable.cpp
+++ b/src/plugins/glsleditor/glsleditoreditable.cpp
@@ -48,6 +48,7 @@ GLSLEditorEditable::GLSLEditorEditable(GLSLTextEditorWidget *editor)
{
setContext(Core::Context(GLSLEditor::Constants::C_GLSLEDITOR_ID,
TextEditor::Constants::C_TEXTEDITOR));
+ setDuplicateSupported(true);
}
} // namespace Internal
diff --git a/src/plugins/glsleditor/glsleditoreditable.h b/src/plugins/glsleditor/glsleditoreditable.h
index 3a45ed989af..b54177ce740 100644
--- a/src/plugins/glsleditor/glsleditoreditable.h
+++ b/src/plugins/glsleditor/glsleditoreditable.h
@@ -44,7 +44,6 @@ class GLSLEditorEditable : public TextEditor::BaseTextEditor
public:
explicit GLSLEditorEditable(GLSLTextEditorWidget *);
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
TextEditor::CompletionAssistProvider *completionAssistProvider();
diff --git a/src/plugins/pythoneditor/pythoneditor.cpp b/src/plugins/pythoneditor/pythoneditor.cpp
index e8ae93e3ae8..f68e7c82137 100644
--- a/src/plugins/pythoneditor/pythoneditor.cpp
+++ b/src/plugins/pythoneditor/pythoneditor.cpp
@@ -52,6 +52,7 @@ PythonEditor::PythonEditor(EditorWidget *editorWidget)
{
setContext(Core::Context(Constants::C_PYTHONEDITOR_ID,
TextEditor::Constants::C_TEXTEDITOR));
+ setDuplicateSupported(true);
}
PythonEditor::~PythonEditor()
diff --git a/src/plugins/pythoneditor/pythoneditor.h b/src/plugins/pythoneditor/pythoneditor.h
index 613aa5f02e3..06901189025 100644
--- a/src/plugins/pythoneditor/pythoneditor.h
+++ b/src/plugins/pythoneditor/pythoneditor.h
@@ -45,7 +45,6 @@ public:
explicit PythonEditor(EditorWidget *editorWidget);
virtual ~PythonEditor();
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
/**
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index 99b92d7463d..575332e0b4b 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -57,6 +57,7 @@ ProFileEditor::ProFileEditor(ProFileEditorWidget *editor)
{
setContext(Core::Context(Constants::C_PROFILEEDITOR,
TextEditor::Constants::C_TEXTEDITOR));
+ setDuplicateSupported(true);
}
Core::IEditor *ProFileEditor::duplicate()
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.h b/src/plugins/qmakeprojectmanager/profileeditor.h
index 682692727a3..f3695b75df5 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.h
+++ b/src/plugins/qmakeprojectmanager/profileeditor.h
@@ -47,7 +47,6 @@ class ProFileEditor : public TextEditor::BaseTextEditor
public:
ProFileEditor(ProFileEditorWidget *);
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
TextEditor::CompletionAssistProvider *completionAssistProvider();
};
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.cpp b/src/plugins/qmljseditor/qmljseditoreditable.cpp
index aba39538c75..bf66c83d26e 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.cpp
+++ b/src/plugins/qmljseditor/qmljseditoreditable.cpp
@@ -53,6 +53,7 @@ QmlJSEditor::QmlJSEditor(QmlJSTextEditorWidget *editor)
m_context.add(Constants::C_QMLJSEDITOR_ID);
m_context.add(TextEditor::Constants::C_TEXTEDITOR);
m_context.add(ProjectExplorer::Constants::LANG_QMLJS);
+ setDuplicateSupported(true);
}
bool QmlJSEditor::isDesignModePreferred() const
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.h b/src/plugins/qmljseditor/qmljseditoreditable.h
index 2899fe17e72..d13f30669a0 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.h
+++ b/src/plugins/qmljseditor/qmljseditoreditable.h
@@ -46,7 +46,6 @@ class QmlJSEditor : public TextEditor::BaseTextEditor
public:
explicit QmlJSEditor(QmlJSTextEditorWidget *);
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
bool isDesignModePreferred() const;
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index a66a0420751..4fb935ea676 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -65,6 +65,7 @@ PlainTextEditor::PlainTextEditor(PlainTextEditorWidget *editor)
{
setContext(Core::Context(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID,
TextEditor::Constants::C_TEXTEDITOR));
+ setDuplicateSupported(true);
}
PlainTextEditorWidget::PlainTextEditorWidget(QWidget *parent)
diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h
index fa3cd99014e..99471cbc5ed 100644
--- a/src/plugins/texteditor/plaintexteditor.h
+++ b/src/plugins/texteditor/plaintexteditor.h
@@ -47,7 +47,6 @@ class TEXTEDITOR_EXPORT PlainTextEditor : public BaseTextEditor
public:
PlainTextEditor(PlainTextEditorWidget *);
- bool duplicateSupported() const { return true; }
Core::IEditor *duplicate();
};
diff --git a/src/plugins/texteditor/snippets/snippeteditor.h b/src/plugins/texteditor/snippets/snippeteditor.h
index 47a4078b4ce..7f1072552bb 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.h
+++ b/src/plugins/texteditor/snippets/snippeteditor.h
@@ -48,7 +48,6 @@ class TEXTEDITOR_EXPORT SnippetEditor : public BaseTextEditor
public:
SnippetEditor(SnippetEditorWidget *editorWidget);
- bool duplicateSupported() const { return false; }
Core::IEditor *duplicate() { return 0; }
};