ControlReference: hide is_input behind function

2 files changed, 17 insertions, 7 deletions

diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
index 5b5d807781..5dc8c858ed 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -32,7 +32,7 @@ void ControlReference::UpdateReference(ciface::Core::DeviceContainer& devices,
   delete parsed_expression;
   parsed_expression = nullptr;
 
-  ControlFinder finder(devices, default_device, is_input);
+  ControlFinder finder(devices, default_device, IsInput());
   parse_error = ParseExpression(expression, finder, &parsed_expression);
 }
 
@@ -48,19 +48,27 @@ int ControlReference::BoundCount() const
     return 0;
 }
 
-ControlReference::ControlReference(const bool _is_input)
-    : range(1), is_input(_is_input), parsed_expression(nullptr)
+ControlReference::ControlReference() : range(1), parsed_expression(nullptr)
 {
 }
 
-InputReference::InputReference() : ControlReference(true)
+InputReference::InputReference() : ControlReference()
 {
 }
 
-OutputReference::OutputReference() : ControlReference(false)
+OutputReference::OutputReference() : ControlReference()
 {
 }
 
+bool InputReference::IsInput() const
+{
+  return true;
+}
+bool OutputReference::IsInput() const
+{
+  return false;
+}
+
 //
 // InputReference :: State
 //
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.h b/Source/Core/InputCommon/ControlReference/ControlReference.h
index 64f782b2ce..4448b58701 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.h
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.h
@@ -26,6 +26,7 @@ public:
   virtual ControlState State(const ControlState state = 0) = 0;
   virtual ciface::Core::Device::Control* Detect(const unsigned int ms,
                                                 ciface::Core::Device* const device) = 0;
+  virtual bool IsInput() const = 0;
 
   int BoundCount() const;
   void UpdateReference(ciface::Core::DeviceContainer& devices,
@@ -33,11 +34,10 @@ public:
 
   ControlState range;
   std::string expression;
-  const bool is_input;
   ciface::ExpressionParser::ExpressionParseStatus parse_error;
 
 protected:
-  ControlReference(const bool _is_input);
+  ControlReference();
   ciface::ExpressionParser::Expression* parsed_expression;
 };
 
@@ -50,6 +50,7 @@ class InputReference : public ControlReference
 {
 public:
   InputReference();
+  bool IsInput() const override;
   ControlState State(const ControlState state) override;
   ciface::Core::Device::Control* Detect(const unsigned int ms,
                                         ciface::Core::Device* const device) override;
@@ -64,6 +65,7 @@ class OutputReference : public ControlReference
 {
 public:
   OutputReference();
+  bool IsInput() const override;
   ControlState State(const ControlState state) override;
   ciface::Core::Device::Control* Detect(const unsigned int ms,
                                         ciface::Core::Device* const device) override;