From 0c0c3faa122c4048becec4457bfeef16c8486808 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 9 Aug 2013 16:32:00 +0200 Subject: [PATCH] QmlDesigner: renaming constant DELETE is provoking a name clash even in the namespace. Change-Id: I5aeb99b527db5308808a3fc077a6710d5a20cdfb Reviewed-by: Marco Bubke --- src/plugins/qmldesigner/qmldesignerconstants.h | 2 +- src/plugins/qmldesigner/shortcutmanager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index 366eef44490..8e5bdf4e0d0 100644 --- a/src/plugins/qmldesigner/qmldesignerconstants.h +++ b/src/plugins/qmldesigner/qmldesignerconstants.h @@ -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"; diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index 7da83aff622..d6f50bfae7a 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -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);