diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-27 20:35:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-27 20:35:19 +0000 |
| commit | d6633a73369339c419f33fb9d641f342826a3290 (patch) | |
| tree | 7909203ea854f7039b62074004df92bec7aec796 /src/interop_subtitle_content.cc | |
| parent | 6f125b65d1bc0650735624d7ada17a2ff573cbc4 (diff) | |
Rename color -> colour.
Diffstat (limited to 'src/interop_subtitle_content.cc')
| -rw-r--r-- | src/interop_subtitle_content.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interop_subtitle_content.cc b/src/interop_subtitle_content.cc index 0fdee0b4..09b30e99 100644 --- a/src/interop_subtitle_content.cc +++ b/src/interop_subtitle_content.cc @@ -86,10 +86,10 @@ InteropSubtitleContent::xml_as_string () const optional<string> font; bool italic = false; - Color color; + Colour colour; int size = 0; Effect effect = NONE; - Color effect_color; + Colour effect_colour; int spot_number = 1; Time last_in; Time last_out; @@ -109,18 +109,18 @@ InteropSubtitleContent::xml_as_string () const bool const font_changed = font != i->font() || italic != i->italic() || - color != i->color() || + colour != i->colour() || size != i->size() || effect != i->effect() || - effect_color != i->effect_color(); + effect_colour != i->effect_colour(); if (font_changed) { font = i->font (); italic = i->italic (); - color = i->color (); + colour = i->colour (); size = i->size (); effect = i->effect (); - effect_color = i->effect_color (); + effect_colour = i->effect_colour (); } if (!font_element || font_changed) { @@ -129,10 +129,10 @@ InteropSubtitleContent::xml_as_string () const font_element->set_attribute ("Id", font.get ()); } font_element->set_attribute ("Italic", italic ? "yes" : "no"); - font_element->set_attribute ("Color", color.to_argb_string()); + font_element->set_attribute ("Color", colour.to_argb_string()); font_element->set_attribute ("Size", raw_convert<string> (size)); font_element->set_attribute ("Effect", effect_to_string (effect)); - font_element->set_attribute ("EffectColor", effect_color.to_argb_string()); + font_element->set_attribute ("EffectColor", effect_colour.to_argb_string()); font_element->set_attribute ("Script", "normal"); font_element->set_attribute ("Underlined", "no"); font_element->set_attribute ("Weight", "normal"); |