Move types.h to util/types.hpp

Utilities/BEType.h

@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/endian.hpp"
 #include <cstring>
 #include <cmath>

Utilities/BitField.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 
 template<typename T, uint N>
 struct bf_base

Utilities/CPUStats.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Utilities/types.h>
+#include "util/types.hpp"
 
 #ifdef _WIN32
 #include "windows.h"

Utilities/Config.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Config.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 #include "util/yaml.hpp"
 

Utilities/Config.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/StrFmt.h"
 #include "util/logs.hpp"
 #include "util/atomic.hpp"

Utilities/File.h

@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "types.h"
+#include "util/types.hpp"
 #include "bit_set.h"
 
 #include <memory>

Utilities/JIT.cpp

@@ -1,4 +1,4 @@
-#include "types.h"
+#include "util/types.hpp"
 #include "JIT.h"
 #include "StrFmt.h"
 #include "File.h"

Utilities/JIT.h

@@ -167,7 +167,7 @@ inline FT build_function_asm(F&& builder)
 #include <string_view>
 #include <unordered_map>
 
-#include "types.h"
+#include "util/types.hpp"
 #include "mutex.h"
 
 #include "restore_new.h"

Utilities/StrFmt.h

@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "types.h"
+#include "util/types.hpp"
 
 #include <string>
 

Utilities/Thread.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 #include "util/shared_ptr.hpp"
 

Utilities/Timer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 
 #include <chrono>
 

Utilities/address_range.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "StrFmt.h"
 #include <vector>
 

Utilities/bit_set.h

@@ -21,7 +21,7 @@ Examples:
 Intersection (&) and symmetric difference (^) is also available.
 */
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 template <typename T>

Utilities/cfmt.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include <climits>
 #include <string>
 #include <vector>

Utilities/cond.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 // Lightweight condition variable

Utilities/hash.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 namespace rpcs3
 {

Utilities/lockless.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 //! Simple sizeless array base for concurrent access. Cannot shrink, only growths automatically.

Utilities/mutex.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <mutex>
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 // Shared mutex with small size (u32).

Utilities/sema.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <mutex>
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 // Lightweight semaphore helper class

Utilities/sync.h

@@ -2,7 +2,7 @@
 
 /* For internal use. Don't include. */
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 #include "util/dyn_lib.hpp"
 

Utilities/sysinfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include <string>
 
 namespace utils

Utilities/typemap.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "mutex.h"
 #include "util/atomic.hpp"
 #include "util/typeindices.hpp"

Utilities/version.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include <string>
 
 namespace utils

rpcs3/Crypto/key_vault.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 #include <string>
 #include <vector>

rpcs3/Crypto/unself.h

@@ -3,7 +3,7 @@
 #include "key_vault.h"
 #include "zlib.h"
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/File.h"
 #include "util/logs.hpp"
 

rpcs3/Crypto/utils.h

@@ -4,7 +4,7 @@
 // Licensed under the terms of the GNU GPL, version 3
 // http://www.gnu.org/licenses/gpl-3.0.txt
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 
 #include <stdlib.h>
 #include "aes.h"

rpcs3/Emu/Audio/AudioBackend.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum : u32
 {
@@ -101,7 +101,7 @@ public:
 	u32 get_sample_size() const;
 
 	u32 get_channels() const;
-	
+
 	bool get_convert_to_u16() const;
 
 	bool has_capability(u32 cap) const;

rpcs3/Emu/Audio/AudioDumper.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/File.h"
 
 struct WAVHeader

rpcs3/Emu/CPU/CPUTranslator.h

@@ -24,7 +24,7 @@
 #endif
 #include "define_new_memleakdetect.h"
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/StrFmt.h"
 #include "Utilities/BEType.h"
 #include "Utilities/BitField.h"

rpcs3/Emu/Cell/Common.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // Floating-point rounding mode (for both PPU and SPU)
 enum FPSCR_RN

rpcs3/Emu/Cell/ErrorCodes.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // Error code type (return type), implements error reporting.
 class error_code

rpcs3/Emu/Cell/MFC.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum MFC : u8
 {

rpcs3/Emu/Cell/Modules/StaticHLE.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 #include "Emu/Memory/vm_ptr.h"
 #include <vector>
 

rpcs3/Emu/Cell/SPUAnalyser.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // SPU Instruction Type
 struct spu_itype

rpcs3/Emu/Cell/lv2/sys_trace.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // SysCalls
 s32 sys_trace_create();

rpcs3/Emu/GameInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include <string>
 
 struct GameInfo

rpcs3/Emu/IdManager.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/mutex.h"
 
 #include <memory>
@@ -48,7 +48,7 @@ namespace id_manager
 		static constexpr std::pair<u32, u32> invl_range = invl_range_extract_impl<T>::invl_range;
 
 		static_assert(count && step && u64{step} * (count - 1) + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");
-	
+
 		// TODO: Add more conditions
 		static_assert(!invl_range.second || (u64{invl_range.second} + invl_range.first <= 32 /*....*/ ));
 	};
@@ -580,7 +580,7 @@ public:
 		{
 			std::lock_guard lock(id_manager::g_mutex);
 
-			if (const auto found = find_id<T, Get>(id); found && 
+			if (const auto found = find_id<T, Get>(id); found &&
 				(!found->second.owner_before(sptr) && !sptr.owner_before(found->second)))
 			{
 				ptr = std::move(found->second);

rpcs3/Emu/Io/Keyboard.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum
 {
@@ -92,7 +92,7 @@ enum Keys
 	CELL_KEYC_KANA        = 0x88,
 	CELL_KEYC_HENKAN      = 0x8a,
 	CELL_KEYC_MUHENKAN    = 0x8b,
-	
+
 	// Raw keycodes for ASCII keys
 	CELL_KEYC_A                     = 0x04,
 	CELL_KEYC_B                     = 0x05,

rpcs3/Emu/Io/PadHandler.h

@@ -4,7 +4,7 @@
 #include "pad_types.h"
 #include "pad_config.h"
 #include "pad_config_types.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 struct PadDevice
 {

rpcs3/Emu/Io/pad_config_types.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum class pad_handler
 {

rpcs3/Emu/Memory/vm.h

@@ -2,7 +2,7 @@
 
 #include <map>
 #include <memory>
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/StrFmt.h"
 #include "Utilities/BEType.h"
 

rpcs3/Emu/Memory/vm_ptr.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/BEType.h"
 #include "vm.h"
 

rpcs3/Emu/RSX/Capture/rsx_trace.h

@@ -1,8 +1,9 @@
 #pragma once
+
 #include <string>
 #include <array>
 #include <vector>
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Emu/RSX/rsx_methods.h"
 
 namespace rsx

rpcs3/Emu/RSX/Common/ShaderParam.h

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Utilities/StrUtil.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum class FUNCTION
 {

rpcs3/Emu/RSX/Common/TextGlyphs.h

@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 /**
 * FONT GLYPHS GO HERE

rpcs3/Emu/RSX/Common/surface_utils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "Utilities/address_range.h"
 #include "TextureUtils.h"

rpcs3/Emu/RSX/GL/GLExecutionState.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "OpenGL.h"
 

rpcs3/Emu/RSX/Overlays/overlay_animation.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "overlay_utils.h"
 

rpcs3/Emu/RSX/Overlays/overlay_controls.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "Utilities/File.h"
 #include "overlay_utils.h"

rpcs3/Emu/RSX/Overlays/overlay_fonts.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "overlay_utils.h"
 
 #include <vector>

rpcs3/Emu/RSX/Overlays/overlay_utils.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 
 #include <string>

rpcs3/Emu/RSX/RSXFIFO.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Emu/RSX/gcm_enums.h"
 
 struct RsxDmaControl;

rpcs3/Emu/RSX/RSXFragmentProgram.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gcm_enums.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum register_type
 {

rpcs3/Emu/RSX/RSXOffload.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/address_range.h"
 
 #include <vector>

rpcs3/Emu/RSX/RSXVertexProgram.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gcm_enums.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 #include <vector>
 #include <bitset>

rpcs3/Emu/RSX/VK/VulkanAPI.h

@@ -12,4 +12,4 @@
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_sdk_platform.h>
 #include "define_new_memleakdetect.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"

rpcs3/Emu/RSX/gcm_enums.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 
 namespace rsx
 {

rpcs3/Emu/RSX/gcm_printing.h

@@ -1,5 +1,6 @@
 #pragma once
-#include <Utilities/types.h>
+
+#include "util/types.hpp"
 #include <string>
 #include <functional>
 

rpcs3/Emu/RSX/rsx_decode.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/BitField.h"
 #include "Utilities/StrFmt.h"
 #include <tuple>

rpcs3/Emu/RSX/rsx_vertex_data.h

@@ -2,7 +2,7 @@
 
 #include "gcm_enums.h"
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "rsx_utils.h"
 
 namespace rsx

rpcs3/Emu/perf_meter.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "util/logs.hpp"
 #include "Utilities/sysinfo.h"
 #include "system_config.h"

rpcs3/Loader/ELF.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 #include "../../Utilities/File.h"
 #include "../../Utilities/bit_set.h"
 

rpcs3/Loader/PUP.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 #include "../../Utilities/File.h"
 
 #include <vector>
@@ -34,7 +34,7 @@ class pup_object
 {
 	const fs::file& m_file;
 	bool isValid = true;
-	
+
 	std::vector<PUPFileEntry> m_file_tbl;
 	std::vector<PUPHashEntry> m_hash_tbl;
 

rpcs3/display_sleep_control.cpp

@@ -14,7 +14,7 @@ static IOPMAssertionID s_pm_assertion = kIOPMNullAssertionID;
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusMessage>
 #include <QDBusReply>
-#include "Utilities/types.h"
+#include "util/types.hpp"
 static u32 s_dbus_cookie = 0;
 #endif
 

rpcs3/emucore.vcxproj

@@ -548,7 +548,7 @@
     <ClInclude Include="..\Utilities\sysinfo.h" />
     <ClInclude Include="..\Utilities\Thread.h" />
     <ClInclude Include="..\Utilities\Timer.h" />
-    <ClInclude Include="..\Utilities\types.h" />
+    <ClInclude Include="util\types.hpp" />
     <ClInclude Include="..\Utilities\version.h" />
     <ClInclude Include="util\vm.hpp" />
     <ClInclude Include="util\asm.hpp" />

rpcs3/emucore.vcxproj.filters

@@ -1183,7 +1183,7 @@
     <ClInclude Include="Emu\RSX\Common\BufferUtils.h">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\types.h">
+    <ClInclude Include="util\types.hpp">
       <Filter>Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\Utilities\BitField.h">

rpcs3/rpcs3qt/game_list_frame.cpp

@@ -17,7 +17,7 @@
 #include "Emu/Memory/vm.h"
 #include "Emu/System.h"
 #include "Loader/PSF.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/lockless.h"
 #include "util/yaml.hpp"
 #include "Input/pad_thread.h"

rpcs3/rpcs3qt/kernel_explorer.h

@@ -3,7 +3,7 @@
 #include <QDialog>
 #include <QTreeWidget>
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 class kernel_explorer : public QDialog
 {

rpcs3/stdafx.h

@@ -13,7 +13,7 @@
 	#include "define_new_memleakdetect.h"
 #endif
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/BEType.h"
 #include "util/atomic.hpp"
 #include "Utilities/StrFmt.h"

rpcs3/util/asm.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 extern bool g_use_rtm;
 extern u64 g_rtm_tx_limit1;

rpcs3/util/atomic.hpp

@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include <functional>
 #include <mutex>
 

rpcs3/util/endian.hpp

@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 namespace stx
 {

rpcs3/util/vm.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 namespace utils
 {

rpcs3/util/yaml.cpp

@@ -1,5 +1,5 @@
 #include "util/yaml.hpp"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/cheat_info.h"
 #include "Utilities/Config.h"