From 924e54b448468c9c036f6155893fa3373f4f2258 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 26 Feb 2014 14:28:20 +0100 Subject: [PATCH] Fix FormWindowEditor id. Broke with recent refactoring and lead to drag&drop no longer working in designer. Change-Id: I33987b4fa8838ce1e009a665e9be80dbe30b45d6 Reviewed-by: Orgad Shaneh Reviewed-by: Friedemann Kleint --- src/plugins/designer/formwindoweditor.cpp | 6 +----- src/plugins/designer/formwindoweditor.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 71456386dea..5a2c6eb375c 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -54,6 +54,7 @@ FormWindowEditor::FormWindowEditor(Internal::DesignerXmlEditorWidget *editor) : TextEditor::PlainTextEditor(editor), d(new FormWindowEditorPrivate) { + setId(Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID)); d->m_widget = editor; setContext(Core::Context(Designer::Constants::K_DESIGNER_XML_EDITOR_ID, Designer::Constants::C_DESIGNER_XML_EDITOR)); @@ -123,11 +124,6 @@ void FormWindowEditor::syncXmlEditor() d->m_widget->formWindowFile()->syncXmlFromFormWindow(); } -Core::Id FormWindowEditor::id() const -{ - return Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID); -} - QWidget *FormWindowEditor::toolBar() { return 0; diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h index 8c7275786ad..159717efa9e 100644 --- a/src/plugins/designer/formwindoweditor.h +++ b/src/plugins/designer/formwindoweditor.h @@ -62,7 +62,6 @@ public: // IEditor virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName); - virtual Core::Id id() const; virtual QWidget *toolBar();