Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 6 insertions, 3 deletions

diff --git a/Source/Core/Common/Src/NandPaths.cpp b/Source/Core/Common/Src/NandPaths.cpp
index 6264f0ba55..5249df361b 100644
--- a/Source/Core/Common/Src/NandPaths.cpp
+++ b/Source/Core/Common/Src/NandPaths.cpp
@@ -26,7 +26,8 @@ namespace Common
 std::string CreateTicketFileName(u64 _titleID)
 {
 	char TicketFilename[1024];
-	sprintf(TicketFilename, "%sticket/%08x/%08x.tik", File::GetUserPath(D_WIIUSER_IDX), (u32)(_titleID >> 32), (u32)_titleID);
+	sprintf(TicketFilename, "%sticket/%08x/%08x.tik",
+			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID);
 
 	return TicketFilename;
 }
@@ -34,7 +35,8 @@ std::string CreateTicketFileName(u64 _titleID)
 std::string CreateTitleDataPath(u64 _titleID)
 {
 	char path[1024];
-	sprintf(path, "%stitle/%08x/%08x/data", File::GetUserPath(D_WIIUSER_IDX), (u32)(_titleID >> 32), (u32)_titleID);
+	sprintf(path, "%stitle/%08x/%08x/data",
+			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID);
 
 	return path;
 }
@@ -42,7 +44,8 @@ std::string CreateTitleDataPath(u64 _titleID)
 std::string CreateTitleContentPath(u64 _titleID)
 {
 	char ContentPath[1024];
-	sprintf(ContentPath, "%stitle/%08x/%08x/content", File::GetUserPath(D_WIIUSER_IDX), (u32)(_titleID >> 32), (u32)_titleID);
+	sprintf(ContentPath, "%stitle/%08x/%08x/content",
+			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID);
 
 	return ContentPath;
 }