From ac21848acc018a48ad4535aada75ae87f42ad8f2 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 28 Sep 2022 12:37:57 +0200 Subject: [PATCH] Utils: Make some HostInfo functions constexpr Enables the removal of static function scope variables. Change-Id: I337468c1525546a5cad9e95ae4a859de18ee514d Reviewed-by: Orgad Shaneh Reviewed-by: Qt CI Bot --- src/libs/utils/hostosinfo.h | 4 ++-- src/libs/utils/osspecificaspects.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/hostosinfo.h b/src/libs/utils/hostosinfo.h index 7626e3caccf..9720b2ecec1 100644 --- a/src/libs/utils/hostosinfo.h +++ b/src/libs/utils/hostosinfo.h @@ -72,12 +72,12 @@ public: : OsSpecificAspects::fileNameCaseSensitivity(hostOs()); } - static QChar pathListSeparator() + static constexpr QChar pathListSeparator() { return OsSpecificAspects::pathListSeparator(hostOs()); } - static Qt::KeyboardModifier controlModifier() + static constexpr Qt::KeyboardModifier controlModifier() { return OsSpecificAspects::controlModifier(hostOs()); } diff --git a/src/libs/utils/osspecificaspects.h b/src/libs/utils/osspecificaspects.h index 2d7b55e12d4..d5f331efdfa 100644 --- a/src/libs/utils/osspecificaspects.h +++ b/src/libs/utils/osspecificaspects.h @@ -24,22 +24,22 @@ inline QString withExecutableSuffix(OsType osType, const QString &executable) return finalName; } -inline Qt::CaseSensitivity fileNameCaseSensitivity(OsType osType) +constexpr Qt::CaseSensitivity fileNameCaseSensitivity(OsType osType) { return osType == OsTypeWindows || osType == OsTypeMac ? Qt::CaseInsensitive : Qt::CaseSensitive; } -inline Qt::CaseSensitivity envVarCaseSensitivity(OsType osType) +constexpr Qt::CaseSensitivity envVarCaseSensitivity(OsType osType) { return fileNameCaseSensitivity(osType); } -inline QChar pathListSeparator(OsType osType) +constexpr QChar pathListSeparator(OsType osType) { return QLatin1Char(osType == OsTypeWindows ? ';' : ':'); } -inline Qt::KeyboardModifier controlModifier(OsType osType) +constexpr Qt::KeyboardModifier controlModifier(OsType osType) { return osType == OsTypeMac ? Qt::MetaModifier : Qt::ControlModifier; }