Move `StreamCopier` to `QPDF::Doc` and update references

Relocate `StreamCopier` to `QPDF::Doc` for improved encapsulation of stream copying functionality. Adjust all references to use the updated placement.

Move `StreamCopier` to `QPDF::Doc` and update references
Relocate `StreamCopier` to `QPDF::Doc` for improved encapsulation of stream copying functionality. Adjust all references to use the updated placement.
m-holger
1 parent d67ad8b7
Showing 3 changed files with 15 additions and 15 deletions
include/qpdf/QPDF.hh
libqpdf/QPDFObjectHandle.cc
libqpdf/qpdf/QPDF_private.hh
@@ -790,7 +790,6 @@ class QPDF
     // End of the public API. The following classes and methods are for qpdf internal use only.
     class Doc;
-    class StreamCopier;
     inline bool reconstructed_xref() const;
     inline Doc& doc();
@@ -1949,7 +1949,7 @@ QPDFObjectHandle::copyStream()
             dict.replaceKey(iter.first, iter.second.shallowCopy());
         }
     }
-    QPDF::StreamCopier::copyStreamData(getOwningQPDF(), result, *this);
+    QPDF::Doc::StreamCopier::copyStreamData(getOwningQPDF(), result, *this);
     return result;
 }
@@ -13,19 +13,6 @@
 using namespace qpdf;
-// StreamCopier class is restricted to QPDFObjectHandle so it can copy stream data.
-class QPDF::StreamCopier
-{
-    friend class QPDFObjectHandle;
-
-  private:
-    static void
-    copyStreamData(QPDF* qpdf, QPDFObjectHandle const& dest, QPDFObjectHandle const& src)
-    {
-        qpdf->copyStreamData(dest, src);
-    }
-};
-
 class QPDF::ObjCache
 {
   public:
@@ -347,9 +334,23 @@ class QPDF::Doc
     class JobSetter;
     class ParseGuard;
     class Resolver;
+    class StreamCopier;
     class Streams;
     class Writer;
+    // StreamCopier class is restricted to QPDFObjectHandle so it can copy stream data.
+    class StreamCopier
+    {
+        friend class QPDFObjectHandle;
+
+      private:
+        static void
+        copyStreamData(QPDF* qpdf, QPDFObjectHandle const& dest, QPDFObjectHandle const& src)
+        {
+            qpdf->copyStreamData(dest, src);
+        }
+    };
+
     Doc() = delete;
     Doc(Doc const&) = delete;
     Doc(Doc&&) = delete;