summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/actionmanager/command.cpp
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2010-06-25 17:37:59 +0200
committerhjk <qtc-committer@nokia.com>2010-06-25 17:38:25 +0200
commit2f5f358ff420bf4fa2fdc09d105463bd1e0e792f (patch)
treea826357ccde587a1cce12749ff5fbb0ae8ac6f79 /src/plugins/coreplugin/actionmanager/command.cpp
parent2bdf10ce1077fc21f6a3835de1f103f87c75eebf (diff)
downloadqt-creator-2f5f358ff420bf4fa2fdc09d105463bd1e0e792f.tar.gz
Core::Context: compile hot fix for Windows.
Diffstat (limited to 'src/plugins/coreplugin/actionmanager/command.cpp')
-rw-r--r--src/plugins/coreplugin/actionmanager/command.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index 7dc9bb9b12..bad827f246 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -336,8 +336,8 @@ QString Shortcut::defaultText() const
bool Shortcut::setCurrentContext(const Core::Context &context)
{
- foreach (int ctxt, m_context) {
- if (context.contains(ctxt)) {
+ foreach (int ctxt, m_context.d) {
+ if (context.d.contains(ctxt)) {
if (!m_shortcut->isEnabled()) {
m_shortcut->setEnabled(true);
emit activeStateChanged();
@@ -487,10 +487,10 @@ static inline QString msgActionWarning(QAction *newAction, int k, QAction *oldAc
void Action::addOverrideAction(QAction *action, const Core::Context &context)
{
- if (context.isEmpty()) {
+ if (context.d.isEmpty()) {
m_contextActionMap.insert(0, action);
} else {
- for (int i=0; i<context.size(); ++i) {
+ for (int i = 0; i < context.size(); ++i) {
int k = context.at(i);
if (m_contextActionMap.contains(k))
qWarning("%s", qPrintable(msgActionWarning(action, k, m_contextActionMap.value(k, 0))));