From 25dd3c67501663353ecdd881bb4322458466cbc0 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 21 Jun 2019 18:41:42 -0400
Subject: [PATCH] Remove QPDF::copyForeignObject with unused parameter

---
 ChangeLog            | 4 ++++
 TODO                 | 3 ---
 include/qpdf/QPDF.hh | 3 ---
 libqpdf/QPDF.cc      | 7 -------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49a3c614..895a3431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-06-21  Jay Berkenbilt  <ejb@ql.org>
 
+	* Source-level incompatibility: remove the version
+	QPDF::copyForeignObject with an unused boolean parameter. If you
+	were, for some reason, calling this, just take the parameter away.
+
 	* Source-level incompatibility: rename QUtil::strcasecmp to
 	QUtil::str_compare_nocase. This is a non-compatible change, but
 	QUtil::strcasecmp is hardly the most important part of qpdf's API.
diff --git a/TODO b/TODO
index bf400c33..6a6f0ea9 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,6 @@
 Next ABI
 ========
 
- * Get rid of the version of QPDF::copyForeignObject with the bool
-   unused parameter.
-
  * Remove version of QPDFTokenizer::expectInlineImage with no
    arguments.
 
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index c3fa0873..f8a84ce9 100644
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@@ -934,9 +934,6 @@ class QPDF
 	QPDFObjectHandle& stream_dict, bool is_attachment_stream,
 	std::vector<PointerHolder<Pipeline> >& heap);
 
-    // Unused copyForeignObject -- remove at next ABI change
-    QPDFObjectHandle copyForeignObject(
-        QPDFObjectHandle foreign, bool unused);
     // Methods to support object copying
     void reserveObjects(QPDFObjectHandle foreign, ObjCopier& obj_copier,
                         bool top);
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 55f220d8..a549eed0 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -2141,13 +2141,6 @@ QPDF::replaceReserved(QPDFObjectHandle reserved,
     replaceObject(reserved.getObjGen(), replacement);
 }
 
-QPDFObjectHandle
-QPDF::copyForeignObject(QPDFObjectHandle foreign, bool)
-{
-    // This method will be removed next time the ABI is changed.
-    return copyForeignObject(foreign);
-}
-
 QPDFObjectHandle
 QPDF::copyForeignObject(QPDFObjectHandle foreign)
 {