From 9a4c18255e08b32f52e001c956817cbf4211b834 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 9 Jun 2019 02:13:47 -0400 Subject: [PATCH] Eliminate type alias CommandMask --- src/commands/CommandFlag.h | 1 - src/commands/CommandManager.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/CommandFlag.h b/src/commands/CommandFlag.h index d4694cbad..22a3a35ff 100644 --- a/src/commands/CommandFlag.h +++ b/src/commands/CommandFlag.h @@ -26,7 +26,6 @@ static_assert( // Type to specify conditions for enabling of a menu item using CommandFlag = std::bitset; -using CommandMask = CommandFlag; // Special constant values constexpr CommandFlag diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index 76a6eb1b9..cee0c5fd9 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -1021,7 +1021,8 @@ void CommandManager::SetKeyFromIndex(int i, const NormalizedKeyString &key) entry->key = key; } -void CommandManager::TellUserWhyDisallowed( const wxString & Name, CommandFlag flagsGot, CommandMask flagsRequired ) +void CommandManager::TellUserWhyDisallowed( + const wxString & Name, CommandFlag flagsGot, CommandFlag flagsRequired ) { // The default string for 'reason' is a catch all. I hope it won't ever be seen // and that we will get something more specific.