diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-06-01 09:22:18 -0400 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-06-02 00:26:26 -0400 |
| commit | dba7bcd489b9802c3d25e3e8183ef7991af301b8 (patch) | |
| tree | 24a040c1117135d965e9f17aefa37a6cdd9d3bc7 | |
| parent | a1eeb9908d9cba0a51fbad519ce770b96d0a78d5 (diff) | |
common: fs: fs_util: Move PathToUTF8String to fs_util
| -rw-r--r-- | src/common/fs/fs_util.cpp | 4 | ||||
| -rw-r--r-- | src/common/fs/fs_util.h | 10 | ||||
| -rw-r--r-- | src/common/fs/path_util.cpp | 6 | ||||
| -rw-r--r-- | src/common/fs/path_util.h | 9 |
4 files changed, 14 insertions, 15 deletions
diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp index 9db746c4bd..357cf5855d 100644 --- a/src/common/fs/fs_util.cpp +++ b/src/common/fs/fs_util.cpp @@ -20,4 +20,8 @@ std::string ToUTF8String(std::u8string_view u8_string) { return std::string{u8_string.begin(), u8_string.end()}; } +std::string PathToUTF8String(const std::filesystem::path& path) { + return ToUTF8String(path.u8string()); +} + } // namespace Common::FS diff --git a/src/common/fs/fs_util.h b/src/common/fs/fs_util.h index de452c0f6c..ec9950ee72 100644 --- a/src/common/fs/fs_util.h +++ b/src/common/fs/fs_util.h @@ -5,6 +5,7 @@ #pragma once #include <concepts> +#include <filesystem> #include <span> #include <string> #include <string_view> @@ -45,4 +46,13 @@ concept IsChar = std::same_as<T, char>; */ [[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string); +/** + * Converts a filesystem path to a UTF-8 encoded std::string. + * + * @param path Filesystem path + * + * @returns UTF-8 encoded std::string. + */ +[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path); + } // namespace Common::FS diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 8b732a21c3..6cdd14f138 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -129,12 +129,6 @@ private: std::unordered_map<YuzuPath, fs::path> yuzu_paths; }; -std::string PathToUTF8String(const fs::path& path) { - const auto utf8_string = path.u8string(); - - return std::string{utf8_string.begin(), utf8_string.end()}; -} - bool ValidatePath(const fs::path& path) { if (path.empty()) { LOG_ERROR(Common_Filesystem, "Input path is empty, path={}", PathToUTF8String(path)); diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h index a9fadbceb9..14e8c35d74 100644 --- a/src/common/fs/path_util.h +++ b/src/common/fs/path_util.h @@ -26,15 +26,6 @@ enum class YuzuPath { }; /** - * Converts a filesystem path to a UTF-8 encoded std::string. - * - * @param path Filesystem path - * - * @returns UTF-8 encoded std::string. - */ -[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path); - -/** * Validates a given path. * * A given path is valid if it meets these conditions: |