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

Core: Make Id(int) constructor less accessible

Browse Source 
... and change two seemingly accidental uses.

The functionality is still available by explicitly using
Id::fromUniqueIdentifier().

Change-Id: I190e58f9fcd5c0f06e29103a0c0c82e322bee100
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
hjk
2015-06-19 13:09:26 +02:00
parent 88a10a92db
commit 5c31c54538
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -30,6 +30,7 @@
#include "command_p.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icontext.h>
#include <coreplugin/id.h>
@@ -320,7 +321,7 @@ void Action::addOverrideAction(QAction *action, const Context &context, bool scr
if (isEmpty())
m_action->initialize(action);
if (context.isEmpty()) {
m_contextActionMap.insert(0, action);
m_contextActionMap.insert(Constants::C_GLOBAL, action);
} else {
for (int i = 0; i < context.size(); ++i) {
Id id = context.at(i);