Remove virtual methods QPDFValue::getTypeCode and getTypeName

13 files changed, 3 insertions, 29 deletions

diff --git a/libqpdf/qpdf/QPDF_Array.hh b/libqpdf/qpdf/QPDF_Array.hh
index b0207115..426efe36 100644
--- a/libqpdf/qpdf/QPDF_Array.hh
+++ b/libqpdf/qpdf/QPDF_Array.hh
@@ -17,8 +17,6 @@ class QPDF_Array: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
 
     int getNItems() const;
     QPDFObjectHandle getItem(int n) const;
diff --git a/libqpdf/qpdf/QPDF_Bool.hh b/libqpdf/qpdf/QPDF_Bool.hh
index 2de585cb..3e45cd8e 100644
--- a/libqpdf/qpdf/QPDF_Bool.hh
+++ b/libqpdf/qpdf/QPDF_Bool.hh
@@ -11,8 +11,6 @@ class QPDF_Bool: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     bool getVal() const;
 
   private:
diff --git a/libqpdf/qpdf/QPDF_Dictionary.hh b/libqpdf/qpdf/QPDF_Dictionary.hh
index 5761b030..19ab8d9b 100644
--- a/libqpdf/qpdf/QPDF_Dictionary.hh
+++ b/libqpdf/qpdf/QPDF_Dictionary.hh
@@ -17,8 +17,6 @@ class QPDF_Dictionary: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
 
     // hasKey() and getKeys() treat keys with null values as if they
     // aren't there.  getKey() returns null for the value of a
diff --git a/libqpdf/qpdf/QPDF_InlineImage.hh b/libqpdf/qpdf/QPDF_InlineImage.hh
index 31f7529a..b7bea9c7 100644
--- a/libqpdf/qpdf/QPDF_InlineImage.hh
+++ b/libqpdf/qpdf/QPDF_InlineImage.hh
@@ -11,8 +11,6 @@ class QPDF_InlineImage: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     std::string getVal() const;
 
   private:
diff --git a/libqpdf/qpdf/QPDF_Integer.hh b/libqpdf/qpdf/QPDF_Integer.hh
index cf201021..7e09673c 100644
--- a/libqpdf/qpdf/QPDF_Integer.hh
+++ b/libqpdf/qpdf/QPDF_Integer.hh
@@ -11,8 +11,6 @@ class QPDF_Integer: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     long long getVal() const;
 
   private:
diff --git a/libqpdf/qpdf/QPDF_Name.hh b/libqpdf/qpdf/QPDF_Name.hh
index 438b118e..74fc7e44 100644
--- a/libqpdf/qpdf/QPDF_Name.hh
+++ b/libqpdf/qpdf/QPDF_Name.hh
@@ -11,8 +11,6 @@ class QPDF_Name: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     std::string getName() const;
 
     // Put # into strings with characters unsuitable for name token
diff --git a/libqpdf/qpdf/QPDF_Null.hh b/libqpdf/qpdf/QPDF_Null.hh
index 7f722a3a..68973de9 100644
--- a/libqpdf/qpdf/QPDF_Null.hh
+++ b/libqpdf/qpdf/QPDF_Null.hh
@@ -11,11 +11,9 @@ class QPDF_Null: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
 
   private:
-    QPDF_Null() = default;
+    QPDF_Null();
 };
 
 #endif // QPDF_NULL_HH
diff --git a/libqpdf/qpdf/QPDF_Operator.hh b/libqpdf/qpdf/QPDF_Operator.hh
index d17f1629..767c0ba0 100644
--- a/libqpdf/qpdf/QPDF_Operator.hh
+++ b/libqpdf/qpdf/QPDF_Operator.hh
@@ -11,8 +11,6 @@ class QPDF_Operator: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     std::string getVal() const;
 
   private:
diff --git a/libqpdf/qpdf/QPDF_Real.hh b/libqpdf/qpdf/QPDF_Real.hh
index 97375c73..dc0f3ff8 100644
--- a/libqpdf/qpdf/QPDF_Real.hh
+++ b/libqpdf/qpdf/QPDF_Real.hh
@@ -13,8 +13,6 @@ class QPDF_Real: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     std::string getVal();
 
   private:
diff --git a/libqpdf/qpdf/QPDF_Reserved.hh b/libqpdf/qpdf/QPDF_Reserved.hh
index e9f8313a..f90242a9 100644
--- a/libqpdf/qpdf/QPDF_Reserved.hh
+++ b/libqpdf/qpdf/QPDF_Reserved.hh
@@ -11,11 +11,9 @@ class QPDF_Reserved: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
 
   private:
-    QPDF_Reserved() = default;
+    QPDF_Reserved();
 };
 
 #endif // QPDF_RESERVED_HH
diff --git a/libqpdf/qpdf/QPDF_Stream.hh b/libqpdf/qpdf/QPDF_Stream.hh
index 639d5298..3a16160e 100644
--- a/libqpdf/qpdf/QPDF_Stream.hh
+++ b/libqpdf/qpdf/QPDF_Stream.hh
@@ -26,8 +26,6 @@ class QPDF_Stream: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     virtual void setDescription(QPDF*, std::string const&);
     QPDFObjectHandle getDict() const;
     bool isDataModified() const;
diff --git a/libqpdf/qpdf/QPDF_String.hh b/libqpdf/qpdf/QPDF_String.hh
index 9b6fc95c..a92427e3 100644
--- a/libqpdf/qpdf/QPDF_String.hh
+++ b/libqpdf/qpdf/QPDF_String.hh
@@ -16,8 +16,6 @@ class QPDF_String: public QPDFValue
     create_utf16(std::string const& utf8_val);
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
     std::string unparse(bool force_binary);
     virtual JSON getJSON(int json_version);
     std::string getVal() const;
diff --git a/libqpdf/qpdf/QPDF_Unresolved.hh b/libqpdf/qpdf/QPDF_Unresolved.hh
index c17748b5..c1231590 100644
--- a/libqpdf/qpdf/QPDF_Unresolved.hh
+++ b/libqpdf/qpdf/QPDF_Unresolved.hh
@@ -11,11 +11,9 @@ class QPDF_Unresolved: public QPDFValue
     virtual std::shared_ptr<QPDFObject> shallowCopy();
     virtual std::string unparse();
     virtual JSON getJSON(int json_version);
-    virtual qpdf_object_type_e getTypeCode() const;
-    virtual char const* getTypeName() const;
 
   private:
-    QPDF_Unresolved() = default;
+    QPDF_Unresolved();
 };
 
 #endif // QPDF_UNRESOLVED_HH