OpenSystemsDevelopment / qpdf

Commit aadbc1f6b7be122303b92f135693aaa7beb17193

Authored by m-holger
1 parent c2131ff0

Refactor `ResolveRecorder`: use `QPDF&` instead of `QPDF*`, mark class as `final… 

…`, and simplify member access.
Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
libqpdf/QPDF_objects.cc
  View file @aadbc1f
... ... @@ -1593,7 +1593,7 @@ QPDF::resolve(QPDFObjGen og)
1593 1593 updateCache(og, QPDFObject::create<QPDF_Null>(), -1, -1);
1594 1594 return m->obj_cache[og].object;
1595 1595 }
1596   - ResolveRecorder rr(this, og);
  1596 + ResolveRecorder rr(*this, og);
1597 1597  
1598 1598 if (m->xref_table.contains(og)) {
1599 1599 QPDFXRefEntry const& entry = m->xref_table[og];
... ...
libqpdf/qpdf/QPDF_private.hh
  View file @aadbc1f
... ... @@ -563,21 +563,21 @@ class QPDF::JobSetter
563 563 }
564 564 };
565 565  
566   -class QPDF::ResolveRecorder
  566 +class QPDF::ResolveRecorder final
567 567 {
568 568 public:
569   - ResolveRecorder(QPDF* qpdf, QPDFObjGen const& og) :
  569 + ResolveRecorder(QPDF& qpdf, QPDFObjGen const& og) :
570 570 qpdf(qpdf),
571   - iter(qpdf->m->resolving.insert(og).first)
  571 + iter(qpdf.m->resolving.insert(og).first)
572 572 {
573 573 }
574   - virtual ~ResolveRecorder()
  574 + ~ResolveRecorder()
575 575 {
576   - this->qpdf->m->resolving.erase(iter);
  576 + qpdf.m->resolving.erase(iter);
577 577 }
578 578  
579 579 private:
580   - QPDF* qpdf;
  580 + QPDF& qpdf;
581 581 std::set<QPDFObjGen>::const_iterator iter;
582 582 };
583 583  
... ...