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

Designer: Remove some redirections.

Browse Source 
Instead of keeping a separate plain text editor and document,
the FormWindowEditor and FormWindowFile are directly derived
from PlainTextEditor and BaseTextDocument respectively.

Change-Id: I4319904dea769ec31900061bc7c3a3c5c22e0e8a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-07-15 14:12:05 +02:00
parent 38a44f7e0f
commit 4ba6faec3f
10 changed files with 72 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/designer/formwindowfile.cpp
View File

@@ -49,12 +49,12 @@ namespace Designer {
namespace Internal {
FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent)
: Core::TextDocument(parent),
m_mimeType(QLatin1String(Designer::Constants::FORM_MIMETYPE)),
: m_mimeType(QLatin1String(Designer::Constants::FORM_MIMETYPE)),
m_shouldAutoSave(false),
m_formWindow(form),
m_isModified(false)
{
setParent(parent);
// Designer needs UTF-8 regardless of settings.
setCodec(QTextCodec::codecForName("UTF-8"));
connect(m_formWindow->core()->formWindowManager(), SIGNAL(formWindowRemoved(QDesignerFormWindowInterface*)),
@@ -141,7 +141,7 @@ bool FormWindowFile::reload(QString *errorString, ReloadFlag flag, ChangeType ty
emit changed();
} else {
emit aboutToReload();
emit reload(errorString, filePath());
emit reloadRequested(errorString, filePath());
const bool success = errorString->isEmpty();
emit reloadFinished(success);
return success;