diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 4 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 7 | ||||
| -rw-r--r-- | manual/release-notes.rst | 4 |
4 files changed, 13 insertions, 11 deletions
@@ -1,3 +1,12 @@ +2022-04-30 Jay Berkenbilt <ejb@ql.org> + + * Remove QPDFObjectHandle::replaceOrRemoveKey. Call replaceKey + instead. Its functionality is identical. Note: usually I would + deprecate this for a release cycle, but the release of qpdf 11 + will require virtually all users to touch their source code, so it + actually seems better to just break this now than to put it off, + particularly since the fix so trivial. + 2022-04-29 Jay Berkenbilt <ejb@ql.org> * QPDFObjectHandle: for the methods insertItem, appendItem, diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 77bef52b..48b7cda9 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -1068,10 +1068,6 @@ class QPDFObjectHandle QPDF_DLL QPDFObjectHandle removeKeyAndGet(std::string const& key); - // ABI: Remove in qpdf 12 - [[deprecated("use replaceKey -- it does the same thing")]] QPDF_DLL void - replaceOrRemoveKey(std::string const& key, QPDFObjectHandle const&); - // Methods for stream objects QPDF_DLL QPDFObjectHandle getDict(); diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 76a6127e..c08c9537 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -1334,13 +1334,6 @@ QPDFObjectHandle::removeKeyAndGet(std::string const& key) return result; } -void -QPDFObjectHandle::replaceOrRemoveKey( - std::string const& key, QPDFObjectHandle const& value) -{ - replaceKey(key, value); -} - // Stream accessors QPDFObjectHandle QPDFObjectHandle::getDict() diff --git a/manual/release-notes.rst b/manual/release-notes.rst index b5e4e150..61143f8e 100644 --- a/manual/release-notes.rst +++ b/manual/release-notes.rst @@ -64,6 +64,10 @@ For a detailed list of changes, please see the file - API: breaking changes + - Remove ``QPDFObjectHandle::replaceOrRemoveKey``. This does the + same thing as ``QPDFObjectHandle::replaceKey``. Just call + ``replaceKey`` instead. + - Remove ``QPDFAcroFormDocumentHelper::copyFieldsFromForeignPage``. This method never worked and only did something in qpdf version |