From 1947ea553c574fe4814dd279ef9e5d7968a3fb91 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sun, 1 Nov 2026 13:20:59 -0500 Subject: [PATCH] Rename Options to RenderParams --- src/fart/Cli.cpp | 10 +++++----- src/fart/Cli.h | 4 ++-- src/fart/Engine.cpp | 4 ++-- src/fart/Engine.h | 6 +++--- src/fart/{Options.h => RenderParams.h} | 2 +- src/fart/main.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename src/fart/{Options.h => RenderParams.h} (89%) diff --git a/src/fart/Cli.cpp b/src/fart/Cli.cpp index ca931fc..2a5bf9c 100644 --- a/src/fart/Cli.cpp +++ b/src/fart/Cli.cpp @@ -128,12 +128,12 @@ int Cli::run(int argc, char * argv[]) } else { - if (this->options.input_file != "") + if (this->params.input_file != "") { fprintf(stderr, "Extraneous argument: %s\n", argv[i]); return 2; } - this->options.input_file = argv[i]; + this->params.input_file = argv[i]; } } return 0; @@ -170,7 +170,7 @@ int Cli::handle_option(size_t flag_idx, const char * arg_value) { case flag_height: case flag_height_l: - if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->options.height)) + if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->params.height)) { return 2; } @@ -190,12 +190,12 @@ int Cli::handle_option(size_t flag_idx, const char * arg_value) case flag_output: case flag_output_l: - this->options.output_file = arg_value; + this->params.output_file = arg_value; return 0; case flag_width: case flag_width_l: - if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->options.width)) + if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->params.width)) { return 2; } diff --git a/src/fart/Cli.h b/src/fart/Cli.h index a38ebf4..c1723d2 100644 --- a/src/fart/Cli.h +++ b/src/fart/Cli.h @@ -1,11 +1,11 @@ #pragma once -#include +#include class Cli { public: - Options options; + RenderParams params; int run(int argc, char * argv[]); diff --git a/src/fart/Engine.cpp b/src/fart/Engine.cpp index f7b3915..85cdcf2 100644 --- a/src/fart/Engine.cpp +++ b/src/fart/Engine.cpp @@ -1,7 +1,7 @@ #include -Engine::Engine(const Options & options) - : options(options) +Engine::Engine(const RenderParams & params) + : params(params) { } diff --git a/src/fart/Engine.h b/src/fart/Engine.h index 88ec152..41021ab 100644 --- a/src/fart/Engine.h +++ b/src/fart/Engine.h @@ -1,13 +1,13 @@ #pragma once -#include +#include class Engine { public: - Engine(const Options & options); + Engine(const RenderParams & params); int run(); protected: - Options options; + RenderParams params; }; diff --git a/src/fart/Options.h b/src/fart/RenderParams.h similarity index 89% rename from src/fart/Options.h rename to src/fart/RenderParams.h index e5f4942..3568822 100644 --- a/src/fart/Options.h +++ b/src/fart/RenderParams.h @@ -3,7 +3,7 @@ #include #include -struct Options +struct RenderParams { std::string input_file; std::string output_file; diff --git a/src/fart/main.cpp b/src/fart/main.cpp index 51e556b..21573e5 100644 --- a/src/fart/main.cpp +++ b/src/fart/main.cpp @@ -10,6 +10,6 @@ int main(int argc, char * argv[]) { return rc - 1; } - Engine engine(cli.options); + Engine engine(cli.params); return engine.run(); }