Skip to content

Commit 0963ed7

Browse files
author
alcomposer
committed
Small fix to actually compile, never use "Disabled" - prefer "Off" or "Inactive" etc https://developers.google.com/style/word-list#disable
1 parent 113f012 commit 0963ed7

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

Source/Dialogs/AudioSettingsPanel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ struct CallbackComboPropertyWithTestButton final : public CallbackComboProperty
116116
class ChannelToggleProperty final : public PropertiesPanel::BoolComponent {
117117
public:
118118
ChannelToggleProperty(String const& channelName, bool const isEnabled, std::function<void(bool)> onClick)
119-
: PropertiesPanel::BoolComponent(channelName, isEnabled, { "Disabled", "Enabled" })
119+
: PropertiesPanel::BoolComponent(channelName, isEnabled, { "Inactive", "Active" })
120120
, callback(std::move(onClick))
121121
{
122122
setPreferredHeight(30);

Source/Dialogs/MidiSettingsPanel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class MidiSettingsComboBox final : public PropertiesPanel::ComboComponent
1010
, private Value::Listener {
1111
public:
1212
MidiSettingsComboBox(bool const isMidiInput, PluginProcessor* pluginProcessor, MidiDeviceInfo const& midiDeviceInfo)
13-
: PropertiesPanel::ComboComponent(midiDeviceInfo.name, { "Disabled", "Port 1", "Port 2", "Port 3", "Port 4", "Port 5", "Port 6", "Port 7", "Port 8" })
13+
: PropertiesPanel::ComboComponent(midiDeviceInfo.name, { "Off", "Port 1", "Port 2", "Port 3", "Port 4", "Port 5", "Port 6", "Port 7", "Port 8" })
1414
, isInput(isMidiInput)
1515
, processor(pluginProcessor)
1616
, deviceInfo(midiDeviceInfo)
@@ -43,7 +43,7 @@ class InternalSynthToggle final : public PropertiesPanel::ComboComponent
4343
, private Value::Listener {
4444
public:
4545
explicit InternalSynthToggle(PluginProcessor* audioProcessor)
46-
: PropertiesPanel::ComboComponent("Internal GM Synth", { "Disabled", "Port 1", "Port 2", "Port 3", "Port 4", "Port 5", "Port 6", "Port 7", "Port 8" })
46+
: PropertiesPanel::ComboComponent("Internal GM Synth", { "Off", "Port 1", "Port 2", "Port 3", "Port 4", "Port 5", "Port 6", "Port 7", "Port 8" })
4747
, processor(audioProcessor)
4848
{
4949
comboValue.referTo(comboBox.getSelectedIdAsValue());

Source/Dialogs/TextEditorDialog.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ struct LuaTokeniserFunctions {
3737

3838
static bool isReservedKeyword(String::CharPointerType token, int const tokenLength) noexcept
3939
{
40-
static constexpr char* const keywords2Char[] = { "do", "if", "or", "in", nullptr };
40+
static constexpr const char* const keywords2Char[] = { "do", "if", "or", "in", nullptr };
4141

42-
static constexpr char* const keywords3Char[] = { "and", "end", "for", "nil", "not", "try", nullptr };
42+
static constexpr const char* const keywords3Char[] = { "and", "end", "for", "nil", "not", "try", nullptr };
4343

44-
static constexpr char* const keywords4Char[] = { "else", "goto", "then", "true", "else", "self", nullptr };
44+
static constexpr const char* const keywords4Char[] = { "else", "goto", "then", "true", "else", "self", nullptr };
4545

46-
static constexpr char* const keywords5Char[] = { "break", "false", "local", "until", "while", "error", nullptr };
46+
static constexpr const char* const keywords5Char[] = { "break", "false", "local", "until", "while", "error", nullptr };
4747

48-
static constexpr char* const keywords6Char[] = { "return", "repeat", "elseif", "assert", nullptr };
48+
static constexpr const char* const keywords6Char[] = { "return", "repeat", "elseif", "assert", nullptr };
4949

50-
static constexpr char* const keywords8Char[] = { "function", nullptr };
50+
static constexpr const char* const keywords8Char[] = { "function", nullptr };
5151

52-
static constexpr char* const keywordsOther[] = { "collectgarbage", "dofile", "getmetatable", "ipairs",
52+
static constexpr const char* const keywordsOther[] = { "collectgarbage", "dofile", "getmetatable", "ipairs",
5353
"loadfile", "loadstring", "next", "pairs", "pcall", "print", "rawequal",
5454
"rawget", "rawset", "require", "select", "setmetatable", "tonumber",
5555
"tostring", "type", "xpcall", nullptr };

0 commit comments

Comments
 (0)