Refactor: replace `isNull` calls with `null`, remove redundant `QTC::TC` calls i…

…n `QPDFOutlineObjectHelper` and `QPDFOutlineDocumentHelper`.

Refactor: replace `isNull` calls with `null`, remove redundant `QTC::TC` calls i…
…n `QPDFOutlineObjectHelper` and `QPDFOutlineDocumentHelper`.
m-holger
1 parent e1560162
Showing 4 changed files with 5 additions and 5 deletions
libqpdf/QPDFAcroFormDocumentHelper.cc
libqpdf/QPDFOutlineDocumentHelper.cc
libqpdf/QPDFOutlineObjectHelper.cc
qpdf/qpdf.testcov
@@ -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
 {
 #include <qpdf/QPDFOutlineDocumentHelper.hh>
+#include <qpdf/QPDFObjectHandle_private.hh>
 #include <qpdf/QTC.hh>
 class QPDFOutlineDocumentHelper::Members
@@ -36,7 +37,7 @@ QPDFOutlineDocumentHelper::QPDFOutlineDocumentHelper(QPDF&amp; 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");
     }
 #include <qpdf/QPDFOutlineObjectHelper.hh>
+#include <qpdf/QPDFObjectHandle_private.hh>
 #include <qpdf/QPDFOutlineDocumentHelper.hh>
 #include <qpdf/QTC.hh>
@@ -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<QPDFOutlineObjectHelper>(*this);
         m->kids.push_back(new_ooh);
@@ -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