Commit 0c0c3faa authored by Thomas Hartmann's avatar Thomas Hartmann

QmlDesigner: renaming constant

DELETE is provoking a name clash even in the namespace.

Change-Id: I5aeb99b527db5308808a3fc077a6710d5a20cdfb
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent a1276ab0
......@@ -33,7 +33,7 @@
namespace QmlDesigner {
namespace Constants {
const char DELETE[] = "QmlDesigner.Delete";
const char C_DELETE[] = "QmlDesigner.Delete";
// Context
const char C_QMLDESIGNER[] = "QmlDesigner::QmlDesignerMain";
......
......@@ -114,8 +114,8 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
//Edit Menu
command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::DELETE, qmlDesignerFormEditorContext);
command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::DELETE, qmlDesignerNavigatorContext);
command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::C_DELETE, qmlDesignerFormEditorContext);
command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::C_DELETE, qmlDesignerNavigatorContext);
command->setDefaultKeySequence(QKeySequence::Delete);
command->setAttribute(Core::Command::CA_Hide); // don't show delete in other modes
editMenu->addAction(command, Core::Constants::G_EDIT_COPYPASTE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment