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

TextEditor: Merge the two sets of *EditorWidget constructors

Browse Source 
Change-Id: I45d87d0be722ac36d64af222f03f8cb76242c9df
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-18 17:49:04 +02:00
parent 2c5231b468
commit d2ec7d80d9
39 changed files with 114 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/pythoneditor/pythoneditor.cpp
View File

@@ -58,7 +58,7 @@ PythonEditor::PythonEditor(PythonEditorWidget *editorWidget)
Core::IEditor *PythonEditor::duplicate()
{
PythonEditorWidget *widget = new PythonEditorWidget(qobject_cast<PythonEditorWidget *>(editorWidget()));
PythonEditorWidget *widget = new PythonEditorWidget(editorWidget()->textDocumentPtr());
TextEditor::TextEditorSettings::initializeEditor(widget);
return widget->editor();
}

4
src/plugins/pythoneditor/pythoneditorfactory.cpp
View File

@@ -60,10 +60,10 @@ EditorFactory::EditorFactory(QObject *parent)
Core::IEditor *EditorFactory::createEditor()
{
auto doc = new BaseTextDocument;
BaseTextDocumentPtr doc(new BaseTextDocument);
doc->setId(Constants::C_PYTHONEDITOR_ID);
doc->setIndenter(new PythonIndenter);
PythonEditorWidget *widget = new PythonEditorWidget(doc, 0);
PythonEditorWidget *widget = new PythonEditorWidget(doc);
TextEditor::TextEditorSettings::initializeEditor(widget);
return widget->editor();

17
src/plugins/pythoneditor/pythoneditorwidget.cpp
View File

@@ -47,25 +47,14 @@
namespace PythonEditor {
namespace Internal {
PythonEditorWidget::PythonEditorWidget(TextEditor::BaseTextDocument *doc, QWidget *parent)
: TextEditor::BaseTextEditorWidget(doc, parent)
{
ctor();
}
PythonEditorWidget::PythonEditorWidget(PythonEditorWidget *other)
: TextEditor::BaseTextEditorWidget(other)
{
ctor();
}
void PythonEditorWidget::ctor()
PythonEditorWidget::PythonEditorWidget(TextEditor::BaseTextDocumentPtr doc)
{
setTextDocument(doc);
setParenthesesMatchingEnabled(true);
setMarksVisible(true);
setCodeFoldingSupported(true);
new PythonHighlighter(textDocument());
new PythonHighlighter(doc.data());
}
TextEditor::BaseTextEditor *PythonEditorWidget::createEditor()

7
src/plugins/pythoneditor/pythoneditorwidget.h
View File

@@ -40,15 +40,10 @@ class PythonEditorWidget : public TextEditor::BaseTextEditorWidget
Q_OBJECT
public:
PythonEditorWidget(TextEditor::BaseTextDocument *doc, QWidget *parent);
PythonEditorWidget(PythonEditorWidget *other);
PythonEditorWidget(TextEditor::BaseTextDocumentPtr doc);
protected:
TextEditor::BaseTextEditor *createEditor();
private:
PythonEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity
void ctor();
};
} // namespace Internal