mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-06-14 00:58:51 +02:00
Run code through clang-modernize -add-override to add 'override' decls.
This commit is contained in:
@ -222,22 +222,22 @@ public:
|
||||
|
||||
ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
|
||||
|
||||
virtual ControlState GetValue()
|
||||
virtual ControlState GetValue() override
|
||||
{
|
||||
return control->ToInput()->GetState();
|
||||
}
|
||||
|
||||
virtual void SetValue(ControlState value)
|
||||
virtual void SetValue(ControlState value) override
|
||||
{
|
||||
control->ToOutput()->SetState(value);
|
||||
}
|
||||
|
||||
virtual int CountNumControls()
|
||||
virtual int CountNumControls() override
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
virtual operator std::string()
|
||||
virtual operator std::string() override
|
||||
{
|
||||
return "`" + (std::string)qualifier + "`";
|
||||
}
|
||||
@ -257,7 +257,7 @@ public:
|
||||
delete rhs;
|
||||
}
|
||||
|
||||
virtual ControlState GetValue()
|
||||
virtual ControlState GetValue() override
|
||||
{
|
||||
ControlState lhsValue = lhs->GetValue();
|
||||
ControlState rhsValue = rhs->GetValue();
|
||||
@ -275,7 +275,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void SetValue(ControlState value)
|
||||
virtual void SetValue(ControlState value) override
|
||||
{
|
||||
// Don't do anything special with the op we have.
|
||||
// Treat "A & B" the same as "A | B".
|
||||
@ -283,12 +283,12 @@ public:
|
||||
rhs->SetValue(value);
|
||||
}
|
||||
|
||||
virtual int CountNumControls()
|
||||
virtual int CountNumControls() override
|
||||
{
|
||||
return lhs->CountNumControls() + rhs->CountNumControls();
|
||||
}
|
||||
|
||||
virtual operator std::string()
|
||||
virtual operator std::string() override
|
||||
{
|
||||
return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
|
||||
}
|
||||
@ -306,7 +306,7 @@ public:
|
||||
delete inner;
|
||||
}
|
||||
|
||||
virtual ControlState GetValue()
|
||||
virtual ControlState GetValue() override
|
||||
{
|
||||
ControlState value = inner->GetValue();
|
||||
switch (op)
|
||||
@ -319,7 +319,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void SetValue(ControlState value)
|
||||
virtual void SetValue(ControlState value) override
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
@ -330,12 +330,12 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual int CountNumControls()
|
||||
virtual int CountNumControls() override
|
||||
{
|
||||
return inner->CountNumControls();
|
||||
}
|
||||
|
||||
virtual operator std::string()
|
||||
virtual operator std::string() override
|
||||
{
|
||||
return OpName(op) + "(" + (std::string)(*inner) + ")";
|
||||
}
|
||||
|
Reference in New Issue
Block a user