From 6c69a747b9f7a801be2ad58985f35886bd38239e Mon Sep 17 00:00:00 2001 From: m-holger Date: Sat, 21 May 2022 15:18:15 +0100 Subject: Code clean up: use range-style for loops wherever possible Remove variables obsoleted by commit 4f24617. --- libqpdf/QPDF_optimization.cc | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'libqpdf/QPDF_optimization.cc') diff --git a/libqpdf/QPDF_optimization.cc b/libqpdf/QPDF_optimization.cc index 4204a20d..da0db663 100644 --- a/libqpdf/QPDF_optimization.cc +++ b/libqpdf/QPDF_optimization.cc @@ -90,8 +90,7 @@ QPDF::optimize( } // Traverse document-level items - std::set keys = this->m->trailer.getKeys(); - for (auto const& key: keys) { + for (auto const& key: this->m->trailer.getKeys()) { if (key == "/Root") { // handled separately } else { @@ -102,8 +101,7 @@ QPDF::optimize( } } - keys = root.getKeys(); - for (auto const& key: keys) { + for (auto const& key: root.getKeys()) { // Technically, /I keys from /Thread dictionaries are supposed // to be handled separately, but we are going to disregard // that specification for now. There is loads of evidence @@ -205,8 +203,7 @@ QPDF::pushInheritedAttributesToPageInternal( // that have values for this attribute. std::set inheritable_keys; - std::set keys = cur_pages.getKeys(); - for (auto const& key: keys) { + for (auto const& key: cur_pages.getKeys()) { if ((key == "/MediaBox") || (key == "/CropBox") || (key == "/Resources") || (key == "/Rotate")) { if (!allow_changes) { @@ -387,8 +384,7 @@ QPDF::updateObjectMapsInternal( } } - std::set keys = dict.getKeys(); - for (auto const& key: keys) { + for (auto const& key: dict.getKeys()) { if (is_page_node && (key == "/Thumb")) { // Traverse page thumbnail dictionaries as a special // case. @@ -437,8 +433,8 @@ QPDF::filterCompressedObjects(std::map const& object_stream_data) for (auto const& i1: this->m->obj_user_to_objects) { ObjUser const& ou = i1.first; - std::set const& objects = i1.second; - for (auto const& og: objects) { + // Loop over objects. + for (auto const& og: i1.second) { auto i2 = object_stream_data.find(og.getObj()); if (i2 == object_stream_data.end()) { t_obj_user_to_objects[ou].insert(og); @@ -450,8 +446,8 @@ QPDF::filterCompressedObjects(std::map const& object_stream_data) for (auto const& i1: this->m->object_to_obj_users) { QPDFObjGen const& og = i1.first; - std::set const& objusers = i1.second; - for (auto const& ou: objusers) { + // Loop over obj_users. + for (auto const& ou: i1.second) { auto i2 = object_stream_data.find(og.getObj()); if (i2 == object_stream_data.end()) { t_object_to_obj_users[og].insert(ou); -- cgit v1.2.3-54-g00ecf