Merge pull request #13522 from tygyh/Enforce-overriding-destructor-style-Core&UnitTests

Core & UnitTests: Make overriding explicit and remove redundant virtual specifiers on overriding destructors
This commit is contained in:
Jordan Woyak
2025-06-07 17:55:14 -05:00
committed by GitHub
126 changed files with 188 additions and 192 deletions

View File

@ -17,7 +17,7 @@ public:
AnalogStick(const char* name, std::unique_ptr<StickGate>&& stick_gate);
AnalogStick(const char* name, const char* ui_name, std::unique_ptr<StickGate>&& stick_gate);
ReshapeData GetReshapableState(bool adjusted) const final override;
ReshapeData GetReshapableState(bool adjusted) const final;
ControlState GetGateRadiusAtAngle(double ang) const override;
StateData GetState() const;

View File

@ -24,7 +24,7 @@ public:
Cursor(std::string name, std::string ui_name);
ReshapeData GetReshapableState(bool adjusted) const final override;
ReshapeData GetReshapableState(bool adjusted) const final;
ControlState GetGateRadiusAtAngle(double ang) const override;
// Modifies the state

View File

@ -18,10 +18,10 @@ public:
explicit Force(const std::string& name);
ReshapeData GetReshapableState(bool adjusted) const final override;
ControlState GetGateRadiusAtAngle(double ang) const final override;
ReshapeData GetReshapableState(bool adjusted) const final;
ControlState GetGateRadiusAtAngle(double ang) const final;
ControlState GetDefaultInputRadiusAtAngle(double angle) const final override;
ControlState GetDefaultInputRadiusAtAngle(double angle) const final;
StateData GetState(bool adjusted = true) const;

View File

@ -18,12 +18,12 @@ public:
explicit Tilt(const std::string& name);
ReshapeData GetReshapableState(bool adjusted) const final override;
ControlState GetGateRadiusAtAngle(double angle) const final override;
ReshapeData GetReshapableState(bool adjusted) const final;
ControlState GetGateRadiusAtAngle(double angle) const final;
// Tilt is using the gate radius to adjust the tilt angle so we must provide an unadjusted value
// for the default input radius.
ControlState GetDefaultInputRadiusAtAngle(double angle) const final override;
ControlState GetDefaultInputRadiusAtAngle(double angle) const final;
StateData GetState() const;

View File

@ -235,7 +235,7 @@ protected:
class EmulatedController : public ControlGroupContainer
{
public:
virtual ~EmulatedController();
~EmulatedController() override;
virtual InputConfig* GetConfig() const = 0;

View File

@ -36,8 +36,8 @@ class OctagonStickGate : public StickGate
public:
// Radius of circumscribed circle
explicit OctagonStickGate(ControlState radius);
ControlState GetRadiusAtAngle(double ang) const override final;
std::optional<u32> GetIdealCalibrationSampleCount() const override final;
ControlState GetRadiusAtAngle(double ang) const final;
std::optional<u32> GetIdealCalibrationSampleCount() const final;
private:
const ControlState m_radius;
@ -48,8 +48,8 @@ class RoundStickGate : public StickGate
{
public:
explicit RoundStickGate(ControlState radius);
ControlState GetRadiusAtAngle(double ang) const override final;
std::optional<u32> GetIdealCalibrationSampleCount() const override final;
ControlState GetRadiusAtAngle(double ang) const final;
std::optional<u32> GetIdealCalibrationSampleCount() const final;
private:
const ControlState m_radius;
@ -60,8 +60,8 @@ class SquareStickGate : public StickGate
{
public:
explicit SquareStickGate(ControlState half_width);
ControlState GetRadiusAtAngle(double ang) const override final;
std::optional<u32> GetIdealCalibrationSampleCount() const override final;
ControlState GetRadiusAtAngle(double ang) const final;
std::optional<u32> GetIdealCalibrationSampleCount() const final;
private:
const ControlState m_half_width;

View File

@ -117,7 +117,7 @@ public:
class Output : public Control
{
public:
virtual ~Output() = default;
~Output() override = default;
virtual void SetState(ControlState state) = 0;
Output* ToOutput() override { return this; }
};

View File

@ -60,13 +60,13 @@ public:
Core::DeviceRemoval UpdateInput() override;
Joystick(const LPDIRECTINPUTDEVICE8 device);
~Joystick();
~Joystick() override;
std::string GetName() const override;
std::string GetSource() const override;
int GetSortPriority() const override { return -3; }
bool IsValid() const final override;
bool IsValid() const final;
private:
const LPDIRECTINPUTDEVICE8 m_device;

View File

@ -97,7 +97,7 @@ public:
Core::DeviceRemoval UpdateInput() override;
KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device);
~KeyboardMouse();
~KeyboardMouse() override;
std::string GetName() const override;
std::string GetSource() const override;

View File

@ -71,11 +71,8 @@ private:
: m_name(name), m_input(input), m_range(range), m_offset(offset)
{
}
std::string GetName() const final override { return m_name; }
ControlState GetState() const final override
{
return (ControlState(m_input) + m_offset) / m_range;
}
std::string GetName() const final { return m_name; }
ControlState GetState() const final { return (ControlState(m_input) + m_offset) / m_range; }
private:
const char* m_name;
@ -203,7 +200,7 @@ class InputBackend final : public ciface::InputBackend
{
public:
InputBackend(ControllerInterface* controller_interface);
~InputBackend();
~InputBackend() override;
void PopulateDevices() override;
private:

View File

@ -26,7 +26,7 @@ class InputBackend final : public ciface::InputBackend
{
public:
InputBackend(ControllerInterface* controller_interface);
~InputBackend();
~InputBackend() override;
void PopulateDevices() override;
void UpdateInput(std::vector<std::weak_ptr<ciface::Core::Device>>& devices_to_remove) override;

View File

@ -93,8 +93,8 @@ private:
: m_name(name), m_input(input), m_range(range)
{
}
std::string GetName() const final override { return m_name; }
ControlState GetState() const final override { return ControlState(m_input) / m_range; }
std::string GetName() const final { return m_name; }
ControlState GetState() const final { return ControlState(m_input) / m_range; }
private:
const char* m_name;

View File

@ -51,7 +51,7 @@ public:
std::string GetName() const override { return m_name; }
ControlState GetState() const final override { return ControlState(m_value) / m_extent; }
ControlState GetState() const final { return ControlState(m_value) / m_extent; }
protected:
const T& m_value;

View File

@ -29,7 +29,7 @@ class Device final : public Core::Device
{
public:
Device(std::unique_ptr<WiimoteReal::Wiimote> wiimote);
~Device();
~Device() override;
std::string GetName() const override;
std::string GetSource() const override;

View File

@ -31,7 +31,7 @@ class InputBackend final : public ciface::InputBackend
{
public:
InputBackend(ControllerInterface* controller_interface);
~InputBackend();
~InputBackend() override;
void PopulateDevices() override;
void HandleWindowChange() override;