Merge pull request #4856 from ligfx/backgroundinput

Move "Background Input" out of individual controller configurations

7 files changed, 2 insertions, 60 deletions

diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index f8ee22f565..768d717874 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -14,7 +14,6 @@ set(SRCS InputConfig.cpp
   ControllerEmu/ControlGroup/Slider.cpp
   ControllerEmu/ControlGroup/Tilt.cpp
   ControllerEmu/ControlGroup/Triggers.cpp
-  ControllerEmu/Setting/BackgroundInputSetting.cpp
   ControllerEmu/Setting/BooleanSetting.cpp
   ControllerEmu/Setting/NumericSetting.cpp
   ControllerInterface/ControllerInterface.cpp
diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.cpp b/Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.cpp
deleted file mode 100644
index 0e7b3d785e..0000000000
--- a/Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 Dolphin Emulator Project
-// Licensed under GPLv2+
-// Refer to the license.txt file included.
-
-#include "InputCommon/ControllerEmu/Setting/BackgroundInputSetting.h"
-#include "Core/ConfigManager.h"
-#include "InputCommon/ControllerEmu/Setting/Setting.h"
-
-namespace ControllerEmu
-{
-BackgroundInputSetting::BackgroundInputSetting(const std::string& setting_name)
-    : BooleanSetting(setting_name, false, SettingType::VIRTUAL)
-{
-}
-
-bool BackgroundInputSetting::GetValue() const
-{
-  return SConfig::GetInstance().m_BackgroundInput;
-}
-void BackgroundInputSetting::SetValue(bool value)
-{
-  m_value = value;
-  SConfig::GetInstance().m_BackgroundInput = value;
-}
-
-}  // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.h b/Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.h
deleted file mode 100644
index fc1f8c1de3..0000000000
--- a/Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 Dolphin Emulator Project
-// Licensed under GPLv2+
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
-
-namespace ControllerEmu
-{
-class BackgroundInputSetting : public BooleanSetting
-{
-public:
-  BackgroundInputSetting(const std::string& setting_name);
-
-  bool GetValue() const override;
-  void SetValue(bool value) override;
-};
-
-}  // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp
index b6e820b031..3f7c4e0752 100644
--- a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp
@@ -19,8 +19,6 @@ BooleanSetting::BooleanSetting(const std::string& setting_name, const bool defau
 {
 }
 
-BooleanSetting::~BooleanSetting() = default;
-
 bool BooleanSetting::GetValue() const
 {
   return m_value;
diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h
index 754d697d2b..98c1614a6a 100644
--- a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h
+++ b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h
@@ -18,10 +18,9 @@ public:
                  const bool default_value, const SettingType setting_type = SettingType::NORMAL);
   BooleanSetting(const std::string& setting_name, const bool default_value,
                  const SettingType setting_type = SettingType::NORMAL);
-  virtual ~BooleanSetting();
 
-  virtual bool GetValue() const;
-  virtual void SetValue(bool value);
+  bool GetValue() const;
+  void SetValue(bool value);
   const SettingType m_type;
   const std::string m_name;
   const std::string m_ui_name;
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index 0552bfe052..6355d41a24 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -50,7 +50,6 @@
     <ClCompile Include="ControllerEmu\ControlGroup\Slider.cpp" />
     <ClCompile Include="ControllerEmu\ControlGroup\Tilt.cpp" />
     <ClCompile Include="ControllerEmu\ControlGroup\Triggers.cpp" />
-    <ClCompile Include="ControllerEmu\Setting\BackgroundInputSetting.cpp" />
     <ClCompile Include="ControllerEmu\Setting\BooleanSetting.cpp" />
     <ClCompile Include="ControllerEmu\Setting\NumericSetting.cpp" />
     <ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
@@ -88,7 +87,6 @@
     <ClInclude Include="ControllerEmu\ControlGroup\Slider.h" />
     <ClInclude Include="ControllerEmu\ControlGroup\Tilt.h" />
     <ClInclude Include="ControllerEmu\ControlGroup\Triggers.h" />
-    <ClInclude Include="ControllerEmu\Setting\BackgroundInputSetting.h" />
     <ClInclude Include="ControllerEmu\Setting\BooleanSetting.h" />
     <ClInclude Include="ControllerEmu\Setting\NumericSetting.h" />
     <ClInclude Include="ControllerEmu\Setting\Setting.h" />
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index 07d4a161a8..3b1c4025e0 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -74,9 +74,6 @@
     <ClCompile Include="ControllerEmu\ControlGroup\Triggers.cpp">
       <Filter>ControllerEmu\ControlGroup</Filter>
     </ClCompile>
-    <ClCompile Include="ControllerEmu\Setting\BackgroundInputSetting.cpp">
-      <Filter>ControllerEmu\Setting</Filter>
-    </ClCompile>
     <ClCompile Include="ControllerEmu\Setting\BooleanSetting.cpp">
       <Filter>ControllerEmu\Setting</Filter>
     </ClCompile>
@@ -163,9 +160,6 @@
     <ClInclude Include="ControllerEmu\ControlGroup\Triggers.h">
       <Filter>ControllerEmu\ControlGroup</Filter>
     </ClInclude>
-    <ClInclude Include="ControllerEmu\Setting\BackgroundInputSetting.h">
-      <Filter>ControllerEmu\Setting</Filter>
-    </ClInclude>
     <ClInclude Include="ControllerEmu\Setting\BooleanSetting.h">
       <Filter>ControllerEmu\Setting</Filter>
     </ClInclude>