From a68703b07e928be0eeb909c0e777e13e88cbf86d Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 9 Apr 2022 14:35:56 -0400
Subject: Replace PointerHolder with std::shared_ptr in library sources only

(patrepl and cleanpatch are my own utilities)

patrepl s/PointerHolder/std::shared_ptr/g {include,libqpdf}/qpdf/*.hh
patrepl s/PointerHolder/std::shared_ptr/g libqpdf/*.cc
patrepl s/make_pointer_holder/std::make_shared/g libqpdf/*.cc
patrepl s/make_array_pointer_holder/QUtil::make_shared_array/g libqpdf/*.cc
patrepl s,qpdf/std::shared_ptr,qpdf/PointerHolder, **/*.cc **/*.hh
git restore include/qpdf/PointerHolder.hh
cleanpatch
./format-code
---
 libqpdf/QPDFJob.cc | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'libqpdf/QPDFJob.cc')

diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index 99cf867f..f714c5d2 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -1879,7 +1879,7 @@ QPDFJob::processFile(
 
 std::shared_ptr<QPDF>
 QPDFJob::processInputSource(
-    PointerHolder<InputSource> is, char const* password, bool used_for_input)
+    std::shared_ptr<InputSource> is, char const* password, bool used_for_input)
 {
     auto f1 = std::mem_fn(&QPDF::processInputSource);
     auto fn = std::bind(f1, std::placeholders::_1, is, std::placeholders::_2);
@@ -2238,7 +2238,7 @@ QPDFJob::handleTransformations(QPDF& pdf)
                     m->oi_min_height,
                     m->oi_min_area,
                     image);
-                PointerHolder<QPDFObjectHandle::StreamDataProvider> sdp(io);
+                std::shared_ptr<QPDFObjectHandle::StreamDataProvider> sdp(io);
                 if (io->evaluate(
                         "image " + name + " on page " +
                         QUtil::int_to_string(pageno))) {
@@ -2494,17 +2494,17 @@ QPDFJob::handlePageSpecs(
                 cout << prefix << ": processing " << page_spec.filename
                      << std::endl;
             });
-            PointerHolder<InputSource> is;
+            std::shared_ptr<InputSource> is;
             ClosedFileInputSource* cis = 0;
             if (!m->keep_files_open) {
                 QTC::TC("qpdf", "QPDFJob keep files open n");
                 cis = new ClosedFileInputSource(page_spec.filename.c_str());
-                is = PointerHolder<InputSource>(cis);
+                is = std::shared_ptr<InputSource>(cis);
                 cis->stayOpen(true);
             } else {
                 QTC::TC("qpdf", "QPDFJob keep files open y");
                 FileInputSource* fis = new FileInputSource();
-                is = PointerHolder<InputSource>(fis);
+                is = std::shared_ptr<InputSource>(fis);
                 fis->setFilename(page_spec.filename.c_str());
             }
             std::shared_ptr<QPDF> qpdf_ph =
@@ -3064,12 +3064,13 @@ QPDFJob::setWriterOptions(QPDF& pdf, QPDFWriter& w)
         w.forcePDFVersion(version, extension_level);
     }
     if (m->progress && m->outfilename) {
-        w.registerProgressReporter(PointerHolder<QPDFWriter::ProgressReporter>(
-            // line-break
-            new ProgressReporter(
-                *(this->m->cout),
-                this->m->message_prefix,
-                m->outfilename.get())));
+        w.registerProgressReporter(
+            std::shared_ptr<QPDFWriter::ProgressReporter>(
+                // line-break
+                new ProgressReporter(
+                    *(this->m->cout),
+                    this->m->message_prefix,
+                    m->outfilename.get())));
     }
 }
 
-- 
cgit v1.2.3-54-g00ecf