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

actionmanager: rename Command::CA_NonConfigureable to CA_NonConfigurable

Browse Source
This commit is contained in:
hjk
2011-02-09 15:23:48 +01:00
parent 703d637cc6
commit af8daf9d30
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

2
src/plugins/coreplugin/actionmanager/command.h
View File

@@ -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)

2
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -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;

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -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);

2
src/plugins/designer/formeditorw.cpp
View File

@@ -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);
}