feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: renaming constant

Browse Source 
DELETE is provoking a name clash even in the namespace.

Change-Id: I5aeb99b527db5308808a3fc077a6710d5a20cdfb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-08-09 16:32:00 +02:00
parent a1276ab0eb
commit 0c0c3faa12
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/qmldesignerconstants.h
View File

@@ -33,7 +33,7 @@
namespace QmlDesigner { namespace QmlDesigner {
namespace Constants { namespace Constants {
const char DELETE[] = "QmlDesigner.Delete"; const char C_DELETE[] = "QmlDesigner.Delete";
// Context // Context
const char C_QMLDESIGNER[] = "QmlDesigner::QmlDesignerMain"; const char C_QMLDESIGNER[] = "QmlDesigner::QmlDesignerMain";

4
src/plugins/qmldesigner/shortcutmanager.cpp
View File

@@ -114,8 +114,8 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
//Edit Menu //Edit Menu
command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::DELETE, qmlDesignerFormEditorContext); command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::C_DELETE, qmlDesignerFormEditorContext);
command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::DELETE, qmlDesignerNavigatorContext); command = Core::ActionManager::registerAction(&m_deleteAction, QmlDesigner::Constants::C_DELETE, qmlDesignerNavigatorContext);
command->setDefaultKeySequence(QKeySequence::Delete); command->setDefaultKeySequence(QKeySequence::Delete);
command->setAttribute(Core::Command::CA_Hide); // don't show delete in other modes command->setAttribute(Core::Command::CA_Hide); // don't show delete in other modes
editMenu->addAction(command, Core::Constants::G_EDIT_COPYPASTE); editMenu->addAction(command, Core::Constants::G_EDIT_COPYPASTE);