Refactor `removeKey` to `erase` in `BaseHandle`, update logic for API consistenc…

…y, and simplify implementation.

Refactor `removeKey` to `erase` in `BaseHandle`, update logic for API consistenc…
…y, and simplify implementation.
m-holger
1 parent c72de58d
Showing 4 changed files with 9 additions and 9 deletions
include/qpdf/ObjectHandle.hh
libqpdf/QPDF_Dictionary.cc
libqpdf/qpdf/QPDFObjectHandle_private.hh
qpdf/qpdf.testcov
@@ -84,6 +84,7 @@ namespace qpdf
         QPDFObjectHandle operator[](int n) const;
         bool contains(std::string const& key) const;
+        size_t erase(std::string const& key);
         QPDFObjectHandle const& operator[](std::string const& key) const;
         std::shared_ptr<QPDFObject> copy(bool shallow = false) const;
@@ -53,11 +53,14 @@ BaseDictionary::getAsMap() const
     return dict()->items;
 }
-void
-BaseDictionary::removeKey(std::string const& key)
+size_t
+BaseHandle::erase(const std::string& key)
 {
     // no-op if key does not exist
-    dict()->items.erase(key);
+    if (auto d = as<QPDF_Dictionary>()) {
+        return d->items.erase(key);
+    }
+    return 0;
 }
 void
@@ -188,18 +191,16 @@ QPDFObjectHandle::replaceKeyAndGetOld(std::string const&amp; key, QPDFObjectHandle c
 void
 QPDFObjectHandle::removeKey(std::string const& key)
 {
-    if (auto dict = as_dictionary(strict)) {
-        dict.removeKey(key);
+    if (erase(key) || isDictionary()) {
         return;
     }
     typeWarning("dictionary", "ignoring key removal request");
-    QTC::TC("qpdf", "QPDFObjectHandle dictionary ignoring removeKey");
 }
 QPDFObjectHandle
 QPDFObjectHandle::removeKeyAndGetOld(std::string const& key)
 {
     auto result = (*this)[key];
-    removeKey(key);
+    erase(key);
     return result ? result : newNull();
 }
@@ -122,7 +122,6 @@ namespace qpdf
         // The following methods are not part of the public API.
         std::set<std::string> getKeys();
         std::map<std::string, QPDFObjectHandle> const& getAsMap() const;
-        void removeKey(std::string const& key);
         void replaceKey(std::string const& key, QPDFObjectHandle value);
         using iterator = std::map<std::string, QPDFObjectHandle>::iterator;
@@ -307,7 +307,6 @@ QPDFObjectHandle dictionary false for hasKey 0
 QPDFObjectHandle dictionary empty set for getKeys 0
 QPDFObjectHandle dictionary empty map for asMap 0
 QPDFObjectHandle dictionary ignoring replaceKey 0
-QPDFObjectHandle dictionary ignoring removeKey 0
 QPDFObjectHandle numeric non-numeric 0
 QPDFObjectHandle erase array bounds 0
 qpdf-c called qpdf_check_pdf 0