Rename Options to RenderParams

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;
         }

src/fart/Cli.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <fart/Options.h>
+#include <fart/RenderParams.h>
 
 class Cli
 {
 public:
-    Options options;
+    RenderParams params;
 
     int run(int argc, char * argv[]);
 

src/fart/Engine.cpp

@@ -1,7 +1,7 @@
 #include <fart/Engine.h>
 
-Engine::Engine(const Options & options)
+Engine::Engine(const RenderParams & params)
-    : options(options)
+    : params(params)
 {
 }
 

src/fart/Engine.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <fart/Options.h>
+#include <fart/RenderParams.h>
 
 class Engine
 {
 public:
-    Engine(const Options & options);
+    Engine(const RenderParams & params);
     int run();
 
 protected:
-    Options options;
+    RenderParams params;
 };

src/fart/RenderParams.h

@@ -3,7 +3,7 @@
 #include <stddef.h>
 #include <string>
 
-struct Options
+struct RenderParams
 {
     std::string input_file;
     std::string output_file;

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();
 }