From f82e4ee9233cb7fd9905ffecaf687e6bc0b0e5f9 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 12 May 2020 00:31:16 -0400 Subject: [PATCH] Makes additional minor `const` improvements. --- .../MultiMachine/Implementation/MultiJoystickMachine.cpp | 2 +- Inputs/Keyboard.hpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp index c73bd37b7..7bf109e1b 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp @@ -25,7 +25,7 @@ class MultiJoystick: public Inputs::Joystick { } } - std::vector &get_inputs() final { + const std::vector &get_inputs() final { if(inputs.empty()) { for(const auto &joystick: joysticks_) { std::vector joystick_inputs = joystick->get_inputs(); diff --git a/Inputs/Keyboard.hpp b/Inputs/Keyboard.hpp index 30bd84191..924526ce9 100644 --- a/Inputs/Keyboard.hpp +++ b/Inputs/Keyboard.hpp @@ -80,10 +80,11 @@ class Keyboard { private: std::set observed_keys_; - std::set essential_modifiers_; + const std::set essential_modifiers_; + const bool is_exclusive_ = true; + std::vector key_states_; Delegate *delegate_ = nullptr; - bool is_exclusive_ = true; }; }