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/wx/film_name_location_dialog.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/wx/film_name_location_dialog.cc')
| -rw-r--r-- | src/wx/film_name_location_dialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc index 516ed86ae..55e5a534d 100644 --- a/src/wx/film_name_location_dialog.cc +++ b/src/wx/film_name_location_dialog.cc @@ -26,7 +26,7 @@ #include "dir_picker_ctrl.h" #endif #include "lib/config.h" -#include "lib/compose.hpp" +#include <dcp/compose.h> #include <wx/stdpaths.h> #include <boost/filesystem.hpp> @@ -139,7 +139,7 @@ FilmNameLocationDialog::check_path () 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?")), path().string().c_str()) ) @@ -149,7 +149,7 @@ FilmNameLocationDialog::check_path () } else if (boost::filesystem::is_regular_file(path())) { error_dialog ( this, - String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a film.")), path().c_str()) + dcp::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a film.")), path().c_str()) ); return false; } |