Commit d67ad8b76d3e8f8efb02426403b68dce07fd3c7e

Authored by m-holger
1 parent c030d31c

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

Relocate `JobSetter` to `QPDF::Doc` for improved encapsulation of job-related logic. Adjust all references to use the new placement.
include/qpdf/QPDF.hh
@@ -791,7 +791,6 @@ class QPDF @@ -791,7 +791,6 @@ class QPDF
791 791
792 class Doc; 792 class Doc;
793 class StreamCopier; 793 class StreamCopier;
794 - class JobSetter;  
795 794
796 inline bool reconstructed_xref() const; 795 inline bool reconstructed_xref() const;
797 inline Doc& doc(); 796 inline Doc& doc();
libqpdf/QPDFJob.cc
@@ -30,6 +30,18 @@ @@ -30,6 +30,18 @@
30 30
31 using namespace qpdf; 31 using namespace qpdf;
32 32
  33 +// JobSetter class is restricted to QPDFJob.
  34 +class QPDF::Doc::JobSetter
  35 +{
  36 + public:
  37 + // Enable enhanced warnings for pdf file checking.
  38 + static void
  39 + setCheckMode(QPDF& qpdf, bool val)
  40 + {
  41 + qpdf.m->check_mode = val;
  42 + }
  43 +};
  44 +
33 namespace 45 namespace
34 { 46 {
35 class ImageOptimizer final: public QPDFObjectHandle::StreamDataProvider 47 class ImageOptimizer final: public QPDFObjectHandle::StreamDataProvider
@@ -734,7 +746,7 @@ QPDFJob::doCheck(QPDF& pdf) @@ -734,7 +746,7 @@ QPDFJob::doCheck(QPDF& pdf)
734 bool okay = true; 746 bool okay = true;
735 auto& cout = *m->log->getInfo(); 747 auto& cout = *m->log->getInfo();
736 cout << "checking " << m->infile_name() << "\n"; 748 cout << "checking " << m->infile_name() << "\n";
737 - QPDF::JobSetter::setCheckMode(pdf, true); 749 + QPDF::Doc::JobSetter::setCheckMode(pdf, true);
738 try { 750 try {
739 int extension_level = pdf.getExtensionLevel(); 751 int extension_level = pdf.getExtensionLevel();
740 cout << "PDF Version: " << pdf.getPDFVersion(); 752 cout << "PDF Version: " << pdf.getPDFVersion();
libqpdf/qpdf/QPDF_private.hh
@@ -344,6 +344,7 @@ class QPDF::PatternFinder final: public InputSource::Finder @@ -344,6 +344,7 @@ class QPDF::PatternFinder final: public InputSource::Finder
344 class QPDF::Doc 344 class QPDF::Doc
345 { 345 {
346 public: 346 public:
  347 + class JobSetter;
347 class ParseGuard; 348 class ParseGuard;
348 class Resolver; 349 class Resolver;
349 class Streams; 350 class Streams;
@@ -520,20 +521,6 @@ class QPDF::Doc::Resolver @@ -520,20 +521,6 @@ class QPDF::Doc::Resolver
520 } 521 }
521 }; 522 };
522 523
523 -// JobSetter class is restricted to QPDFJob.  
524 -class QPDF::JobSetter  
525 -{  
526 - friend class QPDFJob;  
527 -  
528 - private:  
529 - // Enable enhanced warnings for pdf file checking.  
530 - static void  
531 - setCheckMode(QPDF& qpdf, bool val)  
532 - {  
533 - qpdf.m->check_mode = val;  
534 - }  
535 -};  
536 -  
537 inline bool 524 inline bool
538 QPDF::reconstructed_xref() const 525 QPDF::reconstructed_xref() const
539 { 526 {