Move `Pipe` to `QPDF::Doc::Streams` and update references

Relocate `Pipe` functionality to `QPDF::Doc::Streams` for improved encapsulation of stream-related logic. Adjust all references to use the new placement.

Move `Pipe` to `QPDF::Doc::Streams` and update references
Relocate `Pipe` functionality to `QPDF::Doc::Streams` for improved encapsulation of stream-related logic. Adjust all references to use the new placement.
m-holger
1 parent 5e292cff
Showing 3 changed files with 23 additions and 25 deletions
include/qpdf/QPDF.hh
libqpdf/QPDF_Stream.cc
libqpdf/qpdf/QPDF_private.hh
@@ -792,7 +792,6 @@ class QPDF
     class Doc;
     class Writer;
     class StreamCopier;
-    class Pipe;
     class JobSetter;
     inline bool reconstructed_xref() const;
@@ -26,6 +26,27 @@
 using namespace std::literals;
 using namespace qpdf;
+// Pipe class is restricted to QPDF_Stream.
+class QPDF::Doc::Streams
+{
+  public:
+    static bool
+    pipeStreamData(
+        QPDF* qpdf,
+        QPDFObjGen og,
+        qpdf_offset_t offset,
+        size_t length,
+        QPDFObjectHandle dict,
+        bool is_root_metadata,
+        Pipeline* pipeline,
+        bool suppress_warnings,
+        bool will_retry)
+    {
+        return qpdf->pipeStreamData(
+            og, offset, length, dict, is_root_metadata, pipeline, suppress_warnings, will_retry);
+    }
+};
+
 namespace
 {
     class SF_Crypt final: public QPDFStreamFilter
@@ -563,7 +584,7 @@ Stream::pipeStreamData(
             throw std::logic_error("pipeStreamData called for stream with no data");
         }
         QTC::TC("qpdf", "QPDF_Stream pipe original stream data");
-        if (!QPDF::Pipe::pipeStreamData(
+        if (!QPDF::Doc::Streams::pipeStreamData(
                 obj->getQPDF(),
                 obj->getObjGen(),
                 obj->getParsedOffset(),
@@ -26,29 +26,6 @@ class QPDF::StreamCopier
     }
 };
-// Pipe class is restricted to QPDF_Stream.
-class QPDF::Pipe
-{
-    friend class qpdf::Stream;
-
-  private:
-    static bool
-    pipeStreamData(
-        QPDF* qpdf,
-        QPDFObjGen og,
-        qpdf_offset_t offset,
-        size_t length,
-        QPDFObjectHandle dict,
-        bool is_root_metadata,
-        Pipeline* pipeline,
-        bool suppress_warnings,
-        bool will_retry)
-    {
-        return qpdf->pipeStreamData(
-            og, offset, length, dict, is_root_metadata, pipeline, suppress_warnings, will_retry);
-    }
-};
-
 class QPDF::ObjCache
 {
   public:
@@ -369,6 +346,7 @@ class QPDF::Doc
   public:
     class ParseGuard;
     class Resolver;
+    class Streams;
     Doc() = delete;
     Doc(Doc const&) = delete;