From 6f4a8be9461b0c84e98cb57b9d07d2f7b1ff44de Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 4 Feb 2009 13:39:11 +0100
Subject: [PATCH] Fixes: Session loading does not restore form files
RevBy: Eike
Details: Make form editor factory and form editor return the same editor kind.
---
src/plugins/designer/designerconstants.h | 1 -
src/plugins/designer/formeditorw.cpp | 2 +-
src/plugins/designer/formwindoweditor.cpp | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index f403f6322f2..6d5f4a4695c 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 4ab3c61694a..ef5e3153f49 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 65eaf8aceb1..a683dccd864 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
--
GitLab