From af8daf9d306de86cabefc12d2e1098811f21b7b8 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 9 Feb 2011 15:23:48 +0100
Subject: [PATCH] actionmanager: rename Command::CA_NonConfigureable to
CA_NonConfigurable
---
src/plugins/coreplugin/actionmanager/command.cpp | 6 +++---
src/plugins/coreplugin/actionmanager/command.h | 2 +-
src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 2 +-
src/plugins/debugger/debuggerplugin.cpp | 2 +-
src/plugins/designer/formeditorw.cpp | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index e19e89e2554..bc0ff900606 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -83,7 +83,7 @@
\value CA_Hide
When there is no active action, hide the user "visible" action, instead of just
disabling it.
- \value CA_NonConfigureable
+ \value CA_NonConfigurable
Flag to indicate that the keyboard shortcut of this Command should not be
configurable by the user.
*/
@@ -535,7 +535,7 @@ void Action::setAttribute(CommandAttribute attr)
case Core::Command::CA_UpdateIcon:
m_action->setAttribute(Utils::ProxyAction::UpdateIcon);
break;
- case Core::Command::CA_NonConfigureable:
+ case Core::Command::CA_NonConfigurable:
break;
}
}
@@ -553,7 +553,7 @@ void Action::removeAttribute(CommandAttribute attr)
case Core::Command::CA_UpdateIcon:
m_action->removeAttribute(Utils::ProxyAction::UpdateIcon);
break;
- case Core::Command::CA_NonConfigureable:
+ case Core::Command::CA_NonConfigurable:
break;
}
}
diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h
index 34115709891..2fe99d09dd2 100644
--- a/src/plugins/coreplugin/actionmanager/command.h
+++ b/src/plugins/coreplugin/actionmanager/command.h
@@ -57,7 +57,7 @@ public:
CA_Hide = 1,
CA_UpdateText = 2,
CA_UpdateIcon = 4,
- CA_NonConfigureable = 8
+ CA_NonConfigurable = 8
};
Q_DECLARE_FLAGS(CommandAttributes, CommandAttribute)
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index fb992750b94..ba9f438212a 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -300,7 +300,7 @@ void ShortcutSettings::initialize()
QMap<QString, QTreeWidgetItem *> sections;
foreach (Command *c, am->commands()) {
- if (c->hasAttribute(Command::CA_NonConfigureable))
+ if (c->hasAttribute(Command::CA_NonConfigurable))
continue;
if (c->action() && c->action()->isSeparator())
continue;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 1e2cf761f95..7af762a428b 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -3027,7 +3027,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
cmd->action()->setEnabled(true);
editorContextMenu->addAction(cmd);
cmd->setAttribute(Command::CA_Hide);
- cmd->setAttribute(Command::CA_NonConfigureable); // ADD_TO_WATCH1 is enough.
+ cmd->setAttribute(Command::CA_NonConfigurable); // ADD_TO_WATCH1 is enough.
}
m_plugin->addAutoReleasedObject(new CommonOptionsPage);
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index c6e2630aed2..f90006c1fa3 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -625,7 +625,7 @@ Core::ActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManager *
bindShortcut(command, a);
if (isDeviceProfile) {
command->setAttribute(Core::Command::CA_UpdateText);
- command->setAttribute(Core::Command::CA_NonConfigureable);
+ command->setAttribute(Core::Command::CA_NonConfigurable);
}
menuPreviewStyle->addAction(command);
}
--
GitLab