diff options
| author | hjk <qtc-committer@nokia.com> | 2011-02-21 16:02:26 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2011-02-22 11:23:53 +0100 |
| commit | f576ad9f2c169bfa4d336ba2b3b1918f03df6916 (patch) | |
| tree | f9e708ea1972b10d5465c915e7b9d0f7572f671f /src/plugins/designer/formwindoweditor.cpp | |
| parent | e32cf192f7ba34dda96b61507b440c6a17b51a0c (diff) | |
| download | qt-creator-f576ad9f2c169bfa4d336ba2b3b1918f03df6916.tar.gz | |
texteditor: merge ITextEditable into ITextEditor
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
Diffstat (limited to 'src/plugins/designer/formwindoweditor.cpp')
| -rw-r--r-- | src/plugins/designer/formwindoweditor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 2d0ffca66a..af56d2083f 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -62,7 +62,7 @@ struct FormWindowEditorPrivate explicit FormWindowEditorPrivate(Internal::DesignerXmlEditor *editor, QDesignerFormWindowInterface *form); - TextEditor::PlainTextEditorEditable m_textEditable; + TextEditor::PlainTextEditor m_textEditable; Internal::FormWindowFile m_file; Core::Context m_context; }; @@ -185,8 +185,8 @@ void FormWindowEditor::syncXmlEditor() void FormWindowEditor::configureXmlEditor() const { - TextEditor::PlainTextEditor *editor = - qobject_cast<TextEditor::PlainTextEditor *>(d->m_textEditable.editor()); + TextEditor::PlainTextEditorWidget *editor = + qobject_cast<TextEditor::PlainTextEditorWidget *>(d->m_textEditable.editorWidget()); if (editor) editor->configure(Core::ICore::instance()->mimeDatabase()->findByFile( d->m_file.fileName())); @@ -194,8 +194,8 @@ void FormWindowEditor::configureXmlEditor() const void FormWindowEditor::syncXmlEditor(const QString &contents) { - d->m_textEditable.editor()->setPlainText(contents); - d->m_textEditable.editor()->setReadOnly(true); + d->m_textEditable.editorWidget()->setPlainText(contents); + d->m_textEditable.editorWidget()->setReadOnly(true); } Core::IFile *FormWindowEditor::file() @@ -271,7 +271,7 @@ TextEditor::BaseTextDocument *FormWindowEditor::textDocument() return qobject_cast<TextEditor::BaseTextDocument*>(d->m_textEditable.file()); } -TextEditor::PlainTextEditorEditable *FormWindowEditor::textEditable() +TextEditor::PlainTextEditor *FormWindowEditor::textEditable() { return &d->m_textEditable; } |