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

Remove the need to register editors in the action handler

Browse Source 
The action handler already knows which editors to handle through the
context. It only needs to receive signals for updating the actions from
the current editor. So there is no need to tell the action handler about
every individual editor. This also removes some noise from the text
editor implementations.

Change-Id: I76dc5b1559cc8cf54ff313e6cdba4e789a3108aa
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Eike Ziller
2013-12-10 15:54:20 +01:00
parent 3ee9fb4d1c
commit 3d1b70c58e
33 changed files with 93 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
View File

@@ -50,9 +50,8 @@ namespace Internal {
//
////////////////////////////////////////////////////////////////////////////////////////
ProjectFilesFactory::ProjectFilesFactory(Manager *manager, TextEditorActionHandler *handler)
: Core::IEditorFactory(manager),
m_actionHandler(handler)
ProjectFilesFactory::ProjectFilesFactory(Manager *manager)
: Core::IEditorFactory(manager)
{
setId(Constants::FILES_EDITOR_ID);
setDisplayName(QCoreApplication::translate("OpenWith::Editors", ".files Editor"));
@@ -63,7 +62,7 @@ ProjectFilesFactory::ProjectFilesFactory(Manager *manager, TextEditorActionHandl
Core::IEditor *ProjectFilesFactory::createEditor(QWidget *parent)
{
ProjectFilesEditorWidget *ed = new ProjectFilesEditorWidget(parent, this, m_actionHandler);
ProjectFilesEditorWidget *ed = new ProjectFilesEditorWidget(parent, this);
TextEditorSettings::initializeEditor(ed);
return ed->editor();
}
@@ -94,8 +93,7 @@ Core::IEditor *ProjectFilesEditor::duplicate(QWidget *parent)
{
ProjectFilesEditorWidget *parentEditor = qobject_cast<ProjectFilesEditorWidget *>(editorWidget());
ProjectFilesEditorWidget *editor = new ProjectFilesEditorWidget(parent,
parentEditor->factory(),
parentEditor->actionHandler());
parentEditor->factory());
TextEditorSettings::initializeEditor(editor);
return editor->editor();
}
@@ -106,16 +104,12 @@ Core::IEditor *ProjectFilesEditor::duplicate(QWidget *parent)
//
////////////////////////////////////////////////////////////////////////////////////////
ProjectFilesEditorWidget::ProjectFilesEditorWidget(QWidget *parent, ProjectFilesFactory *factory,
TextEditorActionHandler *handler)
ProjectFilesEditorWidget::ProjectFilesEditorWidget(QWidget *parent, ProjectFilesFactory *factory)
: BaseTextEditorWidget(parent),
m_factory(factory),
m_actionHandler(handler)
m_factory(factory)
{
QSharedPointer<BaseTextDocument> doc(new BaseTextDocument());
setBaseTextDocument(doc);
handler->setupActions(this);
}
ProjectFilesFactory *ProjectFilesEditorWidget::factory() const
@@ -123,11 +117,6 @@ ProjectFilesFactory *ProjectFilesEditorWidget::factory() const
return m_factory;
}
TextEditorActionHandler *ProjectFilesEditorWidget::actionHandler() const
{
return m_actionHandler;
}
BaseTextEditor *ProjectFilesEditorWidget::createEditor()
{
return new ProjectFilesEditor(this);