From 1a8c2eb93b3116a3057e8009b8cbd7510abaf138 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 22 Jan 2022 17:37:51 -0500
Subject: QPDFJob: use std::shared_ptr over PointerHolder where possible

Also fix QPDFArgParser
---
 include/qpdf/QPDFArgParser.hh | 12 ++++++------
 include/qpdf/QPDFJob.hh       | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'include')

diff --git a/include/qpdf/QPDFArgParser.hh b/include/qpdf/QPDFArgParser.hh
index 12ade54b..108fc019 100644
--- a/include/qpdf/QPDFArgParser.hh
+++ b/include/qpdf/QPDFArgParser.hh
@@ -23,7 +23,7 @@
 #define QPDFARGPARSER_HH
 
 #include <qpdf/DLL.h>
-#include <qpdf/PointerHolder.hh>
+#include <memory>
 #include <string>
 #include <set>
 #include <map>
@@ -325,15 +325,15 @@ class QPDFArgParser
         option_table_t* option_table;
         std::string option_table_name;
         bare_arg_handler_t final_check_handler;
-        std::vector<PointerHolder<char>> new_argv;
-        std::vector<PointerHolder<char>> bash_argv;
-        PointerHolder<char*> argv_ph;
-        PointerHolder<char*> bash_argv_ph;
+        std::vector<std::shared_ptr<char>> new_argv;
+        std::vector<std::shared_ptr<char>> bash_argv;
+        std::shared_ptr<char*> argv_ph;
+        std::shared_ptr<char*> bash_argv_ph;
         std::map<std::string, HelpTopic> help_topics;
         std::map<std::string, HelpTopic> option_help;
         std::string help_footer;
     };
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFARGPARSER_HH
diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh
index f2e3a019..03035957 100644
--- a/include/qpdf/QPDFJob.hh
+++ b/include/qpdf/QPDFJob.hh
@@ -24,11 +24,11 @@
 
 #include <qpdf/DLL.h>
 #include <qpdf/Constants.h>
-#include <qpdf/PointerHolder.hh>
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFArgParser.hh>
 
+#include <memory>
 #include <string>
 #include <list>
 #include <vector>
@@ -167,7 +167,7 @@ class QPDFJob
         char const* to_nr;
         char const* from_nr;
         char const* repeat_nr;
-        PointerHolder<QPDF> pdf;
+        std::shared_ptr<QPDF> pdf;
         std::vector<int> to_pagenos;
         std::vector<int> from_pagenos;
         std::vector<int> repeat_pagenos;
@@ -316,14 +316,14 @@ class QPDFJob
 
   private:
     // Basic file processing
-    PointerHolder<QPDF> processFile(
+    std::shared_ptr<QPDF> processFile(
         char const* filename, char const* password);
-    PointerHolder<QPDF> processInputSource(
+    std::shared_ptr<QPDF> processInputSource(
         PointerHolder<InputSource> is, char const* password);
-    PointerHolder<QPDF> doProcess(
+    std::shared_ptr<QPDF> doProcess(
         std::function<void(QPDF*, char const*)> fn,
         char const* password, bool empty);
-    PointerHolder<QPDF> doProcessOnce(
+    std::shared_ptr<QPDF> doProcessOnce(
         std::function<void(QPDF*, char const*)> fn,
         char const* password, bool empty);
 
@@ -331,7 +331,7 @@ class QPDFJob
     void setQPDFOptions(QPDF& pdf);
     void handlePageSpecs(
         QPDF& pdf, bool& warnings,
-        std::vector<PointerHolder<QPDF>>& page_heap);
+        std::vector<std::shared_ptr<QPDF>>& page_heap);
     bool shouldRemoveUnreferencedResources(QPDF& pdf);
     void handleRotations(QPDF& pdf);
     void handleUnderOverlay(QPDF& pdf);
@@ -395,9 +395,9 @@ class QPDFJob
         std::ostream* cout;
         std::ostream* cerr;
         unsigned long encryption_status;
-        PointerHolder<QPDFArgParser> ap;
+        std::shared_ptr<QPDFArgParser> ap;
     };
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFOBJECT_HH
-- 
cgit v1.2.3-54-g00ecf