From 9402789146111014ae4d07dfba03886b1130ec9c Mon Sep 17 00:00:00 2001
From: goeiecool9999 <>
Date: Thu, 8 Sep 2022 02:19:07 +0200
Subject: [PATCH] Remove some unnecessary changes.

---
 src/Cafe/Account/Account.cpp          | 2 +-
 src/Cafe/Filesystem/fscDeviceHostFS.h | 2 +-
 src/Cafe/TitleList/SaveInfo.cpp       | 2 +-
 src/Cafe/TitleList/SaveInfo.h         | 5 ++---
 src/Cafe/TitleList/SaveList.cpp       | 4 ++--
 src/Cafe/TitleList/TitleInfo.cpp      | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Cafe/Account/Account.cpp b/src/Cafe/Account/Account.cpp
index 2234bd16..2cf424f1 100644
--- a/src/Cafe/Account/Account.cpp
+++ b/src/Cafe/Account/Account.cpp
@@ -175,7 +175,7 @@ std::error_code Account::Load()
 
 std::error_code Account::Save()
 {
-	FSPath path = CemuApp::GetMLCPath(fmt::format(L"usr/save/system/act/{:08x}", m_persistent_id)).ToStdWstring();
+	fs::path path = CemuApp::GetMLCPath(fmt::format(L"usr/save/system/act/{:08x}", m_persistent_id)).ToStdWstring();
 	if (!fs::exists(path))
 	{
 		std::error_code ec;
diff --git a/src/Cafe/Filesystem/fscDeviceHostFS.h b/src/Cafe/Filesystem/fscDeviceHostFS.h
index e5486f5d..0186b6cd 100644
--- a/src/Cafe/Filesystem/fscDeviceHostFS.h
+++ b/src/Cafe/Filesystem/fscDeviceHostFS.h
@@ -1,5 +1,5 @@
 #include "Cafe/Filesystem/fsc.h"
-#include "FSPath.h"
+#include "Cafe/Filesystem/FSPath.h"
 
 class FSCVirtualFile_Host : public FSCVirtualFile
 {
diff --git a/src/Cafe/TitleList/SaveInfo.cpp b/src/Cafe/TitleList/SaveInfo.cpp
index 7d3a0d83..f5665ea5 100644
--- a/src/Cafe/TitleList/SaveInfo.cpp
+++ b/src/Cafe/TitleList/SaveInfo.cpp
@@ -16,7 +16,7 @@ std::string SaveInfo::GetStorageSubpathByTitleId(TitleId titleId)
 	return fmt::format("usr/save/{:08x}/{:08x}", ((uint64)titleId) >> 32, (uint64)titleId & 0xFFFFFFFF);
 }
 
-FSPath SaveInfo::GetSavePath(TitleId titleId)
+fs::path SaveInfo::GetSavePath(TitleId titleId)
 {
 	return ActiveSettings::GetMlcPath(GetStorageSubpathByTitleId(titleId));
 }
diff --git a/src/Cafe/TitleList/SaveInfo.h b/src/Cafe/TitleList/SaveInfo.h
index 41c8d970..2ea66a54 100644
--- a/src/Cafe/TitleList/SaveInfo.h
+++ b/src/Cafe/TitleList/SaveInfo.h
@@ -2,7 +2,6 @@
 
 #include "TitleId.h"
 #include "ParsedMetaXml.h"
-#include "Cafe/Filesystem/FSPath.h"
 
 class SaveInfo
 {
@@ -21,10 +20,10 @@ public:
 
 private:
 	static std::string GetStorageSubpathByTitleId(TitleId titleId);
-	static FSPath GetSavePath(TitleId titleId);
+	static fs::path GetSavePath(TitleId titleId);
 
 	TitleId m_titleId;
-	FSPath m_path;
+	fs::path m_path;
 	bool m_isValid{false};
 	bool m_hasMetaLoaded{false};
 	ParsedMetaXml* m_parsedMetaXml{nullptr};
diff --git a/src/Cafe/TitleList/SaveList.cpp b/src/Cafe/TitleList/SaveList.cpp
index 4d4ff9f8..224d47b0 100644
--- a/src/Cafe/TitleList/SaveList.cpp
+++ b/src/Cafe/TitleList/SaveList.cpp
@@ -2,7 +2,7 @@
 #include <charconv>
 
 std::mutex sSLMutex;
-FSPath sSLMLCPath;
+fs::path sSLMLCPath;
 
 std::vector<SaveInfo*> sSLList;
 
@@ -59,7 +59,7 @@ void CafeSaveList::RefreshThreadWorker()
 	sSLList.clear();
 
 	sSLMutex.lock();
-	FSPath mlcPath = sSLMLCPath;
+	fs::path mlcPath = sSLMLCPath;
 	sSLMutex.unlock();
 	std::error_code ec;
 	for (auto it_titleHigh : fs::directory_iterator(mlcPath / "usr/save", ec))
diff --git a/src/Cafe/TitleList/TitleInfo.cpp b/src/Cafe/TitleList/TitleInfo.cpp
index 2cd19232..6606c130 100644
--- a/src/Cafe/TitleList/TitleInfo.cpp
+++ b/src/Cafe/TitleList/TitleInfo.cpp
@@ -289,7 +289,7 @@ void TitleInfo::CalcUID()
 	}
 	std::error_code ec;
 	// get absolute normalized path
-	FSPath normalizedPath;
+	fs::path normalizedPath;
 	if (m_fullPath.is_relative())
 	{
 		normalizedPath = ActiveSettings::GetPath();