♻️ (config): Move Config struct in own header + clean up includes

leka · Apr 13, 2022 · 8e1ecbb · 8e1ecbb
1 parent a865c4d
commit 8e1ecbb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 26 deletions.
diff --git a/libs/ConfigKit/include/Config.h b/libs/ConfigKit/include/Config.h
@@ -0,0 +1,28 @@
+// Leka - LekaOS
+// Copyright 2022 APF France handicap
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <filesystem>
+
+namespace leka {
+
+struct Config {
+  public:
+	explicit Config(const std::filesystem::path &path, uint8_t default_value = 0xFF)
+		: _path(_default_parent_path / path), _default_value(default_value)
+	{
+		// nothing to do
+	}
+
+	[[nodiscard]] auto path() const -> std::filesystem::path { return _path; }
+	[[nodiscard]] auto default_value() const -> uint8_t { return _default_value; }
+
+  private:
+	const std::filesystem::path _default_parent_path = "/fs/conf";
+	const std::filesystem::path _path;
+	const uint8_t _default_value;
+};
+
+}	// namespace leka
diff --git a/libs/ConfigKit/include/ConfigKit.h b/libs/ConfigKit/include/ConfigKit.h
@@ -4,32 +4,12 @@
 
 #pragma once
 
-#include <cstdint>
 #include <filesystem>
-#include <optional>
-#include <span>
 
-#include "FileManagerKit.h"
-#include "interface/platform/File.h"
+#include "Config.h"
 
 namespace leka {
 
-struct Config {
-  public:
-	explicit Config(const std::filesystem::path &path, uint8_t default_value = 0xFF)
-		: _path(_default_parent_path / path), _default_value(default_value)
-	{
-	}
-
-	[[nodiscard]] auto path() const -> std::filesystem::path { return _path; }
-	[[nodiscard]] auto default_value() const -> uint8_t { return _default_value; }
-
-  private:
-	const std::filesystem::path _default_parent_path = "/fs/conf";
-	const std::filesystem::path _path;
-	const uint8_t _default_value;
-};
-
 class ConfigKit
 {
   public:

diff --git a/libs/ConfigKit/source/Config.cpp b/libs/ConfigKit/source/Config.cpp
@@ -2,12 +2,8 @@
 // Copyright 2022 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <span>
-
 #include "ConfigKit.h"
+#include "FileManagerKit.h"
 
 using namespace leka;