Changed project structure.

src/Base64.cpp

@@ -1,4 +1,4 @@
-#include "Base64.h"
+#include "ehs/Base64.h"
 
 namespace ehs
 {

src/BaseObj.cpp

@@ -1,4 +1,4 @@
-#include "BaseObj.h"
+#include "ehs/BaseObj.h"
 
 namespace ehs
 {

src/Color3.cpp

@@ -1,5 +1,5 @@
-#include "Color3.h"
-#include "Math.h"
+#include "ehs/Color3.h"
+#include "ehs/Math.h"
 
 namespace ehs
 {

src/Color4.cpp

@@ -1,5 +1,5 @@
-#include "Color4.h"
-#include "Math.h"
+#include "ehs/Color4.h"
+#include "ehs/Math.h"
 
 namespace ehs
 {

src/Data.cpp

@@ -1,4 +1,4 @@
-#include "Data.h"
+#include "ehs/Data.h"
 
 namespace ehs
 {

src/DataType.cpp

@@ -1,4 +1,4 @@
-#include "DataType.h"
+#include "ehs/DataType.h"
 
 namespace ehs
 {

src/EHS.cpp

@@ -1,11 +1,11 @@
-#include "EHS.h"
-#include "Log.h"
-#include "Version.h"
-#include "GarbageCollector.h"
-#include "io/audio/Audio.h"
-#include "io/img/Img.h"
-#include "io/img/PNG.h"
-#include "io/RIFF.h"
+#include "ehs/EHS.h"
+#include "ehs/Log.h"
+#include "ehs/Version.h"
+#include "ehs/GarbageCollector.h"
+#include "ehs/io/audio/Audio.h"
+#include "ehs/io/img/Img.h"
+#include "ehs/io/img/PNG.h"
+#include "ehs/io/RIFF.h"
 
 #include <zlib.h>
 

src/Encryption.cpp

@@ -1,5 +1,5 @@
-#include "Encryption.h"
-#include "PRNG.h"
+#include "ehs/Encryption.h"
+#include "ehs/PRNG.h"
 
 namespace ehs
 {

src/GarbageCollector.cpp

@@ -1,4 +1,4 @@
-#include "GarbageCollector.h"
+#include "ehs/GarbageCollector.h"
 
 namespace ehs
 {

src/HRNG_ARM64.cpp

@@ -1,4 +1,4 @@
-#include "HRNG.h"
+#include "ehs/HRNG.h"
 
 namespace ehs
 {

src/Log.cpp

@@ -1,4 +1,4 @@
-#include "Log.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/Math.cpp

@@ -1,5 +1,5 @@
-#include "Math.h"
-#include "system/Architecture.h"
+#include "ehs/Math.h"
+#include "ehs/system/Architecture.h"
 
 namespace ehs
 {

src/PtrData.cpp

@@ -1,4 +1,4 @@
-#include "PtrData.h"
+#include "ehs/PtrData.h"
 
 namespace ehs
 {

src/Range.cpp

@@ -2,4 +2,4 @@
 // Created by Nelso on 3/29/2022.
 //
 
-#include "Range.h"
+#include "ehs/Range.h"

src/StrToHash.cpp

@@ -1,6 +1,6 @@
-#include "EHS.h"
-#include "Str.h"
-#include "io/Console.h"
+#include "ehs/EHS.h"
+#include "ehs/Str.h"
+#include "ehs/io/Console.h"
 
 ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer)
 {

src/Task.cpp

@@ -1,4 +1,4 @@
-#include "Task.h"
+#include "ehs/Task.h"
 
 namespace ehs
 {

src/Type.cpp

@@ -1,4 +1,4 @@
-#include "Type.h"
+#include "ehs/Type.h"
 
 namespace ehs
 {

src/URI.cpp

@@ -1,4 +1,4 @@
-#include "URI.h"
+#include "ehs/URI.h"
 
 namespace ehs
 {

src/Util.cpp

@@ -1,4 +1,4 @@
-#include "Util.h"
+#include "ehs/Util.h"
 
 namespace ehs
 {

src/Version.cpp

@@ -1,4 +1,4 @@
-#include "Version.h"
+#include "ehs/Version.h"
 
 namespace ehs
 {

src/database/DVar.cpp

@@ -1,4 +1,4 @@
-#include "database/DVar.h"
+#include "ehs/database/DVar.h"
 
 namespace ehs
 {

src/io/BaseFile.cpp

@@ -1,4 +1,4 @@
-#include "io/BaseFile.h"
+#include "ehs/io/BaseFile.h"
 
 namespace ehs
 {

src/io/BaseFileMonitor.cpp

@@ -1,4 +1,4 @@
-#include "io/BaseFileMonitor.h"
+#include "ehs/io/BaseFileMonitor.h"
 
 namespace ehs
 {

src/io/BaseWindow.cpp

@@ -1,4 +1,4 @@
-#include "io/BaseWindow.h"
+#include "ehs/io/BaseWindow.h"
 
 namespace ehs
 {

src/io/COM.cpp

@@ -1,6 +1,6 @@
 #include "io/COM.h"
-#include "Str.h"
-#include "Log.h"
+#include "ehs/Str.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/io/Console.cpp

@@ -1,6 +1,6 @@
-#include "io/Console.h"
-#include "Log.h"
-#include "io/File.h"
+#include "ehs/io/Console.h"
+#include "ehs/Log.h"
+#include "ehs/io/File.h"
 
 #if defined(EHS_OS_LINUX)
     #include <fcntl.h>

src/io/FileMonitor_UNX.cpp

@@ -1,5 +1,5 @@
-#include "io/FileMonitor_UNX.h"
-#include "Log.h"
+#include "ehs/io/FileMonitor_UNX.h"
+#include "ehs/Log.h"
 
 #include <sys/inotify.h>
 #include <cerrno>

src/io/FileMonitor_W32.cpp

@@ -1,6 +1,6 @@
 #include "io/FileMonitor_W32.h"
-#include "Log.h"
-#include "UTF.h"
+#include "ehs/Log.h"
+#include "ehs/UTF.h"
 
 #include <chrono>
 

src/io/File_UNX.cpp

@@ -1,4 +1,4 @@
-#include "io/File_UNX.h"
+#include "ehs/io/File_UNX.h"
 
 #include <cstring>
 #include <sys/stat.h>

src/io/FontAtlas.cpp

@@ -1,6 +1,6 @@
-#include "io/FontAtlas.h"
-#include "io/File.h"
-#include "Serializer.h"
+#include "ehs/io/FontAtlas.h"
+#include "ehs/io/File.h"
+#include "ehs/Serializer.h"
 
 namespace ehs
 {

src/io/Glyph.cpp

@@ -1,4 +1,4 @@
-#include "io/Glyph.h"
+#include "ehs/io/Glyph.h"
 
 namespace ehs
 {

src/io/RIFF.cpp

@@ -1,5 +1,5 @@
-#include "io/RIFF.h"
-#include "io/File.h"
+#include "ehs/io/RIFF.h"
+#include "ehs/io/File.h"
 
 namespace ehs
 {

src/io/RIFF_Chunk.cpp

@@ -1,4 +1,4 @@
-#include "io/RIFF_Chunk.h"
+#include "ehs/io/RIFF_Chunk.h"
 
 namespace ehs
 {

src/io/Window_XCB.cpp

@@ -1,9 +1,9 @@
-#include "io/Window_XCB.h"
-#include "UTF.h"
-#include "Vec2.h"
-#include "io/hid/Keyboard.h"
-#include "io/hid/Mouse.h"
-#include "io/Console.h"
+#include "ehs/io/Window_XCB.h"
+#include "ehs/UTF.h"
+#include "ehs/Vec2.h"
+#include "ehs/io/hid/Keyboard.h"
+#include "ehs/io/hid/Mouse.h"
+#include "ehs/io/Console.h"
 
 #include <cstddef>
 #include <cstdlib>
@@ -12,11 +12,88 @@
 
 namespace ehs
 {
+	Window::~Window()
+	{
+		if (hdl)
+			xcb_destroy_window(server, hdl);
+
+		if (server)
+			xcb_disconnect(server);
+	}
+
     Window::Window()
-        : server(nullptr), screen(nullptr), hdl(0), events{XCB_ATOM_NONE, XCB_ATOM_NONE}, extOpCode(0)
+        : server(nullptr), screen(nullptr), hdl(0), masks{}, extOpCode(0), events{XCB_ATOM_NONE, XCB_ATOM_NONE}
     {
     }
 
+	Window::Window(Window&& win) noexcept
+		: BaseWindow((BaseWindow&&)win), server(win.server), screen(win.screen), hdl(win.hdl),
+		masks{win.masks[0], win.masks[1]}, events((Vector<xcb_generic_event_t*>)win.events), extOpCode(win.extOpCode),
+		clipboard((Serializer<UInt_64>&&)win.clipboard)
+	{
+		win.server = nullptr;
+		win.screen = nullptr;
+		win.hdl = 0;
+		win.masks[0] = 0;
+		win.masks[1] = 0;
+		win.extOpCode = 0;
+	}
+
+	Window::Window(const Window& win)
+		: BaseWindow(win), server(nullptr), screen(nullptr), hdl(0), masks{}, extOpCode(0),
+		events{XCB_ATOM_NONE, XCB_ATOM_NONE}
+	{
+	}
+
+	Window& Window::operator=(Window&& win) noexcept
+	{
+		if (this == &win)
+			return *this;
+
+		Close();
+
+		BaseWindow::operator=((BaseWindow&&)win);
+
+		server = win.server;
+		screen = win.screen;
+		hdl = win.hdl;
+		masks[0] = win.masks[0];
+		masks[1] = win.masks[1];
+		extOpCode = win.extOpCode;
+		events = (Vector<xcb_generic_event_t*>&&)win.events;
+		clipboard = (Serializer<UInt_64>&&)win.clipboard;
+
+		win.server = nullptr;
+		win.screen = nullptr;
+		win.hdl = 0;
+		win.masks[0] = 0;
+		win.masks[1] = 0;
+		win.extOpCode = 0;
+
+		return *this;
+	}
+
+	Window& Window::operator=(const Window& win)
+	{
+		if (this == &win)
+			return *this;
+
+		Close();
+
+		BaseWindow::operator=(win);
+
+		server = nullptr;
+		screen = nullptr;
+		hdl = 0;
+		masks[0] = 0;
+		masks[1] = 0;
+		extOpCode = 0;
+		events = {};
+		clipboard = {};
+
+		return *this;
+	}
+
 	void Window::Create_32(const Str_32 &title, const Vec2_s32 &pos, const Vec2_u32 scale)
 	{
 		Create_8(UTF::To_8(title), pos, scale);

src/io/audio/Audio.cpp

@@ -1,6 +1,6 @@
-#include "io/audio/Audio.h"
-#include "io/File.h"
-#include "io/RIFF.h"
+#include "ehs/io/audio/Audio.h"
+#include "ehs/io/File.h"
+#include "ehs/io/RIFF.h"
 
 namespace ehs
 {

src/io/audio/AudioCodec.cpp

@@ -1,4 +1,4 @@
-#include "io/audio/AudioCodec.h"
+#include "ehs/io/audio/AudioCodec.h"
 
 namespace ehs
 {

src/io/audio/AudioDevice_ALSA.cpp

@@ -1,6 +1,6 @@
-#include "io/audio/AudioDevice_ALSA.h"
-#include "EHS.h"
-#include "Log.h"
+#include "ehs/io/audio/AudioDevice_ALSA.h"
+#include "ehs/EHS.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/io/audio/AudioDevice_W32.cpp

@@ -1,5 +1,5 @@
 #include "io/audio/AudioDevice_W32.h"
-#include "Log.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/io/audio/BaseAudioDevice.cpp

@@ -1,4 +1,4 @@
-#include "io/audio/BaseAudioDevice.h"
+#include "ehs/io/audio/BaseAudioDevice.h"
 
 namespace ehs
 {

src/io/hid/Button.cpp

@@ -1,4 +1,4 @@
-#include "io/hid/Button.h"
+#include "ehs/io/hid/Button.h"
 
 namespace ehs
 {

src/io/hid/ButtonState.cpp

@@ -1,4 +1,4 @@
-#include "io/hid/ButtonState.h"
+#include "ehs/io/hid/ButtonState.h"
 
 namespace ehs
 {

src/io/hid/HID.cpp

@@ -1,4 +1,4 @@
-#include "io/hid/HID.h"
+#include "ehs/io/hid/HID.h"
 
 namespace ehs
 {

src/io/hid/Input.cpp

@@ -1,4 +1,4 @@
-#include "io/hid/Input.h"
+#include "ehs/io/hid/Input.h"
 
 namespace ehs
 {

src/io/hid/InputHandler.cpp

@@ -1,4 +1,4 @@
-#include "io/hid/InputHandler.h"
+#include "ehs/io/hid/InputHandler.h"
 
 namespace ehs
 {

src/io/hid/Keyboard.cpp

@@ -1,4 +1,4 @@
-#include "io/hid/Keyboard.h"
+#include "ehs/io/hid/Keyboard.h"
 
 namespace ehs
 {

src/io/hid/Mouse.cpp

@@ -1,4 +1,4 @@
-#include "io/hid/Mouse.h"
+#include "ehs/io/hid/Mouse.h"
 
 namespace ehs
 {

src/io/img/Img.cpp

@@ -1,4 +1,4 @@
-#include "io/img/Img.h"
+#include "ehs/io/img/Img.h"
 
 namespace ehs
 {

src/io/img/ImgCodec.cpp

@@ -1,5 +1,5 @@
-#include "io/img/ImgCodec.h"
-#include "io/img/Img.h"
+#include "ehs/io/img/ImgCodec.h"
+#include "ehs/io/img/Img.h"
 
 namespace ehs
 {

src/io/img/PNG.cpp

@@ -1,4 +1,4 @@
-#include "io/img/PNG.h"
+#include "ehs/io/img/PNG.h"
 
 namespace ehs
 {

src/io/img/PNG_Chunk.cpp

@@ -1,4 +1,4 @@
-#include "io/img/PNG_Chunk.h"
+#include "ehs/io/img/PNG_Chunk.h"
 
 namespace ehs
 {

src/io/model/AnimBone.cpp

@@ -1,4 +1,4 @@
-#include "io/model/AnimBone.h"
+#include "ehs/io/model/AnimBone.h"
 
 #include <algorithm>
 

src/io/model/Animation.cpp

@@ -1,4 +1,4 @@
-#include "io/model/Animation.h"
+#include "ehs/io/model/Animation.h"
 
 namespace ehs
 {

src/io/model/Bone.cpp

@@ -1,4 +1,4 @@
-#include "io/model/Bone.h"
+#include "ehs/io/model/Bone.h"
 
 namespace ehs
 {

src/io/model/KeyFrame.cpp

@@ -1,4 +1,4 @@
-#include "io/model/KeyFrame.h"
+#include "ehs/io/model/KeyFrame.h"
 
 #include <algorithm>
 

src/io/model/Mesh.cpp

@@ -1,4 +1,4 @@
-#include "io/model/Mesh.h"
+#include "ehs/io/model/Mesh.h"
 
 namespace ehs
 {
@@ -92,7 +92,7 @@ namespace ehs
         vertices = newVertices;
     }
 
-    Array<Vertex_f> Mesh::GetVertices() const
+    const Array<Vertex_f>& Mesh::GetVertices() const
     {
         return vertices;
     }
@@ -112,7 +112,7 @@ namespace ehs
         return indices.Size();
     }
 
-    Array<UInt_32> Mesh::GetIndices() const
+    const Array<UInt_32>& Mesh::GetIndices() const
     {
         return indices;
     }

src/io/model/Model.cpp

@@ -1,4 +1,4 @@
-#include "io/model/Model.h"
+#include "ehs/io/model/Model.h"
 
 namespace ehs
 {

src/io/model/PropertyChange.cpp

@@ -1,4 +1,4 @@
-#include "io/model/PropertyChange.h"
+#include "ehs/io/model/PropertyChange.h"
 
 namespace ehs
 {

src/io/socket/BaseTCP.cpp

@@ -1,5 +1,5 @@
-#include "io/socket/BaseTCP.h"
-#include "Log.h"
+#include "ehs/io/socket/BaseTCP.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/io/socket/BaseUDP.cpp

@@ -1,4 +1,4 @@
-#include "io/socket/BaseUDP.h"
+#include "ehs/io/socket/BaseUDP.h"
 
 namespace ehs
 {

src/io/socket/Comms.cpp

@@ -1,7 +1,7 @@
-#include "io/socket/Comms.h"
-#include "io/socket/CommsSystem.h"
-#include "io/socket/Endpoint.h"
-#include "Encryption.h"
+#include "ehs/io/socket/Comms.h"
+#include "ehs/io/socket/CommsSystem.h"
+#include "ehs/io/socket/Endpoint.h"
+#include "ehs/Encryption.h"
 
 namespace ehs
 {

src/io/socket/CommsSystem.cpp

@@ -1,7 +1,7 @@
-#include "io/socket/CommsSystem.h"
-#include "io/socket/Comms.h"
-#include "io/socket/Endpoint.h"
-#include "io/socket/Operation.h"
+#include "ehs/io/socket/CommsSystem.h"
+#include "ehs/io/socket/Comms.h"
+#include "ehs/io/socket/Endpoint.h"
+#include "ehs/io/socket/Operation.h"
 
 namespace ehs
 {

src/io/socket/DNS.cpp

@@ -1,5 +1,5 @@
-#include "io/socket/DNS.h"
-#include "Log.h"
+#include "ehs/io/socket/DNS.h"
+#include "ehs/Log.h"
 
 #if defined(EHS_OS_WINDOWS)
     #include <WinSock2.h>

src/io/socket/Endpoint.cpp

@@ -1,7 +1,7 @@
-#include "io/socket/Endpoint.h"
-#include "io/socket/Comms.h"
-#include "Encryption.h"
-#include "system/CPU.h"
+#include "ehs/io/socket/Endpoint.h"
+#include "ehs/io/socket/Comms.h"
+#include "ehs/Encryption.h"
+#include "ehs/system/CPU.h"
 
 namespace ehs
 {

src/io/socket/Fragments.cpp

@@ -1,4 +1,4 @@
-#include "io/socket/Fragments.h"
+#include "ehs/io/socket/Fragments.h"
 
 namespace ehs
 {

src/io/socket/Operation.cpp

@@ -1,7 +1,7 @@
-#include "io/socket/Operation.h"
-#include "io/socket/CommsSystem.h"
-#include "io/socket/Comms.h"
-#include "io/socket/Endpoint.h"
+#include "ehs/io/socket/Operation.h"
+#include "ehs/io/socket/CommsSystem.h"
+#include "ehs/io/socket/Comms.h"
+#include "ehs/io/socket/Endpoint.h"
 
 namespace ehs
 {

src/io/socket/Request.cpp

@@ -1,5 +1,5 @@
-#include "io/socket/Request.h"
-#include "Base64.h"
+#include "ehs/io/socket/Request.h"
+#include "ehs/Base64.h"
 
 namespace ehs
 {

src/io/socket/Response.cpp

@@ -1,4 +1,4 @@
-#include "io/socket/Response.h"
+#include "ehs/io/socket/Response.h"
 
 namespace ehs
 {

src/io/socket/SSL.cpp

@@ -1,4 +1,4 @@
-#include "io/socket/SSL.h"
+#include "ehs/io/socket/SSL.h"
 
 #include <openssl/ssl.h>
 #include <openssl/bio.h>

src/io/socket/Socket.cpp

@@ -1,7 +1,7 @@
 #include "io/socket/Socket.h"
 #include "io/socket/Endpoint.h"
 #include "system/System.h"
-#include "Encryption.h"
+#include "ehs/Encryption.h"
 
 #if defined(EHS_OS_WINDOWS)
 	#include <WinSock2.h>

src/io/socket/TCP_BSD.cpp

@@ -1,5 +1,5 @@
-#include "io/socket/TCP_BSD.h"
-#include "io/socket/DNS.h"
+#include "ehs/io/socket/TCP_BSD.h"
+#include "ehs/io/socket/DNS.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>

src/io/socket/UDP_BSD.cpp

@@ -1,5 +1,5 @@
-#include "io/socket/UDP_BSD.h"
-#include "Log.h"
+#include "ehs/io/socket/UDP_BSD.h"
+#include "ehs/Log.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>

src/io/socket/UDP_W32.cpp

@@ -1,5 +1,5 @@
 #include "io/socket/UDP_W32.h"
-#include "Log.h"
+#include "ehs/Log.h"
 
 #include <WinSock2.h>
 #include <WS2tcpip.h>

src/io/socket/rest/Spotify.cpp

@@ -1,7 +1,7 @@
-#include "io/socket/rest/Spotify.h"
-#include "io/socket/DNS.h"
-#include "system/System.h"
-#include "URI.h"
+#include "ehs/io/socket/rest/Spotify.h"
+#include "ehs/io/socket/DNS.h"
+#include "ehs/system/System.h"
+#include "ehs/URI.h"
 
 namespace ehs
 {

src/io/socket/rest/Twitch.cpp

@@ -1,7 +1,7 @@
-#include "io/socket/rest/Twitch.h"
-#include "io/socket/DNS.h"
-#include "system/System.h"
-#include "URI.h"
+#include "ehs/io/socket/rest/Twitch.h"
+#include "ehs/io/socket/DNS.h"
+#include "ehs/system/System.h"
+#include "ehs/URI.h"
 
 namespace ehs
 {

src/io/socket/rest/TwitchChat.cpp

@@ -1,6 +1,6 @@
-#include "io/socket/rest/TwitchChat.h"
-#include "io/socket/DNS.h"
-#include "io/Console.h"
+#include "ehs/io/socket/rest/TwitchChat.h"
+#include "ehs/io/socket/DNS.h"
+#include "ehs/io/Console.h"
 
 namespace ehs
 {

src/json/Json.cpp

@@ -1,5 +1,5 @@
-#include "json/Json.h"
-#include "Log.h"
+#include "ehs/json/Json.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/json/JsonArray.cpp

@@ -1,8 +1,8 @@
-#include "json/JsonArray.h"
-#include "json/JsonObj.h"
-#include "json/JsonBool.h"
-#include "json/JsonNum.h"
-#include "json/JsonStr.h"
+#include "ehs/json/JsonArray.h"
+#include "ehs/json/JsonObj.h"
+#include "ehs/json/JsonBool.h"
+#include "ehs/json/JsonNum.h"
+#include "ehs/json/JsonStr.h"
 
 namespace ehs
 {

src/json/JsonBase.cpp

@@ -1,4 +1,4 @@
-#include "json/JsonBase.h"
+#include "ehs/json/JsonBase.h"
 
 namespace ehs
 {

src/json/JsonBool.cpp

@@ -1,4 +1,4 @@
-#include "json/JsonBool.h"
+#include "ehs/json/JsonBool.h"
 
 namespace ehs
 {

src/json/JsonNum.cpp

@@ -1,4 +1,4 @@
-#include "json/JsonNum.h"
+#include "ehs/json/JsonNum.h"
 
 namespace ehs
 {

src/json/JsonObj.cpp

@@ -1,5 +1,5 @@
-#include "json/JsonObj.h"
-#include "json/JsonVar.h"
+#include "ehs/json/JsonObj.h"
+#include "ehs/json/JsonVar.h"
 
 namespace ehs
 {

src/json/JsonStr.cpp

@@ -1,4 +1,4 @@
-#include "json/JsonStr.h"
+#include "ehs/json/JsonStr.h"
 
 namespace ehs
 {

src/json/JsonVar.cpp

@@ -1,10 +1,10 @@
-#include "json/JsonVar.h"
-#include "json/JsonBase.h"
-#include "json/JsonObj.h"
-#include "json/JsonArray.h"
-#include "json/JsonBool.h"
-#include "json/JsonNum.h"
-#include "json/JsonStr.h"
+#include "ehs/json/JsonVar.h"
+#include "ehs/json/JsonBase.h"
+#include "ehs/json/JsonObj.h"
+#include "ehs/json/JsonArray.h"
+#include "ehs/json/JsonBool.h"
+#include "ehs/json/JsonNum.h"
+#include "ehs/json/JsonStr.h"
 
 namespace ehs
 {

src/system/BaseMutex.cpp

@@ -1,4 +1,4 @@
-#include "system/BaseMutex.h"
+#include "ehs/system/BaseMutex.h"
 
 namespace ehs
 {

src/system/BaseOpen.cpp

@@ -1,4 +1,4 @@
-#include "system/BaseOpen.h"
+#include "ehs/system/BaseOpen.h"
 
 namespace ehs
 {

src/system/BaseSemaphore.cpp

@@ -1,4 +1,4 @@
-#include "system/BaseSemaphore.h"
+#include "ehs/system/BaseSemaphore.h"
 
 namespace ehs
 {

src/system/BaseSystem.cpp

@@ -1,4 +1,4 @@
-#include "system/BaseSystem.h"
+#include "ehs/system/BaseSystem.h"
 
 namespace ehs
 {

src/system/CPU.cpp

@@ -1,8 +1,8 @@
-#include "system/CPU.h"
-#include "Log.h"
-#include "io/File.h"
-#include "json/Json.h"
-#include "system/Thread.h"
+#include "ehs/system/CPU.h"
+#include "ehs/Log.h"
+#include "ehs/io/File.h"
+#include "ehs/json/Json.h"
+#include "ehs/system/Thread.h"
 
 namespace ehs
 {

src/system/FileSystem.cpp

@@ -1,5 +1,5 @@
-#include "system/FileSystem.h"
-#include "Log.h"
+#include "ehs/system/FileSystem.h"
+#include "ehs/Log.h"
 
 #include <unistd.h>
 #include <cstring>

src/system/Mutex_PT.cpp

@@ -1,4 +1,4 @@
-#include "system/Mutex_PT.h"
+#include "ehs/system/Mutex_PT.h"
 
 namespace ehs
 {

src/system/Mutex_W32.cpp

@@ -1,6 +1,6 @@
 #include "system/Mutex_W32.h"
-#include "Str.h"
-#include "Log.h"
+#include "ehs/Str.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/system/Open_UNX.cpp

@@ -1,5 +1,5 @@
-#include "system/Open_UNX.h"
-#include "Log.h"
+#include "ehs/system/Open_UNX.h"
+#include "ehs/Log.h"
 
 #include <dlfcn.h>
 

src/system/Semaphore_P.cpp

@@ -1,5 +1,5 @@
-#include "system/Semaphore_P.h"
-#include "Log.h"
+#include "ehs/system/Semaphore_P.h"
+#include "ehs/Log.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>

src/system/Semaphore_W32.cpp

@@ -1,6 +1,6 @@
 #include "system/Semaphore_W32.h"
-#include "UTF.h"
-#include "Log.h"
+#include "ehs/UTF.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/system/System_LNX.cpp

@@ -1,6 +1,6 @@
-#include "system/System_LNX.h"
-#include "system/Thread.h"
-#include "Log.h"
+#include "ehs/system/System_LNX.h"
+#include "ehs/system/Thread.h"
+#include "ehs/Log.h"
 
 namespace ehs
 {

src/system/Thread.cpp

@@ -1,5 +1,5 @@
-#include "system/Thread.h"
-#include "system/CPU.h"
+#include "ehs/system/Thread.h"
+#include "ehs/system/CPU.h"
 
 #if defined(EHS_OS_WINDOWS)
 	#include <avrt.h>

src/system/User.cpp

@@ -1,5 +1,5 @@
-#include "system/User.h"
-#include "Log.h"
+#include "ehs/system/User.h"
+#include "ehs/Log.h"
 
 #include <unistd.h>
 #include <cstring>