From 13122ddd1269e14c50ede61454473bf2bf119ac8 Mon Sep 17 00:00:00 2001
From: Serena <osama.id78@gmail.com>
Date: Mon, 23 Jan 2023 00:23:07 +0300
Subject: [PATCH] Make changes requested by unknown

---
 CMakeLists.txt                             | 10 +++++-----
 {Common => UI}/DarwinMemoryStickManager.h  |  0
 {Common => UI}/DarwinMemoryStickManager.mm |  0
 UI/GameSettingsScreen.cpp                  | 10 +++++-----
 UI/NativeApp.cpp                           |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename {Common => UI}/DarwinMemoryStickManager.h (100%)
 rename {Common => UI}/DarwinMemoryStickManager.mm (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed7c21ffa3..d964b68790 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1148,8 +1148,8 @@ elseif(IOS)
 		ios/iCade/iCadeReaderView.h
 		ios/iCade/iCadeReaderView.m
 		ios/iCade/iCadeState.h
-		Common/DarwinMemoryStickManager.mm
-		Common/DarwinMemoryStickManager.h
+		UI/DarwinMemoryStickManager.mm
+		UI/DarwinMemoryStickManager.h
 	)
     
 	set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework MediaPlayer -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework UIKit -framework GLKit -framework OpenAL -framework AVFoundation -framework CoreLocation -framework CoreVideo -framework CoreMedia -framework CoreServices" )
@@ -1169,7 +1169,7 @@ elseif(IOS)
 	set_source_files_properties(ios/main.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 	set_source_files_properties(ios/CameraHelper.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 	set_source_files_properties(ios/LocationHelper.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
-	set_source_files_properties(Common/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
+	set_source_files_properties(UI/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 	set(TargetBin PPSSPP)
 elseif(USING_QT_UI)
 	set(CMAKE_AUTOMOC ON)
@@ -1227,8 +1227,8 @@ elseif(TARGET SDL2::SDL2)
 	endif()
 	set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
 	if(APPLE)
-		set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm SDL/SDLCocoaMetalLayer.h SDL/SDLCocoaMetalLayer.mm Common/DarwinMemoryStickManager.mm)
-        set_source_files_properties(Common/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
+		set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm SDL/SDLCocoaMetalLayer.h SDL/SDLCocoaMetalLayer.mm UI/DarwinMemoryStickManager.mm)
+        set_source_files_properties(UI/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 		set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY})
 	elseif(USING_EGL)
 		set(nativeExtraLibs ${nativeExtraLibs} pthread)
diff --git a/Common/DarwinMemoryStickManager.h b/UI/DarwinMemoryStickManager.h
similarity index 100%
rename from Common/DarwinMemoryStickManager.h
rename to UI/DarwinMemoryStickManager.h
diff --git a/Common/DarwinMemoryStickManager.mm b/UI/DarwinMemoryStickManager.mm
similarity index 100%
rename from Common/DarwinMemoryStickManager.mm
rename to UI/DarwinMemoryStickManager.mm
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 73ff4ab7fc..96ef0caa74 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -75,7 +75,7 @@
 #include "GPU/Common/FramebufferManagerCommon.h"
 
 #if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
-#include "Common/DarwinMemoryStickManager.h"
+#include "UI/DarwinMemoryStickManager.h"
 #endif
 
 #if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
@@ -1166,16 +1166,16 @@ UI::EventReturn GameSettingsScreen::OnJitAffectingSetting(UI::EventParams &e) {
 }
 
 UI::EventReturn GameSettingsScreen::OnChangeMemStickDir(UI::EventParams &e) {
-	#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
+#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
 	DarwinMemoryStickManager memoryStickManager;
 	DarwinDirectoryPanelCallback callback = [] (Path thePathChosen) {
-        DarwinMemoryStickManager::setUserPreferredMemoryStickDirectory(thePathChosen);
+		DarwinMemoryStickManager::setUserPreferredMemoryStickDirectory(thePathChosen);
     };
 	
 	memoryStickManager.presentDirectoryPanel(callback);
-	#else
+#else
 	screenManager()->push(new MemStickScreen(false));
-	#endif
+#endif
 	return UI::EVENT_DONE;
 }
 
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 8627061220..4c1913611e 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -142,7 +142,7 @@
 #endif
 
 #if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(MAC)
-#include "Common/DarwinMemoryStickManager.h"
+#include "UI/DarwinMemoryStickManager.h"
 #endif
 
 ScreenManager *screenManager;