1 files changed, 14 insertions, 17 deletions
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index d7df1c8e85..f068888b49 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -34,19 +34,19 @@
 #include "designercontext.h"
 #include <widgethost.h>
 
-#include <coreplugin/editortoolbar.h>
-#include <coreplugin/designmode.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/designmode.h>
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/infobar.h>
-#include <coreplugin/helpmanager.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/modemanager.h>
+#include <coreplugin/editortoolbar.h>
+#include <coreplugin/helpmanager.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
+#include <coreplugin/modemanager.h>
 #include <coreplugin/outputpane.h>
+#include <utils/infobar.h>
 #include <utils/qtcassert.h>
 
 #include <QDesignerFormEditorPluginInterface>
@@ -101,6 +101,7 @@ static inline QIcon designerIcon(const QString &iconName)
 
 using namespace Core;
 using namespace Designer::Constants;
+using namespace Utils;
 
 namespace Designer {
 namespace Internal {
@@ -211,7 +212,6 @@ public:
     QMenu *m_previewInStyleMenu = nullptr;
     QAction *m_actionAboutPlugins = nullptr;
 
-    DesignerContext *m_context = nullptr;
     Context m_contexts;
 
     QList<Id> m_toolActionIds;
@@ -275,8 +275,6 @@ FormEditorData::FormEditorData() :
 
 FormEditorData::~FormEditorData()
 {
-    if (m_context)
-        ICore::removeContextObject(m_context);
     if (m_initStage == FormEditorW::FullyInitialized) {
         QSettings *s = ICore::settings();
         s->beginGroup(settingsGroupC);
@@ -313,7 +311,7 @@ void FormEditorData::addDockViewAction(ActionContainer *viewMenu,
 void FormEditorData::setupViewActions()
 {
     // Populate "View" menu of form editor menu
-    ActionContainer *viewMenu = ActionManager::actionContainer(Core::Constants::M_WINDOW_VIEWS);
+    ActionContainer *viewMenu = ActionManager::actionContainer(Core::Constants::M_VIEW_VIEWS);
     QTC_ASSERT(viewMenu, return);
 
     addDockViewAction(viewMenu, WidgetBoxSubWindow, m_contexts,
@@ -423,8 +421,7 @@ void FormEditorData::fullInit()
 
     Context designerContexts = m_contexts;
     designerContexts.add(Core::Constants::C_EDITORMANAGER);
-    m_context = new DesignerContext(designerContexts, m_modeWidget, m_instance);
-    ICore::addContextObject(m_context);
+    ICore::addContextObject(new DesignerContext(designerContexts, m_modeWidget, m_instance));
 
     DesignMode::registerDesignWidget(m_modeWidget, QStringList(FORM_MIMETYPE), m_contexts);
 
@@ -710,7 +707,7 @@ void FormEditorData::saveSettings(QSettings *s)
 
 void FormEditorData::critical(const QString &errorMessage)
 {
-    QMessageBox::critical(ICore::mainWindow(), tr("Designer"),  errorMessage);
+    QMessageBox::critical(ICore::dialogParent(), tr("Designer"), errorMessage);
 }
 
 // Apply the command shortcut to the action and connects to the command's keySequenceChanged signal
@@ -778,8 +775,8 @@ IEditor *FormEditorData::createEditor()
     m_toolBar->addEditor(formWindowEditor);
 
     if (formWindowEditor) {
-        InfoBarEntry info(Id(Constants::INFO_READ_ONLY),
-                                tr("This file can only be edited in <b>Design</b> mode."));
+        Utils::InfoBarEntry info(Id(Constants::INFO_READ_ONLY),
+                                 tr("This file can only be edited in <b>Design</b> mode."));
         info.setCustomButtonInfo(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); });
         formWindowEditor->document()->infoBar()->addInfo(info);
     }