mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Make overriding explicit and remove redundant virtual specifiers on overriding destructors - Core & UnitTests
This commit is contained in:
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -235,7 +235,7 @@ protected:
|
||||
class EmulatedController : public ControlGroupContainer
|
||||
{
|
||||
public:
|
||||
virtual ~EmulatedController();
|
||||
~EmulatedController() override;
|
||||
|
||||
virtual InputConfig* GetConfig() const = 0;
|
||||
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user