Refactor `QPDFEmbeddedFileDocumentHelper::Members` to use `std::unique_ptr`, imp…

…rove memory management, and simplify initialization logic.

Refactor `QPDFEmbeddedFileDocumentHelper::Members` to use `std::unique_ptr`, imp…
…rove memory management, and simplify initialization logic.
m-holger
1 parent f871b753
Showing 2 changed files with 15 additions and 18 deletions
include/qpdf/QPDFEmbeddedFileDocumentHelper.hh
libqpdf/QPDFEmbeddedFileDocumentHelper.cc
@@ -67,19 +67,7 @@ class QPDFEmbeddedFileDocumentHelper: public QPDFDocumentHelper
   private:
     void initEmbeddedFiles();
-    class Members
-    {
-        friend class QPDFEmbeddedFileDocumentHelper;
-
-      public:
-        ~Members() = default;
-
-      private:
-        Members() = default;
-        Members(Members const&) = delete;
-
-        std::shared_ptr<QPDFNameTreeObjectHelper> embedded_files;
-    };
+    class Members;
     std::shared_ptr<Members> m;
 };
@@ -30,16 +30,25 @@
 //   >>
 // >>
+class QPDFEmbeddedFileDocumentHelper::Members
+{
+  public:
+    Members() = default;
+    Members(Members const&) = delete;
+    ~Members() = default;
+
+    std::unique_ptr<QPDFNameTreeObjectHelper> embedded_files;
+};
+
 QPDFEmbeddedFileDocumentHelper::QPDFEmbeddedFileDocumentHelper(QPDF& qpdf) :
     QPDFDocumentHelper(qpdf),
-    m(new Members())
+    m(std::make_shared<Members>())
 {
-    auto root = qpdf.getRoot();
-    auto names = root.getKey("/Names");
+    auto names = qpdf.getRoot().getKey("/Names");
     if (names.isDictionary()) {
         auto embedded_files = names.getKey("/EmbeddedFiles");
         if (embedded_files.isDictionary()) {
-            m->embedded_files = std::make_shared<QPDFNameTreeObjectHelper>(embedded_files, qpdf);
+            m->embedded_files = std::make_unique<QPDFNameTreeObjectHelper>(embedded_files, qpdf);
         }
     }
 }
@@ -65,7 +74,7 @@ QPDFEmbeddedFileDocumentHelper::initEmbeddedFiles()
     if (!embedded_files.isDictionary()) {
         auto nth = QPDFNameTreeObjectHelper::newEmpty(qpdf);
         names.replaceKey("/EmbeddedFiles", nth.getObjectHandle());
-        m->embedded_files = std::make_shared<QPDFNameTreeObjectHelper>(nth);
+        m->embedded_files = std::make_unique<QPDFNameTreeObjectHelper>(nth);
     }
 }