Merge pull request #726 from m-holger/tidy3

Split QPDFObject into QPDFObject and QPDFValue

1 files changed, 9 insertions, 14 deletions

diff --git a/libqpdf/QPDF_Reserved.cc b/libqpdf/QPDF_Reserved.cc
index 5808a369..f5af4688 100644
--- a/libqpdf/QPDF_Reserved.cc
+++ b/libqpdf/QPDF_Reserved.cc
@@ -2,6 +2,11 @@
 
 #include <stdexcept>
 
+QPDF_Reserved::QPDF_Reserved() :
+    QPDFValue(::ot_reserved, "reserved")
+{
+}
+
 std::shared_ptr<QPDFObject>
 QPDF_Reserved::create()
 {
@@ -17,25 +22,15 @@ QPDF_Reserved::shallowCopy()
 std::string
 QPDF_Reserved::unparse()
 {
-    throw std::logic_error("attempt to unparse QPDF_Reserved");
+    throw std::logic_error(
+        "QPDFObjectHandle: attempting to unparse a reserved object");
     return "";
 }
 
 JSON
 QPDF_Reserved::getJSON(int json_version)
 {
-    throw std::logic_error("attempt to generate JSON from QPDF_Reserved");
+    throw std::logic_error(
+        "QPDFObjectHandle: attempting to unparse a reserved object");
     return JSON::makeNull();
 }
-
-QPDFObject::object_type_e
-QPDF_Reserved::getTypeCode() const
-{
-    return QPDFObject::ot_reserved;
-}
-
-char const*
-QPDF_Reserved::getTypeName() const
-{
-    return "reserved";
-}