Remove `getKey` from `BaseDictionary`, refactor dictionary key access to use `op…

…erator[]`, and simplify null handling logic.

Remove `getKey` from `BaseDictionary`, refactor dictionary key access to use `op…
…erator[]`, and simplify null handling logic.
m-holger
1 parent 08dcf84c
Showing 3 changed files with 8 additions and 25 deletions
libqpdf/QPDF_Dictionary.cc
libqpdf/qpdf/QPDFObjectHandle_private.hh
qpdf/qpdf.testcov
@@ -35,21 +35,6 @@ BaseHandle::contains(std::string const&amp; key) const
     return !(*this)[key].null();
 }
-QPDFObjectHandle
-BaseDictionary::getKey(std::string const& key) const
-{
-    auto d = dict();
-
-    // PDF spec says fetching a non-existent key from a dictionary returns the null object.
-    auto item = d->items.find(key);
-    if (item != d->items.end()) {
-        // May be a null object
-        return item->second;
-    }
-    static auto constexpr msg = " -> dictionary key $VD"sv;
-    return QPDF_Null::create(obj, msg, key);
-}
-
 std::set<std::string>
 BaseDictionary::getKeys()
 {
@@ -133,11 +118,14 @@ QPDFObjectHandle::hasKey(std::string const&amp; key) const
 QPDFObjectHandle
 QPDFObjectHandle::getKey(std::string const& key) const
 {
-    if (auto dict = as_dictionary(strict)) {
-        return dict.getKey(key);
+    if (auto result = (*this)[key]) {
+        return result;
+    }
+    if (isDictionary()) {
+        static auto constexpr msg = " -> dictionary key $VD"sv;
+        return QPDF_Null::create(obj, msg, key);
     }
     typeWarning("dictionary", "returning null for attempted key retrieval");
-    QTC::TC("qpdf", "QPDFObjectHandle dictionary null for getKey");
     static auto constexpr msg = " -> null returned from getting key $VD from non-Dictionary"sv;
     return QPDF_Null::create(obj, msg, "");
 }
@@ -211,10 +199,7 @@ QPDFObjectHandle::removeKey(std::string const&amp; key)
 QPDFObjectHandle
 QPDFObjectHandle::removeKeyAndGetOld(std::string const& key)
 {
-    auto result = QPDFObjectHandle::newNull();
-    if (auto dict = as_dictionary(strict)) {
-        result = dict.getKey(key);
-    }
+    auto result = (*this)[key];
     removeKey(key);
-    return result;
+    return result ? result : newNull();
 }
@@ -120,7 +120,6 @@ namespace qpdf
     {
       public:
         // The following methods are not part of the public API.
-        QPDFObjectHandle getKey(std::string const& key) const;
         std::set<std::string> getKeys();
         std::map<std::string, QPDFObjectHandle> const& getAsMap() const;
         void removeKey(std::string const& key);
@@ -304,7 +304,6 @@ QPDFObjectHandle insert array bounds 0
 QPDFObjectHandle array ignoring append item 0
 QPDFObjectHandle array ignoring erase item 0
 QPDFObjectHandle dictionary false for hasKey 0
-QPDFObjectHandle dictionary null for getKey 0
 QPDFObjectHandle dictionary empty set for getKeys 0
 QPDFObjectHandle dictionary empty map for asMap 0
 QPDFObjectHandle dictionary ignoring replaceKey 0