diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-07-09 22:53:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-10 20:50:32 +0200 |
| commit | 62c34b28567a097e8f22576e7d7891bd3dbe0ac0 (patch) | |
| tree | 2a0440ed2bdb58c608582b75da6c877527dd6bda /src/lib/environment_info.cc | |
| parent | 2c499921a9f8615c8368d8161cb43c9a93c67311 (diff) | |
Replace String::compose with fmt.
sed -i "/Plural-Forms/n;/%100/n;/scanf/n;s/%[123456789]/{}/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc src/lib/po/*.po src/wx/po/*.po src/tools/po/*.po test/*.cc
sed -i "s/String::compose */fmt::format/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc test/*.cc
Diffstat (limited to 'src/lib/environment_info.cc')
| -rw-r--r-- | src/lib/environment_info.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 04aed9eba..d6d5a5a1b 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -87,18 +87,18 @@ environment_info () { list<string> info; - info.push_back(String::compose("%1 %2 git %3 using %4", variant::dcpomatic(), dcpomatic_version, dcpomatic_git_commit, dependency_version_summary())); + info.push_back(fmt::format("{} {} git {} using {}", variant::dcpomatic(), dcpomatic_version, dcpomatic_git_commit, dependency_version_summary())); { char buffer[128]; gethostname (buffer, sizeof (buffer)); - info.push_back (String::compose ("Host name %1", &buffer[0])); + info.push_back (fmt::format("Host name {}", &buffer[0])); } #ifdef DCPOMATIC_DEBUG - info.push_back(variant::insert_dcpomatic("%1 built in debug mode.")); + info.push_back(variant::insert_dcpomatic("{} built in debug mode.")); #else - info.push_back(variant::insert_dcpomatic("%1 built in optimised mode.")); + info.push_back(variant::insert_dcpomatic("{} built in optimised mode.")); #endif #ifdef LIBDCP_DEBUG info.push_back ("libdcp built in debug mode."); @@ -111,8 +111,8 @@ environment_info () os_info.dwOSVersionInfoSize = sizeof (os_info); GetVersionEx (&os_info); info.push_back ( - String::compose ( - "Windows version %1.%2.%3", + fmt::format( + "Windows version {}.{}.{}", (int) os_info.dwMajorVersion, (int) os_info.dwMinorVersion, (int) os_info.dwBuildNumber ) ); @@ -143,9 +143,9 @@ environment_info () #endif #endif - info.push_back (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency())); + info.push_back (fmt::format("CPU: {}, {} processors", cpu_info(), boost::thread::hardware_concurrency())); for (auto const& i: mount_info()) { - info.push_back (String::compose("Mount: %1 %2", i.first, i.second)); + info.push_back (fmt::format("Mount: {} {}", i.first, i.second)); } return info; |