Cleanup: use some better variable names.

diff --git a/src/lib/bitmap_text.h b/src/lib/bitmap_text.h
index 46b6fd142ff541908d3e299a47632576cbb01e66..04cb61e3ea647c0ea1bbc00f7b2e91c2c28abc2b 100644 (file)
--- a/src/lib/bitmap_text.h
+++ b/src/lib/bitmap_text.h
@@ -31,9 +31,9 @@ class Image;
 class BitmapText
 {
 public:
-       BitmapText (std::shared_ptr<const Image> i, dcpomatic::Rect<double> r)
-               : image (i)
-               , rectangle (r)
+       BitmapText(std::shared_ptr<const Image> image_, dcpomatic::Rect<double> rectangle_)
+               : image(image_)
+               , rectangle(rectangle_)
        {}
 
        std::shared_ptr<const Image> image;

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 51d4e8009942899c7008dcb838d27733de37af03..8a7f007ef1e1a8d6c2472c510835bbfba58cc23c 100644 (file)
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -57,9 +57,9 @@ public:
                : ContentText(from)
        {}
 
-       ContentBitmapText (dcpomatic::ContentTime f, std::shared_ptr<const Image> im, dcpomatic::Rect<double> r)
-               : ContentText (f)
-               , subs{ {im, r} }
+       ContentBitmapText(dcpomatic::ContentTime from, std::shared_ptr<const Image> image, dcpomatic::Rect<double> rect)
+               : ContentText(from)
+               , subs{ {image, rect} }
        {}
 
        /* Our texts, with their rectangles unmodified by any offsets or scales that the content specifies */