core: make context and widget IContext data members

1 files changed, 3 insertions, 11 deletions

diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index 6f632e51b4..23d0d5d267 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -120,6 +120,9 @@ DesignMode::DesignMode(EditorManager *editorManager) :
 {
     setObjectName(QLatin1String("DesignMode"));
     setEnabled(false);
+    setContext(Context(Constants::C_DESIGN_MODE));
+    setWidget(d->m_stackWidget);
+
     ExtensionSystem::PluginManager::instance()->addObject(d->m_coreListener);
 
     connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)),
@@ -138,17 +141,6 @@ DesignMode::~DesignMode()
     delete d;
 }
 
-Context DesignMode::context() const
-{
-    static Context contexts(Constants::C_DESIGN_MODE);
-    return contexts;
-}
-
-QWidget *DesignMode::widget()
-{
-    return d->m_stackWidget;
-}
-
 QString DesignMode::displayName() const
 {
     return tr("Design");