From 13154bc1a9b341f46994607fdde2e725444a6e21 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Jul 2021 01:24:48 +0200 Subject: Remove String namespace from around compose(). --- src/subtitle_asset.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/subtitle_asset.cc') diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index e236b77a..c540c96c 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -88,7 +88,7 @@ string_attribute (xmlpp::Element const * node, string name) { auto a = node->get_attribute (name); if (!a) { - throw XMLError (String::compose ("missing attribute %1", name)); + throw XMLError (compose("missing attribute %1", name)); } return string (a->get_value ()); } @@ -524,7 +524,7 @@ SubtitleAsset::equals (shared_ptr other_asset, EqualityOptions opti } if (_subtitles.size() != other->_subtitles.size()) { - note (NoteType::ERROR, String::compose("different number of subtitles: %1 vs %2", _subtitles.size(), other->_subtitles.size())); + note (NoteType::ERROR, compose("different number of subtitles: %1 vs %2", _subtitles.size(), other->_subtitles.size())); return false; } @@ -543,7 +543,7 @@ SubtitleAsset::equals (shared_ptr other_asset, EqualityOptions opti } if (string_i && *string_i != *string_j) { - note (NoteType::ERROR, String::compose("subtitles differ in text or metadata: %1 vs %2", string_i->text(), string_j->text())); + note (NoteType::ERROR, compose("subtitles differ in text or metadata: %1 vs %2", string_i->text(), string_j->text())); return false; } -- cgit v1.2.3