summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-07-10 01:24:48 +0200
committerCarl Hetherington <cth@carlh.net>2021-07-10 01:24:48 +0200
commit13154bc1a9b341f46994607fdde2e725444a6e21 (patch)
tree3fcf211b397092798b2aa39af4cc567d146a574c /src/dcp.cc
parent9853cbf566fdfdea096333c4caa788c29fa5c57b (diff)
Remove String namespace from around compose().compose
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 161b5b52..1db14851 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -236,7 +236,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
p->parse_file (path.string());
} catch (std::exception& e) {
delete p;
- throw ReadError(String::compose("XML error in %1", path.string()), e.what());
+ throw ReadError(compose("XML error in %1", path.string()), e.what());
}
auto const root = p->get_document()->get_root_node()->get_name();
@@ -271,7 +271,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
} else if (*pkl_type == "image/png") {
/* It's an Interop PNG subtitle; let it go */
} else {
- throw ReadError (String::compose("Unknown asset type %1 in PKL", *pkl_type));
+ throw ReadError (compose("Unknown asset type %1 in PKL", *pkl_type));
}
}
@@ -306,7 +306,7 @@ DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
auto b = other.cpls ();
if (a.size() != b.size()) {
- note (NoteType::ERROR, String::compose ("CPL counts differ: %1 vs %2", a.size(), b.size()));
+ note (NoteType::ERROR, compose("CPL counts differ: %1 vs %2", a.size(), b.size()));
return false;
}