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/lib/uploader.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/uploader.cc')
| -rw-r--r-- | src/lib/uploader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/uploader.cc b/src/lib/uploader.cc index c5448e469..11fb55f35 100644 --- a/src/lib/uploader.cc +++ b/src/lib/uploader.cc @@ -21,7 +21,7 @@ #include "uploader.h" #include "dcpomatic_assert.h" -#include "compose.hpp" +#include <dcp/compose.h> #include "i18n.h" @@ -76,7 +76,7 @@ Uploader::upload_directory (boost::filesystem::path base, boost::filesystem::pat if (is_directory(i.path())) { upload_directory (base, i.path(), transferred, total_size); } else { - _set_status (String::compose(_("copying %1"), i.path().leaf())); + _set_status (dcp::compose(_("copying %1"), i.path().leaf())); upload_file (i.path(), remove_prefix (base, i.path()), transferred, total_size); } } |