diff options
Diffstat (limited to 'libqpdf')
-rw-r--r-- | libqpdf/QPDFJob_argv.cc | 6 | ||||
-rw-r--r-- | libqpdf/QPDFJob_config.cc | 12 | ||||
-rw-r--r-- | libqpdf/QPDFJob_json.cc | 16 | ||||
-rw-r--r-- | libqpdf/qpdf/auto_job_json_decl.hh | 8 | ||||
-rw-r--r-- | libqpdf/qpdf/auto_job_json_init.hh | 24 | ||||
-rw-r--r-- | libqpdf/qpdf/auto_job_schema.hh | 8 |
6 files changed, 37 insertions, 37 deletions
diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index b0715819..66ae02a5 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -426,7 +426,7 @@ ArgParser::argEnd256BitEncryption() void ArgParser::argUOPositional(char* arg) { - c_uo->path(arg); + c_uo->file(arg); } void @@ -439,7 +439,7 @@ ArgParser::argEndUnderlayOverlay() void ArgParser::argAttPositional(char* arg) { - c_att->path(arg); + c_att->file(arg); } void @@ -452,7 +452,7 @@ ArgParser::argEndAttachment() void ArgParser::argCopyAttPositional(char* arg) { - c_copy_att->path(arg); + c_copy_att->file(arg); } void diff --git a/libqpdf/QPDFJob_config.cc b/libqpdf/QPDFJob_config.cc index 02f1b69e..33c2e94a 100644 --- a/libqpdf/QPDFJob_config.cc +++ b/libqpdf/QPDFJob_config.cc @@ -761,7 +761,7 @@ QPDFJob::CopyAttConfig::CopyAttConfig(Config* c) : } QPDFJob::CopyAttConfig* -QPDFJob::CopyAttConfig::path(char const* parameter) +QPDFJob::CopyAttConfig::file(char const* parameter) { this->caf.path = parameter; return this; @@ -786,7 +786,7 @@ QPDFJob::CopyAttConfig::endCopyAttachmentsFrom() { if (this->caf.path.empty()) { - usage("copy attachments: no path specified"); + usage("copy attachments: no file specified"); } this->config->o.m->attachments_to_copy.push_back(this->caf); return this->config; @@ -804,7 +804,7 @@ QPDFJob::Config::addAttachment() } QPDFJob::AttConfig* -QPDFJob::AttConfig::path(char const* parameter) +QPDFJob::AttConfig::file(char const* parameter) { this->att.path = parameter; return this; @@ -878,12 +878,12 @@ QPDFJob::AttConfig::endAddAttachment() QUtil::get_current_qpdf_time()); if (this->att.path.empty()) { - usage("add attachment: no path specified"); + usage("add attachment: no file specified"); } std::string last_element = QUtil::path_basename(this->att.path); if (last_element.empty()) { - usage("path for --add-attachment may not be empty"); + usage("file for --add-attachment may not be empty"); } if (this->att.filename.empty()) { @@ -972,7 +972,7 @@ QPDFJob::UOConfig::endUnderlayOverlay() } QPDFJob::UOConfig* -QPDFJob::UOConfig::path(char const* parameter) +QPDFJob::UOConfig::file(char const* parameter) { if (! config->o.m->under_overlay->filename.empty()) { diff --git a/libqpdf/QPDFJob_json.cc b/libqpdf/QPDFJob_json.cc index 967f0cc9..da1e19e2 100644 --- a/libqpdf/QPDFJob_json.cc +++ b/libqpdf/QPDFJob_json.cc @@ -228,7 +228,7 @@ Handlers::endInput() } void -Handlers::setupInputFilename() +Handlers::setupInputFile() { addParameter([this](char const* p) { c_main->inputFile(p); @@ -264,7 +264,7 @@ Handlers::endOutput() } void -Handlers::setupOutputFilename() +Handlers::setupOutputFile() { addParameter([this](char const* p) { c_main->outputFile(p); @@ -465,10 +465,10 @@ Handlers::endOptionsAddAttachment() } void -Handlers::setupOptionsAddAttachmentPath() +Handlers::setupOptionsAddAttachmentFile() { addParameter([this](char const* p) { - c_att->path(p); + c_att->file(p); }); } @@ -498,10 +498,10 @@ Handlers::endOptionsCopyAttachmentsFrom() } void -Handlers::setupOptionsCopyAttachmentsFromPath() +Handlers::setupOptionsCopyAttachmentsFromFile() { addParameter([this](char const* p) { - c_copy_att->path(p); + c_copy_att->file(p); }); } @@ -600,7 +600,7 @@ void Handlers::setupOptionsOverlayFile() { addParameter([this](char const* p) { - c_uo->path(p); + c_uo->file(p); }); } @@ -629,7 +629,7 @@ void Handlers::setupOptionsUnderlayFile() { addParameter([this](char const* p) { - c_uo->path(p); + c_uo->file(p); }); } diff --git a/libqpdf/qpdf/auto_job_json_decl.hh b/libqpdf/qpdf/auto_job_json_decl.hh index 8dc37adf..ba9b7029 100644 --- a/libqpdf/qpdf/auto_job_json_decl.hh +++ b/libqpdf/qpdf/auto_job_json_decl.hh @@ -5,12 +5,12 @@ // void beginInput(JSON); void endInput(); -void setupInputFilename(); +void setupInputFile(); void setupInputPassword(); void setupInputEmpty(); void beginOutput(JSON); void endOutput(); -void setupOutputFilename(); +void setupOutputFile(); void setupOutputReplaceInput(); void beginOutputOptions(JSON); void endOutputOptions(); @@ -36,12 +36,12 @@ void beginOptionsAddAttachmentArray(JSON); void endOptionsAddAttachmentArray(); void beginOptionsAddAttachment(JSON); void endOptionsAddAttachment(); -void setupOptionsAddAttachmentPath(); +void setupOptionsAddAttachmentFile(); void beginOptionsCopyAttachmentsFromArray(JSON); void endOptionsCopyAttachmentsFromArray(); void beginOptionsCopyAttachmentsFrom(JSON); void endOptionsCopyAttachmentsFrom(); -void setupOptionsCopyAttachmentsFromPath(); +void setupOptionsCopyAttachmentsFromFile(); void setupOptionsCopyAttachmentsFromPassword(); void beginOptionsPagesArray(JSON); void endOptionsPagesArray(); diff --git a/libqpdf/qpdf/auto_job_json_init.hh b/libqpdf/qpdf/auto_job_json_init.hh index 68808130..39eb6437 100644 --- a/libqpdf/qpdf/auto_job_json_init.hh +++ b/libqpdf/qpdf/auto_job_json_init.hh @@ -16,9 +16,9 @@ static char const* modify128_choices[] = {"all", "annotate", "form", "assembly", pushKey("input"); beginDict(bindJSON(&Handlers::beginInput), bindBare(&Handlers::endInput)); // .input -pushKey("filename"); -setupInputFilename(); -popHandler(); // key: filename +pushKey("file"); +setupInputFile(); +popHandler(); // key: file pushKey("password"); setupInputPassword(); popHandler(); // key: password @@ -31,9 +31,9 @@ popHandler(); // key: empty popHandler(); // key: input pushKey("output"); beginDict(bindJSON(&Handlers::beginOutput), bindBare(&Handlers::endOutput)); // .output -pushKey("filename"); -setupOutputFilename(); -popHandler(); // key: filename +pushKey("file"); +setupOutputFile(); +popHandler(); // key: file pushKey("replaceInput"); setupOutputReplaceInput(); popHandler(); // key: replaceInput @@ -311,9 +311,9 @@ popHandler(); // key: removeUnreferencedResources pushKey("addAttachment"); beginArray(bindJSON(&Handlers::beginOptionsAddAttachmentArray), bindBare(&Handlers::endOptionsAddAttachmentArray)); // .options.addAttachment[] beginDict(bindJSON(&Handlers::beginOptionsAddAttachment), bindBare(&Handlers::endOptionsAddAttachment)); // .options.addAttachment -pushKey("path"); -setupOptionsAddAttachmentPath(); -popHandler(); // key: path +pushKey("file"); +setupOptionsAddAttachmentFile(); +popHandler(); // key: file pushKey("creationdate"); addParameter([this](char const* p) { c_att->creationdate(p); }); popHandler(); // key: creationdate @@ -343,9 +343,9 @@ popHandler(); // key: removeAttachment pushKey("copyAttachmentsFrom"); beginArray(bindJSON(&Handlers::beginOptionsCopyAttachmentsFromArray), bindBare(&Handlers::endOptionsCopyAttachmentsFromArray)); // .options.copyAttachmentsFrom[] beginDict(bindJSON(&Handlers::beginOptionsCopyAttachmentsFrom), bindBare(&Handlers::endOptionsCopyAttachmentsFrom)); // .options.copyAttachmentsFrom -pushKey("path"); -setupOptionsCopyAttachmentsFromPath(); -popHandler(); // key: path +pushKey("file"); +setupOptionsCopyAttachmentsFromFile(); +popHandler(); // key: file pushKey("password"); setupOptionsCopyAttachmentsFromPassword(); popHandler(); // key: password diff --git a/libqpdf/qpdf/auto_job_schema.hh b/libqpdf/qpdf/auto_job_schema.hh index 9b85536a..df430a27 100644 --- a/libqpdf/qpdf/auto_job_schema.hh +++ b/libqpdf/qpdf/auto_job_schema.hh @@ -1,12 +1,12 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ "input": { - "filename": "input filename", + "file": "input filename", "password": "specify password", "passwordFile": "read password from a file", "empty": "empty input file" }, "output": { - "filename": "output filename", + "file": "output filename", "replaceInput": "set to true to replace input", "options": { "qdf": "enable viewing PDF code in a text editor", @@ -110,7 +110,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ "removeUnreferencedResources": "remove unreferenced page resources", "addAttachment": [ { - "path": "attachment to add", + "file": "attachment to add", "creationdate": "set attachment's creation date", "description": "set attachment's description", "filename": "set attachment's displayed filename", @@ -123,7 +123,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ "removeAttachment": "remove an embedded file", "copyAttachmentsFrom": [ { - "path": "attachment source filename", + "file": "attachment source filename", "password": "specify password", "prefix": "key prefix for copying attachments" } |