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

Relocate `Writer` to `QPDF::Doc` for better encapsulation of writer-related logic. Adjust all references to use the new placement.

Move `Writer` to `QPDF::Doc` and update references
Relocate `Writer` to `QPDF::Doc` for better encapsulation of writer-related logic. Adjust all references to use the new placement.
m-holger
1 parent 09d758b0
Showing 3 changed files with 4 additions and 4 deletions
include/qpdf/QPDF.hh
libqpdf/QPDFWriter.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 Writer;
     class StreamCopier;
     class JobSetter;
  
@@ -260,7 +260,7 @@ Pl_stack::Popper::pop()
 }
  
 // Writer class is restricted to QPDFWriter so that only it can call certain methods.
-class QPDF::Writer
+class QPDF::Doc::Writer
 {
     friend class QPDFWriter;
     Writer(QPDF& pdf) :
@@ -328,7 +328,7 @@ class QPDF::Writer
     QPDF& pdf;
 };
  
-class QPDFWriter::Members: QPDF::Writer
+class QPDFWriter::Members: QPDF::Doc::Writer
 {
     friend class QPDFWriter;
  
@@ -343,7 +343,7 @@ class QPDFWriter::Members: QPDF::Writer
     enum trailer_e { t_normal, t_lin_first, t_lin_second };
  
     Members(QPDFWriter& w, QPDF& pdf) :
-        QPDF::Writer(pdf),
+        QPDF::Doc::Writer(pdf),
         w(w),
         root_og(
             pdf.getRoot().getObjGen().isIndirect() ? pdf.getRoot().getObjGen() : QPDFObjGen(-1, 0)),
@@ -347,6 +347,7 @@ class QPDF::Doc
     class ParseGuard;
     class Resolver;
     class Streams;
+    class Writer;
  
     Doc() = delete;
     Doc(Doc const&) = delete;