From 3e1f2521cc4ae0a9ad3a40ee1c91957c538f763e Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Mon, 11 Feb 2013 13:28:59 +0100
Subject: [PATCH] Qmldesigner: Change action registration

Context variables don't worked, so the context was registered.

Change-Id: Ic0efb8dc68d4762656e7858c1011e9fb759a7d81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 src/plugins/qmldesigner/qmldesignerplugin.cpp | 2 +-
 src/plugins/qmldesigner/shortcutmanager.cpp   | 9 ++++-----
 src/plugins/qmldesigner/shortcutmanager.h     | 6 ++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 2db901e4a73..a39cbcf22c0 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -163,7 +163,7 @@ void QmlDesignerPlugin::createDesignModeWidget()
     m_context->context().add(qmlDesignerNavigatorContext);
     m_context->context().add(ProjectExplorer::Constants::LANG_QMLJS);
 
-    m_shortCutManager.registerActions();
+    m_shortCutManager.registerActions(qmlDesignerMainContext, qmlDesignerFormEditorContext, qmlDesignerNavigatorContext);
 
     connect(Core::ICore::editorManager(),
             SIGNAL(currentEditorChanged(Core::IEditor*)),
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp
index 3852f4958c6..b52e7c61d10 100644
--- a/src/plugins/qmldesigner/shortcutmanager.cpp
+++ b/src/plugins/qmldesigner/shortcutmanager.cpp
@@ -3,6 +3,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/icontext.h>
 #include <coreplugin/editormanager/openeditorsmodel.h>
 #include <coreplugin/coreconstants.h>
 #include <utils/hostosinfo.h>
@@ -39,14 +40,12 @@ ShortCutManager::ShortCutManager()
 
 }
 
-void ShortCutManager::registerActions()
+void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContext,
+                                      const Core::Context &qmlDesignerFormEditorContext,
+                                      const Core::Context &qmlDesignerNavigatorContext)
 {
     Core::ActionContainer *editMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT);
 
-    Core::Context qmlDesignerMainContext(Constants::C_QMLDESIGNER);
-    Core::Context qmlDesignerFormEditorContext(Constants::C_QMLFORMEDITOR);
-    Core::Context qmlDesignerNavigatorContext(Constants::C_QMLNAVIGATOR);
-
     connect(&m_undoAction, SIGNAL(triggered()), this, SLOT(undo()));
 
     connect(&m_redoAction, SIGNAL(triggered()), this, SLOT(redo()));
diff --git a/src/plugins/qmldesigner/shortcutmanager.h b/src/plugins/qmldesigner/shortcutmanager.h
index 03a5450eb61..c54a304935c 100644
--- a/src/plugins/qmldesigner/shortcutmanager.h
+++ b/src/plugins/qmldesigner/shortcutmanager.h
@@ -5,9 +5,9 @@
 #include <QAction>
 #include <utils/parameteraction.h>
 
-
 namespace Core {
     class IEditor;
+    class Context;
 }
 
 namespace QmlDesigner {
@@ -21,7 +21,9 @@ class ShortCutManager : public QObject
 public:
     ShortCutManager();
 
-    void registerActions();
+    void registerActions(const Core::Context &qmlDesignerMainContext,
+                         const Core::Context &qmlDesignerFormEditorContext,
+                         const Core::Context &qmlDesignerNavigatorContext);
 
     void connectUndoActions(DesignDocument *designDocument);
     void disconnectUndoActions(DesignDocument *designDocument);