From d71be68faed1436acc11c097c32a5f2376bd8227 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sun, 1 Nov 2026 14:18:02 -0500
Subject: [PATCH] Add auto-included fart/common.h

---
 Rsconscript               | 2 +-
 src/fart/ImageWriter.cpp  | 4 ++--
 src/fart/ImageWriter.h    | 6 +++---
 src/fart/PngImageWriter.h | 2 +-
 src/fart/RenderParams.h   | 4 ++--
 src/fart/common.h         | 5 +++++
 6 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 src/fart/common.h

diff --git a/Rsconscript b/Rsconscript
index 9b918d2..affac56 100644
--- a/Rsconscript
+++ b/Rsconscript
@@ -17,7 +17,7 @@ end
 
 env do |env|
   env.add_builder(Propane)
-  env["CCFLAGS"] += %w[-Wall -O2 -std=c++23]
+  env["CCFLAGS"] += %w[-Wall -O2 -std=c++23 -include fart/common.h]
   env["CPPPATH"] += %W[src #{env.build_root}/src]
 
   env.Propane("^/src/propane.cpp", "src/fart.propane")
diff --git a/src/fart/ImageWriter.cpp b/src/fart/ImageWriter.cpp
index 9ec70f3..74ad64f 100644
--- a/src/fart/ImageWriter.cpp
+++ b/src/fart/ImageWriter.cpp
@@ -3,9 +3,9 @@
 #include <stdio.h>
 #include <filesystem>
 
-ImageWriter * ImageWriter::build(const std::string & fname)
+ImageWriter * ImageWriter::build(const string & fname)
 {
-    std::string ext = std::filesystem::path(fname).extension().string();
+    string ext = std::filesystem::path(fname).extension().string();
     if (ext == ".png")
     {
         return new PngImageWriter(fname);
diff --git a/src/fart/ImageWriter.h b/src/fart/ImageWriter.h
index ba246d1..3bbf7b7 100644
--- a/src/fart/ImageWriter.h
+++ b/src/fart/ImageWriter.h
@@ -6,11 +6,11 @@
 class ImageWriter
 {
 public:
-    static ImageWriter * build(const std::string & fname);
+    static ImageWriter * build(const string & fname);
     virtual ~ImageWriter() = default;
     virtual bool write(const Image & image) = 0;
 
 protected:
-    ImageWriter(const std::string & fname) : fname(fname) {}
-    std::string fname;
+    ImageWriter(const string & fname) : fname(fname) {}
+    string fname;
 };
diff --git a/src/fart/PngImageWriter.h b/src/fart/PngImageWriter.h
index a60364b..ddee1cd 100644
--- a/src/fart/PngImageWriter.h
+++ b/src/fart/PngImageWriter.h
@@ -5,6 +5,6 @@
 class PngImageWriter : public ImageWriter
 {
 public:
-    PngImageWriter(const std::string & fname) : ImageWriter(fname) {}
+    PngImageWriter(const string & fname) : ImageWriter(fname) {}
     bool write(const Image & image) override;
 };
diff --git a/src/fart/RenderParams.h b/src/fart/RenderParams.h
index 3568822..1514147 100644
--- a/src/fart/RenderParams.h
+++ b/src/fart/RenderParams.h
@@ -5,8 +5,8 @@
 
 struct RenderParams
 {
-    std::string input_file;
-    std::string output_file;
+    string input_file;
+    string output_file;
     size_t width = 0u;
     size_t height = 0u;
 };
diff --git a/src/fart/common.h b/src/fart/common.h
new file mode 100644
index 0000000..0f6142b
--- /dev/null
+++ b/src/fart/common.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <string>
+
+using string = std::string;