Refactor QPDFFormFieldObjectHelper: simplify Members handling by using std::shar…

…ed_ptr and forward declaration.

Refactor QPDFFormFieldObjectHelper: simplify Members handling by using std::shar…
…ed_ptr and forward declaration.
m-holger
1 parent 9a6cfda2
Showing 2 changed files with 9 additions and 13 deletions
include/qpdf/QPDFFormFieldObjectHelper.hh
libqpdf/QPDFFormFieldObjectHelper.cc
@@ -193,17 +193,7 @@ class QPDFFormFieldObjectHelper: public QPDFObjectHelper
     void generateTextAppearance(QPDFAnnotationObjectHelper&);
     QPDFObjectHandle getFontFromResource(QPDFObjectHandle resources, std::string const& font_name);
-    class Members
-    {
-        friend class QPDFFormFieldObjectHelper;
-
-      public:
-        ~Members() = default;
-
-      private:
-        Members() = default;
-        Members(Members const&) = delete;
-    };
+    class Members;
     std::shared_ptr<Members> m;
 };
@@ -10,17 +10,23 @@
 #include <qpdf/QUtil.hh>
 #include <cstdlib>
+#include <memory>
+
 using namespace qpdf;
+class QPDFFormFieldObjectHelper::Members
+{
+};
+
 QPDFFormFieldObjectHelper::QPDFFormFieldObjectHelper(QPDFObjectHandle oh) :
     QPDFObjectHelper(oh),
-    m(new Members())
+    m(std::make_shared<Members>())
 {
 }
 QPDFFormFieldObjectHelper::QPDFFormFieldObjectHelper() :
     QPDFObjectHelper(QPDFObjectHandle::newNull()),
-    m(new Members())
+    m(std::make_shared<Members>())
 {
 }