mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 14:21:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unhelpful return values

Browse Source
This commit is contained in:
Chris Thrasher 2023-12-17 13:33:12 -07:00
parent 2bc4e15043
commit 674d68faa6
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SFML/Window/WindowBase.hpp
View File

@ -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

10
src/SFML/Audio/SoundFileWriterWav.cpp
View File

@ -93,11 +93,7 @@ bool SoundFileWriterWav::open(const std::filesystem::path& filename, unsigned in
}
// Write the header
if (!writeHeader(sampleRate, channelCount))
{
err() << "Failed to write header of WAV sound file\n" << formatDebugPathInfo(filename) << std::endl;
return false;
}
writeHeader(sampleRate, channelCount);
return true;
}
@ -114,7 +110,7 @@ void SoundFileWriterWav::write(const std::int16_t* samples, std::uint64_t count)
////////////////////////////////////////////////////////////
bool SoundFileWriterWav::writeHeader(unsigned int sampleRate, unsigned int channelCount)
void SoundFileWriterWav::writeHeader(unsigned int sampleRate, unsigned int channelCount)
{
assert(m_file.good() && "Most recent I/O operation failed");
@ -152,8 +148,6 @@ bool SoundFileWriterWav::writeHeader(unsigned int sampleRate, unsigned int chann
m_file.write(dataChunkId, sizeof(dataChunkId));
const std::uint32_t dataChunkSize = 0; // placeholder, will be written later
encode(m_file, dataChunkSize);
return true;
}

4
src/SFML/Audio/SoundFileWriterWav.hpp
View File

@ -86,10 +86,8 @@ private:
/// \param sampleRate Sample rate of the sound
/// \param channelCount Number of channels of the sound
///
/// \return True on success, false on error
///
////////////////////////////////////////////////////////////
[[nodiscard]] bool writeHeader(unsigned int sampleRate, unsigned int channelCount);
void writeHeader(unsigned int sampleRate, unsigned int channelCount);
////////////////////////////////////////////////////////////
/// \brief Close the file

10
src/SFML/Window/WindowBase.cpp
View File

@ -164,7 +164,8 @@ bool WindowBase::pollEvent(Event& event)
{
if (m_impl && m_impl->popEvent(event, false))
{
return filterEvent(event);
filterEvent(event);
return true;
}
else
{
@ -178,7 +179,8 @@ bool WindowBase::waitEvent(Event& event)
{
if (m_impl && m_impl->popEvent(event, true))
{
return filterEvent(event);
filterEvent(event);
return true;
}
else
{
@ -383,7 +385,7 @@ void WindowBase::onResize()
////////////////////////////////////////////////////////////
bool WindowBase::filterEvent(const Event& event)
void WindowBase::filterEvent(const Event& event)
{
// Notify resize events to the derived class
if (event.type == Event::Resized)
@ -394,8 +396,6 @@ bool WindowBase::filterEvent(const Event& event)
// Notify the derived class
onResize();
}
return true;
}