Commit 75e74679c54ed6e51217530277b6bf45aa2b2dcd
1 parent
62f00b6d
Move struct JSONHandler::Handlers to implementation file
Showing
2 changed files
with
19 additions
and
18 deletions
libqpdf/JSONHandler.cc
| @@ -4,6 +4,25 @@ | @@ -4,6 +4,25 @@ | ||
| 4 | #include <qpdf/QTC.hh> | 4 | #include <qpdf/QTC.hh> |
| 5 | #include <qpdf/QUtil.hh> | 5 | #include <qpdf/QUtil.hh> |
| 6 | 6 | ||
| 7 | +struct Handlers | ||
| 8 | +{ | ||
| 9 | + Handlers() = default; | ||
| 10 | + | ||
| 11 | + JSONHandler::json_handler_t any_handler{nullptr}; | ||
| 12 | + JSONHandler::void_handler_t null_handler{nullptr}; | ||
| 13 | + JSONHandler::string_handler_t string_handler{nullptr}; | ||
| 14 | + JSONHandler::string_handler_t number_handler{nullptr}; | ||
| 15 | + JSONHandler::bool_handler_t bool_handler{nullptr}; | ||
| 16 | + JSONHandler::json_handler_t dict_start_handler{nullptr}; | ||
| 17 | + JSONHandler::void_handler_t dict_end_handler{nullptr}; | ||
| 18 | + JSONHandler::json_handler_t array_start_handler{nullptr}; | ||
| 19 | + JSONHandler::void_handler_t array_end_handler{nullptr}; | ||
| 20 | + JSONHandler::void_handler_t final_handler{nullptr}; | ||
| 21 | + std::map<std::string, std::shared_ptr<JSONHandler>> dict_handlers; | ||
| 22 | + std::shared_ptr<JSONHandler> fallback_dict_handler; | ||
| 23 | + std::shared_ptr<JSONHandler> array_item_handler; | ||
| 24 | +}; | ||
| 25 | + | ||
| 7 | class JSONHandler::Members | 26 | class JSONHandler::Members |
| 8 | { | 27 | { |
| 9 | friend class JSONHandler; | 28 | friend class JSONHandler; |
libqpdf/qpdf/JSONHandler.hh
| @@ -53,24 +53,6 @@ class JSONHandler | @@ -53,24 +53,6 @@ class JSONHandler | ||
| 53 | 53 | ||
| 54 | static void usage(std::string const& msg); | 54 | static void usage(std::string const& msg); |
| 55 | 55 | ||
| 56 | - struct Handlers | ||
| 57 | - { | ||
| 58 | - Handlers() = default; | ||
| 59 | - | ||
| 60 | - json_handler_t any_handler{nullptr}; | ||
| 61 | - void_handler_t null_handler{nullptr}; | ||
| 62 | - string_handler_t string_handler{nullptr}; | ||
| 63 | - string_handler_t number_handler{nullptr}; | ||
| 64 | - bool_handler_t bool_handler{nullptr}; | ||
| 65 | - json_handler_t dict_start_handler{nullptr}; | ||
| 66 | - void_handler_t dict_end_handler{nullptr}; | ||
| 67 | - json_handler_t array_start_handler{nullptr}; | ||
| 68 | - void_handler_t array_end_handler{nullptr}; | ||
| 69 | - void_handler_t final_handler{nullptr}; | ||
| 70 | - std::map<std::string, std::shared_ptr<JSONHandler>> dict_handlers; | ||
| 71 | - std::shared_ptr<JSONHandler> fallback_dict_handler; | ||
| 72 | - std::shared_ptr<JSONHandler> array_item_handler; | ||
| 73 | - }; | ||
| 74 | 56 | ||
| 75 | class Members; | 57 | class Members; |
| 76 | 58 |