From 8bef59f7939ad3613ded433b145f1b51cf8d83b8 Mon Sep 17 00:00:00 2001 From: Eugene Lykov Date: Mon, 29 Dec 2025 13:39:40 +0000 Subject: [PATCH] Smallcase folders part 1 --- src/CMakeLists.txt | 14 +++++++------- src/Display/CMakeLists.txt | 4 ---- src/Display/UI/CMakeLists.txt | 7 ------- src/{Config => config}/CMakeLists.txt | 6 +++--- .../Client => config/client}/CMakeLists.txt | 0 .../Client => config/client}/CollectorConfig.h | 2 +- src/{Config/Client => config/client}/Config.cpp | 10 +++++++--- src/{Config/Client => config/client}/Config.h | 6 +++--- .../Client => config/client}/NetworkConfig.h | 0 .../Common => config/common}/CMakeLists.txt | 0 src/{Config/Common => config/common}/IniParser.cpp | 2 +- src/{Config/Common => config/common}/IniParser.h | 1 + .../Server => config/server}/BarStyleConfig.h | 2 +- .../Server => config/server}/CMakeLists.txt | 0 src/{Config/Server => config/server}/Config.cpp | 0 src/{Config/Server => config/server}/Config.h | 0 .../Server => config/server}/DisplayConfig.h | 0 .../Server => config/server}/NetworkConfig.h | 0 .../Server => config/server}/TextStyleConfig.h | 0 src/display/CMakeLists.txt | 4 ++++ .../Graphics => display/graphics}/CMakeLists.txt | 0 src/{Display/Graphics => display/graphics}/Color.h | 0 .../Graphics => display/graphics}/Framebuffer.cpp | 0 .../Graphics => display/graphics}/Framebuffer.h | 0 .../graphics}/FramebufferRotation.h | 0 .../Graphics => display/graphics}/Renderer.cpp | 0 .../Graphics => display/graphics}/Renderer.h | 0 src/display/ui/CMakeLists.txt | 7 +++++++ src/{Display/UI/Bar => display/ui/bar}/Bar.cpp | 0 src/{Display/UI/Bar => display/ui/bar}/Bar.h | 0 .../UI/Bar => display/ui/bar}/CMakeLists.txt | 0 .../UI/Bar => display/ui/bar}/Orientation.h | 0 src/{Display/UI/Bar => display/ui/bar}/Style.h | 0 .../UI/Header => display/ui/header}/CMakeLists.txt | 0 .../UI/Header => display/ui/header}/Header.cpp | 0 .../UI/Header => display/ui/header}/Header.h | 0 .../ui/hostblock}/CMakeLists.txt | 0 .../ui/hostblock}/HostBlock.cpp | 0 .../HostBlock => display/ui/hostblock}/HostBlock.h | 0 .../UI/Text => display/ui/text}/CMakeLists.txt | 0 src/{Display/UI/Text => display/ui/text}/Font.h | 0 src/{Display/UI/Text => display/ui/text}/Fonts.cpp | 0 src/{Display/UI/Text => display/ui/text}/Fonts.h | 0 src/{Display/UI/Text => display/ui/text}/Glyph.h | 0 .../UI/Text => display/ui/text}/GlyphKey.h | 0 .../UI/Text => display/ui/text}/Helpers.cpp | 0 src/{Display/UI/Text => display/ui/text}/Helpers.h | 0 .../UI/Text => display/ui/text}/Renderer.cpp | 0 .../UI/Text => display/ui/text}/Renderer.h | 0 .../UI/Text => display/ui/text}/UTFDecoder.h | 0 .../UI/Theme => display/ui/theme}/CMakeLists.txt | 0 src/{Display/UI/Theme => display/ui/theme}/Theme.h | 0 src/{Helpers => helpers}/CMakeLists.txt | 0 src/{Helpers => helpers}/Paths.cpp | 0 src/{Helpers => helpers}/Paths.h | 0 src/{Helpers => helpers}/Version.h.in | 0 src/{Main => main}/CMakeLists.txt | 4 ++-- src/{Main/Client => main/client}/CMakeLists.txt | 0 src/{Main/Client => main/client}/main.cpp | 0 src/{Main/Server => main/server}/CMakeLists.txt | 0 src/{Main/Server => main/server}/main.cpp | 0 src/{Metrics => metrics}/CMakeLists.txt | 0 src/{Metrics => metrics}/Collector.cpp | 0 src/{Metrics => metrics}/Collector.h | 0 src/{Metrics => metrics}/Cpu.h | 0 src/{Metrics => metrics}/Disk.h | 0 src/{Metrics => metrics}/Host.cpp | 0 src/{Metrics => metrics}/Host.h | 0 src/{Metrics => metrics}/Memory.h | 0 src/{Model => model}/CMakeLists.txt | 0 src/{Model => model}/HostRegistry.cpp | 0 src/{Model => model}/HostRegistry.h | 0 src/{Network => network}/CMakeLists.txt | 6 +++--- src/{Network/Client => network/client}/Agent.cpp | 0 src/{Network/Client => network/client}/Agent.h | 0 .../Client => network/client}/CMakeLists.txt | 0 src/{Network/Client => network/client}/Client.cpp | 0 src/{Network/Client => network/client}/Client.h | 0 src/{Network/Common => network/common}/Buffer.cpp | 0 src/{Network/Common => network/common}/Buffer.h | 0 .../Common => network/common}/CMakeLists.txt | 0 .../Server => network/server}/CMakeLists.txt | 0 src/{Network/Server => network/server}/Server.cpp | 0 src/{Network/Server => network/server}/Server.h | 0 84 files changed, 40 insertions(+), 35 deletions(-) delete mode 100644 src/Display/CMakeLists.txt delete mode 100644 src/Display/UI/CMakeLists.txt rename src/{Config => config}/CMakeLists.txt (52%) rename src/{Config/Client => config/client}/CMakeLists.txt (100%) rename src/{Config/Client => config/client}/CollectorConfig.h (68%) rename src/{Config/Client => config/client}/Config.cpp (58%) rename src/{Config/Client => config/client}/Config.h (67%) rename src/{Config/Client => config/client}/NetworkConfig.h (100%) rename src/{Config/Common => config/common}/CMakeLists.txt (100%) rename src/{Config/Common => config/common}/IniParser.cpp (98%) rename src/{Config/Common => config/common}/IniParser.h (99%) rename src/{Config/Server => config/server}/BarStyleConfig.h (84%) rename src/{Config/Server => config/server}/CMakeLists.txt (100%) rename src/{Config/Server => config/server}/Config.cpp (100%) rename src/{Config/Server => config/server}/Config.h (100%) rename src/{Config/Server => config/server}/DisplayConfig.h (100%) rename src/{Config/Server => config/server}/NetworkConfig.h (100%) rename src/{Config/Server => config/server}/TextStyleConfig.h (100%) create mode 100644 src/display/CMakeLists.txt rename src/{Display/Graphics => display/graphics}/CMakeLists.txt (100%) rename src/{Display/Graphics => display/graphics}/Color.h (100%) rename src/{Display/Graphics => display/graphics}/Framebuffer.cpp (100%) rename src/{Display/Graphics => display/graphics}/Framebuffer.h (100%) rename src/{Display/Graphics => display/graphics}/FramebufferRotation.h (100%) rename src/{Display/Graphics => display/graphics}/Renderer.cpp (100%) rename src/{Display/Graphics => display/graphics}/Renderer.h (100%) create mode 100644 src/display/ui/CMakeLists.txt rename src/{Display/UI/Bar => display/ui/bar}/Bar.cpp (100%) rename src/{Display/UI/Bar => display/ui/bar}/Bar.h (100%) rename src/{Display/UI/Bar => display/ui/bar}/CMakeLists.txt (100%) rename src/{Display/UI/Bar => display/ui/bar}/Orientation.h (100%) rename src/{Display/UI/Bar => display/ui/bar}/Style.h (100%) rename src/{Display/UI/Header => display/ui/header}/CMakeLists.txt (100%) rename src/{Display/UI/Header => display/ui/header}/Header.cpp (100%) rename src/{Display/UI/Header => display/ui/header}/Header.h (100%) rename src/{Display/UI/HostBlock => display/ui/hostblock}/CMakeLists.txt (100%) rename src/{Display/UI/HostBlock => display/ui/hostblock}/HostBlock.cpp (100%) rename src/{Display/UI/HostBlock => display/ui/hostblock}/HostBlock.h (100%) rename src/{Display/UI/Text => display/ui/text}/CMakeLists.txt (100%) rename src/{Display/UI/Text => display/ui/text}/Font.h (100%) rename src/{Display/UI/Text => display/ui/text}/Fonts.cpp (100%) rename src/{Display/UI/Text => display/ui/text}/Fonts.h (100%) rename src/{Display/UI/Text => display/ui/text}/Glyph.h (100%) rename src/{Display/UI/Text => display/ui/text}/GlyphKey.h (100%) rename src/{Display/UI/Text => display/ui/text}/Helpers.cpp (100%) rename src/{Display/UI/Text => display/ui/text}/Helpers.h (100%) rename src/{Display/UI/Text => display/ui/text}/Renderer.cpp (100%) rename src/{Display/UI/Text => display/ui/text}/Renderer.h (100%) rename src/{Display/UI/Text => display/ui/text}/UTFDecoder.h (100%) rename src/{Display/UI/Theme => display/ui/theme}/CMakeLists.txt (100%) rename src/{Display/UI/Theme => display/ui/theme}/Theme.h (100%) rename src/{Helpers => helpers}/CMakeLists.txt (100%) rename src/{Helpers => helpers}/Paths.cpp (100%) rename src/{Helpers => helpers}/Paths.h (100%) rename src/{Helpers => helpers}/Version.h.in (100%) rename src/{Main => main}/CMakeLists.txt (60%) rename src/{Main/Client => main/client}/CMakeLists.txt (100%) rename src/{Main/Client => main/client}/main.cpp (100%) rename src/{Main/Server => main/server}/CMakeLists.txt (100%) rename src/{Main/Server => main/server}/main.cpp (100%) rename src/{Metrics => metrics}/CMakeLists.txt (100%) rename src/{Metrics => metrics}/Collector.cpp (100%) rename src/{Metrics => metrics}/Collector.h (100%) rename src/{Metrics => metrics}/Cpu.h (100%) rename src/{Metrics => metrics}/Disk.h (100%) rename src/{Metrics => metrics}/Host.cpp (100%) rename src/{Metrics => metrics}/Host.h (100%) rename src/{Metrics => metrics}/Memory.h (100%) rename src/{Model => model}/CMakeLists.txt (100%) rename src/{Model => model}/HostRegistry.cpp (100%) rename src/{Model => model}/HostRegistry.h (100%) rename src/{Network => network}/CMakeLists.txt (52%) rename src/{Network/Client => network/client}/Agent.cpp (100%) rename src/{Network/Client => network/client}/Agent.h (100%) rename src/{Network/Client => network/client}/CMakeLists.txt (100%) rename src/{Network/Client => network/client}/Client.cpp (100%) rename src/{Network/Client => network/client}/Client.h (100%) rename src/{Network/Common => network/common}/Buffer.cpp (100%) rename src/{Network/Common => network/common}/Buffer.h (100%) rename src/{Network/Common => network/common}/CMakeLists.txt (100%) rename src/{Network/Server => network/server}/CMakeLists.txt (100%) rename src/{Network/Server => network/server}/Server.cpp (100%) rename src/{Network/Server => network/server}/Server.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c3eb77f..693d583 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,13 +2,13 @@ if (BUILD_SERVER OR BUILD_CLIENT) if (BUILD_SERVER) - add_subdirectory(Display) - add_subdirectory(Model) + add_subdirectory(display) + add_subdirectory(model) endif() - add_subdirectory(Helpers) - add_subdirectory(Config) - add_subdirectory(Metrics) - add_subdirectory(Network) + add_subdirectory(helpers) + add_subdirectory(config) + add_subdirectory(metrics) + add_subdirectory(network) - add_subdirectory(Main) + add_subdirectory(main) endif() diff --git a/src/Display/CMakeLists.txt b/src/Display/CMakeLists.txt deleted file mode 100644 index f048661..0000000 --- a/src/Display/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -message(STATUS "·Configuring Display") - -add_subdirectory(Graphics) -add_subdirectory(UI) diff --git a/src/Display/UI/CMakeLists.txt b/src/Display/UI/CMakeLists.txt deleted file mode 100644 index bb379ad..0000000 --- a/src/Display/UI/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -message(STATUS "··Configuring UI") - -add_subdirectory(Bar) -add_subdirectory(Text) -add_subdirectory(Header) -add_subdirectory(HostBlock) -add_subdirectory(Theme) \ No newline at end of file diff --git a/src/Config/CMakeLists.txt b/src/config/CMakeLists.txt similarity index 52% rename from src/Config/CMakeLists.txt rename to src/config/CMakeLists.txt index de60e6f..d9929b7 100644 --- a/src/Config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -1,9 +1,9 @@ message(STATUS "·Configuring Config") -add_subdirectory(Common) +add_subdirectory(common) if (BUILD_SERVER) - add_subdirectory(Server) + add_subdirectory(server) endif() if (BUILD_CLIENT) - add_subdirectory(Client) + add_subdirectory(client) endif() \ No newline at end of file diff --git a/src/Config/Client/CMakeLists.txt b/src/config/client/CMakeLists.txt similarity index 100% rename from src/Config/Client/CMakeLists.txt rename to src/config/client/CMakeLists.txt diff --git a/src/Config/Client/CollectorConfig.h b/src/config/client/CollectorConfig.h similarity index 68% rename from src/Config/Client/CollectorConfig.h rename to src/config/client/CollectorConfig.h index b7194f2..a58df13 100644 --- a/src/Config/Client/CollectorConfig.h +++ b/src/config/client/CollectorConfig.h @@ -7,6 +7,6 @@ namespace config::client { struct CollectorConfig { - std::vector disks{{"/"}}; + std::vector> disks{{{"R", "/"}}}; }; } // namespace config::client diff --git a/src/Config/Client/Config.cpp b/src/config/client/Config.cpp similarity index 58% rename from src/Config/Client/Config.cpp rename to src/config/client/Config.cpp index daf8465..cd2ea06 100644 --- a/src/Config/Client/Config.cpp +++ b/src/config/client/Config.cpp @@ -1,5 +1,5 @@ -#include "Config/Client/Config.h" -#include "Config/Common/IniParser.h" +#include "config/client/Config.h" +#include "config/common/IniParser.h" #include namespace config::client @@ -13,7 +13,11 @@ namespace config::client cfg.network.serverHost = ini.get("network", "server_host", "127.0.0.1"); cfg.network.serverPort = std::stoi(ini.get("network", "server_port", "5005")); cfg.network.intervalMs = std::chrono::milliseconds(std::stoi(ini.get("network", "interval_ms", "1000"))); - cfg.collector.disks = config::splitList(ini.get("collector", "disks", "/")); + + const std::string disks_line = ini.get("collector", "disks", "R:/"); + const std::vector disks_vec = config::splitList(disks_line, ','); + for (const std::string &disk : disks_vec) + cfg.collector.disks.push_back(config::splitList(disk, ':')); return cfg; } diff --git a/src/Config/Client/Config.h b/src/config/client/Config.h similarity index 67% rename from src/Config/Client/Config.h rename to src/config/client/Config.h index 6de4837..c97b77c 100644 --- a/src/Config/Client/Config.h +++ b/src/config/client/Config.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Display/Graphics/Color.h" -#include "Config/Client/NetworkConfig.h" -#include "Config/Client/CollectorConfig.h" +#include "display/graphics/Color.h" +#include "config/client/NetworkConfig.h" +#include "config/client/CollectorConfig.h" namespace config::client { diff --git a/src/Config/Client/NetworkConfig.h b/src/config/client/NetworkConfig.h similarity index 100% rename from src/Config/Client/NetworkConfig.h rename to src/config/client/NetworkConfig.h diff --git a/src/Config/Common/CMakeLists.txt b/src/config/common/CMakeLists.txt similarity index 100% rename from src/Config/Common/CMakeLists.txt rename to src/config/common/CMakeLists.txt diff --git a/src/Config/Common/IniParser.cpp b/src/config/common/IniParser.cpp similarity index 98% rename from src/Config/Common/IniParser.cpp rename to src/config/common/IniParser.cpp index d78f545..6993570 100644 --- a/src/Config/Common/IniParser.cpp +++ b/src/config/common/IniParser.cpp @@ -1,4 +1,4 @@ -#include "Config/Common/IniParser.h" +#include "config/common/IniParser.h" #include #include #include diff --git a/src/Config/Common/IniParser.h b/src/config/common/IniParser.h similarity index 99% rename from src/Config/Common/IniParser.h rename to src/config/common/IniParser.h index 8c25f8a..cb0bb49 100644 --- a/src/Config/Common/IniParser.h +++ b/src/config/common/IniParser.h @@ -1,6 +1,7 @@ #pragma once #include #include + #include namespace config diff --git a/src/Config/Server/BarStyleConfig.h b/src/config/server/BarStyleConfig.h similarity index 84% rename from src/Config/Server/BarStyleConfig.h rename to src/config/server/BarStyleConfig.h index aaf5d0d..1f8a332 100644 --- a/src/Config/Server/BarStyleConfig.h +++ b/src/config/server/BarStyleConfig.h @@ -1,6 +1,6 @@ #pragma once -#include "Display/Graphics/Color.h" +#include "display/graphics/Color.h" namespace config::server { diff --git a/src/Config/Server/CMakeLists.txt b/src/config/server/CMakeLists.txt similarity index 100% rename from src/Config/Server/CMakeLists.txt rename to src/config/server/CMakeLists.txt diff --git a/src/Config/Server/Config.cpp b/src/config/server/Config.cpp similarity index 100% rename from src/Config/Server/Config.cpp rename to src/config/server/Config.cpp diff --git a/src/Config/Server/Config.h b/src/config/server/Config.h similarity index 100% rename from src/Config/Server/Config.h rename to src/config/server/Config.h diff --git a/src/Config/Server/DisplayConfig.h b/src/config/server/DisplayConfig.h similarity index 100% rename from src/Config/Server/DisplayConfig.h rename to src/config/server/DisplayConfig.h diff --git a/src/Config/Server/NetworkConfig.h b/src/config/server/NetworkConfig.h similarity index 100% rename from src/Config/Server/NetworkConfig.h rename to src/config/server/NetworkConfig.h diff --git a/src/Config/Server/TextStyleConfig.h b/src/config/server/TextStyleConfig.h similarity index 100% rename from src/Config/Server/TextStyleConfig.h rename to src/config/server/TextStyleConfig.h diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt new file mode 100644 index 0000000..a5328d9 --- /dev/null +++ b/src/display/CMakeLists.txt @@ -0,0 +1,4 @@ +message(STATUS "·Configuring Display") + +add_subdirectory(graphics) +add_subdirectory(ui) diff --git a/src/Display/Graphics/CMakeLists.txt b/src/display/graphics/CMakeLists.txt similarity index 100% rename from src/Display/Graphics/CMakeLists.txt rename to src/display/graphics/CMakeLists.txt diff --git a/src/Display/Graphics/Color.h b/src/display/graphics/Color.h similarity index 100% rename from src/Display/Graphics/Color.h rename to src/display/graphics/Color.h diff --git a/src/Display/Graphics/Framebuffer.cpp b/src/display/graphics/Framebuffer.cpp similarity index 100% rename from src/Display/Graphics/Framebuffer.cpp rename to src/display/graphics/Framebuffer.cpp diff --git a/src/Display/Graphics/Framebuffer.h b/src/display/graphics/Framebuffer.h similarity index 100% rename from src/Display/Graphics/Framebuffer.h rename to src/display/graphics/Framebuffer.h diff --git a/src/Display/Graphics/FramebufferRotation.h b/src/display/graphics/FramebufferRotation.h similarity index 100% rename from src/Display/Graphics/FramebufferRotation.h rename to src/display/graphics/FramebufferRotation.h diff --git a/src/Display/Graphics/Renderer.cpp b/src/display/graphics/Renderer.cpp similarity index 100% rename from src/Display/Graphics/Renderer.cpp rename to src/display/graphics/Renderer.cpp diff --git a/src/Display/Graphics/Renderer.h b/src/display/graphics/Renderer.h similarity index 100% rename from src/Display/Graphics/Renderer.h rename to src/display/graphics/Renderer.h diff --git a/src/display/ui/CMakeLists.txt b/src/display/ui/CMakeLists.txt new file mode 100644 index 0000000..69d5085 --- /dev/null +++ b/src/display/ui/CMakeLists.txt @@ -0,0 +1,7 @@ +message(STATUS "··Configuring UI") + +add_subdirectory(bar) +add_subdirectory(text) +add_subdirectory(header) +add_subdirectory(hostblock) +add_subdirectory(theme) \ No newline at end of file diff --git a/src/Display/UI/Bar/Bar.cpp b/src/display/ui/bar/Bar.cpp similarity index 100% rename from src/Display/UI/Bar/Bar.cpp rename to src/display/ui/bar/Bar.cpp diff --git a/src/Display/UI/Bar/Bar.h b/src/display/ui/bar/Bar.h similarity index 100% rename from src/Display/UI/Bar/Bar.h rename to src/display/ui/bar/Bar.h diff --git a/src/Display/UI/Bar/CMakeLists.txt b/src/display/ui/bar/CMakeLists.txt similarity index 100% rename from src/Display/UI/Bar/CMakeLists.txt rename to src/display/ui/bar/CMakeLists.txt diff --git a/src/Display/UI/Bar/Orientation.h b/src/display/ui/bar/Orientation.h similarity index 100% rename from src/Display/UI/Bar/Orientation.h rename to src/display/ui/bar/Orientation.h diff --git a/src/Display/UI/Bar/Style.h b/src/display/ui/bar/Style.h similarity index 100% rename from src/Display/UI/Bar/Style.h rename to src/display/ui/bar/Style.h diff --git a/src/Display/UI/Header/CMakeLists.txt b/src/display/ui/header/CMakeLists.txt similarity index 100% rename from src/Display/UI/Header/CMakeLists.txt rename to src/display/ui/header/CMakeLists.txt diff --git a/src/Display/UI/Header/Header.cpp b/src/display/ui/header/Header.cpp similarity index 100% rename from src/Display/UI/Header/Header.cpp rename to src/display/ui/header/Header.cpp diff --git a/src/Display/UI/Header/Header.h b/src/display/ui/header/Header.h similarity index 100% rename from src/Display/UI/Header/Header.h rename to src/display/ui/header/Header.h diff --git a/src/Display/UI/HostBlock/CMakeLists.txt b/src/display/ui/hostblock/CMakeLists.txt similarity index 100% rename from src/Display/UI/HostBlock/CMakeLists.txt rename to src/display/ui/hostblock/CMakeLists.txt diff --git a/src/Display/UI/HostBlock/HostBlock.cpp b/src/display/ui/hostblock/HostBlock.cpp similarity index 100% rename from src/Display/UI/HostBlock/HostBlock.cpp rename to src/display/ui/hostblock/HostBlock.cpp diff --git a/src/Display/UI/HostBlock/HostBlock.h b/src/display/ui/hostblock/HostBlock.h similarity index 100% rename from src/Display/UI/HostBlock/HostBlock.h rename to src/display/ui/hostblock/HostBlock.h diff --git a/src/Display/UI/Text/CMakeLists.txt b/src/display/ui/text/CMakeLists.txt similarity index 100% rename from src/Display/UI/Text/CMakeLists.txt rename to src/display/ui/text/CMakeLists.txt diff --git a/src/Display/UI/Text/Font.h b/src/display/ui/text/Font.h similarity index 100% rename from src/Display/UI/Text/Font.h rename to src/display/ui/text/Font.h diff --git a/src/Display/UI/Text/Fonts.cpp b/src/display/ui/text/Fonts.cpp similarity index 100% rename from src/Display/UI/Text/Fonts.cpp rename to src/display/ui/text/Fonts.cpp diff --git a/src/Display/UI/Text/Fonts.h b/src/display/ui/text/Fonts.h similarity index 100% rename from src/Display/UI/Text/Fonts.h rename to src/display/ui/text/Fonts.h diff --git a/src/Display/UI/Text/Glyph.h b/src/display/ui/text/Glyph.h similarity index 100% rename from src/Display/UI/Text/Glyph.h rename to src/display/ui/text/Glyph.h diff --git a/src/Display/UI/Text/GlyphKey.h b/src/display/ui/text/GlyphKey.h similarity index 100% rename from src/Display/UI/Text/GlyphKey.h rename to src/display/ui/text/GlyphKey.h diff --git a/src/Display/UI/Text/Helpers.cpp b/src/display/ui/text/Helpers.cpp similarity index 100% rename from src/Display/UI/Text/Helpers.cpp rename to src/display/ui/text/Helpers.cpp diff --git a/src/Display/UI/Text/Helpers.h b/src/display/ui/text/Helpers.h similarity index 100% rename from src/Display/UI/Text/Helpers.h rename to src/display/ui/text/Helpers.h diff --git a/src/Display/UI/Text/Renderer.cpp b/src/display/ui/text/Renderer.cpp similarity index 100% rename from src/Display/UI/Text/Renderer.cpp rename to src/display/ui/text/Renderer.cpp diff --git a/src/Display/UI/Text/Renderer.h b/src/display/ui/text/Renderer.h similarity index 100% rename from src/Display/UI/Text/Renderer.h rename to src/display/ui/text/Renderer.h diff --git a/src/Display/UI/Text/UTFDecoder.h b/src/display/ui/text/UTFDecoder.h similarity index 100% rename from src/Display/UI/Text/UTFDecoder.h rename to src/display/ui/text/UTFDecoder.h diff --git a/src/Display/UI/Theme/CMakeLists.txt b/src/display/ui/theme/CMakeLists.txt similarity index 100% rename from src/Display/UI/Theme/CMakeLists.txt rename to src/display/ui/theme/CMakeLists.txt diff --git a/src/Display/UI/Theme/Theme.h b/src/display/ui/theme/Theme.h similarity index 100% rename from src/Display/UI/Theme/Theme.h rename to src/display/ui/theme/Theme.h diff --git a/src/Helpers/CMakeLists.txt b/src/helpers/CMakeLists.txt similarity index 100% rename from src/Helpers/CMakeLists.txt rename to src/helpers/CMakeLists.txt diff --git a/src/Helpers/Paths.cpp b/src/helpers/Paths.cpp similarity index 100% rename from src/Helpers/Paths.cpp rename to src/helpers/Paths.cpp diff --git a/src/Helpers/Paths.h b/src/helpers/Paths.h similarity index 100% rename from src/Helpers/Paths.h rename to src/helpers/Paths.h diff --git a/src/Helpers/Version.h.in b/src/helpers/Version.h.in similarity index 100% rename from src/Helpers/Version.h.in rename to src/helpers/Version.h.in diff --git a/src/Main/CMakeLists.txt b/src/main/CMakeLists.txt similarity index 60% rename from src/Main/CMakeLists.txt rename to src/main/CMakeLists.txt index 1b0d7df..fe88777 100644 --- a/src/Main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -1,8 +1,8 @@ message(STATUS "·Configuring Main") if (BUILD_SERVER) - add_subdirectory(Server) + add_subdirectory(server) endif() if (BUILD_CLIENT) - add_subdirectory(Client) + add_subdirectory(client) endif() diff --git a/src/Main/Client/CMakeLists.txt b/src/main/client/CMakeLists.txt similarity index 100% rename from src/Main/Client/CMakeLists.txt rename to src/main/client/CMakeLists.txt diff --git a/src/Main/Client/main.cpp b/src/main/client/main.cpp similarity index 100% rename from src/Main/Client/main.cpp rename to src/main/client/main.cpp diff --git a/src/Main/Server/CMakeLists.txt b/src/main/server/CMakeLists.txt similarity index 100% rename from src/Main/Server/CMakeLists.txt rename to src/main/server/CMakeLists.txt diff --git a/src/Main/Server/main.cpp b/src/main/server/main.cpp similarity index 100% rename from src/Main/Server/main.cpp rename to src/main/server/main.cpp diff --git a/src/Metrics/CMakeLists.txt b/src/metrics/CMakeLists.txt similarity index 100% rename from src/Metrics/CMakeLists.txt rename to src/metrics/CMakeLists.txt diff --git a/src/Metrics/Collector.cpp b/src/metrics/Collector.cpp similarity index 100% rename from src/Metrics/Collector.cpp rename to src/metrics/Collector.cpp diff --git a/src/Metrics/Collector.h b/src/metrics/Collector.h similarity index 100% rename from src/Metrics/Collector.h rename to src/metrics/Collector.h diff --git a/src/Metrics/Cpu.h b/src/metrics/Cpu.h similarity index 100% rename from src/Metrics/Cpu.h rename to src/metrics/Cpu.h diff --git a/src/Metrics/Disk.h b/src/metrics/Disk.h similarity index 100% rename from src/Metrics/Disk.h rename to src/metrics/Disk.h diff --git a/src/Metrics/Host.cpp b/src/metrics/Host.cpp similarity index 100% rename from src/Metrics/Host.cpp rename to src/metrics/Host.cpp diff --git a/src/Metrics/Host.h b/src/metrics/Host.h similarity index 100% rename from src/Metrics/Host.h rename to src/metrics/Host.h diff --git a/src/Metrics/Memory.h b/src/metrics/Memory.h similarity index 100% rename from src/Metrics/Memory.h rename to src/metrics/Memory.h diff --git a/src/Model/CMakeLists.txt b/src/model/CMakeLists.txt similarity index 100% rename from src/Model/CMakeLists.txt rename to src/model/CMakeLists.txt diff --git a/src/Model/HostRegistry.cpp b/src/model/HostRegistry.cpp similarity index 100% rename from src/Model/HostRegistry.cpp rename to src/model/HostRegistry.cpp diff --git a/src/Model/HostRegistry.h b/src/model/HostRegistry.h similarity index 100% rename from src/Model/HostRegistry.h rename to src/model/HostRegistry.h diff --git a/src/Network/CMakeLists.txt b/src/network/CMakeLists.txt similarity index 52% rename from src/Network/CMakeLists.txt rename to src/network/CMakeLists.txt index 7875451..f1d38c5 100644 --- a/src/Network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,9 +1,9 @@ message(STATUS "·Configuring Network") -add_subdirectory(Common) +add_subdirectory(common) if (BUILD_SERVER) - add_subdirectory(Server) + add_subdirectory(server) endif() if (BUILD_CLIENT) - add_subdirectory(Client) + add_subdirectory(client) endif() diff --git a/src/Network/Client/Agent.cpp b/src/network/client/Agent.cpp similarity index 100% rename from src/Network/Client/Agent.cpp rename to src/network/client/Agent.cpp diff --git a/src/Network/Client/Agent.h b/src/network/client/Agent.h similarity index 100% rename from src/Network/Client/Agent.h rename to src/network/client/Agent.h diff --git a/src/Network/Client/CMakeLists.txt b/src/network/client/CMakeLists.txt similarity index 100% rename from src/Network/Client/CMakeLists.txt rename to src/network/client/CMakeLists.txt diff --git a/src/Network/Client/Client.cpp b/src/network/client/Client.cpp similarity index 100% rename from src/Network/Client/Client.cpp rename to src/network/client/Client.cpp diff --git a/src/Network/Client/Client.h b/src/network/client/Client.h similarity index 100% rename from src/Network/Client/Client.h rename to src/network/client/Client.h diff --git a/src/Network/Common/Buffer.cpp b/src/network/common/Buffer.cpp similarity index 100% rename from src/Network/Common/Buffer.cpp rename to src/network/common/Buffer.cpp diff --git a/src/Network/Common/Buffer.h b/src/network/common/Buffer.h similarity index 100% rename from src/Network/Common/Buffer.h rename to src/network/common/Buffer.h diff --git a/src/Network/Common/CMakeLists.txt b/src/network/common/CMakeLists.txt similarity index 100% rename from src/Network/Common/CMakeLists.txt rename to src/network/common/CMakeLists.txt diff --git a/src/Network/Server/CMakeLists.txt b/src/network/server/CMakeLists.txt similarity index 100% rename from src/Network/Server/CMakeLists.txt rename to src/network/server/CMakeLists.txt diff --git a/src/Network/Server/Server.cpp b/src/network/server/Server.cpp similarity index 100% rename from src/Network/Server/Server.cpp rename to src/network/server/Server.cpp diff --git a/src/Network/Server/Server.h b/src/network/server/Server.h similarity index 100% rename from src/Network/Server/Server.h rename to src/network/server/Server.h