From b5af953b02e04d889a6af96893ead510b11df0bd Mon Sep 17 00:00:00 2001 From: m-holger Date: Sun, 31 Aug 2025 13:33:07 +0100 Subject: [PATCH] Refactor: replace `isNull` calls with `null`, remove redundant `QTC::TC` calls in `QPDFOutlineObjectHelper` and `QPDFOutlineDocumentHelper`. --- libqpdf/QPDFAcroFormDocumentHelper.cc | 2 +- libqpdf/QPDFOutlineDocumentHelper.cc | 3 ++- libqpdf/QPDFOutlineObjectHelper.cc | 4 ++-- qpdf/qpdf.testcov | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libqpdf/QPDFAcroFormDocumentHelper.cc b/libqpdf/QPDFAcroFormDocumentHelper.cc index 912e4f9..7adbe08 100644 --- a/libqpdf/QPDFAcroFormDocumentHelper.cc +++ b/libqpdf/QPDFAcroFormDocumentHelper.cc @@ -502,10 +502,10 @@ QPDFAcroFormDocumentHelper::adjustInheritedFields( int q = cur_field.getQuadding(); if (q != from_default_q) { obj.replaceKey("/Q", QPDFObjectHandle::newInteger(from_default_q)); + } } } } -} namespace { diff --git a/libqpdf/QPDFOutlineDocumentHelper.cc b/libqpdf/QPDFOutlineDocumentHelper.cc index f1774ff..bcba309 100644 --- a/libqpdf/QPDFOutlineDocumentHelper.cc +++ b/libqpdf/QPDFOutlineDocumentHelper.cc @@ -1,5 +1,6 @@ #include +#include #include class QPDFOutlineDocumentHelper::Members @@ -36,7 +37,7 @@ QPDFOutlineDocumentHelper::QPDFOutlineDocumentHelper(QPDF& qpdf) : } QPDFObjectHandle cur = outlines.getKey("/First"); QPDFObjGen::set seen; - while (!cur.isNull() && seen.add(cur)) { + while (!cur.null() && seen.add(cur)) { m->outlines.emplace_back(QPDFOutlineObjectHelper::Accessor::create(cur, *this, 1)); cur = cur.getKey("/Next"); } diff --git a/libqpdf/QPDFOutlineObjectHelper.cc b/libqpdf/QPDFOutlineObjectHelper.cc index 640826a..4c3a2bf 100644 --- a/libqpdf/QPDFOutlineObjectHelper.cc +++ b/libqpdf/QPDFOutlineObjectHelper.cc @@ -1,5 +1,6 @@ #include +#include #include #include @@ -19,13 +20,12 @@ QPDFOutlineObjectHelper::QPDFOutlineObjectHelper( return; } if (QPDFOutlineDocumentHelper::Accessor::checkSeen(m->dh, a_oh.getObjGen())) { - QTC::TC("qpdf", "QPDFOutlineObjectHelper loop"); return; } QPDFObjGen::set children; QPDFObjectHandle cur = a_oh.getKey("/First"); - while (!cur.isNull() && cur.isIndirect() && children.add(cur)) { + while (!cur.null() && cur.isIndirect() && children.add(cur)) { QPDFOutlineObjectHelper new_ooh(cur, dh, 1 + depth); new_ooh.m->parent = std::make_shared(*this); m->kids.push_back(new_ooh); diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov index 3f93a3c..c3beb4e 100644 --- a/qpdf/qpdf.testcov +++ b/qpdf/qpdf.testcov @@ -326,7 +326,6 @@ QPDFOutlineObjectHelper direct dest 0 QPDFOutlineObjectHelper action dest 0 QPDFOutlineObjectHelper named dest 0 QPDFOutlineDocumentHelper string named dest 0 -QPDFOutlineObjectHelper loop 0 QPDFObjectHandle merge top type mismatch 0 QPDFObjectHandle merge shallow copy 0 QPDFObjectHandle merge array 0 -- libgit2 0.21.4