diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/qpdf/QPDFObject.hh | 6 | ||||
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/qpdf/QPDFObject.hh b/include/qpdf/QPDFObject.hh index 4a5f2dec..d58deb72 100644 --- a/include/qpdf/QPDFObject.hh +++ b/include/qpdf/QPDFObject.hh @@ -30,17 +30,17 @@ class QPDFObject ot_uninitialized, ot_reserved, // Object types that can occur in the main document - ot_boolean, ot_null, + ot_boolean, ot_integer, ot_real, - ot_name, ot_string, + ot_name, ot_array, ot_dictionary, ot_stream, // Additional object types that can occur in content streams - ot_keyword, + ot_operator, ot_inlineimage, }; diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index a23d81df..e2c8b529 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -99,7 +99,7 @@ class QPDFObjectHandle QPDF_DLL char const* getTypeName() const; - // Exactly one of these will return true for any object. Keyword + // Exactly one of these will return true for any object. Operator // and InlineImage are only allowed in content streams. QPDF_DLL bool isBool(); @@ -114,7 +114,7 @@ class QPDFObjectHandle QPDF_DLL bool isString(); QPDF_DLL - bool isKeyword(); + bool isOperator(); QPDF_DLL bool isInlineImage(); QPDF_DLL @@ -182,7 +182,7 @@ class QPDFObjectHandle QPDF_DLL static QPDFObjectHandle newString(std::string const& str); QPDF_DLL - static QPDFObjectHandle newKeyword(std::string const&); + static QPDFObjectHandle newOperator(std::string const&); QPDF_DLL static QPDFObjectHandle newInlineImage(std::string const&); QPDF_DLL @@ -279,7 +279,7 @@ class QPDFObjectHandle // Methods for content stream objects QPDF_DLL - std::string getKeywordValue(); + std::string getOperatorValue(); QPDF_DLL std::string getInlineImageValue(); @@ -554,7 +554,7 @@ class QPDFObjectHandle QPDF_DLL void assertString(); QPDF_DLL - void assertKeyword(); + void assertOperator(); QPDF_DLL void assertInlineImage(); QPDF_DLL |