diff --git a/src/actions/setvalueaction.h b/src/actions/setvalueaction.h index 9bb907d..1da73a9 100644 --- a/src/actions/setvalueaction.h +++ b/src/actions/setvalueaction.h @@ -25,7 +25,7 @@ public: if (auto result = m_accessorInterface.setValue(m_value); result) m_confirmInterface.confirm(); else - m_errorHandlerInterface.errorOccured(std::move(result).error()); + m_errorHandlerInterface.errorOccurred(std::move(result).error()); } T value() const { return m_value; } diff --git a/src/actions/toggleboolaction.h b/src/actions/toggleboolaction.h index 4f44292..bf79255 100644 --- a/src/actions/toggleboolaction.h +++ b/src/actions/toggleboolaction.h @@ -15,7 +15,7 @@ public: void triggered() override { if (auto result = setValue(!getValue()); !result) - errorOccured(std::move(result).error()); + errorOccurred(std::move(result).error()); } }; } // namespace espgui diff --git a/src/changevaluedisplay.h b/src/changevaluedisplay.h index 1988020..0480ce8 100644 --- a/src/changevaluedisplay.h +++ b/src/changevaluedisplay.h @@ -107,7 +107,7 @@ void ChangeValueDisplay::update() if (auto result = static_cast*>(this)->setValue(m_value); result) confirm(); else - errorOccured(std::move(result).error()); + errorOccurred(std::move(result).error()); } } diff --git a/src/changevaluedisplay_chrono.h b/src/changevaluedisplay_chrono.h index 6787804..993f77b 100644 --- a/src/changevaluedisplay_chrono.h +++ b/src/changevaluedisplay_chrono.h @@ -89,7 +89,7 @@ void ChangeValueDisplayChrono::update() if (auto result = this->setValue(m_value); result) confirm(); else - errorOccured(std::move(result).error()); + errorOccurred(std::move(result).error()); } } diff --git a/src/changevaluedisplay_ip_address_t.cpp b/src/changevaluedisplay_ip_address_t.cpp index 32c9264..78ab66a 100644 --- a/src/changevaluedisplay_ip_address_t.cpp +++ b/src/changevaluedisplay_ip_address_t.cpp @@ -90,7 +90,7 @@ void ChangeValueDisplay::buttonPressed(Button button) if (auto result = this->setValue(m_value); result) confirm(); else - errorOccured(std::move(result).error()); + errorOccurred(std::move(result).error()); } break; case Button::Up: diff --git a/src/changevaluedisplay_string.cpp b/src/changevaluedisplay_string.cpp index bc0eb4a..f06fd5d 100644 --- a/src/changevaluedisplay_string.cpp +++ b/src/changevaluedisplay_string.cpp @@ -59,7 +59,7 @@ void espgui::ChangeValueDisplay::confirmValue() if (auto result = this->setValue(m_value); result) confirm(); else - errorOccured(std::move(result).error()); + errorOccurred(std::move(result).error()); } void espgui::ChangeValueDisplay::removeLastCharFromShownValue() diff --git a/src/errorhandlerinterface.h b/src/errorhandlerinterface.h index 1957e93..4298ba6 100644 --- a/src/errorhandlerinterface.h +++ b/src/errorhandlerinterface.h @@ -8,13 +8,13 @@ namespace espgui { class ErrorHandlerInterface { public: - virtual void errorOccured(std::string &&error) = 0; + virtual void errorOccurred(std::string &&error) = 0; }; class DummyErrorHandler : public virtual ErrorHandlerInterface { public: - void errorOccured(std::string &&error) override {} + void errorOccurred(std::string &&error) override {} }; } // namespace espgui