Remove unnecessary Src/ folders

Source/Core/DiscIO/CMakeLists.txt

@@ -1,24 +1,24 @@
-set(SRCS	Src/BannerLoader.cpp
-			Src/BannerLoaderGC.cpp
-			Src/BannerLoaderWii.cpp
-			Src/Blob.cpp
-			Src/CISOBlob.cpp
-			Src/WbfsBlob.cpp
-			Src/CompressedBlob.cpp
-			Src/DiscScrubber.cpp
-			Src/DriveBlob.cpp
-			Src/FileBlob.cpp
-			Src/FileHandlerARC.cpp
-			Src/FileMonitor.cpp
-			Src/FileSystemGCWii.cpp
-			Src/Filesystem.cpp
-			Src/NANDContentLoader.cpp
-			Src/VolumeCommon.cpp
-			Src/VolumeCreator.cpp
-			Src/VolumeDirectory.cpp
-			Src/VolumeGC.cpp
-			Src/VolumeWad.cpp
-			Src/VolumeWiiCrypted.cpp
-			Src/WiiWad.cpp)
+set(SRCS	BannerLoader.cpp
+			BannerLoaderGC.cpp
+			BannerLoaderWii.cpp
+			Blob.cpp
+			CISOBlob.cpp
+			WbfsBlob.cpp
+			CompressedBlob.cpp
+			DiscScrubber.cpp
+			DriveBlob.cpp
+			FileBlob.cpp
+			FileHandlerARC.cpp
+			FileMonitor.cpp
+			FileSystemGCWii.cpp
+			Filesystem.cpp
+			NANDContentLoader.cpp
+			VolumeCommon.cpp
+			VolumeCreator.cpp
+			VolumeDirectory.cpp
+			VolumeGC.cpp
+			VolumeWad.cpp
+			VolumeWiiCrypted.cpp
+			WiiWad.cpp)
 
 add_dolphin_library(discio "${SRCS}" "")

Source/Core/DiscIO/DiscIO.vcxproj

@@ -43,56 +43,56 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="Src\BannerLoader.cpp" />
-    <ClCompile Include="Src\BannerLoaderGC.cpp" />
-    <ClCompile Include="Src\BannerLoaderWii.cpp" />
-    <ClCompile Include="Src\Blob.cpp" />
-    <ClCompile Include="Src\CISOBlob.cpp" />
-    <ClCompile Include="Src\CompressedBlob.cpp" />
-    <ClCompile Include="Src\DiscScrubber.cpp" />
-    <ClCompile Include="Src\DriveBlob.cpp" />
-    <ClCompile Include="Src\FileBlob.cpp" />
-    <ClCompile Include="Src\FileHandlerARC.cpp" />
-    <ClCompile Include="Src\FileMonitor.cpp" />
-    <ClCompile Include="Src\Filesystem.cpp" />
-    <ClCompile Include="Src\FileSystemGCWii.cpp" />
-    <ClCompile Include="Src\NANDContentLoader.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
+    <ClCompile Include="BannerLoader.cpp" />
+    <ClCompile Include="BannerLoaderGC.cpp" />
+    <ClCompile Include="BannerLoaderWii.cpp" />
+    <ClCompile Include="Blob.cpp" />
+    <ClCompile Include="CISOBlob.cpp" />
+    <ClCompile Include="CompressedBlob.cpp" />
+    <ClCompile Include="DiscScrubber.cpp" />
+    <ClCompile Include="DriveBlob.cpp" />
+    <ClCompile Include="FileBlob.cpp" />
+    <ClCompile Include="FileHandlerARC.cpp" />
+    <ClCompile Include="FileMonitor.cpp" />
+    <ClCompile Include="Filesystem.cpp" />
+    <ClCompile Include="FileSystemGCWii.cpp" />
+    <ClCompile Include="NANDContentLoader.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Src\VolumeCommon.cpp" />
-    <ClCompile Include="Src\VolumeCreator.cpp" />
-    <ClCompile Include="Src\VolumeDirectory.cpp" />
-    <ClCompile Include="Src\VolumeGC.cpp" />
-    <ClCompile Include="Src\VolumeWad.cpp" />
-    <ClCompile Include="Src\VolumeWiiCrypted.cpp" />
-    <ClCompile Include="Src\WbfsBlob.cpp" />
-    <ClCompile Include="Src\WiiWad.cpp" />
+    <ClCompile Include="VolumeCommon.cpp" />
+    <ClCompile Include="VolumeCreator.cpp" />
+    <ClCompile Include="VolumeDirectory.cpp" />
+    <ClCompile Include="VolumeGC.cpp" />
+    <ClCompile Include="VolumeWad.cpp" />
+    <ClCompile Include="VolumeWiiCrypted.cpp" />
+    <ClCompile Include="WbfsBlob.cpp" />
+    <ClCompile Include="WiiWad.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\BannerLoader.h" />
-    <ClInclude Include="Src\BannerLoaderGC.h" />
-    <ClInclude Include="Src\BannerLoaderWii.h" />
-    <ClInclude Include="Src\Blob.h" />
-    <ClInclude Include="Src\CISOBlob.h" />
-    <ClInclude Include="Src\CompressedBlob.h" />
-    <ClInclude Include="Src\DiscScrubber.h" />
-    <ClInclude Include="Src\DriveBlob.h" />
-    <ClInclude Include="Src\FileBlob.h" />
-    <ClInclude Include="Src\FileHandlerARC.h" />
-    <ClInclude Include="Src\FileMonitor.h" />
-    <ClInclude Include="Src\Filesystem.h" />
-    <ClInclude Include="Src\FileSystemGCWii.h" />
-    <ClInclude Include="Src\NANDContentLoader.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Volume.h" />
-    <ClInclude Include="Src\VolumeCreator.h" />
-    <ClInclude Include="Src\VolumeDirectory.h" />
-    <ClInclude Include="Src\VolumeGC.h" />
-    <ClInclude Include="Src\VolumeWad.h" />
-    <ClInclude Include="Src\VolumeWiiCrypted.h" />
-    <ClInclude Include="Src\WbfsBlob.h" />
-    <ClInclude Include="Src\WiiWad.h" />
+    <ClInclude Include="BannerLoader.h" />
+    <ClInclude Include="BannerLoaderGC.h" />
+    <ClInclude Include="BannerLoaderWii.h" />
+    <ClInclude Include="Blob.h" />
+    <ClInclude Include="CISOBlob.h" />
+    <ClInclude Include="CompressedBlob.h" />
+    <ClInclude Include="DiscScrubber.h" />
+    <ClInclude Include="DriveBlob.h" />
+    <ClInclude Include="FileBlob.h" />
+    <ClInclude Include="FileHandlerARC.h" />
+    <ClInclude Include="FileMonitor.h" />
+    <ClInclude Include="Filesystem.h" />
+    <ClInclude Include="FileSystemGCWii.h" />
+    <ClInclude Include="NANDContentLoader.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="Volume.h" />
+    <ClInclude Include="VolumeCreator.h" />
+    <ClInclude Include="VolumeDirectory.h" />
+    <ClInclude Include="VolumeGC.h" />
+    <ClInclude Include="VolumeWad.h" />
+    <ClInclude Include="VolumeWiiCrypted.h" />
+    <ClInclude Include="WbfsBlob.h" />
+    <ClInclude Include="WiiWad.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/DiscIO/DiscIO.vcxproj.filters

@@ -21,142 +21,142 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\DiscScrubber.cpp">
+    <ClCompile Include="DiscScrubber.cpp">
       <Filter>DiscScrubber</Filter>
     </ClCompile>
-    <ClCompile Include="Src\BannerLoader.cpp">
+    <ClCompile Include="BannerLoader.cpp">
       <Filter>FileHandler</Filter>
     </ClCompile>
-    <ClCompile Include="Src\BannerLoaderGC.cpp">
+    <ClCompile Include="BannerLoaderGC.cpp">
       <Filter>FileHandler</Filter>
     </ClCompile>
-    <ClCompile Include="Src\BannerLoaderWii.cpp">
+    <ClCompile Include="BannerLoaderWii.cpp">
       <Filter>FileHandler</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FileHandlerARC.cpp">
+    <ClCompile Include="FileHandlerARC.cpp">
       <Filter>FileHandler</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Filesystem.cpp">
+    <ClCompile Include="Filesystem.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FileSystemGCWii.cpp">
+    <ClCompile Include="FileSystemGCWii.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
-    <ClCompile Include="Src\WiiWad.cpp">
+    <ClCompile Include="WiiWad.cpp">
       <Filter>NAND</Filter>
     </ClCompile>
-    <ClCompile Include="Src\NANDContentLoader.cpp">
+    <ClCompile Include="NANDContentLoader.cpp">
       <Filter>NAND</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Blob.cpp">
+    <ClCompile Include="Blob.cpp">
       <Filter>Volume\Blob</Filter>
     </ClCompile>
-    <ClCompile Include="Src\CISOBlob.cpp">
+    <ClCompile Include="CISOBlob.cpp">
       <Filter>Volume\Blob</Filter>
     </ClCompile>
-    <ClCompile Include="Src\CompressedBlob.cpp">
+    <ClCompile Include="CompressedBlob.cpp">
       <Filter>Volume\Blob</Filter>
     </ClCompile>
-    <ClCompile Include="Src\DriveBlob.cpp">
+    <ClCompile Include="DriveBlob.cpp">
       <Filter>Volume\Blob</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FileBlob.cpp">
+    <ClCompile Include="FileBlob.cpp">
       <Filter>Volume\Blob</Filter>
     </ClCompile>
-    <ClCompile Include="Src\WbfsBlob.cpp">
+    <ClCompile Include="WbfsBlob.cpp">
       <Filter>Volume\Blob</Filter>
     </ClCompile>
-    <ClCompile Include="Src\FileMonitor.cpp">
+    <ClCompile Include="FileMonitor.cpp">
       <Filter>Volume</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VolumeCommon.cpp">
+    <ClCompile Include="VolumeCommon.cpp">
       <Filter>Volume</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VolumeCreator.cpp">
+    <ClCompile Include="VolumeCreator.cpp">
       <Filter>Volume</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VolumeDirectory.cpp">
+    <ClCompile Include="VolumeDirectory.cpp">
       <Filter>Volume</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VolumeGC.cpp">
+    <ClCompile Include="VolumeGC.cpp">
       <Filter>Volume</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VolumeWad.cpp">
+    <ClCompile Include="VolumeWad.cpp">
       <Filter>Volume</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VolumeWiiCrypted.cpp">
+    <ClCompile Include="VolumeWiiCrypted.cpp">
       <Filter>Volume</Filter>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp" />
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\DiscScrubber.h">
+    <ClInclude Include="DiscScrubber.h">
       <Filter>DiscScrubber</Filter>
     </ClInclude>
-    <ClInclude Include="Src\BannerLoaderWii.h">
+    <ClInclude Include="BannerLoaderWii.h">
       <Filter>FileHandler</Filter>
     </ClInclude>
-    <ClInclude Include="Src\BannerLoader.h">
+    <ClInclude Include="BannerLoader.h">
       <Filter>FileHandler</Filter>
     </ClInclude>
-    <ClInclude Include="Src\BannerLoaderGC.h">
+    <ClInclude Include="BannerLoaderGC.h">
       <Filter>FileHandler</Filter>
     </ClInclude>
-    <ClInclude Include="Src\FileHandlerARC.h">
+    <ClInclude Include="FileHandlerARC.h">
       <Filter>FileHandler</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Filesystem.h">
+    <ClInclude Include="Filesystem.h">
       <Filter>FileSystem</Filter>
     </ClInclude>
-    <ClInclude Include="Src\FileSystemGCWii.h">
+    <ClInclude Include="FileSystemGCWii.h">
       <Filter>FileSystem</Filter>
     </ClInclude>
-    <ClInclude Include="Src\WiiWad.h">
+    <ClInclude Include="WiiWad.h">
       <Filter>NAND</Filter>
     </ClInclude>
-    <ClInclude Include="Src\NANDContentLoader.h">
+    <ClInclude Include="NANDContentLoader.h">
       <Filter>NAND</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Blob.h">
+    <ClInclude Include="Blob.h">
       <Filter>Volume\Blob</Filter>
     </ClInclude>
-    <ClInclude Include="Src\CISOBlob.h">
+    <ClInclude Include="CISOBlob.h">
       <Filter>Volume\Blob</Filter>
     </ClInclude>
-    <ClInclude Include="Src\CompressedBlob.h">
+    <ClInclude Include="CompressedBlob.h">
       <Filter>Volume\Blob</Filter>
     </ClInclude>
-    <ClInclude Include="Src\DriveBlob.h">
+    <ClInclude Include="DriveBlob.h">
       <Filter>Volume\Blob</Filter>
     </ClInclude>
-    <ClInclude Include="Src\FileBlob.h">
+    <ClInclude Include="FileBlob.h">
       <Filter>Volume\Blob</Filter>
     </ClInclude>
-    <ClInclude Include="Src\WbfsBlob.h">
+    <ClInclude Include="WbfsBlob.h">
       <Filter>Volume\Blob</Filter>
     </ClInclude>
-    <ClInclude Include="Src\FileMonitor.h">
+    <ClInclude Include="FileMonitor.h">
       <Filter>Volume</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Volume.h">
+    <ClInclude Include="Volume.h">
       <Filter>Volume</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VolumeCreator.h">
+    <ClInclude Include="VolumeCreator.h">
       <Filter>Volume</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VolumeDirectory.h">
+    <ClInclude Include="VolumeDirectory.h">
       <Filter>Volume</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VolumeGC.h">
+    <ClInclude Include="VolumeGC.h">
       <Filter>Volume</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VolumeWad.h">
+    <ClInclude Include="VolumeWad.h">
       <Filter>Volume</Filter>
     </ClInclude>
-    <ClInclude Include="Src\VolumeWiiCrypted.h">
+    <ClInclude Include="VolumeWiiCrypted.h">
       <Filter>Volume</Filter>
     </ClInclude>
-    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/DiscIO/FileMonitor.cpp

@@ -12,8 +12,8 @@
 #include "IniFile.h"
 #include "LogManager.h"
 
-#include "../../Core/Src/Core.h"
-#include "../../Core/Src/ConfigManager.h"
+#include "../Core/Core.h"
+#include "../Core/ConfigManager.h"
 #include "FileSystemGCWii.h"
 #include "VolumeCreator.h"