summaryrefslogtreecommitdiff
path: root/src/lib/cross_common.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-12-23 21:53:32 +0100
committerCarl Hetherington <cth@carlh.net>2024-12-26 00:27:08 +0100
commit8caf013a9b8d709ed7c3d5e9febee0067e6fcf1f (patch)
tree40da87cb357e8b1c54a1464bdbac2d014640e30c /src/lib/cross_common.cc
parentcec6ff92aef45c687085ecfc1059004407c18c57 (diff)
Replace String::compose with fmt::format().
Diffstat (limited to 'src/lib/cross_common.cc')
-rw-r--r--src/lib/cross_common.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index 2e6f5c414..1aabef75e 100644
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -20,7 +20,6 @@
#include "cross.h"
-#include "compose.hpp"
#include "dcpomatic_assert.h"
#include "dcpomatic_log.h"
#include <dcp/warnings.h>
@@ -96,7 +95,7 @@ Drive::description () const
name = _("Unknown");
}
- return String::compose(_("%1 (%2 GB) [%3]"), name, gb, _device);
+ return fmt::format(_("{} ({} GB) [{}]"), name, gb, _device);
}
@@ -113,8 +112,8 @@ Drive::log_summary () const
mp = mp.substr (0, mp.length() - 1);
}
- return String::compose(
- "Device %1 mounted on %2 size %3 vendor %4 model %5",
+ return fmt::format(
+ "Device {} mounted on {} size {} vendor {} model {}",
_device, mp, _size, _vendor.get_value_or("[none]"), _model.get_value_or("[none]")
);
}