Common: Move IniInterface to WX GUI

Qt doesn't use it.

common/CMakeLists.txt

@@ -19,7 +19,6 @@ target_sources(common PRIVATE
 	FastFormatString.cpp
 	FastJmp.cpp
 	FileSystem.cpp
-	IniInterface.cpp
 	Mutex.cpp
 	Misc.cpp
 	MD5Digest.cpp

common/common.vcxproj

@@ -58,7 +58,6 @@
     <ClCompile Include="GL\ShaderCache.cpp" />
     <ClCompile Include="GL\StreamBuffer.cpp" />
     <ClCompile Include="FileSystem.cpp" />
-    <ClCompile Include="IniInterface.cpp" />
     <ClCompile Include="MD5Digest.cpp" />
     <ClCompile Include="ProgressCallback.cpp" />
     <ClCompile Include="pxTranslate.cpp" />

common/common.vcxproj.filters

@@ -25,9 +25,6 @@
     <ClCompile Include="emitter\groups.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="IniInterface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="emitter\jmp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

pcsx2/CMakeLists.txt

@@ -1109,6 +1109,7 @@ set(pcsx2GuiSources
 	gui/ExecutorThread.cpp
 	gui/FrameForGS.cpp
 	gui/GlobalCommands.cpp
+	gui/IniInterface.cpp
 	gui/i18n.cpp
 	gui/IsoDropTarget.cpp
 	gui/MainFrame.cpp
@@ -1172,6 +1173,7 @@ set(pcsx2GuiHeaders
 	gui/DriveList.h
 	gui/GSFrame.h
 	gui/i18n.h
+	gui/IniInterface.h
 	gui/IsoDropTarget.h
 	gui/MainFrame.h
 	gui/MSWstuff.h

pcsx2/DEV9/DEV9Config.cpp

@@ -19,10 +19,10 @@
 #include <wx/fileconf.h>
 
 #include "DEV9.h"
-#include "common/IniInterface.h"
 
 #ifndef PCSX2_CORE
 #include "gui/AppConfig.h"
+#include "gui/IniInterface.h"
 #endif
 
 #ifdef _WIN32

pcsx2/gui/AppConfig.cpp

@@ -16,8 +16,7 @@
 #include "PrecompiledHeader.h"
 #include "App.h"
 #include "MainFrame.h"
-
+#include "IniInterface.h"
-#include "common/IniInterface.h"
 #include "common/SettingsWrapper.h"
 #include "wxSettingsInterface.h"
 

pcsx2/gui/AppEventListeners.h

@@ -16,8 +16,8 @@
 #pragma once
 
 #include "common/EventSource.h"
+#include "gui/IniInterface.h"
 #include "gui/pxEvents.h"
-#include "common/IniInterface.h"
 
 enum CoreThreadStatus
 {

pcsx2/gui/AppEventSources.cpp

@@ -15,7 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "App.h"
-#include "common/IniInterface.h"
+#include "IniInterface.h"
 #include "common/EventSource.inl"
 
 template class EventSource< IEventListener_CoreThread >;

pcsx2/gui/AppInit.cpp

@@ -19,8 +19,8 @@
 #include "ConsoleLogger.h"
 #include "MSWstuff.h"
 #include "MTVU.h" // for thread cancellation on shutdown
+#include "IniInterface.h"
 
-#include "common/IniInterface.h"
 #include "common/StringUtil.h"
 #include "DebugTools/Debug.h"
 #include "Dialogs/ModalPopups.h"

pcsx2/gui/AppMain.cpp

@@ -21,6 +21,7 @@
 #include "Host.h"
 #include "AppSaveStates.h"
 #include "AppAccelerators.h"
+#include "IniInterface.h"
 #include "PAD/Gamepad.h"
 
 #include "ps2/BiosTools.h"
@@ -36,7 +37,6 @@
 #	include "Recording/InputRecording.h"
 #endif
 
-#include "common/IniInterface.h"
 #include "common/FileSystem.h"
 #include "common/StringUtil.h"
 #include "common/AppTrait.h"

pcsx2/gui/AppUserMode.cpp

@@ -15,7 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "MainFrame.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
 #include "Dialogs/ModalPopups.h"
 
 #include <wx/stdpaths.h>

pcsx2/gui/ConsoleLogger.cpp

@@ -19,9 +19,9 @@
 #include "ConsoleLogger.h"
 #include "MSWstuff.h"
 #include "Host.h"
+#include "IniInterface.h"
 
 #include "common/Console.h"
-#include "common/IniInterface.h"
 #include "common/SafeArray.inl"
 #include "Dialogs/LogOptionsDialog.h"
 #include "DebugTools/Debug.h"

pcsx2/gui/IniInterface.cpp

@@ -15,7 +15,7 @@
 
 #include <wx/gdicmn.h>
 
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
 #include "common/Console.h"
 
 const wxRect wxDefaultRect(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord);

pcsx2/gui/IniInterface.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "Path.h"
+#include "common/Path.h"
 #include <wx/config.h>
 #include <wx/gdicmn.h>
 #include <string>

pcsx2/gui/MainMenuClicks.cpp

@@ -19,6 +19,7 @@
 #include "CDVD/CDVD.h"
 #include "GS.h"
 #include "GSFrame.h"
+#include "IniInterface.h"
 #include "SPU2/spu2.h"
 #include "System/SysThreads.h"
 #include "DEV9/DEV9.h"
@@ -33,7 +34,6 @@
 #include "Dialogs/ConfigurationDialog.h"
 #include "Debugger/DisassemblyDialog.h"
 
-#include "common/IniInterface.h"
 
 #include "fmt/core.h"
 #include "wx/numdlg.h"

pcsx2/gui/Panels/LogOptionsPanels.cpp

@@ -16,7 +16,7 @@
 #include "PrecompiledHeader.h"
 #include "LogOptionsPanels.h"
 
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
 #include "DebugTools/Debug.h"
 
 #include <wx/statline.h>

pcsx2/gui/Panels/MemoryCardListPanel.cpp

@@ -22,7 +22,7 @@
 #include "MemoryCardPanels.h"
 
 #include "gui/Dialogs/ConfigurationDialog.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
 #include "common/StringUtil.h"
 #include "Sio.h"
 

pcsx2/gui/Panels/MemoryCardListView.cpp

@@ -19,7 +19,7 @@
 
 #include "gui/Dialogs/ConfigurationDialog.h"
 
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
 
 using namespace pxSizerFlags;
 using namespace Panels;

pcsx2/gui/RecentIsoList.cpp

@@ -18,7 +18,7 @@
 #include "AppCoreThread.h"
 #include "RecentIsoList.h"
 #include "IsoDropTarget.h"
-#include "common/IniInterface.h"
+#include "IniInterface.h"
 
 extern wxString GetMsg_IsoImageChanged();
 

pcsx2/gui/wxHelpers.cpp

@@ -20,7 +20,7 @@
 #include <wx/spinctrl.h>
 #include "common/General.h"
 #include "common/Threading.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
 #include "gui/wxGuiTools.h"
 #include "gui/pxStaticText.h"
 

pcsx2/pcsx2.vcxproj

@@ -349,6 +349,7 @@
     <ClCompile Include="gui\Dialogs\GSDumpDialog.cpp" />
     <ClCompile Include="gui\Dialogs\McdConfigDialog.cpp" />
     <ClCompile Include="gui\DriveList.cpp" />
+    <ClCompile Include="gui\IniInterface.cpp" />
     <ClCompile Include="gui\Panels\MemoryCardListView.cpp" />
     <ClCompile Include="gui\pxCheckBox.cpp" />
     <ClCompile Include="gui\pxRadioPanel.cpp" />
@@ -797,6 +798,7 @@
     <ClInclude Include="gui\CheckedStaticBox.h" />
     <ClInclude Include="gui\i18n.h" />
     <ClInclude Include="gui\DriveList.h" />
+    <ClInclude Include="gui\IniInterface.h" />
     <ClInclude Include="gui\pxCheckBox.h" />
     <ClInclude Include="gui\pxEvents.h" />
     <ClInclude Include="gui\pxRadioPanel.h" />

pcsx2/pcsx2.vcxproj.filters

@@ -1766,6 +1766,9 @@
     <ClCompile Include="x86\iR5900Analysis.cpp">
       <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
     </ClCompile>
+    <ClCompile Include="gui\IniInterface.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Patch.h">
@@ -2933,6 +2936,9 @@
     <ClInclude Include="x86\iR5900Analysis.h">
       <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
     </ClInclude>
+    <ClInclude Include="gui\IniInterface.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="windows\wxResources.rc">