Merge pull request #8163 from lioncash/config

Core/ConfigManager: Use forward declarations where applicable

Source/Android/jni/MainAndroid.cpp

@@ -23,6 +23,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Common/FileUtil.h"
+#include "Common/IniFile.h"
 #include "Common/Logging/LogManager.h"
 #include "Common/MsgHandler.h"
 #include "Common/Version.h"

Source/Core/Common/IniFile.cpp

@@ -121,6 +121,10 @@ bool IniFile::Section::GetLines(std::vector<std::string>* lines, const bool remo
 
 // IniFile
 
+IniFile::IniFile() = default;
+
+IniFile::~IniFile() = default;
+
 const IniFile::Section* IniFile::GetSection(const std::string& sectionName) const
 {
   for (const Section& sect : sections)

Source/Core/Common/IniFile.h

@@ -86,6 +86,9 @@ public:
     std::vector<std::string> m_lines;
   };
 
+  IniFile();
+  ~IniFile();
+
   /**
    * Loads sections and keys.
    * @param filename filename of the ini file which should be loaded

Source/Core/Core/BootManager.cpp

@@ -38,6 +38,7 @@
 #include "Core/Core.h"
 #include "Core/HW/EXI/EXI.h"
 #include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/Movie.h"

Source/Core/Core/ConfigManager.cpp

@@ -19,6 +19,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
+#include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/NandPaths.h"
@@ -34,7 +35,9 @@
 #include "Core/FifoPlayer/FifoDataFile.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HW/DVD/DVDInterface.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/Host.h"
 #include "Core/IOS/ES/ES.h"
 #include "Core/IOS/ES/Formats.h"

Source/Core/Core/ConfigManager.h

@@ -11,9 +11,9 @@
 #include <utility>
 #include <vector>
 
-#include "Common/IniFile.h"
+#include "Common/CommonTypes.h"
-#include "Core/HW/EXI/EXI_Device.h"
+
-#include "Core/HW/SI/SI_Device.h"
+class IniFile;
 
 namespace DiscIO
 {
@@ -24,19 +24,26 @@ struct Partition;
 class Volume;
 }  // namespace DiscIO
 
-namespace IOS
+namespace ExpansionInterface
 {
-namespace ES
+enum TEXIDevices : int;
+}  // namespace ExpansionInterface
+
+namespace IOS::ES
 {
 class TMDReader;
-}
+}  // namespace IOS::ES
-}  // namespace IOS
 
 namespace PowerPC
 {
 enum class CPUCore;
 }  // namespace PowerPC
 
+namespace SerialInterface
+{
+enum SIDevices : int;
+}  // namespace SerialInterface
+
 struct BootParameters;
 
 // DSP Backend Types

Source/Core/Core/Movie.cpp

@@ -44,6 +44,7 @@
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteCommon/DataReport.h"
 #include "Core/HW/WiimoteCommon/WiimoteReport.h"

Source/Core/Core/NetPlayClient.cpp

@@ -39,11 +39,11 @@
 #include "Core/GeckoCode.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/SI/SI_DeviceGCController.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiiSave.h"
 #include "Core/HW/WiiSaveStructs.h"
-#include "Core/HW/WiimoteCommon/WiimoteReport.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/IOS/FS/FileSystem.h"
@@ -52,11 +52,9 @@
 #include "Core/IOS/Uids.h"
 #include "Core/Movie.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "Core/WiiRoot.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Attachments.h"
 #include "InputCommon/GCAdapter.h"
 #include "InputCommon/InputConfig.h"
-#include "UICommon/GameFile.h"
 #include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/VideoConfig.h"
 

Source/Core/DolphinNoGUI/PlatformX11.cpp

@@ -14,6 +14,7 @@
 
 #include <climits>
 #include <cstdio>
+#include <cstring>
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>

Source/Core/DolphinQt/Config/ControllersWindow.cpp

@@ -25,11 +25,11 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/IOS/IOS.h"
 #include "Core/IOS/USB/Bluetooth/BTReal.h"
-#include "Core/NetPlayProto.h"
 
 #include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
 #include "DolphinQt/Config/Mapping/MappingWindow.h"

Source/Core/DolphinQt/GameList/GameList.cpp

@@ -32,6 +32,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/DVD/DVDInterface.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/WiiSave.h"
 #include "Core/WiiUtils.h"
 

Source/Core/DolphinQt/MainWindow.cpp

@@ -44,6 +44,7 @@
 #include "Core/HW/GCKeyboard.h"
 #include "Core/HW/GCPad.h"
 #include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HotkeyManager.h"

Source/Core/InputCommon/GCAdapter.cpp

@@ -15,6 +15,7 @@
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/LibusbUtils.h"
 #include "Core/NetPlayProto.h"

Source/Core/InputCommon/GCAdapter_Android.cpp

@@ -15,6 +15,7 @@
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/SystemTimers.h"
 
 #include "InputCommon/GCAdapter.h"

Source/Core/UICommon/UICommon.cpp

@@ -17,6 +17,7 @@
 #include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
+#include "Common/IniFile.h"
 #include "Common/Logging/LogManager.h"
 #include "Common/MathUtil.h"
 #include "Common/MsgHandler.h"

Source/Core/VideoCommon/OnScreenDisplay.cpp

@@ -11,6 +11,7 @@
 #include "imgui.h"
 
 #include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
 #include "Common/Timer.h"
 
 #include "Core/ConfigManager.h"