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/cross_common.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/cross_common.cc')
| -rw-r--r-- | src/lib/cross_common.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc index 2e48bf3e0..0a5451ff1 100644 --- a/src/lib/cross_common.cc +++ b/src/lib/cross_common.cc @@ -20,9 +20,9 @@ #include "cross.h" -#include "compose.hpp" #include "dcpomatic_log.h" #include "warnings.h" +#include <dcp/compose.h> #include <dcp/raw_convert.h> DCPOMATIC_DISABLE_WARNINGS #include <libxml++/libxml++.h> @@ -91,7 +91,7 @@ Drive::description () const name = _("Unknown"); } - return String::compose(_("%1 (%2 GB) [%3]"), name, gb, _device); + return dcp::compose(_("%1 (%2 GB) [%3]"), name, gb, _device); } @@ -108,7 +108,7 @@ Drive::log_summary () const mp = mp.substr (0, mp.length() - 1); } - return String::compose( + return dcp::compose( "Device %1 mounted on %2 size %3 vendor %4 model %5", _device, mp, _size, _vendor.get_value_or("[none]"), _model.get_value_or("[none]") ); |