diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-09-05 15:15:14 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-09-06 00:52:59 +0200 |
commit | 6c61be00e8366d467e7e4c82a6d91a4d074a1181 (patch) | |
tree | 610ccf8c637cdd778e734c15d1e94bcd68e9f30f /include | |
parent | 5d65e73ca719fdb921f627e3789920ea60c66f01 (diff) | |
download | qpdf-6c61be00e8366d467e7e4c82a6d91a4d074a1181.tar.zst |
Rename QPDFObject -> QPDFValueProxy
This is in preparation for restoring a QPDFObject.hh to ease the
transition on qpdf_object_type_e.
This commit was created by
* Renaming QPDFObject.cc and QPDFObject.hh
* Replacing QPDFObject\b with QPDFValueProxy (where \b is word
boundary)
* Running format-code
* Manually resorting files in libqpdf/CMakeLists.txt
* Manually refilling the comment in QPDF.hh near class Resolver
Diffstat (limited to 'include')
-rw-r--r-- | include/qpdf/QPDF.hh | 14 | ||||
-rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index 567817f1..c7ac5281 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -842,11 +842,11 @@ class QPDF } }; - // Resolver class is restricted to QPDFObject so that only it can - // resolve indirect references. + // Resolver class is restricted to QPDFValueProxy so that only it + // can resolve indirect references. class Resolver { - friend class QPDFObject; + friend class QPDFValueProxy; private: static void @@ -952,7 +952,7 @@ class QPDF { } ObjCache( - std::shared_ptr<QPDFObject> object, + std::shared_ptr<QPDFValueProxy> object, qpdf_offset_t end_before_space, qpdf_offset_t end_after_space) : object(object), @@ -961,7 +961,7 @@ class QPDF { } - std::shared_ptr<QPDFObject> object; + std::shared_ptr<QPDFValueProxy> object; qpdf_offset_t end_before_space; qpdf_offset_t end_after_space; }; @@ -1186,12 +1186,12 @@ class QPDF QPDFObjectHandle reserveObjectIfNotExists(QPDFObjGen const& og); QPDFObjectHandle reserveStream(QPDFObjGen const& og); QPDFObjectHandle - newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFObject> const&); + newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFValueProxy> const&); bool isCached(QPDFObjGen const& og); bool isUnresolved(QPDFObjGen const& og); void updateCache( QPDFObjGen const& og, - std::shared_ptr<QPDFObject> const& object, + std::shared_ptr<QPDFValueProxy> const& object, qpdf_offset_t end_before_space, qpdf_offset_t end_after_space); diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 8f1858a1..de085bb6 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -54,7 +54,7 @@ class QPDF_Real; class QPDF_Reserved; class QPDF_Stream; class QPDF_String; -class QPDFObject; +class QPDFValueProxy; class QPDFTokenizer; class QPDFExc; class Pl_QPDFTokenizer; @@ -1453,7 +1453,7 @@ class QPDFObjectHandle private: static QPDFObjectHandle - newIndirect(std::shared_ptr<QPDFObject> const& obj) + newIndirect(std::shared_ptr<QPDFValueProxy> const& obj) { return QPDFObjectHandle(obj); } @@ -1478,7 +1478,7 @@ class QPDFObjectHandle friend class QPDF; private: - static std::shared_ptr<QPDFObject> + static std::shared_ptr<QPDFValueProxy> getObject(QPDFObjectHandle& o) { if (!o.dereference()) { @@ -1560,7 +1560,7 @@ class QPDFObjectHandle bool isImage(bool exclude_imagemask = true); private: - QPDFObjectHandle(std::shared_ptr<QPDFObject> const& obj) : + QPDFObjectHandle(std::shared_ptr<QPDFValueProxy> const& obj) : obj(obj) { } @@ -1613,7 +1613,7 @@ class QPDFObjectHandle // Moving members of QPDFObjectHandle into a smart pointer incurs // a substantial performance penalty since QPDFObjectHandle // objects are copied around so frequently. - std::shared_ptr<QPDFObject> obj; + std::shared_ptr<QPDFValueProxy> obj; }; #ifndef QPDF_NO_QPDF_STRING |