json-writer: use std::unique_ptr<T> instead of explicit destructor

Suggested-by: Lukas Zaoral
csutils · Apr 13, 2022 · a6a19c0 · a6a19c0
1 parent 5e0601e
commit a6a19c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/json-writer.cc b/src/json-writer.cc
@@ -363,10 +363,10 @@ void SarifTreeEncoder::writeTo(std::ostream &str)
 }
 
 struct JsonWriter::Private {
-    std::ostream                   &str;
-    std::queue<Defect>              defQueue;
-    TScanProps                      scanProps;
-    AbstractTreeEncoder            *encoder;
+    std::ostream                           &str;
+    std::queue<Defect>                      defQueue;
+    TScanProps                              scanProps;
+    std::unique_ptr<AbstractTreeEncoder>    encoder;
 
     Private(std::ostream &str_):
         str(str_)
@@ -379,24 +379,18 @@ JsonWriter::JsonWriter(std::ostream &str, const EFileFormat format):
 {
     switch (format) {
         case FF_JSON:
-            d->encoder = new SimpleTreeEncoder;
+            d->encoder.reset(new SimpleTreeEncoder);
             break;
 
         case FF_SARIF:
-            d->encoder = new SarifTreeEncoder;
+            d->encoder.reset(new SarifTreeEncoder);
             break;
 
         default:
             throw std::runtime_error("unknown output format");
     }
 }
 
-JsonWriter::~JsonWriter()
-{
-    delete d->encoder;
-    delete d;
-}
-
 const TScanProps& JsonWriter::getScanProps() const
 {
     return d->scanProps;

diff --git a/src/json-writer.hh b/src/json-writer.hh
@@ -23,21 +23,22 @@
 #include "abstract-writer.hh"
 
 #include <iostream>
+#include <memory>
 
 class JsonWriter: public AbstractWriter {
     public:
         JsonWriter(std::ostream &, EFileFormat format = FF_JSON);
-        virtual ~JsonWriter();
+        ~JsonWriter() override = default;
 
-        virtual const TScanProps& getScanProps() const;
-        virtual void setScanProps(const TScanProps &);
+        const TScanProps& getScanProps() const override;
+        void setScanProps(const TScanProps &) override;
 
-        virtual void handleDef(const Defect &def);
-        virtual void flush();
+        void handleDef(const Defect &def) override;
+        void flush() override;
 
     private:
         struct Private;
-        Private *d;
+        std::unique_ptr<Private> d;
 };
 
 #endif /* H_GUARD_JSON_WRITER_H */