piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary virtual keywords

Browse Source
This commit is contained in:
Lioncash
2015-07-30 06:47:02 -04:00
parent 567d0b20fa
commit 7ee0e75633
38 changed files with 211 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
View File

@ -254,22 +254,22 @@ public:
ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
virtual ControlState GetValue() override
ControlState GetValue() override
{
return control->ToInput()->GetGatedState();
}
virtual void SetValue(ControlState value) override
void SetValue(ControlState value) override
{
control->ToOutput()->SetGatedState(value);
}
virtual int CountNumControls() override
int CountNumControls() override
{
return 1;
}
virtual operator std::string() override
operator std::string() override
{
return "`" + (std::string)qualifier + "`";
}
@ -289,7 +289,7 @@ public:
delete rhs;
}
virtual ControlState GetValue() override
ControlState GetValue() override
{
ControlState lhsValue = lhs->GetValue();
ControlState rhsValue = rhs->GetValue();
@ -307,7 +307,7 @@ public:
}
}
virtual void SetValue(ControlState value) override
void SetValue(ControlState value) override
{
// Don't do anything special with the op we have.
// Treat "A & B" the same as "A | B".
@ -315,12 +315,12 @@ public:
rhs->SetValue(value);
}
virtual int CountNumControls() override
int CountNumControls() override
{
return lhs->CountNumControls() + rhs->CountNumControls();
}
virtual operator std::string() override
operator std::string() override
{
return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
}
@ -338,7 +338,7 @@ public:
delete inner;
}
virtual ControlState GetValue() override
ControlState GetValue() override
{
ControlState value = inner->GetValue();
switch (op)
@ -351,7 +351,7 @@ public:
}
}
virtual void SetValue(ControlState value) override
void SetValue(ControlState value) override
{
switch (op)
{
@ -364,12 +364,12 @@ public:
}
}
virtual int CountNumControls() override
int CountNumControls() override
{
return inner->CountNumControls();
}
virtual operator std::string() override
operator std::string() override
{
return OpName(op) + "(" + (std::string)(*inner) + ")";
}