diff options
Diffstat (limited to 'include/cru/platform')
32 files changed, 43 insertions, 43 deletions
diff --git a/include/cru/platform/Check.h b/include/cru/platform/Check.h index 453521cc..270150e8 100644 --- a/include/cru/platform/Check.h +++ b/include/cru/platform/Check.h @@ -2,7 +2,7 @@ #include "Exception.h" #include "Resource.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include <memory> #include <type_traits> diff --git a/include/cru/platform/Color.h b/include/cru/platform/Color.h index 2b38138a..d993bd43 100644 --- a/include/cru/platform/Color.h +++ b/include/cru/platform/Color.h @@ -1,9 +1,9 @@ #pragma once #include "Base.h" -#include "cru/common/Base.h" -#include "cru/common/Format.h" -#include "cru/common/String.h" +#include "cru/base/Base.h" +#include "cru/base/Format.h" +#include "cru/base/String.h" #include <cstdint> #include <optional> diff --git a/include/cru/platform/Exception.h b/include/cru/platform/Exception.h index a957c95a..2771d4d7 100644 --- a/include/cru/platform/Exception.h +++ b/include/cru/platform/Exception.h @@ -1,8 +1,8 @@ #pragma once #include "Base.h" -#include "cru/common/Base.h" -#include "cru/common/Exception.h" -#include "cru/common/platform/Exception.h" +#include "cru/base/Base.h" +#include "cru/base/Exception.h" +#include "cru/base/platform/Exception.h" #include <optional> diff --git a/include/cru/platform/GraphicsBase.h b/include/cru/platform/GraphicsBase.h index 676d3924..4837b08b 100644 --- a/include/cru/platform/GraphicsBase.h +++ b/include/cru/platform/GraphicsBase.h @@ -1,9 +1,9 @@ #pragma once #include "Base.h" -#include "cru/common/Format.h" -#include "cru/common/Range.h" -#include "cru/common/String.h" +#include "cru/base/Format.h" +#include "cru/base/Range.h" +#include "cru/base/String.h" #include <limits> diff --git a/include/cru/platform/Resource.h b/include/cru/platform/Resource.h index ba3c5617..69210348 100644 --- a/include/cru/platform/Resource.h +++ b/include/cru/platform/Resource.h @@ -1,8 +1,8 @@ #pragma once #include "Base.h" -#include "cru/common/Base.h" -#include "cru/common/String.h" +#include "cru/base/Base.h" +#include "cru/base/String.h" namespace cru::platform { struct CRU_PLATFORM_API IPlatformResource : virtual Interface { diff --git a/include/cru/platform/graphics/ImageFactory.h b/include/cru/platform/graphics/ImageFactory.h index cd868087..e7e28143 100644 --- a/include/cru/platform/graphics/ImageFactory.h +++ b/include/cru/platform/graphics/ImageFactory.h @@ -1,6 +1,6 @@ #pragma once #include "Resource.h" -#include "cru/common/io/Stream.h" +#include "cru/base/io/Stream.h" namespace cru::platform::graphics { enum class ImageFormat { Jpeg, Png, Gif }; diff --git a/include/cru/platform/graphics/NullPainter.h b/include/cru/platform/graphics/NullPainter.h index 2c6e6cb1..27cb6393 100644 --- a/include/cru/platform/graphics/NullPainter.h +++ b/include/cru/platform/graphics/NullPainter.h @@ -1,6 +1,6 @@ #pragma once #include "Painter.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::platform::graphics { class CRU_PLATFORM_GRAPHICS_API NullPainter : public Object, diff --git a/include/cru/platform/graphics/SvgGeometryBuilderMixin.h b/include/cru/platform/graphics/SvgGeometryBuilderMixin.h index d516ce6c..1f7420e9 100644 --- a/include/cru/platform/graphics/SvgGeometryBuilderMixin.h +++ b/include/cru/platform/graphics/SvgGeometryBuilderMixin.h @@ -1,7 +1,7 @@ #pragma once #include "Geometry.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include <utility> diff --git a/include/cru/platform/graphics/direct2d/ComResource.h b/include/cru/platform/graphics/direct2d/ComResource.h index 2beb4e20..d274ae16 100644 --- a/include/cru/platform/graphics/direct2d/ComResource.h +++ b/include/cru/platform/graphics/direct2d/ComResource.h @@ -1,7 +1,7 @@ #pragma once #include "Base.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::platform::graphics::direct2d { template <typename TInterface> diff --git a/include/cru/platform/graphics/direct2d/Factory.h b/include/cru/platform/graphics/direct2d/Factory.h index d6c43d9f..7abdc31f 100644 --- a/include/cru/platform/graphics/direct2d/Factory.h +++ b/include/cru/platform/graphics/direct2d/Factory.h @@ -3,7 +3,7 @@ #include "ImageFactory.h" -#include "cru/common/platform/win/ComAutoInit.h" +#include "cru/base/platform/win/ComAutoInit.h" #include "cru/platform/graphics/Base.h" #include "cru/platform/graphics/Factory.h" diff --git a/include/cru/platform/graphics/direct2d/Painter.h b/include/cru/platform/graphics/direct2d/Painter.h index f85d840a..5e0fc92f 100644 --- a/include/cru/platform/graphics/direct2d/Painter.h +++ b/include/cru/platform/graphics/direct2d/Painter.h @@ -2,7 +2,7 @@ #include "ComResource.h" #include "Resource.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Painter.h" #include <vector> diff --git a/include/cru/platform/graphics/quartz/Brush.h b/include/cru/platform/graphics/quartz/Brush.h index d5714293..9b29ef59 100644 --- a/include/cru/platform/graphics/quartz/Brush.h +++ b/include/cru/platform/graphics/quartz/Brush.h @@ -1,6 +1,6 @@ #pragma once #include "Resource.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Base.h" #include "cru/platform/graphics/Brush.h" diff --git a/include/cru/platform/graphics/quartz/Convert.h b/include/cru/platform/graphics/quartz/Convert.h index c7dab7c9..c5a1a6cc 100644 --- a/include/cru/platform/graphics/quartz/Convert.h +++ b/include/cru/platform/graphics/quartz/Convert.h @@ -1,7 +1,7 @@ #pragma once -#include "cru/common/Range.h" -#include "cru/common/String.h" -#include "cru/common/io/Stream.h" +#include "cru/base/Range.h" +#include "cru/base/String.h" +#include "cru/base/io/Stream.h" #include "cru/platform/Matrix.h" #include <CoreGraphics/CoreGraphics.h> diff --git a/include/cru/platform/graphics/quartz/Factory.h b/include/cru/platform/graphics/quartz/Factory.h index 57992d87..042e35ca 100644 --- a/include/cru/platform/graphics/quartz/Factory.h +++ b/include/cru/platform/graphics/quartz/Factory.h @@ -1,6 +1,6 @@ #pragma once #include "Resource.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/quartz/ImageFactory.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/graphics/ImageFactory.h" diff --git a/include/cru/platform/graphics/quartz/Font.h b/include/cru/platform/graphics/quartz/Font.h index 36dba31a..975607b9 100644 --- a/include/cru/platform/graphics/quartz/Font.h +++ b/include/cru/platform/graphics/quartz/Font.h @@ -1,6 +1,6 @@ #pragma once #include "Resource.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Font.h" #include <CoreText/CoreText.h> diff --git a/include/cru/platform/graphics/quartz/Painter.h b/include/cru/platform/graphics/quartz/Painter.h index eba66a56..9e21904d 100644 --- a/include/cru/platform/graphics/quartz/Painter.h +++ b/include/cru/platform/graphics/quartz/Painter.h @@ -1,6 +1,6 @@ #pragma once #include "Resource.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Base.h" #include "cru/platform/graphics/Painter.h" diff --git a/include/cru/platform/graphics/quartz/TextLayout.h b/include/cru/platform/graphics/quartz/TextLayout.h index 0d23360d..bbb417f6 100644 --- a/include/cru/platform/graphics/quartz/TextLayout.h +++ b/include/cru/platform/graphics/quartz/TextLayout.h @@ -2,7 +2,7 @@ #include "Resource.h" #include "Font.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/TextLayout.h" #include <memory> diff --git a/include/cru/platform/graphics/web_canvas/WebCanvasRef.h b/include/cru/platform/graphics/web_canvas/WebCanvasRef.h index a5d4f395..a8995b90 100644 --- a/include/cru/platform/graphics/web_canvas/WebCanvasRef.h +++ b/include/cru/platform/graphics/web_canvas/WebCanvasRef.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include <emscripten/val.h> diff --git a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h index 1e9bf75d..6c8087d0 100644 --- a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h +++ b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/Resource.h" namespace cru::platform::graphics::web_canvas { diff --git a/include/cru/platform/gui/Base.h b/include/cru/platform/gui/Base.h index 789ab308..f84e815e 100644 --- a/include/cru/platform/gui/Base.h +++ b/include/cru/platform/gui/Base.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/Base.h" -#include "cru/common/Bitmask.h" +#include "cru/base/Base.h" +#include "cru/base/Bitmask.h" #include "cru/platform/graphics/Base.h" #include "../Resource.h" diff --git a/include/cru/platform/gui/InputMethod.h b/include/cru/platform/gui/InputMethod.h index 90d6b15a..b4a1e9d9 100644 --- a/include/cru/platform/gui/InputMethod.h +++ b/include/cru/platform/gui/InputMethod.h @@ -1,7 +1,7 @@ #pragma once #include "Base.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include <memory> #include <vector> diff --git a/include/cru/platform/gui/Keyboard.h b/include/cru/platform/gui/Keyboard.h index f25b25fa..224aea04 100644 --- a/include/cru/platform/gui/Keyboard.h +++ b/include/cru/platform/gui/Keyboard.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/common/Bitmask.h" +#include "cru/base/Bitmask.h" #include "cru/platform/gui/Base.h" #include <string> diff --git a/include/cru/platform/gui/UiApplication.h b/include/cru/platform/gui/UiApplication.h index ef13aaa4..88aa3e20 100644 --- a/include/cru/platform/gui/UiApplication.h +++ b/include/cru/platform/gui/UiApplication.h @@ -1,7 +1,7 @@ #pragma once #include "Base.h" -#include "cru/common/Bitmask.h" +#include "cru/base/Bitmask.h" #include "cru/platform/gui/Menu.h" #include "SaveOpenDialogOptions.h" diff --git a/include/cru/platform/gui/Window.h b/include/cru/platform/gui/Window.h index d3f0daad..7f6923d1 100644 --- a/include/cru/platform/gui/Window.h +++ b/include/cru/platform/gui/Window.h @@ -3,7 +3,7 @@ #include "Keyboard.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include <string_view> diff --git a/include/cru/platform/gui/win/Base.h b/include/cru/platform/gui/win/Base.h index 78068827..d9a81068 100644 --- a/include/cru/platform/gui/win/Base.h +++ b/include/cru/platform/gui/win/Base.h @@ -1,7 +1,7 @@ #pragma once #include "cru/platform/win/WinPreConfig.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #ifdef CRU_PLATFORM_WINDOWS #ifdef CRU_WIN_GUI_EXPORT_API diff --git a/include/cru/platform/gui/win/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h index dc4bc9b5..a322d520 100644 --- a/include/cru/platform/gui/win/Clipboard.h +++ b/include/cru/platform/gui/win/Clipboard.h @@ -1,6 +1,6 @@ #pragma once #include "Resource.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/gui/Clipboard.h" #include "cru/platform/gui/win/Base.h" diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h index fe61c80d..84fdfcea 100644 --- a/include/cru/platform/gui/win/GodWindow.h +++ b/include/cru/platform/gui/win/GodWindow.h @@ -2,8 +2,8 @@ #include "Base.h" #include "WindowNativeMessageEventArgs.h" -#include "cru/common/Event.h" -#include "cru/common/String.h" +#include "cru/base/Event.h" +#include "cru/base/String.h" #include <memory> diff --git a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h index bc85a597..1b5a233c 100644 --- a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h +++ b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h @@ -1,7 +1,7 @@ #pragma once #include "Base.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::platform::gui::win { struct CRU_WIN_GUI_API WindowNativeMessage { diff --git a/include/cru/platform/osx/Convert.h b/include/cru/platform/osx/Convert.h index bf32174a..7994af44 100644 --- a/include/cru/platform/osx/Convert.h +++ b/include/cru/platform/osx/Convert.h @@ -1,2 +1,2 @@ #pragma once -#include "cru/common/platform/osx/Convert.h" +#include "cru/base/platform/osx/Convert.h" diff --git a/include/cru/platform/osx/Exception.h b/include/cru/platform/osx/Exception.h index c346b970..d3c2aee0 100644 --- a/include/cru/platform/osx/Exception.h +++ b/include/cru/platform/osx/Exception.h @@ -1,3 +1,3 @@ #pragma once -#include "cru/common/platform/osx/Exception.h" +#include "cru/base/platform/osx/Exception.h" #include "cru/platform/Exception.h" diff --git a/include/cru/platform/win/Exception.h b/include/cru/platform/win/Exception.h index af8b495c..353c2dab 100644 --- a/include/cru/platform/win/Exception.h +++ b/include/cru/platform/win/Exception.h @@ -1,3 +1,3 @@ #pragma once -#include "cru/common/platform/win/Exception.h" +#include "cru/base/platform/win/Exception.h" #include "cru/platform/Exception.h" diff --git a/include/cru/platform/win/WinPreConfig.h b/include/cru/platform/win/WinPreConfig.h index e714bf5e..a67faf8f 100644 --- a/include/cru/platform/win/WinPreConfig.h +++ b/include/cru/platform/win/WinPreConfig.h @@ -1,2 +1,2 @@ #pragma once -#include "cru/common/platform/win/WinPreConfig.h" +#include "cru/base/platform/win/WinPreConfig.h" |