OpenSystemsDevelopment / qpdf

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.
Inline Side-by-side
Showing 3 changed files with 14 additions and 16 deletions
include/qpdf/QPDF.hh
  View file @d67ad8b
... ... @@ -791,7 +791,6 @@ class QPDF
791 791  
792 792 class Doc;
793 793 class StreamCopier;
794   - class JobSetter;
795 794  
796 795 inline bool reconstructed_xref() const;
797 796 inline Doc& doc();
... ...
libqpdf/QPDFJob.cc
  View file @d67ad8b
... ... @@ -30,6 +30,18 @@
30 30  
31 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 45 namespace
34 46 {
35 47 class ImageOptimizer final: public QPDFObjectHandle::StreamDataProvider
... ... @@ -734,7 +746,7 @@ QPDFJob::doCheck(QPDF& pdf)
734 746 bool okay = true;
735 747 auto& cout = *m->log->getInfo();
736 748 cout << "checking " << m->infile_name() << "\n";
737   - QPDF::JobSetter::setCheckMode(pdf, true);
  749 + QPDF::Doc::JobSetter::setCheckMode(pdf, true);
738 750 try {
739 751 int extension_level = pdf.getExtensionLevel();
740 752 cout << "PDF Version: " << pdf.getPDFVersion();
... ...
libqpdf/qpdf/QPDF_private.hh
  View file @d67ad8b
... ... @@ -344,6 +344,7 @@ class QPDF::PatternFinder final: public InputSource::Finder
344 344 class QPDF::Doc
345 345 {
346 346 public:
  347 + class JobSetter;
347 348 class ParseGuard;
348 349 class Resolver;
349 350 class Streams;
... ... @@ -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 524 inline bool
538 525 QPDF::reconstructed_xref() const
539 526 {
... ...