From c4ba046aa3e27e6445c663c7af544562e25d591b Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Tue, 7 Feb 2017 18:28:40 -0800 Subject: Remove unused ControllerEmu::BackgroundInputSetting --- .../Setting/BackgroundInputSetting.cpp | 26 ---------------------- .../ControllerEmu/Setting/BackgroundInputSetting.h | 20 ----------------- 2 files changed, 46 deletions(-) delete mode 100644 Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.cpp delete mode 100644 Source/Core/InputCommon/ControllerEmu/Setting/BackgroundInputSetting.h (limited to 'Source/Core/InputCommon/ControllerEmu/Setting') 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 -- cgit v1.2.3 From 1b0701e988bcdfe0f822638bb5c22bbd3739fd06 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Tue, 7 Feb 2017 18:28:53 -0800 Subject: Make ControllerEmu::BooleanSetting non-virtual --- Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp | 2 -- Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/Setting') 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; -- cgit v1.2.3