From 5702111ac930a3b8a1159c60c1fc098659d90af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Sat, 2 Nov 2024 10:11:12 +0000 Subject: [PATCH] [Ref] About Dialog: Use UV_ instead of U_ where UL_ is not possible. git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22065 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- mptrack/AboutDialog.cpp | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mptrack/AboutDialog.cpp b/mptrack/AboutDialog.cpp index d73d5055ba7..a2182a8d871 100644 --- a/mptrack/AboutDialog.cpp +++ b/mptrack/AboutDialog.cpp @@ -397,9 +397,9 @@ mpt::ustring CAboutDlg::GetTabText(int tab) text += MPT_UFORMAT("Available CPU features: {}\n")(CPUFeaturesToString(CPUInfo.get_features())); #endif // MPT_ENABLE_ARCH_INTRINSICS text += MPT_UFORMAT("Operating System: {}\n\n")(mpt::OS::Windows::Version::GetCurrentName()); - text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); - text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); - text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); + text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_("")); + text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_("")); + text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_("")); break; case 1: { @@ -440,22 +440,22 @@ mpt::ustring CAboutDlg::GetTabText(int tab) } text += MPT_UFORMAT("{}: {}") ( name - , info.state == ComponentStateAvailable ? U_("ok") : - info.state == ComponentStateUnavailable? U_("missing") : - info.state == ComponentStateUnintialized ? U_("not loaded") : - info.state == ComponentStateBlocked ? U_("blocked") : - info.state == ComponentStateUnregistered ? U_("unregistered") : - U_("unknown") + , info.state == ComponentStateAvailable ? UV_("ok") : + info.state == ComponentStateUnavailable? UV_("missing") : + info.state == ComponentStateUnintialized ? UV_("not loaded") : + info.state == ComponentStateBlocked ? UV_("blocked") : + info.state == ComponentStateUnregistered ? UV_("unregistered") : + UV_("unknown") ); if(info.type != ComponentTypeUnknown) { text += MPT_UFORMAT(" ({})") - ( info.type == ComponentTypeBuiltin ? U_("builtin") : - info.type == ComponentTypeSystem ? U_("system") : - info.type == ComponentTypeSystemInstallable ? U_("system, optional") : - info.type == ComponentTypeBundled ? U_("bundled") : - info.type == ComponentTypeForeign ? U_("foreign") : - U_("unknown") + ( info.type == ComponentTypeBuiltin ? UV_("builtin") : + info.type == ComponentTypeSystem ? UV_("system") : + info.type == ComponentTypeSystemInstallable ? UV_("system, optional") : + info.type == ComponentTypeBundled ? UV_("bundled") : + info.type == ComponentTypeForeign ? UV_("foreign") : + UV_("unknown") ); } text += lf; @@ -492,14 +492,14 @@ mpt::ustring CAboutDlg::GetTabText(int tab) ); text += MPT_UFORMAT("Windows version: {}\n") ( - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? U_("Windows 8.1") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? U_("Windows 8") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? U_("Windows 7") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? U_("Windows Vista") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? U_("Windows XP") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? U_("Windows 2000") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? U_("Windows NT4") : - U_("unknown") + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? UV_("Windows 8.1") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? UV_("Windows 8") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? UV_("Windows 7") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? UV_("Windows Vista") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? UV_("Windows XP") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? UV_("Windows 2000") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? UV_("Windows NT4") : + UV_("unknown") ); text += MPT_UFORMAT("Windows original: {}\n") ( mpt::OS::Windows::IsOriginal() ? yes : no