diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index f403f6322f2e238492e0207799e3587b8bf04909..6d5f4a4695ceeb09a7cef16d4b8fe78f4eb1304f 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -42,7 +42,6 @@ const char * const C_FORMEDITOR = "Formeditor"; const char * const T_FORMEDITOR = "Formeditor.Toolbar"; const char * const M_FORMEDITOR = "Formeditor.Menu"; const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview"; -const char * const C_FORMWINDOW = "Formwindow"; // Wizard type const char * const FORM_FILE_TYPE = "Qt4FormFiles"; diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 4ab3c61694accbd89298c74d3eae5873326b4f00..ef5e3153f49fa576d68a227164889c5a45093931 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -546,7 +546,7 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor) qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount(); // Deactivate Designer if a non-form is being edited - if (editor && !qstrcmp(editor->kind(), Constants::C_FORMWINDOW)) { + if (editor && !qstrcmp(editor->kind(), Constants::C_FORMEDITOR)) { FormWindowEditor *fw = qobject_cast<FormWindowEditor *>(editor); QTC_ASSERT(fw, return); fw->activate(); diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 65eaf8aceb119820df4bc73102e989bf01903704..a683dccd86451d2a560199880fad483a34d276f4 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -260,7 +260,7 @@ Core::IFile *FormWindowEditor::file() const char *FormWindowEditor::kind() const { - return C_FORMWINDOW; + return C_FORMEDITOR; } QString FormWindowEditor::displayName() const