From 683677b5aa4dbf88995933ed7e72ef687e7200ba Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Mon, 19 Feb 2024 11:17:04 -0700 Subject: [PATCH] Use `override` --- src/SFML/Audio/SoundRecorderStruct.h | 6 +++--- src/SFML/Audio/SoundStreamStruct.h | 4 ++-- src/SFML/CallbackStream.h | 8 ++++---- src/SFML/Graphics/ShapeStruct.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/SFML/Audio/SoundRecorderStruct.h b/src/SFML/Audio/SoundRecorderStruct.h index 9fb133a..2e70516 100644 --- a/src/SFML/Audio/SoundRecorderStruct.h +++ b/src/SFML/Audio/SoundRecorderStruct.h @@ -58,7 +58,7 @@ public : private : - virtual bool onStart() + bool onStart() override { if (myStartCallback) return myStartCallback(myUserData); @@ -66,7 +66,7 @@ private : return true; } - virtual bool onProcessSamples(const sf::Int16* samples, std::size_t sampleCount) + bool onProcessSamples(const sf::Int16* samples, std::size_t sampleCount) override { if (myProcessCallback) return myProcessCallback(samples, sampleCount, myUserData); @@ -74,7 +74,7 @@ private : return true; } - virtual void onStop() + void onStop() override { if (myStopCallback) myStopCallback(myUserData); diff --git a/src/SFML/Audio/SoundStreamStruct.h b/src/SFML/Audio/SoundStreamStruct.h index 84fccd0..29ac41b 100644 --- a/src/SFML/Audio/SoundStreamStruct.h +++ b/src/SFML/Audio/SoundStreamStruct.h @@ -53,7 +53,7 @@ public : private : - virtual bool onGetData(Chunk& data) + bool onGetData(Chunk& data) override { sfSoundStreamChunk chunk = {nullptr, 0}; bool ok = myGetDataCallback(&chunk, myUserData); @@ -64,7 +64,7 @@ private : return ok; } - virtual void onSeek(sf::Time timeOffset) + void onSeek(sf::Time timeOffset) override { if (mySeekCallback) { diff --git a/src/SFML/CallbackStream.h b/src/SFML/CallbackStream.h index 6e3f210..2d375a9 100644 --- a/src/SFML/CallbackStream.h +++ b/src/SFML/CallbackStream.h @@ -68,7 +68,7 @@ public: /// \return The number of bytes actually read /// //////////////////////////////////////////////////////////// - virtual sf::Int64 read(void* data, sf::Int64 size) + sf::Int64 read(void* data, sf::Int64 size) override { return myStream.read ? myStream.read(data, size, myStream.userData) : -1; } @@ -81,7 +81,7 @@ public: /// \return The position actually seeked to, or -1 on error /// //////////////////////////////////////////////////////////// - virtual sf::Int64 seek(sf::Int64 position) + sf::Int64 seek(sf::Int64 position) override { return myStream.seek ? myStream.seek(position, myStream.userData) : -1; } @@ -92,7 +92,7 @@ public: /// \return The current position, or -1 on error. /// //////////////////////////////////////////////////////////// - virtual sf::Int64 tell() + sf::Int64 tell() override { return myStream.tell ? myStream.tell(myStream.userData) : -1; } @@ -103,7 +103,7 @@ public: /// \return The total number of bytes available in the stream, or -1 on error /// //////////////////////////////////////////////////////////// - virtual sf::Int64 getSize() + sf::Int64 getSize() override { return myStream.getSize ? myStream.getSize(myStream.userData) : -1; } diff --git a/src/SFML/Graphics/ShapeStruct.h b/src/SFML/Graphics/ShapeStruct.h index 6d0a194..9b764fc 100644 --- a/src/SFML/Graphics/ShapeStruct.h +++ b/src/SFML/Graphics/ShapeStruct.h @@ -51,12 +51,12 @@ public : { } - virtual std::size_t getPointCount() const + std::size_t getPointCount() const override { return myGetPointCountCallback(myUserData); } - virtual sf::Vector2f getPoint(std::size_t index) const + sf::Vector2f getPoint(std::size_t index) const override { sfVector2f point = myGetPointCallback(index, myUserData); return sf::Vector2f(point.x, point.y);