summaryrefslogtreecommitdiff
path: root/src/font.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-27 20:35:19 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-27 20:35:19 +0000
commitd6633a73369339c419f33fb9d641f342826a3290 (patch)
tree7909203ea854f7039b62074004df92bec7aec796 /src/font.h
parent6f125b65d1bc0650735624d7ada17a2ff573cbc4 (diff)
Rename color -> colour.
Diffstat (limited to 'src/font.h')
-rw-r--r--src/font.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font.h b/src/font.h
index 979166cd..d5ea5636 100644
--- a/src/font.h
+++ b/src/font.h
@@ -50,9 +50,9 @@ public:
boost::optional<std::string> id;
int size;
boost::optional<bool> italic;
- boost::optional<Color> color;
+ boost::optional<Colour> colour;
boost::optional<Effect> effect;
- boost::optional<Color> effect_color;
+ boost::optional<Colour> effect_colour;
std::list<boost::shared_ptr<Subtitle> > subtitle_nodes;
std::list<boost::shared_ptr<Font> > font_nodes;