aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorm-holger <m-holger@kubitscheck.org>2024-01-14 19:06:27 +0100
committerm-holger <m-holger@kubitscheck.org>2024-01-15 16:18:55 +0100
commitdca5927ba0e57c7046a93213e05bfa6eda130707 (patch)
tree4e659a4e3ff966c35e590ee6a3e3b695851bb9ad
parentb85a590bc51796f0495be7550da7c4e9975ccaca (diff)
downloadqpdf-dca5927ba0e57c7046a93213e05bfa6eda130707.tar.zst
Tweak Handlers::json_handlers
Use std::vector instead of list and move shared pointers
-rw-r--r--libqpdf/QPDFJob_json.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/libqpdf/QPDFJob_json.cc b/libqpdf/QPDFJob_json.cc
index b3568cf5..53458a52 100644
--- a/libqpdf/QPDFJob_json.cc
+++ b/libqpdf/QPDFJob_json.cc
@@ -59,7 +59,7 @@ namespace
void beginUnderOverlay(JSON const& j);
- std::list<std::shared_ptr<JSONHandler>> json_handlers;
+ std::vector<std::shared_ptr<JSONHandler>> json_handlers;
bool partial;
JSONHandler* jh{nullptr}; // points to last of json_handlers
std::shared_ptr<QPDFJob::Config> c_main;
@@ -100,7 +100,7 @@ Handlers::bindJSON(void (Handlers::*f)(JSON))
void
Handlers::initHandlers()
{
- this->json_handlers.push_back(std::make_shared<JSONHandler>());
+ this->json_handlers.emplace_back(std::make_shared<JSONHandler>());
this->jh = this->json_handlers.back().get();
jh->addDictHandlers(
[](std::string const&, JSON) {},
@@ -184,8 +184,9 @@ Handlers::pushKey(std::string const& key)
{
auto new_jh = std::make_shared<JSONHandler>();
this->jh->addDictKeyHandler(key, new_jh);
- this->json_handlers.push_back(new_jh);
this->jh = new_jh.get();
+ this->json_handlers.emplace_back(std::move(new_jh));
+
}
void
@@ -205,8 +206,9 @@ Handlers::beginArray(json_handler_t start_fn, bare_handler_t end_fn)
[end_fn](std::string const&) { end_fn(); },
item_jh);
jh->addFallbackHandler(item_jh);
- this->json_handlers.push_back(item_jh);
this->jh = item_jh.get();
+ this->json_handlers.emplace_back(std::move(item_jh));
+
}
void