From 1b0701e988bcdfe0f822638bb5c22bbd3739fd06 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Tue, 7 Feb 2017 18:28:53 -0800 Subject: [PATCH] Make ControllerEmu::BooleanSetting non-virtual --- .../InputCommon/ControllerEmu/Setting/BooleanSetting.cpp | 2 -- .../Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) 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;