From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Jul 2021 02:02:19 +0200 Subject: Use dcp::compose rather than our own. --- src/tools/dcpomatic_combiner.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/dcpomatic_combiner.cc') diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index 4a783d634..0f6004bd2 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -152,7 +152,7 @@ private: if (!confirm_dialog ( this, std_to_wx ( - String::compose(wx_to_std(_("The directory %1 already exists and is not empty. " + dcp::compose(wx_to_std(_("The directory %1 already exists and is not empty. " "Are you sure you want to use it?")), output.string()) ) @@ -162,7 +162,7 @@ private: } else if (is_regular_file(output)) { error_dialog ( this, - String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string()) + dcp::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string()) ); return; } -- cgit v1.2.3