Fixed up FileSystemTranersal visitor to use std::fs::path

1 files changed, 7 insertions, 7 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index ea776d641..ea234aaed 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1925,7 +1925,7 @@ struct RemoteExecutionRequest
 		for (const auto& Kv : m_Visit.m_Files)
 		{
 			PrepReq.BeginObject();
-			PrepReq << "file" << zen::WideToUtf8(Kv.first) << "size" << Kv.second.Size << "hash" << Kv.second.Hash;
+			PrepReq << "file" << zen::ToUtf8(Kv.first) << "size" << Kv.second.Size << "hash" << Kv.second.Hash;
 			PrepReq.EndObject();
 		}
 		PrepReq.EndArray();
@@ -1986,7 +1986,7 @@ private:
 
 		Visitor(const std::filesystem::path& RootPath) : m_RootPath(RootPath) {}
 
-		virtual void VisitFile(const std::filesystem::path& Parent, const std::wstring_view& FileName, uint64_t FileSize) override
+		virtual void VisitFile(const std::filesystem::path& Parent, const path_view& FileName, uint64_t FileSize) override
 		{
 			std::filesystem::path FullPath = Parent / FileName;
 
@@ -1994,8 +1994,8 @@ private:
 			zen::ScanFile(FullPath, 64 * 1024, [&](const void* Data, size_t Size) { Ios.Append(Data, Size); });
 			zen::IoHash Hash = Ios.GetHash();
 
-			std::wstring RelativePath = FullPath.lexically_relative(m_RootPath).native();
-			//			ZEN_INFO("File: {:32} => {} ({})", zen::WideToUtf8(RelativePath), Hash, FileSize);
+			auto RelativePath = FullPath.lexically_relative(m_RootPath).native();
+			//			ZEN_INFO("File: {:32} => {} ({})", zen::ToUtf8(RelativePath), Hash, FileSize);
 
 			FileEntry& Entry = m_Files[RelativePath];
 			Entry.Hash		 = Hash;
@@ -2004,11 +2004,11 @@ private:
 			m_HashToFile[Hash] = FullPath;
 		}
 
-		virtual bool VisitDirectory(const std::filesystem::path& Parent, const std::wstring_view& DirectoryName) override
+		virtual bool VisitDirectory(const std::filesystem::path& Parent, const path_view& DirectoryName) override
 		{
 			std::filesystem::path FullPath = Parent / DirectoryName;
 
-			if (DirectoryName.starts_with(L"."))
+			if (DirectoryName.starts_with('.'))
 			{
 				return false;
 			}
@@ -2022,7 +2022,7 @@ private:
 			zen::IoHash Hash;
 		};
 
-		std::map<std::wstring, FileEntry>											m_Files;
+		std::map<std::filesystem::path::string_type, FileEntry>						m_Files;
 		std::unordered_map<zen::IoHash, std::filesystem::path, zen::IoHash::Hasher> m_HashToFile;
 	};