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

TextEditor: Remove one stack of EditorWidget constructors

Browse Source 
There are conceptually only two: one that operates a new document,
and one that shares one. Being explicit makes moving data over to
the Editor hierarchy easier. Convenience can be re-added there,
later.

Change-Id: I9b34ff26628c99ffff01201dcf99332d5e7253e9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-07-31 14:44:42 +02:00
parent 73d41589ab
commit f5b0bd32b2
16 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,9 +64,9 @@ ProjectFilesFactory::ProjectFilesFactory(Manager *manager)
Core::IEditor *ProjectFilesFactory::createEditor()
{
ProjectFilesEditorWidget *ed = new ProjectFilesEditorWidget();
TextEditorSettings::initializeEditor(ed);
return ed->editor();
auto widget = new ProjectFilesEditorWidget(new BaseTextDocument, 0);
TextEditorSettings::initializeEditor(widget);
return widget->editor();
}
////////////////////////////////////////////////////////////////////////////////////////
@@ -85,10 +85,9 @@ ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor)
Core::IEditor *ProjectFilesEditor::duplicate()
{
ProjectFilesEditorWidget *editor = new ProjectFilesEditorWidget(
qobject_cast<ProjectFilesEditorWidget *>(editorWidget()));
TextEditorSettings::initializeEditor(editor);
return editor->editor();
auto widget = new ProjectFilesEditorWidget(editorWidget());
TextEditorSettings::initializeEditor(widget);
return widget->editor();
}
////////////////////////////////////////////////////////////////////////////////////////
@@ -97,12 +96,12 @@ Core::IEditor *ProjectFilesEditor::duplicate()
//
////////////////////////////////////////////////////////////////////////////////////////
ProjectFilesEditorWidget::ProjectFilesEditorWidget(QWidget *parent)
: BaseTextEditorWidget(parent)
ProjectFilesEditorWidget::ProjectFilesEditorWidget(BaseTextDocument *doc, QWidget *parent)
: BaseTextEditorWidget(doc, parent)
{
}
ProjectFilesEditorWidget::ProjectFilesEditorWidget(ProjectFilesEditorWidget *other)
ProjectFilesEditorWidget::ProjectFilesEditorWidget(BaseTextEditorWidget *other)
: BaseTextEditorWidget(other)
{
}