Merge branch 'dev' into main

castle055 · Apr 23, 2024 · 89a3923 · 89a3923
2 parents 4e60575 + 4958bc0
commit 89a3923
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/include/cydui.hpp b/include/cydui.hpp
@@ -6,7 +6,7 @@
 namespace cydui {
 }
 
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 
 #include "layout.h"
 #include "window.h"

diff --git a/include/layout.h b/include/layout.h
@@ -4,7 +4,7 @@
 #define CYD_UI_LAYOUT_H
 
 #include "components/component.h"
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 
 namespace cyd::ui::window {
     class CWindow;

diff --git a/src/graphics/color/colors.cpp b/src/graphics/color/colors.cpp
@@ -7,7 +7,7 @@
 #include <iomanip>
 #include "graphics/color.h"
 
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 
 using namespace cyd::ui::graphics::color;
 namespace color = cyd::ui::graphics::color;

diff --git a/src/graphics/x11/events/events.cpp b/src/graphics/x11/events/events.cpp
@@ -4,7 +4,7 @@
 // Created by castle on 8/21/22.
 //
 
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 #include "../state/state.hpp"
 #include "events.hpp"
 #include <X11/Xlib.h>

diff --git a/src/graphics/x11/render/render.cpp b/src/graphics/x11/render/render.cpp
@@ -5,7 +5,7 @@
 
 #include <iostream>
 
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 
 #include <X11/Xlib.h>
 

diff --git a/src/graphics/x11/state/state.cpp b/src/graphics/x11/state/state.cpp
@@ -1,9 +1,11 @@
+// Copyright (c) 2024, Victor Castillo, All rights reserved.
+
 //
 // Created by castle on 8/21/22.
 //
 
 #include "state.hpp"
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 
 const logging::logger log_task = {.name = "X11_IMPL::state"};
 

diff --git a/src/graphics/x11/x11_impl.cpp b/src/graphics/x11/x11_impl.cpp
@@ -4,8 +4,7 @@
 // Created by castle on 8/21/22.
 //
 
-#include "cydstd/cydstd.h"
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 #include "images.h"
 #include "events/events.hpp"
 #include <X11/Xft/Xft.h>

diff --git a/src/logging.cpp b/src/logging.cpp
@@ -1,8 +1,10 @@
+// Copyright (c) 2024, Victor Castillo, All rights reserved.
+
 //
 // Created by castle on 8/21/22.
 //
 
-#include "cydstd/logging.hpp"
+#include <cyd_fabric/logging/logging.hpp>
 #include <cstdarg>
 #include <ctime>
 #include <string>