Remove some delete calls

Author: ChrisThrasher

src/CSFML/Audio/Music.cpp

@@ -35,28 +35,22 @@ sfMusic* sfMusic_createFromFile(const char* filename)
 {
     assert(filename);
 
-    auto* music = new sfMusic;
-    if (!music->This.openFromFile(filename))
-    {
-        delete music;
-        music = nullptr;
-    }
-
-    return music;
+    sf::Music music;
+    if (!music.openFromFile(filename))
+        return nullptr;
+
+    return new sfMusic{{}, std::move(music)};
 }
 
 
 ////////////////////////////////////////////////////////////
 sfMusic* sfMusic_createFromMemory(const void* data, size_t sizeInBytes)
 {
-    auto* music = new sfMusic;
-    if (!music->This.openFromMemory(data, sizeInBytes))
-    {
-        delete music;
-        music = nullptr;
-    }
-
-    return music;
+    sf::Music music;
+    if (!music.openFromMemory(data, sizeInBytes))
+        return nullptr;
+
+    return new sfMusic{{}, std::move(music)};
 }
 
 
@@ -65,15 +59,12 @@ sfMusic* sfMusic_createFromStream(sfInputStream* stream)
 {
     assert(stream);
 
-    auto* music   = new sfMusic;
-    music->Stream = CallbackStream(stream);
-    if (!music->This.openFromStream(music->Stream))
-    {
-        delete music;
-        music = nullptr;
-    }
+    auto      callbackStream = std::make_unique<CallbackStream>(stream);
+    sf::Music music;
+    if (!music.openFromStream(*callbackStream))
+        return nullptr;
 
-    return music;
+    return new sfMusic{std::move(callbackStream), std::move(music)};
 }
 
 

src/CSFML/Audio/MusicStruct.hpp

@@ -31,12 +31,14 @@
 
 #include <SFML/Audio/Music.hpp>
 
+#include <memory>
+
 
 ////////////////////////////////////////////////////////////
 // Internal structure of sfMusic
 ////////////////////////////////////////////////////////////
 struct sfMusic
 {
-    CallbackStream Stream;
-    sf::Music      This;
+    std::unique_ptr<CallbackStream> Stream;
+    sf::Music                       This;
 };

src/CSFML/Graphics/Font.cpp

@@ -60,23 +60,20 @@ sfFont* sfFont_createFromStream(sfInputStream* stream)
 {
     assert(stream);
 
-    auto* font   = new sfFont;
-    font->Stream = CallbackStream(stream);
-    if (!font->This.openFromStream(font->Stream))
-    {
-        delete font;
-        font = nullptr;
-    }
+    auto     callbackStream = std::make_unique<CallbackStream>(stream);
+    sf::Font font;
+    if (!font.openFromStream(*callbackStream))
+        return nullptr;
 
-    return font;
+    return new sfFont{std::move(font), {}, std::move(callbackStream)};
 }
 
 
 ////////////////////////////////////////////////////////////
 sfFont* sfFont_copy(const sfFont* font)
 {
     assert(font);
-    return new sfFont(*font);
+    return new sfFont{font->This, font->Textures, std::make_unique<CallbackStream>(*font->Stream)};
 }
 
 

src/CSFML/Graphics/FontStruct.hpp

@@ -42,5 +42,5 @@ struct sfFont
 {
     sf::Font                          This;
     std::map<unsigned int, sfTexture> Textures;
-    CallbackStream                    Stream;
+    std::unique_ptr<CallbackStream>   Stream;
 };

src/CSFML/Graphics/VertexBuffer.cpp

@@ -32,20 +32,14 @@
 ////////////////////////////////////////////////////////////
 sfVertexBuffer* sfVertexBuffer_create(unsigned int vertexCount, sfPrimitiveType type, sfVertexBufferUsage usage)
 {
-    auto* buffer = new sfVertexBuffer;
+    sf::VertexBuffer buffer;
+    if (!buffer.create(vertexCount))
+        return nullptr;
 
-    if (!buffer->This.create(vertexCount))
-    {
-        delete buffer;
-        buffer = nullptr;
-    }
-    else
-    {
-        buffer->This.setPrimitiveType(static_cast<sf::PrimitiveType>(type));
-        buffer->This.setUsage(static_cast<sf::VertexBuffer::Usage>(usage));
-    }
+    buffer.setPrimitiveType(static_cast<sf::PrimitiveType>(type));
+    buffer.setUsage(static_cast<sf::VertexBuffer::Usage>(usage));
 
-    return buffer;
+    return new sfVertexBuffer{std::move(buffer)};
 }
 
 

src/CSFML/Network/TcpListener.cpp

@@ -90,14 +90,13 @@ sfSocketStatus sfTcpListener_accept(sfTcpListener* listener, sfTcpSocket** conne
     assert(listener);
     assert(connected);
 
-    *connected  = new sfTcpSocket;
-    auto status = static_cast<sfSocketStatus>(listener->This.accept((*connected)->This));
+    auto socket = std::make_unique<sfTcpSocket>();
+    auto status = static_cast<sfSocketStatus>(listener->This.accept(socket->This));
 
     if (status != sfSocketDone)
-    {
-        delete *connected;
         *connected = nullptr;
-    }
+    else
+        *connected = socket.release();
 
     return status;
 }