Merge pull request #5 from lioncash/include

General: Avoid indirect includes

include/kabufuda/AsyncIO.hpp

@@ -8,9 +8,11 @@ using SizeReturn = ssize_t;
 using SizeReturn = DWORD;
 #endif
 
-#include "Util.hpp"
+#include <cstddef>
 #include <vector>
 
+#include "kabufuda/Util.hpp"
+
 namespace kabufuda {
 
 class AsyncIO {

include/kabufuda/BlockAllocationTable.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "Constants.hpp"
+#include <cstdint>
+#include "kabufuda/Constants.hpp"
 
 namespace kabufuda {
 class BlockAllocationTable {

include/kabufuda/Card.hpp

@@ -1,14 +1,13 @@
 #pragma once
 
-#include "BlockAllocationTable.hpp"
+#include <cstdint>
-#include "Directory.hpp"
-#include "File.hpp"
-#include "Util.hpp"
-#include "AsyncIO.hpp"
-
 #include <string>
-#include <vector>
+
-#include <memory>
+#include "kabufuda/AsyncIO.hpp"
+#include "kabufuda/BlockAllocationTable.hpp"
+#include "kabufuda/Directory.hpp"
+#include "kabufuda/File.hpp"
+#include "kabufuda/Util.hpp"
 
 #define CARD_FILENAME_MAX 32
 #define CARD_ICON_MAX 8

include/kabufuda/Constants.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
-#include "Util.hpp"
+#include "kabufuda/Util.hpp"
 
 namespace kabufuda {
-uint32_t constexpr BlockSize = 0x2000;
+constexpr uint32_t BlockSize = 0x2000;
-uint32_t constexpr MaxFiles = 127;
+constexpr uint32_t MaxFiles = 127;
-uint32_t constexpr FSTBlocks = 5;
+constexpr uint32_t FSTBlocks = 5;
-uint32_t constexpr MbitToBlocks = 0x10;
+constexpr uint32_t MbitToBlocks = 0x10;
-uint32_t constexpr BATSize = 0xFFB;
+constexpr uint32_t BATSize = 0xFFB;
 
 /**
  * @brief The EPermissions enum

include/kabufuda/Directory.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "File.hpp"
+#include <cstdint>
+#include "kabufuda/File.hpp"
 
 namespace kabufuda {
 class Directory {

include/kabufuda/File.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "Constants.hpp"
+#include <cstdint>
+#include "kabufuda/Constants.hpp"
 
 namespace kabufuda {
 class File {

include/kabufuda/SRAM.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 // Modified code taken from libogc
 

include/kabufuda/Util.hpp

@@ -1,15 +1,16 @@
 #pragma once
 
 #ifndef _WIN32
+#include <cerrno>
 #include <cstdlib>
-#include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/statvfs.h>
-#include <cerrno>
 #else
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
@@ -25,13 +26,12 @@
 #endif
 #endif
 
-#include <cstdarg>
-#include <cstdint>
-#include <cstdio>
 #include <algorithm>
+#include <cstdint>
 #include <string>
-#include <cstring>
+#include <type_traits>
-#include "WideStringConvert.hpp"
+
+#include "kabufuda/WideStringConvert.hpp"
 
 #undef bswap16
 #undef bswap32

lib/kabufuda/AsyncIOPosix.cpp

@@ -1,5 +1,9 @@
 #include "kabufuda/AsyncIO.hpp"
 
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
+
 namespace kabufuda {
 
 AsyncIO::AsyncIO(SystemStringView filename, bool truncate) {

lib/kabufuda/AsyncIOWin32.cpp

@@ -1,5 +1,8 @@
 #include "kabufuda/AsyncIO.hpp"
 
+#include <algorithm>
+#include <cstdio>
+
 namespace kabufuda {
 
 #undef min

lib/kabufuda/BlockAllocationTable.cpp

@@ -1,7 +1,12 @@
 #include "kabufuda/BlockAllocationTable.hpp"
-#include "kabufuda/Util.hpp"
+
+#include <algorithm>
+#include <cstddef>
+#include <cstring>
 #include <vector>
 
+#include "kabufuda/Util.hpp"
+
 namespace kabufuda {
 void BlockAllocationTable::swapEndian() {
   m_checksum = SBig(m_checksum);

lib/kabufuda/Card.cpp

@@ -1,10 +1,12 @@
 #include "kabufuda/Card.hpp"
-#include "kabufuda/SRAM.hpp"
+
+#include <algorithm>
 #include <cstdio>
 #include <cstring>
-#include <algorithm>
 #include <memory>
 
+#include "kabufuda/SRAM.hpp"
+
 namespace kabufuda {
 
 #define ROUND_UP_8192(val) (((val) + 8191) & ~8191)

lib/kabufuda/Directory.cpp

@@ -1,7 +1,10 @@
 #include "kabufuda/Directory.hpp"
-#include "kabufuda/Util.hpp"
+
+#include <algorithm>
 #include <cstring>
 
+#include "kabufuda/Util.hpp"
+
 namespace kabufuda {
 void Directory::swapEndian() {
   std::for_each(std::begin(m_files), std::end(m_files), [](File& f) { f.swapEndian(); });

lib/kabufuda/File.cpp

@@ -1,4 +1,7 @@
 #include "kabufuda/File.hpp"
+
+#include <cstring>
+
 #include "kabufuda/Util.hpp"
 
 namespace kabufuda {

lib/kabufuda/WideStringConvert.cpp

@@ -1,5 +1,8 @@
 #include "kabufuda/WideStringConvert.hpp"
-#include "utf8proc.h"
+
+#include <cstdio>
+
+#include <utf8proc.h>
 
 namespace kabufuda {
 std::string WideToUTF8(std::wstring_view src) {