From bff2977f138d843a30f5712c081eac5f2b9ae799 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Thu, 9 Nov 2023 16:42:47 -0700 Subject: [PATCH] Remove unhelpful return value --- include/SFML/Window/WindowBase.hpp | 2 +- src/SFML/Window/WindowBase.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/SFML/Window/WindowBase.hpp b/include/SFML/Window/WindowBase.hpp index 11f380957..e5bd77ca2 100644 --- a/include/SFML/Window/WindowBase.hpp +++ b/include/SFML/Window/WindowBase.hpp @@ -475,7 +475,7 @@ private: /// \param event Event to filter /// //////////////////////////////////////////////////////////// - [[nodiscard]] bool filterEvent(const Event& event); + void filterEvent(const Event& event); //////////////////////////////////////////////////////////// /// \brief Perform some common internal initializations diff --git a/src/SFML/Window/WindowBase.cpp b/src/SFML/Window/WindowBase.cpp index ed2476e13..d2bc2da2f 100644 --- a/src/SFML/Window/WindowBase.cpp +++ b/src/SFML/Window/WindowBase.cpp @@ -161,7 +161,8 @@ bool WindowBase::pollEvent(Event& event) { if (m_impl && m_impl->popEvent(event, false)) { - return filterEvent(event); + filterEvent(event); + return true; } else { @@ -175,7 +176,8 @@ bool WindowBase::waitEvent(Event& event) { if (m_impl && m_impl->popEvent(event, true)) { - return filterEvent(event); + filterEvent(event); + return true; } else { @@ -380,7 +382,7 @@ void WindowBase::onResize() //////////////////////////////////////////////////////////// -bool WindowBase::filterEvent(const Event& event) +void WindowBase::filterEvent(const Event& event) { // Notify resize events to the derived class if (const auto* resized = event.getIf()) @@ -391,8 +393,6 @@ bool WindowBase::filterEvent(const Event& event) // Notify the derived class onResize(); } - - return true; }