diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2013-01-23 15:38:05 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2013-01-23 15:38:05 +0100 |
| commit | bfda71774907263f5263a3ae2e8c8fa40fbc2cca (patch) | |
| tree | 0861f846c89f67fc18b11793fdb662313c5dfd9e /include | |
| parent | 913eb5ac35011b3d28c653b6f89d936c8f99c844 (diff) | |
| download | qpdf-bfda71774907263f5263a3ae2e8c8fa40fbc2cca.tar.zst | |
Cosmetic changes to be closer to Adobe terminology
Change object type Keyword to Operator, and place the order of the
object types in object_type_e in the same order as they are mentioned
in the PDF specification.
Note that this change only breaks backward compatibility with code
that has not yet been released.
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 |