Use dcp::compose rather than our own.

[dcpomatic.git] / src / tools / dcpomatic_combiner.cc

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 4a783d6346f65679d289a29035199b7401c24bc4..0f6004bd27924819e2ef9b0a13b8b178694fe232 100644 (file)
--- 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;
                }