Rename QPDFObject::shallowCopy to copy

Add optional parameter shallow. Change logic errors to runtime errors.

Rename QPDFObject::shallowCopy to copy
Add optional parameter shallow. Change logic errors to runtime errors.
m-holger · Jay Berkenbilt
1 parent 34a6f893
Showing 31 changed files with 34 additions and 34 deletions
libqpdf/QPDFObjectHandle.cc
libqpdf/QPDF_Array.cc
libqpdf/QPDF_Bool.cc
libqpdf/QPDF_Destroyed.cc
libqpdf/QPDF_Dictionary.cc
libqpdf/QPDF_InlineImage.cc
libqpdf/QPDF_Integer.cc
libqpdf/QPDF_Name.cc
libqpdf/QPDF_Null.cc
libqpdf/QPDF_Operator.cc
libqpdf/QPDF_Real.cc
libqpdf/QPDF_Reserved.cc
libqpdf/QPDF_Stream.cc
libqpdf/QPDF_String.cc
libqpdf/QPDF_Unresolved.cc
libqpdf/qpdf/QPDFObject_private.hh
libqpdf/qpdf/QPDFValue.hh
libqpdf/qpdf/QPDF_Array.hh
libqpdf/qpdf/QPDF_Bool.hh
libqpdf/qpdf/QPDF_Destroyed.hh
@@ -2223,7 +2223,7 @@ QPDFObjectHandle::shallowCopyInternal(
         QTC::TC("qpdf", "QPDFObjectHandle ERR shallow copy stream");
         throw std::runtime_error("attempt to make a shallow copy of a stream");
     }
-    new_obj = QPDFObjectHandle(obj->shallowCopy());
+    new_obj = QPDFObjectHandle(obj->copy(true));
     std::set<QPDFObjGen> visited;
     new_obj.copyObject(visited, false, first_level_only, false);
@@ -2268,7 +2268,7 @@ QPDFObjectHandle::copyObject(
     if (isBool() || isInteger() || isName() || isNull() || isReal() ||
         isString()) {
-        new_obj = obj->shallowCopy();
+        new_obj = obj->copy(true);
     } else if (isArray()) {
         std::vector<QPDFObjectHandle> items;
         auto array = asArray();
@@ -29,7 +29,7 @@ QPDF_Array::create(SparseOHArray const&amp; items)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Array::shallowCopy()
+QPDF_Array::copy(bool shallow)
 {
     return create(elements);
 }
@@ -13,7 +13,7 @@ QPDF_Bool::create(bool value)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Bool::shallowCopy()
+QPDF_Bool::copy(bool shallow)
 {
     return create(val);
 }
@@ -15,7 +15,7 @@ QPDF_Destroyed::getInstance()
 }
 std::shared_ptr<QPDFObject>
-QPDF_Destroyed::shallowCopy()
+QPDF_Destroyed::copy(bool shallow)
 {
     throw std::logic_error(
         "attempted to shallow copy QPDFObjectHandle from destroyed QPDF");
@@ -16,7 +16,7 @@ QPDF_Dictionary::create(std::map&lt;std::string, QPDFObjectHandle&gt; const&amp; items)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Dictionary::shallowCopy()
+QPDF_Dictionary::copy(bool shallow)
 {
     return create(items);
 }
@@ -13,7 +13,7 @@ QPDF_InlineImage::create(std::string const&amp; val)
 }
 std::shared_ptr<QPDFObject>
-QPDF_InlineImage::shallowCopy()
+QPDF_InlineImage::copy(bool shallow)
 {
     return create(val);
 }
@@ -15,7 +15,7 @@ QPDF_Integer::create(long long value)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Integer::shallowCopy()
+QPDF_Integer::copy(bool shallow)
 {
     return create(val);
 }
@@ -17,7 +17,7 @@ QPDF_Name::create(std::string const&amp; name)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Name::shallowCopy()
+QPDF_Name::copy(bool shallow)
 {
     return create(name);
 }
@@ -12,7 +12,7 @@ QPDF_Null::create()
 }
 std::shared_ptr<QPDFObject>
-QPDF_Null::shallowCopy()
+QPDF_Null::copy(bool shallow)
 {
     return create();
 }
@@ -13,7 +13,7 @@ QPDF_Operator::create(std::string const&amp; val)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Operator::shallowCopy()
+QPDF_Operator::copy(bool shallow)
 {
     return create(val);
 }
@@ -29,7 +29,7 @@ QPDF_Real::create(double value, int decimal_places, bool trim_trailing_zeroes)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Real::shallowCopy()
+QPDF_Real::copy(bool shallow)
 {
     return create(val);
 }
@@ -14,7 +14,7 @@ QPDF_Reserved::create()
 }
 std::shared_ptr<QPDFObject>
-QPDF_Reserved::shallowCopy()
+QPDF_Reserved::copy(bool shallow)
 {
     return create();
 }
@@ -140,9 +140,9 @@ QPDF_Stream::create(
 }
 std::shared_ptr<QPDFObject>
-QPDF_Stream::shallowCopy()
+QPDF_Stream::copy(bool shallow)
 {
-    throw std::logic_error("stream objects cannot be cloned");
+    throw std::runtime_error("stream objects cannot be cloned");
 }
 void
@@ -37,7 +37,7 @@ QPDF_String::create_utf16(std::string const&amp; utf8_val)
 }
 std::shared_ptr<QPDFObject>
-QPDF_String::shallowCopy()
+QPDF_String::copy(bool shallow)
 {
     return create(val);
 }
@@ -14,7 +14,7 @@ QPDF_Unresolved::create(QPDF* qpdf, QPDFObjGen const&amp; og)
 }
 std::shared_ptr<QPDFObject>
-QPDF_Unresolved::shallowCopy()
+QPDF_Unresolved::copy(bool shallow)
 {
     throw std::logic_error(
         "attempted to shallow copy an unresolved QPDFObjectHandle");
@@ -24,9 +24,9 @@ class QPDFObject
     QPDFObject() = default;
     std::shared_ptr<QPDFObject>
-    shallowCopy()
+    copy(bool shallow = false)
     {
-        return value->shallowCopy();
+        return value->copy(shallow);
     }
     std::string
     unparse()
@@ -20,7 +20,7 @@ class QPDFValue
   public:
     virtual ~QPDFValue() = default;
-    virtual std::shared_ptr<QPDFObject> shallowCopy() = 0;
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false) = 0;
     virtual std::string unparse() = 0;
     virtual JSON getJSON(int json_version) = 0;
     virtual void
@@ -14,7 +14,7 @@ class QPDF_Array: public QPDFValue
     static std::shared_ptr<QPDFObject>
     create(std::vector<QPDFObjectHandle> const& items);
     static std::shared_ptr<QPDFObject> create(SparseOHArray const& items);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     virtual void disconnect();
@@ -8,7 +8,7 @@ class QPDF_Bool: public QPDFValue
   public:
     virtual ~QPDF_Bool() = default;
     static std::shared_ptr<QPDFObject> create(bool val);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     bool getVal() const;
@@ -7,7 +7,7 @@ class QPDF_Destroyed: public QPDFValue
 {
   public:
     virtual ~QPDF_Destroyed() = default;
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     static std::shared_ptr<QPDFValue> getInstance();
@@ -14,7 +14,7 @@ class QPDF_Dictionary: public QPDFValue
     virtual ~QPDF_Dictionary() = default;
     static std::shared_ptr<QPDFObject>
     create(std::map<std::string, QPDFObjectHandle> const& items);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     virtual void disconnect();
@@ -8,7 +8,7 @@ class QPDF_InlineImage: public QPDFValue
   public:
     virtual ~QPDF_InlineImage() = default;
     static std::shared_ptr<QPDFObject> create(std::string const& val);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     std::string getVal() const;
@@ -8,7 +8,7 @@ class QPDF_Integer: public QPDFValue
   public:
     virtual ~QPDF_Integer() = default;
     static std::shared_ptr<QPDFObject> create(long long value);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     long long getVal() const;
@@ -8,7 +8,7 @@ class QPDF_Name: public QPDFValue
   public:
     virtual ~QPDF_Name() = default;
     static std::shared_ptr<QPDFObject> create(std::string const& name);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     std::string getName() const;
@@ -8,7 +8,7 @@ class QPDF_Null: public QPDFValue
   public:
     virtual ~QPDF_Null() = default;
     static std::shared_ptr<QPDFObject> create();
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
@@ -8,7 +8,7 @@ class QPDF_Operator: public QPDFValue
   public:
     virtual ~QPDF_Operator() = default;
     static std::shared_ptr<QPDFObject> create(std::string const& val);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     std::string getVal() const;
@@ -10,7 +10,7 @@ class QPDF_Real: public QPDFValue
     static std::shared_ptr<QPDFObject> create(std::string const& val);
     static std::shared_ptr<QPDFObject>
     create(double value, int decimal_places, bool trim_trailing_zeroes);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     std::string getVal();
@@ -8,7 +8,7 @@ class QPDF_Reserved: public QPDFValue
   public:
     virtual ~QPDF_Reserved() = default;
     static std::shared_ptr<QPDFObject> create();
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
@@ -23,7 +23,7 @@ class QPDF_Stream: public QPDFValue
         QPDFObjectHandle stream_dict,
         qpdf_offset_t offset,
         size_t length);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
     virtual void setDescription(QPDF*, std::string const&);
@@ -14,7 +14,7 @@ class QPDF_String: public QPDFValue
     static std::shared_ptr<QPDFObject> create(std::string const& val);
     static std::shared_ptr<QPDFObject>
     create_utf16(std::string const& utf8_val);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     std::string unparse(bool force_binary);
     virtual JSON getJSON(int json_version);
@@ -8,7 +8,7 @@ class QPDF_Unresolved: public QPDFValue
   public:
     virtual ~QPDF_Unresolved() = default;
     static std::shared_ptr<QPDFObject> create(QPDF* qpdf, QPDFObjGen const& og);
-    virtual std::shared_ptr<QPDFObject> shallowCopy();
+    virtual std::shared_ptr<QPDFObject> copy(bool shallow = false);
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);