From 1914488336ba63706cf89cca8c0b5e32b96e84ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Sat, 19 Oct 2024 14:32:58 -0300
Subject: [PATCH] Minor clean up.

---
 .ecode/project_build.json                            | 12 ++++++++++++
 include/eepp/ui/css/propertydefinition.hpp           |  3 ---
 include/eepp/ui/css/propertyidset.hpp                |  7 +++----
 include/eepp/ui/css/propertyspecification.hpp        |  6 ++----
 include/eepp/ui/css/stylesheetpropertiesparser.hpp   |  2 --
 src/eepp/ui/css/propertydefinition.cpp               |  7 -------
 .../ecode/plugins/lsp/lspclientservermanager.hpp     |  1 +
 7 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.ecode/project_build.json b/.ecode/project_build.json
index c39823f86..ca3a760ae 100644
--- a/.ecode/project_build.json
+++ b/.ecode/project_build.json
@@ -186,6 +186,18 @@
         "name": "eepp-unit_tests",
         "run_in_terminal": true,
         "working_dir": "${project_root}/bin/unit_tests"
+      },
+      {
+        "args": "",
+        "command": "eepp-empty-window-debug",
+        "name": "eepp-empty_window-debug",
+        "working_dir": "${project_root}/bin"
+      },
+      {
+        "args": "",
+        "command": "eepp-empty-window",
+        "name": "eepp-empty_window",
+        "working_dir": "${project_root}/bin"
       }
     ],
     "var": {
diff --git a/include/eepp/ui/css/propertydefinition.hpp b/include/eepp/ui/css/propertydefinition.hpp
index 702e01b91..9947ad44c 100644
--- a/include/eepp/ui/css/propertydefinition.hpp
+++ b/include/eepp/ui/css/propertydefinition.hpp
@@ -259,9 +259,6 @@ enum class PropertyRelativeTarget : Uint32 {
 
 class EE_API PropertyDefinition {
   public:
-	static PropertyDefinition* New( const std::string& name, const std::string& defaultValue,
-									const bool& inherited = false );
-
 	PropertyDefinition( const std::string& name, const std::string& defaultValue,
 						const bool& inherited = false );
 
diff --git a/include/eepp/ui/css/propertyidset.hpp b/include/eepp/ui/css/propertyidset.hpp
index 1e8725747..4f6db143b 100644
--- a/include/eepp/ui/css/propertyidset.hpp
+++ b/include/eepp/ui/css/propertyidset.hpp
@@ -1,9 +1,8 @@
 #ifndef EE_UI_CSS_PROPERTYIDSET_HPP
 #define EE_UI_CSS_PROPERTYIDSET_HPP
 
-#include <bitset>
+#include <eepp/core/containers.hpp>
 #include <eepp/ui/css/propertydefinition.hpp>
-#include <set>
 
 namespace EE { namespace UI { namespace CSS {
 
@@ -11,7 +10,7 @@ class PropertyIdSetIterator;
 
 class EE_API PropertyIdSet {
   private:
-	std::set<Uint32> mIds;
+	UnorderedSet<Uint32> mIds;
 
   public:
 	void insert( Uint32 id ) { mIds.insert( id ); }
@@ -74,7 +73,7 @@ class EE_API PropertyIdSet {
 
 class EE_API PropertyIdSetIterator {
   public:
-	using CustomIdsIt = std::set<Uint32>::const_iterator;
+	using CustomIdsIt = UnorderedSet<Uint32>::const_iterator;
 
 	PropertyIdSetIterator() : container( nullptr ), custom_ids_iterator() {}
 	PropertyIdSetIterator( const PropertyIdSet* container, CustomIdsIt custom_ids_iterator ) :
diff --git a/include/eepp/ui/css/propertyspecification.hpp b/include/eepp/ui/css/propertyspecification.hpp
index 1e14ac5ca..7e4e09097 100644
--- a/include/eepp/ui/css/propertyspecification.hpp
+++ b/include/eepp/ui/css/propertyspecification.hpp
@@ -4,8 +4,6 @@
 #include <eepp/system/singleton.hpp>
 #include <eepp/ui/css/propertydefinition.hpp>
 #include <eepp/ui/css/shorthanddefinition.hpp>
-#include <memory>
-#include <unordered_map>
 
 namespace EE { namespace UI { namespace CSS {
 
@@ -35,8 +33,8 @@ class EE_API PropertySpecification {
 
   protected:
 	friend class PropertyDefinition;
-	std::unordered_map<Uint32, std::shared_ptr<PropertyDefinition>> mProperties;
-	std::unordered_map<Uint32, std::shared_ptr<ShorthandDefinition>> mShorthands;
+	UnorderedMap<Uint32, std::shared_ptr<PropertyDefinition>> mProperties;
+	UnorderedMap<Uint32, std::shared_ptr<ShorthandDefinition>> mShorthands;
 
 	const PropertyDefinition* addPropertyAlias( Uint32 aliasId, const PropertyDefinition* propDef );
 };
diff --git a/include/eepp/ui/css/stylesheetpropertiesparser.hpp b/include/eepp/ui/css/stylesheetpropertiesparser.hpp
index 37c39f3f8..1daddbc42 100644
--- a/include/eepp/ui/css/stylesheetpropertiesparser.hpp
+++ b/include/eepp/ui/css/stylesheetpropertiesparser.hpp
@@ -4,8 +4,6 @@
 #include <eepp/core/string.hpp>
 #include <eepp/ui/css/stylesheetproperty.hpp>
 #include <eepp/ui/css/stylesheetvariable.hpp>
-#include <map>
-#include <vector>
 
 namespace EE { namespace UI { namespace CSS {
 
diff --git a/src/eepp/ui/css/propertydefinition.cpp b/src/eepp/ui/css/propertydefinition.cpp
index 6072bd53c..281dfb70f 100644
--- a/src/eepp/ui/css/propertydefinition.cpp
+++ b/src/eepp/ui/css/propertydefinition.cpp
@@ -1,16 +1,9 @@
-#include <algorithm>
 #include <eepp/core.hpp>
 #include <eepp/ui/css/propertydefinition.hpp>
 #include <eepp/ui/css/propertyspecification.hpp>
 
 namespace EE { namespace UI { namespace CSS {
 
-PropertyDefinition* PropertyDefinition::New( const std::string& name,
-											 const std::string& defaultValue,
-											 const bool& inherited ) {
-	return eeNew( PropertyDefinition, ( name, defaultValue, inherited ) );
-}
-
 PropertyDefinition::PropertyDefinition( const std::string& name, const std::string& defaultValue,
 										const bool& inherited ) :
 	mName( name ),
diff --git a/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp b/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp
index 55aeee812..321847fa5 100644
--- a/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp
+++ b/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp
@@ -5,6 +5,7 @@
 #include "lspclientserver.hpp"
 #include "lspdefinition.hpp"
 #include <eepp/core.hpp>
+#include <set>
 
 using namespace EE;