Rename `pages` to `page_dh` in `QPDF::Doc` and update references

Refactor `pages` method and related members in `QPDF::Doc` to `page_dh`. Update all associated references to reflect the change.

Rename `pages` to `page_dh` in `QPDF::Doc` and update references
Refactor `pages` method and related members in `QPDF::Doc` to `page_dh`. Update all associated references to reflect the change.
m-holger
1 parent 988a63cc
Showing 4 changed files with 12 additions and 15 deletions
include/qpdf/QPDF.hh
libqpdf/QPDFJob.cc
libqpdf/QPDFPageDocumentHelper.cc
libqpdf/qpdf/QPDF_private.hh
@@ -49,19 +49,11 @@
 namespace qpdf
 {
     class Dictionary;
-
-    namespace is
-    {
-        class OffsetBuffer;
-    }
 } // namespace qpdf
-class QPDF_Stream;
 class BitStream;
 class BitWriter;
-class BufferInputSource;
 class QPDFLogger;
-class QPDFParser;
 class QPDF
 {
@@ -764,7 +764,7 @@ QPDFJob::doCheck(QPDF&amp; pdf)
         // Create all document helper to trigger any validations they carry out.
         auto& doc = pdf.doc();
-        auto& pages = doc.pages();
+        auto& pages = doc.page_dh();
         (void)doc.acroform();
         (void)doc.embedded_files();
         (void)doc.page_labels();
@@ -18,7 +18,7 @@ QPDFPageDocumentHelper::QPDFPageDocumentHelper(QPDF&amp; qpdf) :
 QPDFPageDocumentHelper&
 QPDFPageDocumentHelper::get(QPDF& qpdf)
 {
-    return qpdf.doc().pages();
+    return qpdf.doc().page_dh();
 }
 void
@@ -13,6 +13,11 @@
 using namespace qpdf;
+namespace qpdf::is
+{
+    class OffsetBuffer;
+} // namespace qpdf::is
+
 class QPDF::ObjCache
 {
   public:
@@ -610,12 +615,12 @@ class QPDF::Doc
     }
     QPDFPageDocumentHelper&
-    pages()
+    page_dh()
     {
-        if (!pages_) {
-            pages_ = std::make_unique<QPDFPageDocumentHelper>(qpdf);
+        if (!page_dh_) {
+            page_dh_ = std::make_unique<QPDFPageDocumentHelper>(qpdf);
         }
-        return *pages_;
+        return *page_dh_;
     }
     QPDFPageLabelDocumentHelper&
@@ -637,7 +642,7 @@ class QPDF::Doc
     std::unique_ptr<QPDFAcroFormDocumentHelper> acroform_;
     std::unique_ptr<QPDFEmbeddedFileDocumentHelper> embedded_files_;
     std::unique_ptr<QPDFOutlineDocumentHelper> outlines_;
-    std::unique_ptr<QPDFPageDocumentHelper> pages_;
+    std::unique_ptr<QPDFPageDocumentHelper> page_dh_;
     std::unique_ptr<QPDFPageLabelDocumentHelper> page_labels_;
 };