diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/tools/dcpomatic_combiner.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/tools/dcpomatic_combiner.cc')
| -rw-r--r-- | src/tools/dcpomatic_combiner.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |