refactor: remove 'usa' namespace (#18)

Author: rmaxi-me

src/Engine/include/Engine/Application.hpp

@@ -17,7 +17,6 @@
 #include "Engine/Settings/Settings.hpp"
 #include "Scene.hpp"
 
-namespace usa {
 namespace Engine {
 
     class Application {
@@ -69,4 +68,3 @@ namespace Engine {
     };
 
 } // namespace Engine
-} // namespace usa

src/Engine/include/Engine/Scene.hpp

@@ -9,7 +9,6 @@
 
 #include <SFML/Graphics/RenderWindow.hpp>
 
-namespace usa {
 namespace Engine {
 
     class Application;
@@ -35,4 +34,3 @@ namespace Engine {
     };
 
 } // namespace Engine
-} // namespace usa

src/Engine/include/Engine/Settings/Settings.hpp

@@ -11,7 +11,6 @@
 
 #include "Engine/Json.hpp"
 
-namespace usa {
 namespace Engine {
 
     struct Settings {
@@ -30,4 +29,3 @@ namespace Engine {
     void to_json(Json &json, const Settings &settings);
     void from_json(const Json &json, Settings &settings);
 } // namespace Engine
-} // namespace usa

src/Engine/include/Engine/UI/AWidget.hpp

@@ -16,8 +16,6 @@
 
 #include <functional>
 
-namespace usa {
-
 namespace Engine {
 
 /**
@@ -88,5 +86,3 @@ class AWidget
 };
 
 }
-
-}

src/Engine/include/Engine/UI/UiWindow.hpp

@@ -8,15 +8,13 @@
 
 #include "AWidget.hpp"
 
-namespace usa {
-
 namespace Engine {
 
     /**
      * @class UiWindow
-     * 
+     *
      * @brief Window base class
-     * 
+     *
      */
     class UiWindow
     {
@@ -33,115 +31,115 @@ namespace Engine {
     public:
         /**
          * @brief Construct a new Ui Window object
-         * 
+         *
          */
         UiWindow() = default;
 
         /**
          * @brief Construct a new Ui Window object
-         * 
+         *
          * @param name The name of the window, the name may be rendered
          * @param flags The flags parameters of the window
          */
         UiWindow(const std::string_view &name, ImGuiWindowFlags flags = 0) : m_window_flags(flags), m_name(name) {}
 
         /**
          * @brief Destroy the Ui Window object
-         * 
+         *
          */
         virtual ~UiWindow() = default;
 
         /**
          * @brief Open the window
-         * 
+         *
          */
         auto open()     -> void { m_isOpen = true; }
 
         /**
          * @brief Close the window
-         * 
+         *
          */
         auto close()    -> void { m_isOpen = false; }
 
         /**
          * @brief Render the window and everything it contains
-         * 
+         *
          */
         virtual auto render()   -> void;
 
         /**
          * @brief Set the Window Flags
-         * 
+         *
          * @param flags The value of the flags, different value will trigger different options
          */
         auto setWindowFlags(ImGuiWindowFlags flags) noexcept -> void { m_window_flags = flags; }
 
         /**
          * @brief Set the position of the object
-         * 
+         *
          * @param pos The new postion of the object
          */
         auto setPosition(const ImVec2 &pos) noexcept    -> void { m_position = pos; }
 
         /**
          * @brief Set the size of the object
-         * 
+         *
          * @param size The new size of the object
          */
         auto setSize(const ImVec2 &size)    noexcept    -> void { m_size = size; }
 
         /**
          * @brief Set the name of the object
-         * 
+         *
          * @param name The new name of the object
          */
         auto setName(const std::string_view &name) noexcept  -> void { m_name = name; }
 
         /**
          * @brief Get the Flags object
-         * 
-         * @return ImGuiWindowFlags& 
+         *
+         * @return ImGuiWindowFlags&
          */
         auto getFlags()     -> ImGuiWindowFlags &{ return m_window_flags; }
 
         /**
          * @brief Get the position of the object
-         * 
-         * @return const ImVec2& 
+         *
+         * @return const ImVec2&
          */
         auto getPosition()  -> const ImVec2 & { return m_position; }
         /**
          * @brief Get the size of the object
-         * 
-         * @return const ImVec2& 
+         *
+         * @return const ImVec2&
          */
         auto getSize()      -> const ImVec2 & { return m_size; }
         /**
          * @brief Get the name of the object
-         * 
-         * @return const std::string_view& 
+         *
+         * @return const std::string_view&
          */
         auto getName()      -> const std::string_view & { return m_name; }
 
         /**
          * @brief Add a new widget to the window
-         * 
-         * @param widget The new widget to add 
+         *
+         * @param widget The new widget to add
          */
         auto addWidget(std::shared_ptr<AWidget> widget) -> void { m_WidgetList.emplace_back(widget); }
-        
+
         /**
          * @brief Delete a widget stored in the window
-         * 
+         *
          * @param name The name of the widget to delete
          * @return true Return true if a widget was delete
          * @return false Return false if no widget was found
          */
         auto deleteWidget(const std::string_view &name)  -> bool;
-        
+
         /**
          * @brief Get the Widget object
-         * 
+         *
          * @param name The name of the widget to get
          * @return std::shared_ptr<AWidget> Return a widget smart pointer if found
          * @return nullptr Return nullptr if the widget was not found
@@ -150,29 +148,27 @@ namespace Engine {
 
         /**
          * @brief Add a new sub Window in the current window
-         * 
-         * @param win The new window to add 
+         *
+         * @param win The new window to add
          */
         auto addWindow(std::shared_ptr<UiWindow> win) -> void { m_WindowList.emplace_back(win); }
-        
+
         /**
          * @brief Delete a sub-window stored in the window
-         * 
+         *
          * @param name the name of the sub-window to delete
          * @return true return true if a window was deleted
          * @return false return false otherwise
          */
         auto deleteWindow(const std::string_view &name) -> bool;
-        
+
         /**
          * @brief Get the Window object
-         * 
+         *
          * @param name The name of the window object to get
          * @return std::shared_ptr<UiWindow> return a UiWindow smart pointer
          * @return nullptr return nullptr otherwise
          */
         auto getWindow(const std::string_view &name) -> std::shared_ptr<UiWindow>;
     };
 }
-
-}

src/Engine/include/Engine/UI/Widget/WButton.hpp

@@ -4,8 +4,6 @@
 #include <functional>
 #include <string_view>
 
-namespace usa {
-
 namespace Engine {
 
     /**
@@ -48,5 +46,3 @@ namespace Engine {
     };
 
 }
-
-}

src/Engine/include/Engine/UI/Widget/WMenuItem.hpp

@@ -4,52 +4,49 @@
 #include <functional>
 #include <string_view>
 
-namespace usa
-{
-
-    namespace Engine
+namespace Engine {
+
+/**
+ * @class WMenuItem
+ *
+ * @brief Widget class representing a Menu Item
+ *
+ */
+class WMenuItem : public AWidget {
+private:
+    std::string_view m_shortcut{};
+    std::function<void()> f;
+
+public:
+    /**
+     * @brief Construct a new WMenuItem object
+     *
+     * @param name The name of the menu item
+     * @param shortcut The sub name of the menu item
+     */
+    WMenuItem(const std::string_view &name, const std::string_view &shortcut = "") :
+        AWidget(name, ImVec2()), m_shortcut(shortcut)
     {
-
-        /**
-         * @class WMenuItem
-         * 
-         * @brief Widget class representing a Menu Item
-         * 
-         */
-        class WMenuItem : public AWidget
-        {
-        private:
-            std::string_view m_shortcut{};
-            std::function<void()> f;
-        public:
-            /**
-             * @brief Construct a new WMenuItem object
-             * 
-             * @param name The name of the menu item
-             * @param shortcut The sub name of the menu item
-             */
-            WMenuItem(const std::string_view &name, const std::string_view &shortcut = "") : AWidget(name, ImVec2()), m_shortcut(shortcut) {}
-
-            /**
-             * @brief Destroy the WMenuItem object
-             * 
-             */
-            virtual ~WMenuItem() = default;
-
-            /**
-             * @brief Bind an action to the menu item
-             * 
-             * @param func The function action to bind
-             */
-            auto bindAction(std::function<void()> func) -> void override;
-            
-            /**
-             * @brief Render the menu item and check if it's triggered. If it is, call the bound function
-             * 
-             */
-            auto render() -> void override;
-        };
-
-    } // namespace Engine
-
-} // namespace usa
+    }
+
+    /**
+     * @brief Destroy the WMenuItem object
+     *
+     */
+    virtual ~WMenuItem() = default;
+
+    /**
+     * @brief Bind an action to the menu item
+     *
+     * @param func The function action to bind
+     */
+    auto bindAction(std::function<void()> func) -> void override;
+
+    /**
+     * @brief Render the menu item and check if it's triggered. If it is, call the bound function
+     *
+     */
+    auto render() -> void override;
+};
+
+} // namespace Engine