From aadbc1f6b7be122303b92f135693aaa7beb17193 Mon Sep 17 00:00:00 2001
From: m-holger <m.holger@qpdf.org>
Date: Fri, 15 Aug 2025 11:19:14 +0100
Subject: [PATCH] Refactor `ResolveRecorder`: use `QPDF&` instead of `QPDF*`, mark class as `final`, and simplify member access.

---
 libqpdf/QPDF_objects.cc      |  2 +-
 libqpdf/qpdf/QPDF_private.hh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libqpdf/QPDF_objects.cc b/libqpdf/QPDF_objects.cc
index 168c1c8..a709cab 100644
--- a/libqpdf/QPDF_objects.cc
+++ b/libqpdf/QPDF_objects.cc
@@ -1593,7 +1593,7 @@ QPDF::resolve(QPDFObjGen og)
         updateCache(og, QPDFObject::create<QPDF_Null>(), -1, -1);
         return m->obj_cache[og].object;
     }
-    ResolveRecorder rr(this, og);
+    ResolveRecorder rr(*this, og);
 
     if (m->xref_table.contains(og)) {
         QPDFXRefEntry const& entry = m->xref_table[og];
diff --git a/libqpdf/qpdf/QPDF_private.hh b/libqpdf/qpdf/QPDF_private.hh
index 85898bd..5a12786 100644
--- a/libqpdf/qpdf/QPDF_private.hh
+++ b/libqpdf/qpdf/QPDF_private.hh
@@ -563,21 +563,21 @@ class QPDF::JobSetter
     }
 };
 
-class QPDF::ResolveRecorder
+class QPDF::ResolveRecorder final
 {
   public:
-    ResolveRecorder(QPDF* qpdf, QPDFObjGen const& og) :
+    ResolveRecorder(QPDF& qpdf, QPDFObjGen const& og) :
         qpdf(qpdf),
-        iter(qpdf->m->resolving.insert(og).first)
+        iter(qpdf.m->resolving.insert(og).first)
     {
     }
-    virtual ~ResolveRecorder()
+    ~ResolveRecorder()
     {
-        this->qpdf->m->resolving.erase(iter);
+        qpdf.m->resolving.erase(iter);
     }
 
   private:
-    QPDF* qpdf;
+    QPDF& qpdf;
     std::set<QPDFObjGen>::const_iterator iter;
 };
 
--
libgit2 0.21.4