From 8cc744997fe72650a43ae543109dc44a84478648 Mon Sep 17 00:00:00 2001 From: elsid Date: Fri, 3 May 2024 01:28:38 +0200 Subject: [PATCH] Make path helpers constexpr and noexcept --- components/misc/pathhelpers.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/misc/pathhelpers.hpp b/components/misc/pathhelpers.hpp index 5a6d3feb55..5dc814e20d 100644 --- a/components/misc/pathhelpers.hpp +++ b/components/misc/pathhelpers.hpp @@ -1,18 +1,18 @@ #ifndef OPENMW_COMPONENTS_MISC_PATHHELPERS_H #define OPENMW_COMPONENTS_MISC_PATHHELPERS_H -#include +#include namespace Misc { - inline size_t findExtension(std::string_view file) + inline constexpr std::size_t findExtension(std::string_view file) noexcept { return file.find_last_of('.'); } - inline std::string_view getFileExtension(std::string_view file) + inline constexpr std::string_view getFileExtension(std::string_view file) noexcept { - if (auto extPos = findExtension(file); extPos != std::string::npos) + if (auto extPos = findExtension(file); extPos != std::string_view::npos) { file.remove_prefix(extPos + 1); return file; @@ -20,9 +20,9 @@ namespace Misc return {}; } - inline std::string_view getFileName(std::string_view path) + inline constexpr std::string_view getFileName(std::string_view path) noexcept { - if (auto namePos = path.find_last_of("/\\"); namePos != std::string::npos) + if (auto namePos = path.find_last_of("/\\"); namePos != std::string_view::npos) { path.remove_prefix(namePos + 1); } @@ -30,11 +30,11 @@ namespace Misc return path; } - inline std::string_view stemFile(std::string_view path) + inline constexpr std::string_view stemFile(std::string_view path) noexcept { path = getFileName(path); - if (auto extPos = path.find_last_of("."); extPos != std::string::npos) + if (auto extPos = path.find_last_of('.'); extPos != std::string_view::npos) { path.remove_suffix(path.size() - extPos); }