summaryrefslogtreecommitdiff
path: root/src/lib/font_id_allocator.cc
diff options
context:
space:
mode:
authorcah <cth@carlh.net>2025-07-10 22:47:19 +0200
committercah <cth@carlh.net>2025-07-10 22:47:19 +0200
commit4be4e97abf911e7633172ada950d107a3ed28834 (patch)
treec9deceb5f3684fa081db0613da88264732093fcb /src/lib/font_id_allocator.cc
parent727c1aa7da8b325dfa38c8443b1dd356acaf6ec3 (diff)
parent42bde2d97039f6d0d645d83db90612d18ebf225a (diff)
Merge branch 'compose-to-fmt-take2'
This removes all uses of String::compose, replacing them with fmt and updating the i18n strings where required.
Diffstat (limited to 'src/lib/font_id_allocator.cc')
-rw-r--r--src/lib/font_id_allocator.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/font_id_allocator.cc b/src/lib/font_id_allocator.cc
index b85fc90dc..902d76be6 100644
--- a/src/lib/font_id_allocator.cc
+++ b/src/lib/font_id_allocator.cc
@@ -19,7 +19,6 @@
*/
-#include "compose.hpp"
#include "constants.h"
#include "dcpomatic_assert.h"
#include "font_id_allocator.h"
@@ -88,7 +87,7 @@ FontIDAllocator::allocate()
auto proposed = font.first.font_id;
int prefix = 0;
while (used_ids.find(proposed) != used_ids.end()) {
- proposed = String::compose("%1_%2", prefix++, font.first.font_id);
+ proposed = fmt::format("{}_{}", prefix++, font.first.font_id);
DCPOMATIC_ASSERT(prefix < 128);
}
font.second = proposed;