Commit 51b9e4196ea3159eade207cdab84c9b545aeef73

Authored by m-holger
1 parent 94a7bab5

Remove deprecated overload of QPDFObjectHandle::getJSON

include/qpdf/QPDFObjectHandle.hh
@@ -1206,11 +1206,6 @@ class QPDFObjectHandle @@ -1206,11 +1206,6 @@ class QPDFObjectHandle
1206 void writeJSON( 1206 void writeJSON(
1207 int json_version, Pipeline* p, bool dereference_indirect = false, size_t depth = 0) const; 1207 int json_version, Pipeline* p, bool dereference_indirect = false, size_t depth = 0) const;
1208 1208
1209 - // Deprecated version uses v1 for backward compatibility.  
1210 - // ABI: remove for qpdf 12  
1211 - [[deprecated("Use getJSON(int version)")]] QPDF_DLL JSON  
1212 - getJSON(bool dereference_indirect = false) const;  
1213 -  
1214 // This method can be called on a stream to get a more extended JSON representation of the 1209 // This method can be called on a stream to get a more extended JSON representation of the
1215 // stream that includes the stream's data. The JSON object returned is always a dictionary whose 1210 // stream that includes the stream's data. The JSON object returned is always a dictionary whose
1216 // "dict" key is an encoding of the stream's dictionary. The representation of the data is 1211 // "dict" key is an encoding of the stream's dictionary. The representation of the data is
libqpdf/QPDFObjectHandle.cc
@@ -1615,13 +1615,6 @@ QPDFObjectHandle::unparseBinary() const @@ -1615,13 +1615,6 @@ QPDFObjectHandle::unparseBinary() const
1615 } 1615 }
1616 } 1616 }
1617 1617
1618 -// Deprecated versionless getJSON to be removed in qpdf 12  
1619 -JSON  
1620 -QPDFObjectHandle::getJSON(bool dereference_indirect) const  
1621 -{  
1622 - return getJSON(1, dereference_indirect);  
1623 -}  
1624 -  
1625 JSON 1618 JSON
1626 QPDFObjectHandle::getJSON(int json_version, bool dereference_indirect) const 1619 QPDFObjectHandle::getJSON(int json_version, bool dereference_indirect) const
1627 { 1620 {
manual/release-notes.rst
@@ -11,6 +11,9 @@ For a detailed list of changes, please see the file @@ -11,6 +11,9 @@ For a detailed list of changes, please see the file
11 12.0.0: not yet released 11 12.0.0: not yet released
12 - API: breaking changes 12 - API: breaking changes
13 13
  14 + - Deprecated versionless overload of ``QPDFObjectHandle::getJSON``
  15 + has been removed.
  16 +
14 - ``Buffer`` copy constructor and assignment operator have been 17 - ``Buffer`` copy constructor and assignment operator have been
15 removed. ``Buffer`` copy operations are expensive as they always 18 removed. ``Buffer`` copy operations are expensive as they always
16 involve copying the buffer content. Use ``buffer2 = buffer1.copy();`` 19 involve copying the buffer content. Use ``buffer2 = buffer1.copy();``