Merge pull request #20 from 0xFEEDC0DE64/spelling

This commit is contained in:
CommanderRedYT
2022-06-15 10:51:34 +02:00
committed by GitHub
7 changed files with 8 additions and 8 deletions

View File

@ -25,7 +25,7 @@ public:
if (auto result = m_accessorInterface.setValue(m_value); result) if (auto result = m_accessorInterface.setValue(m_value); result)
m_confirmInterface.confirm(); m_confirmInterface.confirm();
else else
m_errorHandlerInterface.errorOccured(std::move(result).error()); m_errorHandlerInterface.errorOccurred(std::move(result).error());
} }
T value() const { return m_value; } T value() const { return m_value; }

View File

@ -15,7 +15,7 @@ public:
void triggered() override void triggered() override
{ {
if (auto result = setValue(!getValue()); !result) if (auto result = setValue(!getValue()); !result)
errorOccured(std::move(result).error()); errorOccurred(std::move(result).error());
} }
}; };
} // namespace espgui } // namespace espgui

View File

@ -107,7 +107,7 @@ void ChangeValueDisplay<Tvalue>::update()
if (auto result = static_cast<AccessorInterface<Tvalue>*>(this)->setValue(m_value); result) if (auto result = static_cast<AccessorInterface<Tvalue>*>(this)->setValue(m_value); result)
confirm(); confirm();
else else
errorOccured(std::move(result).error()); errorOccurred(std::move(result).error());
} }
} }

View File

@ -89,7 +89,7 @@ void ChangeValueDisplayChrono<T>::update()
if (auto result = this->setValue(m_value); result) if (auto result = this->setValue(m_value); result)
confirm(); confirm();
else else
errorOccured(std::move(result).error()); errorOccurred(std::move(result).error());
} }
} }

View File

@ -90,7 +90,7 @@ void ChangeValueDisplay<wifi_stack::ip_address_t>::buttonPressed(Button button)
if (auto result = this->setValue(m_value); result) if (auto result = this->setValue(m_value); result)
confirm(); confirm();
else else
errorOccured(std::move(result).error()); errorOccurred(std::move(result).error());
} }
break; break;
case Button::Up: case Button::Up:

View File

@ -59,7 +59,7 @@ void espgui::ChangeValueDisplay<std::string>::confirmValue()
if (auto result = this->setValue(m_value); result) if (auto result = this->setValue(m_value); result)
confirm(); confirm();
else else
errorOccured(std::move(result).error()); errorOccurred(std::move(result).error());
} }
void espgui::ChangeValueDisplay<std::string>::removeLastCharFromShownValue() void espgui::ChangeValueDisplay<std::string>::removeLastCharFromShownValue()

View File

@ -8,13 +8,13 @@ namespace espgui {
class ErrorHandlerInterface class ErrorHandlerInterface
{ {
public: public:
virtual void errorOccured(std::string &&error) = 0; virtual void errorOccurred(std::string &&error) = 0;
}; };
class DummyErrorHandler : public virtual ErrorHandlerInterface class DummyErrorHandler : public virtual ErrorHandlerInterface
{ {
public: public:
void errorOccured(std::string &&error) override {} void errorOccurred(std::string &&error) override {}
}; };
} // namespace espgui } // namespace espgui