QPDFJob json: flatten json structure

Flatten everything to make it easier to map command-line flags to
json. The old structure was an illusion anyway because there was no
mechanism to enforce that things were in the right place. This also
helps with future flexibility.

1 files changed, 43 insertions, 53 deletions

diff --git a/libqpdf/qpdf/auto_job_json_decl.hh b/libqpdf/qpdf/auto_job_json_decl.hh
index ba9b7029..951e6a92 100644
--- a/libqpdf/qpdf/auto_job_json_decl.hh
+++ b/libqpdf/qpdf/auto_job_json_decl.hh
@@ -3,58 +3,48 @@
 // Edits will be automatically overwritten if the build is
 // run in maintainer mode.
 //
-void beginInput(JSON);
-void endInput();
 void setupInputFile();
-void setupInputPassword();
-void setupInputEmpty();
-void beginOutput(JSON);
-void endOutput();
+void setupPassword();
+void setupEmpty();
 void setupOutputFile();
-void setupOutputReplaceInput();
-void beginOutputOptions(JSON);
-void endOutputOptions();
-void beginOutputOptionsEncrypt(JSON);
-void endOutputOptionsEncrypt();
-void setupOutputOptionsEncryptUserPassword();
-void setupOutputOptionsEncryptOwnerPassword();
-void beginOutputOptionsEncrypt40bit(JSON);
-void endOutputOptionsEncrypt40bit();
-void beginOutputOptionsEncrypt128bit(JSON);
-void endOutputOptionsEncrypt128bit();
-void beginOutputOptionsEncrypt256bit(JSON);
-void endOutputOptionsEncrypt256bit();
-void beginInspect(JSON);
-void endInspect();
-void beginInspectJsonKeyArray(JSON);
-void endInspectJsonKeyArray();
-void beginInspectJsonObjectArray(JSON);
-void endInspectJsonObjectArray();
-void beginOptions(JSON);
-void endOptions();
-void beginOptionsAddAttachmentArray(JSON);
-void endOptionsAddAttachmentArray();
-void beginOptionsAddAttachment(JSON);
-void endOptionsAddAttachment();
-void setupOptionsAddAttachmentFile();
-void beginOptionsCopyAttachmentsFromArray(JSON);
-void endOptionsCopyAttachmentsFromArray();
-void beginOptionsCopyAttachmentsFrom(JSON);
-void endOptionsCopyAttachmentsFrom();
-void setupOptionsCopyAttachmentsFromFile();
-void setupOptionsCopyAttachmentsFromPassword();
-void beginOptionsPagesArray(JSON);
-void endOptionsPagesArray();
-void beginOptionsPages(JSON);
-void endOptionsPages();
-void setupOptionsPagesFile();
-void setupOptionsPagesPassword();
-void setupOptionsPagesRange();
-void beginOptionsOverlay(JSON);
-void endOptionsOverlay();
-void setupOptionsOverlayFile();
-void setupOptionsOverlayPassword();
-void beginOptionsUnderlay(JSON);
-void endOptionsUnderlay();
-void setupOptionsUnderlayFile();
-void setupOptionsUnderlayPassword();
+void setupReplaceInput();
+void beginEncrypt(JSON);
+void endEncrypt();
+void setupEncryptUserPassword();
+void setupEncryptOwnerPassword();
+void beginEncrypt40bit(JSON);
+void endEncrypt40bit();
+void beginEncrypt128bit(JSON);
+void endEncrypt128bit();
+void beginEncrypt256bit(JSON);
+void endEncrypt256bit();
+void beginJsonKeyArray(JSON);
+void endJsonKeyArray();
+void beginJsonObjectArray(JSON);
+void endJsonObjectArray();
+void beginAddAttachmentArray(JSON);
+void endAddAttachmentArray();
+void beginAddAttachment(JSON);
+void endAddAttachment();
+void setupAddAttachmentFile();
+void beginCopyAttachmentsFromArray(JSON);
+void endCopyAttachmentsFromArray();
+void beginCopyAttachmentsFrom(JSON);
+void endCopyAttachmentsFrom();
+void setupCopyAttachmentsFromFile();
+void setupCopyAttachmentsFromPassword();
+void beginPagesArray(JSON);
+void endPagesArray();
+void beginPages(JSON);
+void endPages();
+void setupPagesFile();
+void setupPagesPassword();
+void setupPagesRange();
+void beginOverlay(JSON);
+void endOverlay();
+void setupOverlayFile();
+void setupOverlayPassword();
+void beginUnderlay(JSON);
+void endUnderlay();
+void setupUnderlayFile();
+void setupUnderlayPassword();