From 846eef2a0578ccbacd1ab5cda8d3c3871bdb2a4c Mon Sep 17 00:00:00 2001
From: OatmealDome <julian@oatmealdome.me>
Date: Tue, 17 Jan 2023 14:13:14 -0500
Subject: [PATCH] CommonPaths: Rename USERDATA_DIR to PORTABLE_USER_DIR

---
 Source/Core/Common/CommonPaths.h  | 10 +++++-----
 Source/Core/UICommon/UICommon.cpp |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
index 187231f743..0eadb0b2b7 100644
--- a/Source/Core/Common/CommonPaths.h
+++ b/Source/Core/Common/CommonPaths.h
@@ -10,20 +10,20 @@
 // The user data dir
 #define ROOT_DIR "."
 #ifdef _WIN32
-#define USERDATA_DIR "User"
+#define PORTABLE_USER_DIR "User"
 #define DOLPHIN_DATA_DIR "Dolphin"
 #elif defined __APPLE__
-// On OS X, USERDATA_DIR exists within the .app, but *always* reference
+// On OS X, PORTABLE_USER_DIR exists within the .app, but *always* reference
 // the copy in Application Support instead! (Copied on first run)
 // You can use the File::GetUserPath() util for this
-#define USERDATA_DIR "Contents/Resources/User"
+#define PORTABLE_USER_DIR "Contents/Resources/User"
 #define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
 #elif defined ANDROID
-#define USERDATA_DIR "user"
+#define PORTABLE_USER_DIR "user"
 #define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu"
 #define NOMEDIA_FILE ".nomedia"
 #else
-#define USERDATA_DIR "user"
+#define PORTABLE_USER_DIR "user"
 #define DOLPHIN_DATA_DIR "dolphin-emu"
 #endif
 
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
index 96e469d0aa..8525bd43d4 100644
--- a/Source/Core/UICommon/UICommon.cpp
+++ b/Source/Core/UICommon/UICommon.cpp
@@ -345,7 +345,7 @@ void SetUserDirectory(std::string custom_path)
 
   if (local)  // Case 1-2
   {
-    user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+    user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
   }
   else if (configPath)  // Case 3
   {
@@ -370,15 +370,15 @@ void SetUserDirectory(std::string custom_path)
   }
   else  // Case 6
   {
-    user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+    user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
   }
 
   CoTaskMemFree(appdata);
   CoTaskMemFree(documents);
 #else
-  if (File::IsDirectory(ROOT_DIR DIR_SEP USERDATA_DIR))
+  if (File::IsDirectory(ROOT_DIR DIR_SEP PORTABLE_USER_DIR))
   {
-    user_path = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
+    user_path = ROOT_DIR DIR_SEP PORTABLE_USER_DIR DIR_SEP;
   }
   else
   {