[fix][cleanup] Use std::unique_ptr for TextField, and so fix memo…

…ryleak.
kallisti5 · Oct 15, 2024 · 5715219 · 5715219
1 parent 9e3b776
commit 5715219
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/include/guisan/widgets/textfield.hpp b/include/guisan/widgets/textfield.hpp
@@ -62,6 +62,7 @@
 #include "guisan/platform.hpp"
 #include "guisan/widget.hpp"
 
+#include <memory>
 #include <string>
 
 namespace gcn
@@ -90,6 +91,11 @@ namespace gcn
          */
         TextField(const std::string& text);
 
+        /**
+         * Destructor.
+         */
+        ~TextField() override;
+
         /**
          * Sets the text of the text field.
          *
@@ -190,7 +196,7 @@ namespace gcn
         /**
          * Holds the text of the text field.
          */
-        Text* mText = nullptr;
+        std::unique_ptr<Text> mText;
 
         /**
          * Holds the amount scrolled in x. If a user types more characters than

diff --git a/src/widgets/textfield.cpp b/src/widgets/textfield.cpp
@@ -68,7 +68,7 @@
 
 namespace gcn
 {
-    TextField::TextField() : mText(new Text())
+    TextField::TextField() : mText(std::make_unique<Text>())
     {
         setFocusable(true);
 
@@ -78,7 +78,7 @@ namespace gcn
         adjustHeight();
     }
 
-    TextField::TextField(const std::string& text) : mText(new Text(text))
+    TextField::TextField(const std::string& text) : mText(std::make_unique<Text>(text))
     {
         setFocusable(true);
 
@@ -88,6 +88,8 @@ namespace gcn
         adjustSize();
     }
 
+    TextField::~TextField() = default;
+
     void TextField::setText(const std::string& text)
     {
         mText->setRow(0, text);