diff options
262 files changed, 324 insertions, 326 deletions
diff --git a/demos/Graphics/DrawCircle/DrawCircle.cpp b/demos/Graphics/DrawCircle/DrawCircle.cpp index aa73d44c..a28bc4e4 100644 --- a/demos/Graphics/DrawCircle/DrawCircle.cpp +++ b/demos/Graphics/DrawCircle/DrawCircle.cpp @@ -1,4 +1,4 @@ -#include "cru/common/io/CFileStream.h" +#include "cru/base/io/CFileStream.h" #include "cru/platform/Color.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/graphics/ImageFactory.h" diff --git a/include/cru/common/Base.h b/include/cru/base/Base.h index 8a6a7634..8a6a7634 100644 --- a/include/cru/common/Base.h +++ b/include/cru/base/Base.h diff --git a/include/cru/common/Bitmask.h b/include/cru/base/Bitmask.h index 9b6b8957..9b6b8957 100644 --- a/include/cru/common/Bitmask.h +++ b/include/cru/base/Bitmask.h diff --git a/include/cru/common/Buffer.h b/include/cru/base/Buffer.h index bc2e2a26..bc2e2a26 100644 --- a/include/cru/common/Buffer.h +++ b/include/cru/base/Buffer.h diff --git a/include/cru/common/ClonablePtr.h b/include/cru/base/ClonablePtr.h index a2a88758..a2a88758 100644 --- a/include/cru/common/ClonablePtr.h +++ b/include/cru/base/ClonablePtr.h diff --git a/include/cru/common/Event.h b/include/cru/base/Event.h index 18d2c570..18d2c570 100644 --- a/include/cru/common/Event.h +++ b/include/cru/base/Event.h diff --git a/include/cru/common/Event2.h b/include/cru/base/Event2.h index 62fb366d..891b314f 100644 --- a/include/cru/common/Event2.h +++ b/include/cru/base/Event2.h @@ -1,7 +1,7 @@ #pragma once -#include <cru/common/Bitmask.h> -#include <cru/common/SelfResolvable.h> +#include <cru/base/Bitmask.h> +#include <cru/base/SelfResolvable.h> #include <cstddef> #include <functional> diff --git a/include/cru/common/Exception.h b/include/cru/base/Exception.h index 609fd2c9..609fd2c9 100644 --- a/include/cru/common/Exception.h +++ b/include/cru/base/Exception.h diff --git a/include/cru/common/Format.h b/include/cru/base/Format.h index d5c5ed99..d5c5ed99 100644 --- a/include/cru/common/Format.h +++ b/include/cru/base/Format.h diff --git a/include/cru/common/Guard.h b/include/cru/base/Guard.h index 5a9f9c5d..5a9f9c5d 100644 --- a/include/cru/common/Guard.h +++ b/include/cru/base/Guard.h diff --git a/include/cru/common/HandlerRegistry.h b/include/cru/base/HandlerRegistry.h index e405d1fd..e405d1fd 100644 --- a/include/cru/common/HandlerRegistry.h +++ b/include/cru/base/HandlerRegistry.h diff --git a/include/cru/common/PreConfig.h b/include/cru/base/PreConfig.h index 3f26c589..3f26c589 100644 --- a/include/cru/common/PreConfig.h +++ b/include/cru/base/PreConfig.h diff --git a/include/cru/common/PropertyTree.h b/include/cru/base/PropertyTree.h index 54e185b9..54e185b9 100644 --- a/include/cru/common/PropertyTree.h +++ b/include/cru/base/PropertyTree.h diff --git a/include/cru/common/Range.h b/include/cru/base/Range.h index edc2ec55..edc2ec55 100644 --- a/include/cru/common/Range.h +++ b/include/cru/base/Range.h diff --git a/include/cru/common/SelfResolvable.h b/include/cru/base/SelfResolvable.h index 84fa54f6..84fa54f6 100644 --- a/include/cru/common/SelfResolvable.h +++ b/include/cru/base/SelfResolvable.h diff --git a/include/cru/common/String.h b/include/cru/base/String.h index 21a3db51..21a3db51 100644 --- a/include/cru/common/String.h +++ b/include/cru/base/String.h diff --git a/include/cru/common/StringToNumberConverter.h b/include/cru/base/StringToNumberConverter.h index 758b26c8..758b26c8 100644 --- a/include/cru/common/StringToNumberConverter.h +++ b/include/cru/base/StringToNumberConverter.h diff --git a/include/cru/common/StringUtil.h b/include/cru/base/StringUtil.h index 8f085283..8f085283 100644 --- a/include/cru/common/StringUtil.h +++ b/include/cru/base/StringUtil.h diff --git a/include/cru/common/SubProcess.h b/include/cru/base/SubProcess.h index fbe8ad2b..fbe8ad2b 100644 --- a/include/cru/common/SubProcess.h +++ b/include/cru/base/SubProcess.h diff --git a/include/cru/common/concurrent/ConcurrentQueue.h b/include/cru/base/concurrent/ConcurrentQueue.h index e311d5f9..e311d5f9 100644 --- a/include/cru/common/concurrent/ConcurrentQueue.h +++ b/include/cru/base/concurrent/ConcurrentQueue.h diff --git a/include/cru/common/io/AutoReadStream.h b/include/cru/base/io/AutoReadStream.h index 759d5026..759d5026 100644 --- a/include/cru/common/io/AutoReadStream.h +++ b/include/cru/base/io/AutoReadStream.h diff --git a/include/cru/common/io/BufferStream.h b/include/cru/base/io/BufferStream.h index 5ebff546..5ebff546 100644 --- a/include/cru/common/io/BufferStream.h +++ b/include/cru/base/io/BufferStream.h diff --git a/include/cru/common/io/CFileStream.h b/include/cru/base/io/CFileStream.h index 0b58bdc9..0b58bdc9 100644 --- a/include/cru/common/io/CFileStream.h +++ b/include/cru/base/io/CFileStream.h diff --git a/include/cru/common/io/MemoryStream.h b/include/cru/base/io/MemoryStream.h index a1f90c3b..a1f90c3b 100644 --- a/include/cru/common/io/MemoryStream.h +++ b/include/cru/base/io/MemoryStream.h diff --git a/include/cru/common/io/OpenFileFlag.h b/include/cru/base/io/OpenFileFlag.h index 4a5789fb..4a5789fb 100644 --- a/include/cru/common/io/OpenFileFlag.h +++ b/include/cru/base/io/OpenFileFlag.h diff --git a/include/cru/common/io/ProxyStream.h b/include/cru/base/io/ProxyStream.h index 42ec9dfd..42ec9dfd 100644 --- a/include/cru/common/io/ProxyStream.h +++ b/include/cru/base/io/ProxyStream.h diff --git a/include/cru/common/io/Resource.h b/include/cru/base/io/Resource.h index 1d5313a6..1d5313a6 100644 --- a/include/cru/common/io/Resource.h +++ b/include/cru/base/io/Resource.h diff --git a/include/cru/common/io/Stream.h b/include/cru/base/io/Stream.h index e0b61627..e0b61627 100644 --- a/include/cru/common/io/Stream.h +++ b/include/cru/base/io/Stream.h diff --git a/include/cru/common/log/Logger.h b/include/cru/base/log/Logger.h index 25735e14..25735e14 100644 --- a/include/cru/common/log/Logger.h +++ b/include/cru/base/log/Logger.h diff --git a/include/cru/common/log/StdioLogTarget.h b/include/cru/base/log/StdioLogTarget.h index 4123766b..4123766b 100644 --- a/include/cru/common/log/StdioLogTarget.h +++ b/include/cru/base/log/StdioLogTarget.h diff --git a/include/cru/common/platform/Exception.h b/include/cru/base/platform/Exception.h index 74dd6ad4..74dd6ad4 100644 --- a/include/cru/common/platform/Exception.h +++ b/include/cru/base/platform/Exception.h diff --git a/include/cru/common/platform/osx/Convert.h b/include/cru/base/platform/osx/Convert.h index 395cbbae..395cbbae 100644 --- a/include/cru/common/platform/osx/Convert.h +++ b/include/cru/base/platform/osx/Convert.h diff --git a/include/cru/common/platform/osx/Exception.h b/include/cru/base/platform/osx/Exception.h index 5ab14ebd..5ab14ebd 100644 --- a/include/cru/common/platform/osx/Exception.h +++ b/include/cru/base/platform/osx/Exception.h diff --git a/include/cru/common/platform/unix/PosixSpawnSubProcess.h b/include/cru/base/platform/unix/PosixSpawnSubProcess.h index ee4e912a..ee4e912a 100644 --- a/include/cru/common/platform/unix/PosixSpawnSubProcess.h +++ b/include/cru/base/platform/unix/PosixSpawnSubProcess.h diff --git a/include/cru/common/platform/unix/UnixFileStream.h b/include/cru/base/platform/unix/UnixFileStream.h index 8021f21a..8021f21a 100644 --- a/include/cru/common/platform/unix/UnixFileStream.h +++ b/include/cru/base/platform/unix/UnixFileStream.h diff --git a/include/cru/common/platform/unix/UnixPipe.h b/include/cru/base/platform/unix/UnixPipe.h index cf35fb11..cf35fb11 100644 --- a/include/cru/common/platform/unix/UnixPipe.h +++ b/include/cru/base/platform/unix/UnixPipe.h diff --git a/include/cru/common/platform/web/WebException.h b/include/cru/base/platform/web/WebException.h index d98b8943..d98b8943 100644 --- a/include/cru/common/platform/web/WebException.h +++ b/include/cru/base/platform/web/WebException.h diff --git a/include/cru/common/platform/win/ComAutoInit.h b/include/cru/base/platform/win/ComAutoInit.h index cc968e4b..569085c8 100644 --- a/include/cru/common/platform/win/ComAutoInit.h +++ b/include/cru/base/platform/win/ComAutoInit.h @@ -4,7 +4,7 @@ #ifdef CRU_PLATFORM_WINDOWS #include "WinPreConfig.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::platform::win { class CRU_BASE_API ComAutoInit { diff --git a/include/cru/common/platform/win/DebugLogTarget.h b/include/cru/base/platform/win/DebugLogTarget.h index 8257f637..8257f637 100644 --- a/include/cru/common/platform/win/DebugLogTarget.h +++ b/include/cru/base/platform/win/DebugLogTarget.h diff --git a/include/cru/common/platform/win/Exception.h b/include/cru/base/platform/win/Exception.h index 3e63b191..3e63b191 100644 --- a/include/cru/common/platform/win/Exception.h +++ b/include/cru/base/platform/win/Exception.h diff --git a/include/cru/common/platform/win/StreamConvert.h b/include/cru/base/platform/win/StreamConvert.h index 3499604a..3499604a 100644 --- a/include/cru/common/platform/win/StreamConvert.h +++ b/include/cru/base/platform/win/StreamConvert.h diff --git a/include/cru/common/platform/win/Win32FileStream.h b/include/cru/base/platform/win/Win32FileStream.h index 06656466..06656466 100644 --- a/include/cru/common/platform/win/Win32FileStream.h +++ b/include/cru/base/platform/win/Win32FileStream.h diff --git a/include/cru/common/platform/win/WinPreConfig.h b/include/cru/base/platform/win/WinPreConfig.h index c2284df3..c2284df3 100644 --- a/include/cru/common/platform/win/WinPreConfig.h +++ b/include/cru/base/platform/win/WinPreConfig.h diff --git a/include/cru/parse/Production.h b/include/cru/parse/Production.h index d5ababe6..07bd2962 100644 --- a/include/cru/parse/Production.h +++ b/include/cru/parse/Production.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/common/String.h" +#include "cru/base/String.h" #include "Nonterminal.h" #include "Terminal.h" diff --git a/include/cru/parse/Symbol.h b/include/cru/parse/Symbol.h index e7bd4808..0252b3b7 100644 --- a/include/cru/parse/Symbol.h +++ b/include/cru/parse/Symbol.h @@ -1,7 +1,7 @@ #pragma once #include "Base.h" -#include "cru/common/String.h" +#include "cru/base/String.h" namespace cru::parse { class Grammar; diff --git a/include/cru/parse/TokenType.h b/include/cru/parse/TokenType.h index cb6f6159..4e8545b1 100644 --- a/include/cru/parse/TokenType.h +++ b/include/cru/parse/TokenType.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::parse { class CRU_PARSE_API TokenType : public Object { 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" diff --git a/include/cru/toml/TomlDocument.h b/include/cru/toml/TomlDocument.h index 6da5ad74..d072d384 100644 --- a/include/cru/toml/TomlDocument.h +++ b/include/cru/toml/TomlDocument.h @@ -2,8 +2,8 @@ #include "Base.h" -#include "cru/common/Base.h" -#include "cru/common/String.h" +#include "cru/base/Base.h" +#include "cru/base/String.h" #include <optional> #include <unordered_map> diff --git a/include/cru/toml/TomlParser.h b/include/cru/toml/TomlParser.h index dcef2920..76c270c3 100644 --- a/include/cru/toml/TomlParser.h +++ b/include/cru/toml/TomlParser.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/toml/TomlDocument.h" #include <optional> diff --git a/include/cru/ui/Base.h b/include/cru/ui/Base.h index 5e62d785..78b8ccf9 100644 --- a/include/cru/ui/Base.h +++ b/include/cru/ui/Base.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Base.h" #include "cru/platform/gui/Base.h" diff --git a/include/cru/ui/ThemeManager.h b/include/cru/ui/ThemeManager.h index faa8a1cf..d4e6a096 100644 --- a/include/cru/ui/ThemeManager.h +++ b/include/cru/ui/ThemeManager.h @@ -1,6 +1,6 @@ #pragma once #include "Base.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/ThemeResourceDictionary.h" #include <vector> diff --git a/include/cru/ui/ThemeResourceDictionary.h b/include/cru/ui/ThemeResourceDictionary.h index 7112ab27..597fe707 100644 --- a/include/cru/ui/ThemeResourceDictionary.h +++ b/include/cru/ui/ThemeResourceDictionary.h @@ -1,7 +1,7 @@ #pragma once #include "Base.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/xml/XmlNode.h" #include "mapper/MapperRegistry.h" #include "style/StyleRuleSet.h" diff --git a/include/cru/ui/components/Component.h b/include/cru/ui/components/Component.h index a2f83149..ae742aae 100644 --- a/include/cru/ui/components/Component.h +++ b/include/cru/ui/components/Component.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" #include "../DeleteLater.h" -#include "cru/common/SelfResolvable.h" +#include "cru/base/SelfResolvable.h" namespace cru::ui::components { /** diff --git a/include/cru/ui/components/Menu.h b/include/cru/ui/components/Menu.h index 82766aa5..913f5c92 100644 --- a/include/cru/ui/components/Menu.h +++ b/include/cru/ui/components/Menu.h @@ -1,6 +1,6 @@ #pragma once #include "Component.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/ui/controls/Button.h" #include "cru/ui/controls/Control.h" #include "cru/ui/controls/FlexLayout.h" diff --git a/include/cru/ui/controls/Button.h b/include/cru/ui/controls/Button.h index 6df23c62..717710e8 100644 --- a/include/cru/ui/controls/Button.h +++ b/include/cru/ui/controls/Button.h @@ -5,7 +5,7 @@ #include "../render/BorderRenderObject.h" #include "IBorderControl.h" #include "IClickableControl.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::controls { class CRU_UI_API Button : public SingleChildControl<render::BorderRenderObject>, diff --git a/include/cru/ui/controls/Control.h b/include/cru/ui/controls/Control.h index 38a9a86b..790f4a3a 100644 --- a/include/cru/ui/controls/Control.h +++ b/include/cru/ui/controls/Control.h @@ -4,7 +4,7 @@ #include "../events/UiEvents.h" #include "../render/RenderObject.h" #include "../style/StyleRuleSet.h" -#include "cru/common/SelfResolvable.h" +#include "cru/base/SelfResolvable.h" #include "cru/ui/render/MeasureRequirement.h" namespace cru::ui::controls { diff --git a/include/cru/ui/controls/IBorderControl.h b/include/cru/ui/controls/IBorderControl.h index f8f2f88d..e3eb3388 100644 --- a/include/cru/ui/controls/IBorderControl.h +++ b/include/cru/ui/controls/IBorderControl.h @@ -1,6 +1,6 @@ #pragma once #include "../style/ApplyBorderStyleInfo.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::ui::controls { struct CRU_UI_API IBorderControl : virtual Interface { diff --git a/include/cru/ui/controls/ICheckableControl.h b/include/cru/ui/controls/ICheckableControl.h index 2c7aace8..7a6d7b8e 100644 --- a/include/cru/ui/controls/ICheckableControl.h +++ b/include/cru/ui/controls/ICheckableControl.h @@ -1,6 +1,6 @@ #pragma once #include "../Base.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::controls { struct CRU_UI_API ICheckableControl : virtual Interface { diff --git a/include/cru/ui/controls/IClickableControl.h b/include/cru/ui/controls/IClickableControl.h index 67fa43ab..4ddea730 100644 --- a/include/cru/ui/controls/IClickableControl.h +++ b/include/cru/ui/controls/IClickableControl.h @@ -1,7 +1,7 @@ #pragma once #include "../helper/ClickDetector.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::controls { struct CRU_UI_API IClickableControl : virtual Interface { diff --git a/include/cru/ui/controls/IconButton.h b/include/cru/ui/controls/IconButton.h index a76d01d4..632450e2 100644 --- a/include/cru/ui/controls/IconButton.h +++ b/include/cru/ui/controls/IconButton.h @@ -8,7 +8,7 @@ #include "IBorderControl.h" #include "IClickableControl.h" #include "IContentBrushControl.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/graphics/Brush.h" namespace cru::ui::controls { diff --git a/include/cru/ui/controls/RootControl.h b/include/cru/ui/controls/RootControl.h index 851b4db0..5fa8090e 100644 --- a/include/cru/ui/controls/RootControl.h +++ b/include/cru/ui/controls/RootControl.h @@ -1,7 +1,7 @@ #pragma once #include "LayoutControl.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/gui/Window.h" #include "cru/ui/host/WindowHost.h" #include "cru/ui/render/StackLayoutRenderObject.h" diff --git a/include/cru/ui/controls/Window.h b/include/cru/ui/controls/Window.h index a1a97f87..656a96dd 100644 --- a/include/cru/ui/controls/Window.h +++ b/include/cru/ui/controls/Window.h @@ -2,7 +2,7 @@ #include "cru/platform/gui/Base.h" #include "cru/ui/controls/RootControl.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::ui::controls { class CRU_UI_API Window final : public RootControl { diff --git a/include/cru/ui/document/DocumentElementType.h b/include/cru/ui/document/DocumentElementType.h index d16836c1..6d4958d0 100644 --- a/include/cru/ui/document/DocumentElementType.h +++ b/include/cru/ui/document/DocumentElementType.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include <vector> diff --git a/include/cru/ui/document/TextDocumentElement.h b/include/cru/ui/document/TextDocumentElement.h index 93b4933b..73a041ef 100644 --- a/include/cru/ui/document/TextDocumentElement.h +++ b/include/cru/ui/document/TextDocumentElement.h @@ -2,8 +2,8 @@ #include "../Base.h" #include "DocumentElement.h" -#include "cru/common/Base.h" -#include "cru/common/Bitmask.h" +#include "cru/base/Base.h" +#include "cru/base/Bitmask.h" namespace cru::ui::document { namespace details { diff --git a/include/cru/ui/events/RoutedEvent.h b/include/cru/ui/events/RoutedEvent.h index 909678f8..a01839a6 100644 --- a/include/cru/ui/events/RoutedEvent.h +++ b/include/cru/ui/events/RoutedEvent.h @@ -1,7 +1,7 @@ #pragma once #include "UiEventArgs.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::events { // TEventArgs must not be a reference type. This class help add reference. diff --git a/include/cru/ui/helper/ClickDetector.h b/include/cru/ui/helper/ClickDetector.h index 3bf28451..5e30d9c3 100644 --- a/include/cru/ui/helper/ClickDetector.h +++ b/include/cru/ui/helper/ClickDetector.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::helper { class ClickDetector; diff --git a/include/cru/ui/helper/ShortcutHub.h b/include/cru/ui/helper/ShortcutHub.h index fe3b2a72..341e76da 100644 --- a/include/cru/ui/helper/ShortcutHub.h +++ b/include/cru/ui/helper/ShortcutHub.h @@ -2,8 +2,8 @@ #include "../Base.h" #include "../events/KeyEventArgs.h" -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" #include "cru/platform/gui/Keyboard.h" #include <cstddef> diff --git a/include/cru/ui/host/WindowHost.h b/include/cru/ui/host/WindowHost.h index 17f69d89..23229036 100644 --- a/include/cru/ui/host/WindowHost.h +++ b/include/cru/ui/host/WindowHost.h @@ -2,7 +2,7 @@ #include "../Base.h" #include "../render/RenderObject.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" #include "cru/platform/gui/Window.h" diff --git a/include/cru/ui/mapper/BrushMapper.h b/include/cru/ui/mapper/BrushMapper.h index 0748c037..3b918dc7 100644 --- a/include/cru/ui/mapper/BrushMapper.h +++ b/include/cru/ui/mapper/BrushMapper.h @@ -1,6 +1,6 @@ #pragma once #include "Mapper.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Brush.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/FontMapper.h b/include/cru/ui/mapper/FontMapper.h index f6dbf56a..f8b10047 100644 --- a/include/cru/ui/mapper/FontMapper.h +++ b/include/cru/ui/mapper/FontMapper.h @@ -1,6 +1,6 @@ #pragma once #include "Mapper.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Font.h" namespace cru::ui::mapper { diff --git a/include/cru/ui/mapper/Mapper.h b/include/cru/ui/mapper/Mapper.h index e059f9c0..40e15186 100644 --- a/include/cru/ui/mapper/Mapper.h +++ b/include/cru/ui/mapper/Mapper.h @@ -1,8 +1,8 @@ #pragma once #include "../Base.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Exception.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Exception.h" #include "cru/xml/XmlNode.h" #include <memory> diff --git a/include/cru/ui/mapper/ThicknessMapper.h b/include/cru/ui/mapper/ThicknessMapper.h index 10f6c87e..fab1e5d3 100644 --- a/include/cru/ui/mapper/ThicknessMapper.h +++ b/include/cru/ui/mapper/ThicknessMapper.h @@ -2,7 +2,7 @@ #include "Mapper.h" #include "../Base.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/xml/XmlNode.h" namespace cru::ui::mapper { diff --git a/include/cru/ui/mapper/style/BorderStylerMapper.h b/include/cru/ui/mapper/style/BorderStylerMapper.h index 3cf78faa..57b5dce4 100644 --- a/include/cru/ui/mapper/style/BorderStylerMapper.h +++ b/include/cru/ui/mapper/style/BorderStylerMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../Mapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/style/IStylerMapper.h" #include "cru/ui/style/Styler.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/IConditionMapper.h b/include/cru/ui/mapper/style/IConditionMapper.h index 7610dc8d..bfe24224 100644 --- a/include/cru/ui/mapper/style/IConditionMapper.h +++ b/include/cru/ui/mapper/style/IConditionMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../../Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/Mapper.h" #include "cru/ui/style/Condition.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/IStylerMapper.h b/include/cru/ui/mapper/style/IStylerMapper.h index 4c2ecd16..adf9b6fb 100644 --- a/include/cru/ui/mapper/style/IStylerMapper.h +++ b/include/cru/ui/mapper/style/IStylerMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../../Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/Mapper.h" #include "cru/ui/style/Styler.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/NoConditionMapper.h b/include/cru/ui/mapper/style/NoConditionMapper.h index 2103a268..06106514 100644 --- a/include/cru/ui/mapper/style/NoConditionMapper.h +++ b/include/cru/ui/mapper/style/NoConditionMapper.h @@ -1,8 +1,8 @@ #pragma once #include "../Mapper.h" #include "IConditionMapper.h" -#include "cru/common/Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/Base.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.h b/include/cru/ui/mapper/style/StyleRuleMapper.h index 21bf3176..7430274c 100644 --- a/include/cru/ui/mapper/style/StyleRuleMapper.h +++ b/include/cru/ui/mapper/style/StyleRuleMapper.h @@ -1,7 +1,7 @@ #pragma once #include "../Mapper.h" -#include "cru/common/Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/Base.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/StyleRule.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/model/IListChangeNotify.h b/include/cru/ui/model/IListChangeNotify.h index a9fcd65b..0cbd25f2 100644 --- a/include/cru/ui/model/IListChangeNotify.h +++ b/include/cru/ui/model/IListChangeNotify.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" namespace cru::ui::model { enum ListChangeType { diff --git a/include/cru/ui/render/CanvasRenderObject.h b/include/cru/ui/render/CanvasRenderObject.h index f498c5ae..dfe8f090 100644 --- a/include/cru/ui/render/CanvasRenderObject.h +++ b/include/cru/ui/render/CanvasRenderObject.h @@ -1,7 +1,7 @@ #pragma once #include "RenderObject.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::render { class CanvasPaintEventArgs { diff --git a/include/cru/ui/render/MeasureRequirement.h b/include/cru/ui/render/MeasureRequirement.h index ace52ef6..3f4e0a3d 100644 --- a/include/cru/ui/render/MeasureRequirement.h +++ b/include/cru/ui/render/MeasureRequirement.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include <algorithm> #include <limits> diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h index 8a0ba511..7ab62446 100644 --- a/include/cru/ui/render/RenderObject.h +++ b/include/cru/ui/render/RenderObject.h @@ -2,7 +2,7 @@ #include "../Base.h" #include "MeasureRequirement.h" -#include "cru/common/String.h" +#include "cru/base/String.h" namespace cru::ui::render { struct BoxConstraint { diff --git a/include/cru/ui/render/ScrollBar.h b/include/cru/ui/render/ScrollBar.h index 20b6e6cf..45f80389 100644 --- a/include/cru/ui/render/ScrollBar.h +++ b/include/cru/ui/render/ScrollBar.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" #include "cru/platform/graphics/Base.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Geometry.h" diff --git a/include/cru/ui/render/ScrollRenderObject.h b/include/cru/ui/render/ScrollRenderObject.h index 44656942..180e927a 100644 --- a/include/cru/ui/render/ScrollRenderObject.h +++ b/include/cru/ui/render/ScrollRenderObject.h @@ -2,7 +2,7 @@ #include "SingleChildRenderObject.h" #include "ScrollBar.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/render/RenderObject.h" #include <memory> diff --git a/include/cru/ui/style/Condition.h b/include/cru/ui/style/Condition.h index 28f42315..2d2dceac 100644 --- a/include/cru/ui/style/Condition.h +++ b/include/cru/ui/style/Condition.h @@ -1,8 +1,8 @@ #pragma once #include "../Base.h" -#include "cru/common/Base.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Event.h" #include "cru/ui/controls/IClickableControl.h" #include "cru/ui/helper/ClickDetector.h" diff --git a/include/cru/ui/style/StyleRule.h b/include/cru/ui/style/StyleRule.h index 27069930..1ae2f0f1 100644 --- a/include/cru/ui/style/StyleRule.h +++ b/include/cru/ui/style/StyleRule.h @@ -2,7 +2,7 @@ #include "../Base.h" #include "Condition.h" #include "Styler.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include <memory> #include <vector> diff --git a/include/cru/ui/style/StyleRuleSet.h b/include/cru/ui/style/StyleRuleSet.h index 080c2eb8..fae9ab5f 100644 --- a/include/cru/ui/style/StyleRuleSet.h +++ b/include/cru/ui/style/StyleRuleSet.h @@ -1,7 +1,7 @@ #pragma once #include "StyleRule.h" -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" #include "cru/ui/model/IListChangeNotify.h" #include <cstddef> diff --git a/include/cru/ui/style/Styler.h b/include/cru/ui/style/Styler.h index 7df3e138..3ed85e1e 100644 --- a/include/cru/ui/style/Styler.h +++ b/include/cru/ui/style/Styler.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" #include "ApplyBorderStyleInfo.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/gui/Cursor.h" #include "cru/ui/render/MeasureRequirement.h" diff --git a/include/cru/xml/XmlNode.h b/include/cru/xml/XmlNode.h index 50685749..a7d1bf38 100644 --- a/include/cru/xml/XmlNode.h +++ b/include/cru/xml/XmlNode.h @@ -2,7 +2,7 @@ #include "Base.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include <algorithm> #include <optional> diff --git a/include/cru/xml/XmlParser.h b/include/cru/xml/XmlParser.h index 75664ce3..ca4fb54a 100644 --- a/include/cru/xml/XmlParser.h +++ b/include/cru/xml/XmlParser.h @@ -2,8 +2,8 @@ #include "XmlNode.h" -#include "cru/common/Exception.h" -#include "cru/common/String.h" +#include "cru/base/Exception.h" +#include "cru/base/String.h" #include <optional> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9cb01e47..959f2dd1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,5 @@ -add_subdirectory(common) - +add_subdirectory(base) add_subdirectory(platform) - add_subdirectory(ui) add_subdirectory(parse) add_subdirectory(toml) diff --git a/src/ThemeBuilder/components/Editor.h b/src/ThemeBuilder/components/Editor.h index 29809c82..2e1db741 100644 --- a/src/ThemeBuilder/components/Editor.h +++ b/src/ThemeBuilder/components/Editor.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/components/Component.h" namespace cru::theme_builder::components { diff --git a/src/ThemeBuilder/components/HeadBodyEditor.h b/src/ThemeBuilder/components/HeadBodyEditor.h index 8119724f..1fcf2f63 100644 --- a/src/ThemeBuilder/components/HeadBodyEditor.h +++ b/src/ThemeBuilder/components/HeadBodyEditor.h @@ -1,6 +1,6 @@ #pragma once #include "Editor.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/controls/Container.h" #include "cru/ui/controls/FlexLayout.h" #include "cru/ui/controls/IconButton.h" diff --git a/src/ThemeBuilder/components/StyleRuleSetEditor.cpp b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp index 8cf5af6d..a1c19e08 100644 --- a/src/ThemeBuilder/components/StyleRuleSetEditor.cpp +++ b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp @@ -1,6 +1,6 @@ #include "StyleRuleSetEditor.h" -#include "cru/common/Exception.h" -#include "cru/common/String.h" +#include "cru/base/Exception.h" +#include "cru/base/String.h" #include "cru/ui/DeleteLater.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/controls/FlexLayout.h" diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp index 64370981..57e72a0f 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp @@ -1,5 +1,5 @@ #include "CheckedConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h index 7cf14912..b6e740f1 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/CheckBoxPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp index a8d5cc87..bf0b1d98 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp @@ -1,5 +1,5 @@ #include "ClickStateConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/helper/ClickDetector.h" #include "cru/ui/style/Condition.h" diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h index 454a1346..2ea4fcf4 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h @@ -1,8 +1,8 @@ #pragma once #include "../properties/SelectPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Event.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Event.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp index 69b8ed02..8be3aa0f 100644 --- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp @@ -4,7 +4,7 @@ #include "ConditionEditor.h" #include "FocusConditionEditor.h" #include "NoConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/Color.h" #include "cru/ui/Base.h" #include "cru/ui/ThemeManager.h" diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h index e1398514..2948df36 100644 --- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Event.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Event.h" #include "cru/ui/components/Component.h" #include "cru/ui/components/PopupButton.h" #include "cru/ui/controls/Button.h" diff --git a/src/ThemeBuilder/components/conditions/ConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp index 5b79c639..421bb028 100644 --- a/src/ThemeBuilder/components/conditions/ConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp @@ -5,7 +5,7 @@ #include "CompoundConditionEditor.h" #include "FocusConditionEditor.h" #include "NoConditionEditor.h" -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/ui/controls/FlexLayout.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp index 1fb99d64..78c99b5c 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp @@ -1,5 +1,5 @@ #include "FocusConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h index 1faf4d7d..d5478653 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/CheckBoxPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/NoConditionEditor.h b/src/ThemeBuilder/components/conditions/NoConditionEditor.h index 19616319..b38806b5 100644 --- a/src/ThemeBuilder/components/conditions/NoConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/NoConditionEditor.h @@ -1,6 +1,6 @@ #pragma once #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp index d1f4afce..ad338e78 100644 --- a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp +++ b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp @@ -1,5 +1,5 @@ #include "MeasureLengthPropertyEditor.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/render/MeasureRequirement.h" diff --git a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp index 6d4277aa..d8487209 100644 --- a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp +++ b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp @@ -1,5 +1,5 @@ #include "PointPropertyEditor.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/mapper/PointMapper.h" diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp index 81eb66d3..1329a08a 100644 --- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp @@ -1,5 +1,5 @@ #include "BorderStylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/gui/UiApplication.h" diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h index 539262d6..c9435ee9 100644 --- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h @@ -4,7 +4,7 @@ #include "../properties/OptionalPropertyEditor.h" #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" namespace cru::theme_builder::components::stylers { class BorderStylerEditor : public StylerEditor { diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp index 6b8a5033..c8b2a871 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp @@ -6,7 +6,7 @@ #include "MarginStylerEditor.h" #include "PaddingStylerEditor.h" #include "PreferredSizeStylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/style/Styler.h" diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h index 57150e83..91d2bff5 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h @@ -1,6 +1,6 @@ #pragma once #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/DeleteLater.h" #include "cru/ui/components/PopupButton.h" #include "cru/ui/controls/FlexLayout.h" diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h index 8385b7c3..ec51c041 100644 --- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h @@ -2,7 +2,7 @@ #include "../Editor.h" #include "../properties/ColorPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/FontStylerEditor.h b/src/ThemeBuilder/components/stylers/FontStylerEditor.h index ccd12113..847b0e2a 100644 --- a/src/ThemeBuilder/components/stylers/FontStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.h @@ -2,7 +2,7 @@ #include "../Editor.h" #include "../properties/FontPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h index 9de6f1a2..9a1ca750 100644 --- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h index b78d310b..69565cad 100644 --- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h index 4a64da10..36fdc3d6 100644 --- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/MeasureLengthPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/main.cpp b/src/ThemeBuilder/main.cpp index 0c5b2159..4f4ffe4a 100644 --- a/src/ThemeBuilder/main.cpp +++ b/src/ThemeBuilder/main.cpp @@ -1,5 +1,5 @@ #include "components/MainWindow.h" -#include "cru/common/io/Resource.h" +#include "cru/base/io/Resource.h" #include "cru/platform/bootstrap/Bootstrap.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/ThemeResourceDictionary.h" diff --git a/src/common/Base.cpp b/src/base/Base.cpp index ba4077b4..1704f8a9 100644 --- a/src/common/Base.cpp +++ b/src/base/Base.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include <exception> diff --git a/src/common/Buffer.cpp b/src/base/Buffer.cpp index 7b4248c7..1213364a 100644 --- a/src/common/Buffer.cpp +++ b/src/base/Buffer.cpp @@ -1,5 +1,5 @@ -#include "cru/common/Buffer.h" -#include "cru/common/Exception.h" +#include "cru/base/Buffer.h" +#include "cru/base/Exception.h" #include <cstring> diff --git a/src/common/CMakeLists.txt b/src/base/CMakeLists.txt index 19feddba..19feddba 100644 --- a/src/common/CMakeLists.txt +++ b/src/base/CMakeLists.txt diff --git a/src/common/Exception.cpp b/src/base/Exception.cpp index 4110ad56..19938970 100644 --- a/src/common/Exception.cpp +++ b/src/base/Exception.cpp @@ -1,6 +1,6 @@ -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include <cerrno> diff --git a/src/common/Format.cpp b/src/base/Format.cpp index d58c90b7..cba4137f 100644 --- a/src/common/Format.cpp +++ b/src/base/Format.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Format.h" +#include "cru/base/Format.h" namespace cru { namespace details { diff --git a/src/common/PropertyTree.cpp b/src/base/PropertyTree.cpp index b587becb..8303a706 100644 --- a/src/common/PropertyTree.cpp +++ b/src/base/PropertyTree.cpp @@ -1,6 +1,6 @@ -#include "cru/common/PropertyTree.h" +#include "cru/base/PropertyTree.h" #include <unordered_map> -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" namespace cru { String PropertySubTreeRef::CombineKey(StringView left, StringView right) { diff --git a/src/common/String.cpp b/src/base/String.cpp index 27712f01..47b64373 100644 --- a/src/common/String.cpp +++ b/src/base/String.cpp @@ -1,9 +1,9 @@ -#include "cru/common/String.h" +#include "cru/base/String.h" -#include "cru/common/Buffer.h" -#include "cru/common/Exception.h" -#include "cru/common/StringToNumberConverter.h" -#include "cru/common/StringUtil.h" +#include "cru/base/Buffer.h" +#include "cru/base/Exception.h" +#include "cru/base/StringToNumberConverter.h" +#include "cru/base/StringUtil.h" #include <double-conversion/double-conversion.h> #include <double-conversion/string-to-double.h> diff --git a/src/common/StringToNumberConverter.cpp b/src/base/StringToNumberConverter.cpp index 7a926d3d..65aec48e 100644 --- a/src/common/StringToNumberConverter.cpp +++ b/src/base/StringToNumberConverter.cpp @@ -1,5 +1,5 @@ -#include "cru/common/StringToNumberConverter.h" -#include "cru/common/Exception.h" +#include "cru/base/StringToNumberConverter.h" +#include "cru/base/Exception.h" namespace cru { bool StringToIntegerConverter::CheckParams() const { diff --git a/src/common/StringUtil.cpp b/src/base/StringUtil.cpp index f584fd4e..9053f384 100644 --- a/src/common/StringUtil.cpp +++ b/src/base/StringUtil.cpp @@ -1,6 +1,6 @@ -#include "cru/common/StringUtil.h" -#include "cru/common/Base.h" -#include "cru/common/Exception.h" +#include "cru/base/StringUtil.h" +#include "cru/base/Base.h" +#include "cru/base/Exception.h" namespace cru { using details::ExtractBits; diff --git a/src/common/SubProcess.cpp b/src/base/SubProcess.cpp index 33926f39..1133b848 100644 --- a/src/common/SubProcess.cpp +++ b/src/base/SubProcess.cpp @@ -1,9 +1,9 @@ -#include "cru/common/SubProcess.h" +#include "cru/base/SubProcess.h" #include <thread> #ifdef CRU_PLATFORM_UNIX -#include "cru/common/platform/unix/PosixSpawnSubProcess.h" +#include "cru/base/platform/unix/PosixSpawnSubProcess.h" #endif namespace cru { diff --git a/src/common/io/AutoReadStream.cpp b/src/base/io/AutoReadStream.cpp index 18bc18da..c24f61d1 100644 --- a/src/common/io/AutoReadStream.cpp +++ b/src/base/io/AutoReadStream.cpp @@ -1,5 +1,5 @@ -#include "cru/common/io/AutoReadStream.h" -#include "cru/common/io/Stream.h" +#include "cru/base/io/AutoReadStream.h" +#include "cru/base/io/Stream.h" #include <thread> diff --git a/src/common/io/BufferStream.cpp b/src/base/io/BufferStream.cpp index 73e5719b..e81731e8 100644 --- a/src/common/io/BufferStream.cpp +++ b/src/base/io/BufferStream.cpp @@ -1,5 +1,5 @@ -#include "cru/common/io/BufferStream.h" -#include "cru/common/io/Stream.h" +#include "cru/base/io/BufferStream.h" +#include "cru/base/io/Stream.h" namespace cru::io { BufferStream::BufferStream(const BufferStreamOptions& options) diff --git a/src/common/io/CFileStream.cpp b/src/base/io/CFileStream.cpp index 01456437..d5acc707 100644 --- a/src/common/io/CFileStream.cpp +++ b/src/base/io/CFileStream.cpp @@ -1,6 +1,6 @@ -#include "cru/common/io/CFileStream.h" -#include "cru/common/Exception.h" -#include "cru/common/io/Stream.h" +#include "cru/base/io/CFileStream.h" +#include "cru/base/Exception.h" +#include "cru/base/io/Stream.h" #include <cstdio> diff --git a/src/common/io/MemoryStream.cpp b/src/base/io/MemoryStream.cpp index 4b33d780..4c650f3e 100644 --- a/src/common/io/MemoryStream.cpp +++ b/src/base/io/MemoryStream.cpp @@ -1,8 +1,8 @@ -#include "cru/common/io/MemoryStream.h" +#include "cru/base/io/MemoryStream.h" #include <cstring> -#include "cru/common/Exception.h" -#include "cru/common/io/Stream.h" +#include "cru/base/Exception.h" +#include "cru/base/io/Stream.h" namespace cru::io { MemoryStream::MemoryStream( diff --git a/src/common/io/OpenFileFlag.cpp b/src/base/io/OpenFileFlag.cpp index 6b9957fe..47069b29 100644 --- a/src/common/io/OpenFileFlag.cpp +++ b/src/base/io/OpenFileFlag.cpp @@ -1,4 +1,4 @@ -#include "cru/common/io/OpenFileFlag.h" +#include "cru/base/io/OpenFileFlag.h" namespace cru::io { bool CheckOpenFileFlag(OpenFileFlag flags) { diff --git a/src/common/io/ProxyStream.cpp b/src/base/io/ProxyStream.cpp index c2e64056..de66169e 100644 --- a/src/common/io/ProxyStream.cpp +++ b/src/base/io/ProxyStream.cpp @@ -1,5 +1,5 @@ -#include "cru/common/io/ProxyStream.h" -#include "cru/common/io/Stream.h" +#include "cru/base/io/ProxyStream.h" +#include "cru/base/io/Stream.h" namespace cru::io { ProxyStream::ProxyStream(ProxyStreamHandlers handlers) diff --git a/src/common/io/Resource.cpp b/src/base/io/Resource.cpp index b847e1cf..d369b5f5 100644 --- a/src/common/io/Resource.cpp +++ b/src/base/io/Resource.cpp @@ -1,6 +1,6 @@ -#include "cru/common/io/Resource.h" -#include "cru/common/Exception.h" -#include "cru/common/log/Logger.h" +#include "cru/base/io/Resource.h" +#include "cru/base/Exception.h" +#include "cru/base/log/Logger.h" #if defined(CRU_PLATFORM_OSX) #include <CoreFoundation/CoreFoundation.h> diff --git a/src/common/io/Stream.cpp b/src/base/io/Stream.cpp index 6b0a513c..d65bac46 100644 --- a/src/common/io/Stream.cpp +++ b/src/base/io/Stream.cpp @@ -1,6 +1,6 @@ -#include "cru/common/io/Stream.h" -#include "cru/common/Exception.h" -#include "cru/common/Format.h" +#include "cru/base/io/Stream.h" +#include "cru/base/Exception.h" +#include "cru/base/Format.h" #include <utility> diff --git a/src/common/log/Logger.cpp b/src/base/log/Logger.cpp index 4b07ed87..86c65dbc 100644 --- a/src/common/log/Logger.cpp +++ b/src/base/log/Logger.cpp @@ -1,11 +1,11 @@ -#include "cru/common/log/Logger.h" -#include "cru/common/log/StdioLogTarget.h" +#include "cru/base/log/Logger.h" +#include "cru/base/log/StdioLogTarget.h" #include <ctime> #include <algorithm> #ifdef CRU_PLATFORM_WINDOWS -#include "cru/common/platform/win/DebugLogTarget.h" +#include "cru/base/platform/win/DebugLogTarget.h" #endif namespace cru::log { diff --git a/src/common/log/StdioLogTarget.cpp b/src/base/log/StdioLogTarget.cpp index 7f99dbd1..64ddcacc 100644 --- a/src/common/log/StdioLogTarget.cpp +++ b/src/base/log/StdioLogTarget.cpp @@ -1,4 +1,4 @@ -#include "cru/common/log/StdioLogTarget.h" +#include "cru/base/log/StdioLogTarget.h" #include <iostream> diff --git a/src/base/platform/Exception.cpp b/src/base/platform/Exception.cpp new file mode 100644 index 00000000..b5e8c5b9 --- /dev/null +++ b/src/base/platform/Exception.cpp @@ -0,0 +1 @@ +#include "cru/base/platform/Exception.h" diff --git a/src/common/platform/osx/Convert.cpp b/src/base/platform/osx/Convert.cpp index 4792df1f..1a6deb8f 100644 --- a/src/common/platform/osx/Convert.cpp +++ b/src/base/platform/osx/Convert.cpp @@ -1,4 +1,4 @@ -#include "cru/common/platform/osx/Convert.h" +#include "cru/base/platform/osx/Convert.h" namespace cru::platform::osx { CFStringRef Convert(const String& string) { diff --git a/src/base/platform/osx/Exception.cpp b/src/base/platform/osx/Exception.cpp new file mode 100644 index 00000000..a60448dd --- /dev/null +++ b/src/base/platform/osx/Exception.cpp @@ -0,0 +1 @@ +#include "cru/base/platform//osx/Exception.h" diff --git a/src/common/platform/unix/PosixSpawnSubProcess.cpp b/src/base/platform/unix/PosixSpawnSubProcess.cpp index b5d68845..75d48cc2 100644 --- a/src/common/platform/unix/PosixSpawnSubProcess.cpp +++ b/src/base/platform/unix/PosixSpawnSubProcess.cpp @@ -1,10 +1,10 @@ -#include "cru/common/platform/unix/PosixSpawnSubProcess.h" -#include "cru/common/Exception.h" -#include "cru/common/Format.h" -#include "cru/common/Guard.h" -#include "cru/common/String.h" -#include "cru/common/SubProcess.h" -#include "cru/common/log/Logger.h" +#include "cru/base/platform/unix/PosixSpawnSubProcess.h" +#include "cru/base/Exception.h" +#include "cru/base/Format.h" +#include "cru/base/Guard.h" +#include "cru/base/String.h" +#include "cru/base/SubProcess.h" +#include "cru/base/log/Logger.h" #include <signal.h> #include <spawn.h> diff --git a/src/common/platform/unix/UnixFileStream.cpp b/src/base/platform/unix/UnixFileStream.cpp index 804e24f0..c53bbbaa 100644 --- a/src/common/platform/unix/UnixFileStream.cpp +++ b/src/base/platform/unix/UnixFileStream.cpp @@ -1,8 +1,8 @@ -#include "cru/common/platform/unix/UnixFileStream.h" -#include "cru/common/Exception.h" -#include "cru/common/Format.h" -#include "cru/common/io/Stream.h" -#include "cru/common/log/Logger.h" +#include "cru/base/platform/unix/UnixFileStream.h" +#include "cru/base/Exception.h" +#include "cru/base/Format.h" +#include "cru/base/io/Stream.h" +#include "cru/base/log/Logger.h" #include <fcntl.h> #include <sys/fcntl.h> diff --git a/src/common/platform/unix/UnixPipe.cpp b/src/base/platform/unix/UnixPipe.cpp index f30c599e..747efe94 100644 --- a/src/common/platform/unix/UnixPipe.cpp +++ b/src/base/platform/unix/UnixPipe.cpp @@ -1,6 +1,6 @@ -#include "cru/common/platform/unix/UnixPipe.h" -#include "cru/common/Exception.h" -#include "cru/common/log/Logger.h" +#include "cru/base/platform/unix/UnixPipe.h" +#include "cru/base/Exception.h" +#include "cru/base/log/Logger.h" #include <fcntl.h> #include <sys/fcntl.h> diff --git a/src/base/platform/web/WebException.cpp b/src/base/platform/web/WebException.cpp new file mode 100644 index 00000000..f473bb5b --- /dev/null +++ b/src/base/platform/web/WebException.cpp @@ -0,0 +1 @@ +#include "cru/base/platform/web/WebException.h" diff --git a/src/common/platform/win/BridgeComStream.cpp b/src/base/platform/win/BridgeComStream.cpp index 4c83fd45..c6987ab2 100644 --- a/src/common/platform/win/BridgeComStream.cpp +++ b/src/base/platform/win/BridgeComStream.cpp @@ -1,5 +1,5 @@ #include "BrigdeComStream.h" -#include "cru/common/io/Stream.h" +#include "cru/base/io/Stream.h" namespace cru::platform::win { BridgeComStream::BridgeComStream(io::Stream *stream) diff --git a/src/common/platform/win/BrigdeComStream.h b/src/base/platform/win/BrigdeComStream.h index 7c8a79d1..1621b567 100644 --- a/src/common/platform/win/BrigdeComStream.h +++ b/src/base/platform/win/BrigdeComStream.h @@ -1,7 +1,7 @@ #pragma once -#include "cru/common/platform/win/WinPreConfig.h" +#include "cru/base/platform/win/WinPreConfig.h" -#include "cru/common/io/Stream.h" +#include "cru/base/io/Stream.h" #include <objidlbase.h> diff --git a/src/common/platform/win/ComAutoInit.cpp b/src/base/platform/win/ComAutoInit.cpp index 55a53a8d..548a7bea 100644 --- a/src/common/platform/win/ComAutoInit.cpp +++ b/src/base/platform/win/ComAutoInit.cpp @@ -1,5 +1,5 @@ -#include "cru/common/platform/win/ComAutoInit.h" -#include "cru/common/platform/win/Exception.h" +#include "cru/base/platform/win/ComAutoInit.h" +#include "cru/base/platform/win/Exception.h" #include <combaseapi.h> diff --git a/src/common/platform/win/DebugLogTarget.cpp b/src/base/platform/win/DebugLogTarget.cpp index 92d26449..89bd3d19 100644 --- a/src/common/platform/win/DebugLogTarget.cpp +++ b/src/base/platform/win/DebugLogTarget.cpp @@ -1,4 +1,4 @@ -#include "cru/common/platform/win/DebugLogTarget.h" +#include "cru/base/platform/win/DebugLogTarget.h" namespace cru::platform::win { void WinDebugLogTarget::Write(::cru::log::LogLevel level, StringView s) { diff --git a/src/common/platform/win/Exception.cpp b/src/base/platform/win/Exception.cpp index a20e8a31..5ff6146b 100644 --- a/src/common/platform/win/Exception.cpp +++ b/src/base/platform/win/Exception.cpp @@ -1,5 +1,5 @@ -#include "cru/common/platform/win/Exception.h" -#include "cru/common/Format.h" +#include "cru/base/platform/win/Exception.h" +#include "cru/base/Format.h" #include <optional> diff --git a/src/common/platform/win/StreamConvert.cpp b/src/base/platform/win/StreamConvert.cpp index d547caa5..f7a0537c 100644 --- a/src/common/platform/win/StreamConvert.cpp +++ b/src/base/platform/win/StreamConvert.cpp @@ -1,12 +1,12 @@ -#include "cru/common/platform/win/StreamConvert.h" +#include "cru/base/platform/win/StreamConvert.h" #include "BrigdeComStream.h" #include "Win32FileStreamPrivate.h" -#include "cru/common/Exception.h" -#include "cru/common/io/MemoryStream.h" -#include "cru/common/io/OpenFileFlag.h" -#include "cru/common/platform/win/ComAutoInit.h" -#include "cru/common/platform/win/Exception.h" -#include "cru/common/platform/win/Win32FileStream.h" +#include "cru/base/Exception.h" +#include "cru/base/io/MemoryStream.h" +#include "cru/base/io/OpenFileFlag.h" +#include "cru/base/platform/win/ComAutoInit.h" +#include "cru/base/platform/win/Exception.h" +#include "cru/base/platform/win/Win32FileStream.h" #include <shlwapi.h> #include <winnt.h> diff --git a/src/common/platform/win/Win32FileStream.cpp b/src/base/platform/win/Win32FileStream.cpp index a118dc02..54e6ae45 100644 --- a/src/common/platform/win/Win32FileStream.cpp +++ b/src/base/platform/win/Win32FileStream.cpp @@ -1,8 +1,8 @@ -#include "cru/common/platform/win/Win32FileStream.h" +#include "cru/base/platform/win/Win32FileStream.h" #include "Win32FileStreamPrivate.h" -#include "cru/common/io/OpenFileFlag.h" -#include "cru/common/platform/win/Exception.h" +#include "cru/base/io/OpenFileFlag.h" +#include "cru/base/platform/win/Exception.h" #include <Windows.h> #include <coml2api.h> diff --git a/src/common/platform/win/Win32FileStreamPrivate.h b/src/base/platform/win/Win32FileStreamPrivate.h index 24492f8d..718f8d9a 100644 --- a/src/common/platform/win/Win32FileStreamPrivate.h +++ b/src/base/platform/win/Win32FileStreamPrivate.h @@ -1,4 +1,4 @@ -#include "cru/common/platform/win/WinPreConfig.h" +#include "cru/base/platform/win/WinPreConfig.h" #include <objidl.h> diff --git a/src/common/platform/Exception.cpp b/src/common/platform/Exception.cpp deleted file mode 100644 index 1c5db390..00000000 --- a/src/common/platform/Exception.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "cru/common/platform/Exception.h" diff --git a/src/common/platform/osx/Exception.cpp b/src/common/platform/osx/Exception.cpp deleted file mode 100644 index e03faa4c..00000000 --- a/src/common/platform/osx/Exception.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "cru/common/platform//osx/Exception.h" diff --git a/src/common/platform/web/WebException.cpp b/src/common/platform/web/WebException.cpp deleted file mode 100644 index 30f9d1f0..00000000 --- a/src/common/platform/web/WebException.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "cru/common/platform/web/WebException.h" diff --git a/src/parse/Grammar.cpp b/src/parse/Grammar.cpp index 17978adc..12617de3 100644 --- a/src/parse/Grammar.cpp +++ b/src/parse/Grammar.cpp @@ -1,7 +1,7 @@ #include "cru/parse/Grammar.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include "cru/parse/Symbol.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include <algorithm> #include <iterator> diff --git a/src/platform/Exception.cpp b/src/platform/Exception.cpp index 7aef3b7f..948345e0 100644 --- a/src/platform/Exception.cpp +++ b/src/platform/Exception.cpp @@ -1,5 +1,5 @@ #include "cru/platform/Exception.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include <optional> diff --git a/src/platform/graphics/Geometry.cpp b/src/platform/graphics/Geometry.cpp index 0c98b456..25dfba6e 100644 --- a/src/platform/graphics/Geometry.cpp +++ b/src/platform/graphics/Geometry.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/Geometry.h" -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/platform/Exception.h" #include "cru/platform/graphics/Factory.h" diff --git a/src/platform/graphics/cairo/CairoImageFactory.cpp b/src/platform/graphics/cairo/CairoImageFactory.cpp index 99994226..912226d9 100644 --- a/src/platform/graphics/cairo/CairoImageFactory.cpp +++ b/src/platform/graphics/cairo/CairoImageFactory.cpp @@ -1,5 +1,5 @@ #include "cru/platform/graphics/cairo/CairoImageFactory.h" -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/platform/Check.h" #include "cru/platform/graphics/cairo/CairoImage.h" #include "cru/platform/graphics/cairo/CairoResource.h" diff --git a/src/platform/graphics/cairo/CairoPainter.cpp b/src/platform/graphics/cairo/CairoPainter.cpp index 00c8187c..b9ab50c4 100644 --- a/src/platform/graphics/cairo/CairoPainter.cpp +++ b/src/platform/graphics/cairo/CairoPainter.cpp @@ -1,5 +1,5 @@ #include "cru/platform/graphics/cairo/CairoPainter.h" -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/platform/Check.h" #include "cru/platform/Exception.h" #include "cru/platform/graphics/cairo/Base.h" diff --git a/src/platform/graphics/cairo/PangoTextLayout.cpp b/src/platform/graphics/cairo/PangoTextLayout.cpp index 25e84707..1033ce9e 100644 --- a/src/platform/graphics/cairo/PangoTextLayout.cpp +++ b/src/platform/graphics/cairo/PangoTextLayout.cpp @@ -1,5 +1,5 @@ #include "cru/platform/graphics/cairo/PangoTextLayout.h" -#include "cru/common/StringUtil.h" +#include "cru/base/StringUtil.h" #include "cru/platform/Check.h" #include "cru/platform/GraphicsBase.h" #include "cru/platform/graphics/Base.h" diff --git a/src/platform/graphics/direct2d/Factory.cpp b/src/platform/graphics/direct2d/Factory.cpp index c35c53cf..cf65c2a5 100644 --- a/src/platform/graphics/direct2d/Factory.cpp +++ b/src/platform/graphics/direct2d/Factory.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/direct2d/Factory.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/graphics/direct2d/Brush.h" #include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Font.h" diff --git a/src/platform/graphics/direct2d/Font.cpp b/src/platform/graphics/direct2d/Font.cpp index afbc9049..b1c03751 100644 --- a/src/platform/graphics/direct2d/Font.cpp +++ b/src/platform/graphics/direct2d/Font.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/direct2d/Font.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" diff --git a/src/platform/graphics/direct2d/Geometry.cpp b/src/platform/graphics/direct2d/Geometry.cpp index b84a901e..a2377400 100644 --- a/src/platform/graphics/direct2d/Geometry.cpp +++ b/src/platform/graphics/direct2d/Geometry.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/direct2d/Geometry.h" -#include "cru/common/platform/win/Exception.h" +#include "cru/base/platform/win/Exception.h" #include "cru/platform/graphics/direct2d/ConvertUtil.h" #include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" diff --git a/src/platform/graphics/direct2d/Image.cpp b/src/platform/graphics/direct2d/Image.cpp index 78cccd6a..2f60b373 100644 --- a/src/platform/graphics/direct2d/Image.cpp +++ b/src/platform/graphics/direct2d/Image.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/direct2d/Image.h" #include <d2d1_1.h> -#include "cru/common/platform/win/Exception.h" +#include "cru/base/platform/win/Exception.h" #include "cru/platform/graphics/direct2d/ConvertUtil.h" #include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" diff --git a/src/platform/graphics/direct2d/ImageFactory.cpp b/src/platform/graphics/direct2d/ImageFactory.cpp index 7cbc0ad4..113f70c8 100644 --- a/src/platform/graphics/direct2d/ImageFactory.cpp +++ b/src/platform/graphics/direct2d/ImageFactory.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/direct2d/ImageFactory.h" -#include "cru/common/platform/win/Exception.h" -#include "cru/common/platform/win/StreamConvert.h" +#include "cru/base/platform/win/Exception.h" +#include "cru/base/platform/win/StreamConvert.h" #include "cru/platform/Check.h" #include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" diff --git a/src/platform/graphics/direct2d/Painter.cpp b/src/platform/graphics/direct2d/Painter.cpp index dea3ba03..95b0bb4e 100644 --- a/src/platform/graphics/direct2d/Painter.cpp +++ b/src/platform/graphics/direct2d/Painter.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/direct2d/Painter.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/Check.h" #include "cru/platform/graphics/direct2d/Brush.h" #include "cru/platform/graphics/direct2d/ConvertUtil.h" diff --git a/src/platform/graphics/direct2d/TextLayout.cpp b/src/platform/graphics/direct2d/TextLayout.cpp index 5bc392de..06bbcaa6 100644 --- a/src/platform/graphics/direct2d/TextLayout.cpp +++ b/src/platform/graphics/direct2d/TextLayout.cpp @@ -1,7 +1,7 @@ #include "cru/platform/graphics/direct2d/TextLayout.h" #include <dwrite.h> -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/Check.h" #include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" diff --git a/src/platform/graphics/quartz/Brush.cpp b/src/platform/graphics/quartz/Brush.cpp index 2aa31bd8..ea740eb3 100644 --- a/src/platform/graphics/quartz/Brush.cpp +++ b/src/platform/graphics/quartz/Brush.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/quartz/Brush.h" -#include "cru/common/String.h" -#include "cru/common/Format.h" +#include "cru/base/String.h" +#include "cru/base/Format.h" namespace cru::platform::graphics::quartz { QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphicsFactory* graphics_factory, diff --git a/src/platform/graphics/quartz/Image.cpp b/src/platform/graphics/quartz/Image.cpp index 3fa40937..966ce6be 100644 --- a/src/platform/graphics/quartz/Image.cpp +++ b/src/platform/graphics/quartz/Image.cpp @@ -1,5 +1,5 @@ #include "cru/platform/graphics/quartz/Image.h" -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/platform/graphics/quartz/Convert.h" #include "cru/platform/graphics/quartz/Painter.h" diff --git a/src/platform/graphics/quartz/ImageFactory.cpp b/src/platform/graphics/quartz/ImageFactory.cpp index a48b4b86..0557afa9 100644 --- a/src/platform/graphics/quartz/ImageFactory.cpp +++ b/src/platform/graphics/quartz/ImageFactory.cpp @@ -1,6 +1,6 @@ #include "cru/platform/graphics/quartz/ImageFactory.h" -#include "cru/common/Exception.h" -#include "cru/common/platform/osx/Convert.h" +#include "cru/base/Exception.h" +#include "cru/base/platform/osx/Convert.h" #include "cru/platform/graphics/quartz/Convert.h" #include "cru/platform/graphics/quartz/Image.h" #include "cru/platform/Check.h" diff --git a/src/platform/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp index 24fd71ef..9e18ac85 100644 --- a/src/platform/graphics/quartz/TextLayout.cpp +++ b/src/platform/graphics/quartz/TextLayout.cpp @@ -1,7 +1,7 @@ #include "cru/platform/graphics/quartz/TextLayout.h" -#include "cru/common/Base.h" -#include "cru/common/Format.h" -#include "cru/common/StringUtil.h" +#include "cru/base/Base.h" +#include "cru/base/Format.h" +#include "cru/base/StringUtil.h" #include "cru/platform/osx/Convert.h" #include "cru/platform/graphics/quartz/Convert.h" #include "cru/platform/graphics/quartz/Resource.h" diff --git a/src/platform/gui/osx/Clipboard.mm b/src/platform/gui/osx/Clipboard.mm index 068771c8..5d498d0e 100644 --- a/src/platform/gui/osx/Clipboard.mm +++ b/src/platform/gui/osx/Clipboard.mm @@ -1,7 +1,7 @@ #include "cru/platform/gui/osx/Clipboard.h" #include "ClipboardPrivate.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/osx/Convert.h" #include <memory> diff --git a/src/platform/gui/osx/ClipboardPrivate.h b/src/platform/gui/osx/ClipboardPrivate.h index e00c59dc..766026b6 100644 --- a/src/platform/gui/osx/ClipboardPrivate.h +++ b/src/platform/gui/osx/ClipboardPrivate.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/gui/osx/Clipboard.h" #include <AppKit/AppKit.h> diff --git a/src/platform/gui/osx/InputMethod.mm b/src/platform/gui/osx/InputMethod.mm index 50ff80de..af2d1ec2 100644 --- a/src/platform/gui/osx/InputMethod.mm +++ b/src/platform/gui/osx/InputMethod.mm @@ -3,7 +3,7 @@ #import <AppKit/AppKit.h> #include "InputMethodPrivate.h" #include "WindowPrivate.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/osx/Convert.h" #include "cru/platform/gui/osx/Window.h" diff --git a/src/platform/gui/osx/Menu.mm b/src/platform/gui/osx/Menu.mm index 568a5208..e74ec23b 100644 --- a/src/platform/gui/osx/Menu.mm +++ b/src/platform/gui/osx/Menu.mm @@ -2,7 +2,7 @@ #import "MenuPrivate.h" #include "KeyboardPrivate.h" -#include "cru/common/platform/osx/Convert.h" +#include "cru/base/platform/osx/Convert.h" #import <AppKit/NSApplication.h> diff --git a/src/platform/gui/osx/UiApplication.mm b/src/platform/gui/osx/UiApplication.mm index ef62af58..fd6e8ef0 100644 --- a/src/platform/gui/osx/UiApplication.mm +++ b/src/platform/gui/osx/UiApplication.mm @@ -1,8 +1,8 @@ #include "cru/platform/gui/osx/UiApplication.h" #include "ClipboardPrivate.h" -#include "cru/common/log/Logger.h" -#include "cru/common/platform/osx/Convert.h" +#include "cru/base/log/Logger.h" +#include "cru/base/platform/osx/Convert.h" #include "cru/platform/graphics/quartz/Factory.h" #include "cru/platform/gui/osx/Clipboard.h" #include "cru/platform/gui/osx/Cursor.h" diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm index d6bee564..8c059a12 100644 --- a/src/platform/gui/osx/Window.mm +++ b/src/platform/gui/osx/Window.mm @@ -3,8 +3,8 @@ #include "CursorPrivate.h" #include "InputMethodPrivate.h" -#include "cru/common/Range.h" -#include "cru/common/log/Logger.h" +#include "cru/base/Range.h" +#include "cru/base/log/Logger.h" #include "cru/platform/Check.h" #include "cru/platform/graphics/NullPainter.h" #include "cru/platform/graphics/quartz/Convert.h" diff --git a/src/platform/gui/osx/WindowPrivate.h b/src/platform/gui/osx/WindowPrivate.h index 00e15084..478ce4e5 100644 --- a/src/platform/gui/osx/WindowPrivate.h +++ b/src/platform/gui/osx/WindowPrivate.h @@ -1,7 +1,7 @@ #pragma once #include "cru/platform/gui/osx/Window.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/gui/TimerHelper.h" #include "cru/platform/gui/Window.h" #include "cru/platform/gui/osx/Cursor.h" diff --git a/src/platform/gui/win/Clipboard.cpp b/src/platform/gui/win/Clipboard.cpp index 26850d3d..a0914a0b 100644 --- a/src/platform/gui/win/Clipboard.cpp +++ b/src/platform/gui/win/Clipboard.cpp @@ -1,5 +1,5 @@ #include "cru/platform/gui/win/Clipboard.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/gui/win/GodWindow.h" #include "cru/platform/gui/win/UiApplication.h" diff --git a/src/platform/gui/win/Cursor.cpp b/src/platform/gui/win/Cursor.cpp index c2efff1b..d7692c2d 100644 --- a/src/platform/gui/win/Cursor.cpp +++ b/src/platform/gui/win/Cursor.cpp @@ -1,6 +1,6 @@ #include "cru/platform/gui/win/Cursor.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/gui/win/Exception.h" #include <stdexcept> diff --git a/src/platform/gui/win/GodWindow.cpp b/src/platform/gui/win/GodWindow.cpp index 4a062369..364688e5 100644 --- a/src/platform/gui/win/GodWindow.cpp +++ b/src/platform/gui/win/GodWindow.cpp @@ -1,6 +1,6 @@ #include "cru/platform/gui/win/GodWindow.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/gui/win/Exception.h" #include "cru/platform/gui/win/UiApplication.h" #include "cru/platform/gui/win/WindowClass.h" diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp index 4c5b3b8c..44b5681d 100644 --- a/src/platform/gui/win/InputMethod.cpp +++ b/src/platform/gui/win/InputMethod.cpp @@ -1,7 +1,7 @@ #include "cru/platform/gui/win/InputMethod.h" -#include "cru/common/StringUtil.h" -#include "cru/common/log/Logger.h" +#include "cru/base/StringUtil.h" +#include "cru/base/log/Logger.h" #include "cru/platform/Check.h" #include "cru/platform/gui/DebugFlags.h" #include "cru/platform/gui/win/Exception.h" diff --git a/src/platform/gui/win/TimerManager.h b/src/platform/gui/win/TimerManager.h index 21c00690..b3f4aa38 100644 --- a/src/platform/gui/win/TimerManager.h +++ b/src/platform/gui/win/TimerManager.h @@ -1,8 +1,8 @@ #pragma once -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/win/WinPreConfig.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/gui/win/GodWindow.h" #include "cru/platform/gui/win/WindowNativeMessageEventArgs.h" diff --git a/src/platform/gui/win/UiApplication.cpp b/src/platform/gui/win/UiApplication.cpp index 94d6b9c5..5be1a5d2 100644 --- a/src/platform/gui/win/UiApplication.cpp +++ b/src/platform/gui/win/UiApplication.cpp @@ -2,7 +2,7 @@ #include "TimerManager.h" #include "WindowManager.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/Check.h" #include "cru/platform/graphics/direct2d/Factory.h" #include "cru/platform/gui/win/Base.h" diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp index 79ae02e2..47ca93f8 100644 --- a/src/platform/gui/win/Window.cpp +++ b/src/platform/gui/win/Window.cpp @@ -1,7 +1,7 @@ #include "cru/platform/gui/win/Window.h" #include "WindowManager.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/Check.h" #include "cru/platform/graphics/NullPainter.h" #include "cru/platform/gui/Base.h" diff --git a/src/platform/gui/win/WindowManager.h b/src/platform/gui/win/WindowManager.h index afc4a5f5..062f2002 100644 --- a/src/platform/gui/win/WindowManager.h +++ b/src/platform/gui/win/WindowManager.h @@ -1,7 +1,7 @@ #pragma once #include "cru/platform/win/WinPreConfig.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include <map> #include <memory> diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp index 7358637e..c1b2167e 100644 --- a/src/ui/ThemeManager.cpp +++ b/src/ui/ThemeManager.cpp @@ -1,8 +1,8 @@ #include "cru/ui/ThemeManager.h" #include "Helper.h" -#include "cru/common/StringUtil.h" -#include "cru/common/io/Resource.h" +#include "cru/base/StringUtil.h" +#include "cru/base/io/Resource.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/gui/UiApplication.h" diff --git a/src/ui/ThemeResourceDictionary.cpp b/src/ui/ThemeResourceDictionary.cpp index 86a19083..c5986962 100644 --- a/src/ui/ThemeResourceDictionary.cpp +++ b/src/ui/ThemeResourceDictionary.cpp @@ -1,6 +1,6 @@ #include "cru/ui/ThemeResourceDictionary.h" -#include "cru/common/io/CFileStream.h" -#include "cru/common/log/Logger.h" +#include "cru/base/io/CFileStream.h" +#include "cru/base/log/Logger.h" #include "cru/xml/XmlNode.h" #include "cru/xml/XmlParser.h" diff --git a/src/ui/components/Input.cpp b/src/ui/components/Input.cpp index daca68c4..b308ed51 100644 --- a/src/ui/components/Input.cpp +++ b/src/ui/components/Input.cpp @@ -1,7 +1,7 @@ #include "cru/ui/components/Input.h" #include <cmath> #include <optional> -#include "cru/common/StringToNumberConverter.h" +#include "cru/base/StringToNumberConverter.h" #include "cru/ui/controls/Control.h" namespace cru::ui::components { diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp index 3b0d4be3..17633e3d 100644 --- a/src/ui/controls/Control.cpp +++ b/src/ui/controls/Control.cpp @@ -1,6 +1,6 @@ #include "cru/ui/controls/Control.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" #include "cru/ui/host/WindowHost.h" diff --git a/src/ui/controls/RootControl.cpp b/src/ui/controls/RootControl.cpp index 2d23bb36..1bb2e7ee 100644 --- a/src/ui/controls/RootControl.cpp +++ b/src/ui/controls/RootControl.cpp @@ -1,6 +1,6 @@ #include "cru/ui/controls/RootControl.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/gui/Base.h" #include "cru/platform/gui/Window.h" #include "cru/ui/Base.h" diff --git a/src/ui/controls/TextHostControlService.cpp b/src/ui/controls/TextHostControlService.cpp index 36703986..3e885bd3 100644 --- a/src/ui/controls/TextHostControlService.cpp +++ b/src/ui/controls/TextHostControlService.cpp @@ -1,10 +1,10 @@ #include "cru/ui/controls/TextHostControlService.h" #include "../Helper.h" -#include "cru/common/Base.h" -#include "cru/common/String.h" -#include "cru/common/StringUtil.h" -#include "cru/common/log/Logger.h" +#include "cru/base/Base.h" +#include "cru/base/String.h" +#include "cru/base/StringUtil.h" +#include "cru/base/log/Logger.h" #include "cru/platform/graphics/Font.h" #include "cru/platform/gui/Base.h" #include "cru/platform/gui/Clipboard.h" diff --git a/src/ui/document/TextDocumentElement.cpp b/src/ui/document/TextDocumentElement.cpp index ab79823d..1ba39849 100644 --- a/src/ui/document/TextDocumentElement.cpp +++ b/src/ui/document/TextDocumentElement.cpp @@ -1,5 +1,5 @@ #include "cru/ui/document/TextDocumentElement.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include "cru/ui/document/DocumentElement.h" #include "cru/ui/document/DocumentElementType.h" diff --git a/src/ui/helper/ClickDetector.cpp b/src/ui/helper/ClickDetector.cpp index f76f8af4..de39f14e 100644 --- a/src/ui/helper/ClickDetector.cpp +++ b/src/ui/helper/ClickDetector.cpp @@ -1,6 +1,6 @@ #include "cru/ui/helper/ClickDetector.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/ui/DebugFlags.h" #include "cru/ui/controls/Control.h" #include "cru/ui/host/WindowHost.h" diff --git a/src/ui/helper/ShortcutHub.cpp b/src/ui/helper/ShortcutHub.cpp index 8fbf0b8d..30a563ed 100644 --- a/src/ui/helper/ShortcutHub.cpp +++ b/src/ui/helper/ShortcutHub.cpp @@ -1,6 +1,6 @@ #include "cru/ui/helper/ShortcutHub.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/ui/DebugFlags.h" #include "cru/ui/controls/Control.h" diff --git a/src/ui/host/RoutedEventDispatch.h b/src/ui/host/RoutedEventDispatch.h index 5d1c8ce5..207e1ee6 100644 --- a/src/ui/host/RoutedEventDispatch.h +++ b/src/ui/host/RoutedEventDispatch.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/SelfResolvable.h" -#include "cru/common/log/Logger.h" +#include "cru/base/SelfResolvable.h" +#include "cru/base/log/Logger.h" #include "cru/ui/DebugFlags.h" #include "cru/ui/controls/Control.h" #include "cru/ui/host/WindowHost.h" diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp index 283224b1..616803b6 100644 --- a/src/ui/host/WindowHost.cpp +++ b/src/ui/host/WindowHost.cpp @@ -1,8 +1,8 @@ #include "cru/ui/host/WindowHost.h" #include "RoutedEventDispatch.h" -#include "cru/common/Base.h" -#include "cru/common/log/Logger.h" +#include "cru/base/Base.h" +#include "cru/base/log/Logger.h" #include "cru/platform/graphics/Painter.h" #include "cru/platform/gui/InputMethod.h" #include "cru/platform/gui/UiApplication.h" diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp index 462a07a1..a51651bd 100644 --- a/src/ui/mapper/BorderStyleMapper.cpp +++ b/src/ui/mapper/BorderStyleMapper.cpp @@ -1,6 +1,6 @@ #include "cru/ui/mapper/BorderStyleMapper.h" #include "../Helper.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Factory.h" #include "cru/ui/mapper/MapperRegistry.h" diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp index 7de422e8..ed3c91ec 100644 --- a/src/ui/mapper/CursorMapper.cpp +++ b/src/ui/mapper/CursorMapper.cpp @@ -1,6 +1,6 @@ #include "cru/ui/mapper/CursorMapper.h" #include "../Helper.h" -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp index dd8784d5..d57c4927 100644 --- a/src/ui/mapper/style/AndConditionMapper.cpp +++ b/src/ui/mapper/style/AndConditionMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/AndConditionMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/mapper/style/IConditionMapper.h" #include "cru/ui/style/Condition.h" diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp index 95dd28ee..e6e33053 100644 --- a/src/ui/mapper/style/BorderStylerMapper.cpp +++ b/src/ui/mapper/style/BorderStylerMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/BorderStylerMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/style/ApplyBorderStyleInfo.h" #include "cru/ui/style/Styler.h" diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp index f61a3d44..74e0a3c5 100644 --- a/src/ui/mapper/style/CheckedConditionMapper.cpp +++ b/src/ui/mapper/style/CheckedConditionMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/style/CheckedConditionMapper.h" #include "cru/ui/style/Condition.h" #include "cru/xml/XmlNode.h" diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp index 5b25de2c..d6b403c9 100644 --- a/src/ui/mapper/style/ClickStateConditionMapper.cpp +++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp @@ -1,6 +1,6 @@ #include "cru/ui/mapper/style/ClickStateConditionMapper.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Exception.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Exception.h" #include "cru/ui/helper/ClickDetector.h" #include "cru/ui/style/Condition.h" diff --git a/src/ui/mapper/style/ContentBrushStylerMapper.cpp b/src/ui/mapper/style/ContentBrushStylerMapper.cpp index e83f4988..b3571374 100644 --- a/src/ui/mapper/style/ContentBrushStylerMapper.cpp +++ b/src/ui/mapper/style/ContentBrushStylerMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/ContentBrushStylerMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/graphics/Brush.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/style/Styler.h" diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp index 6798798c..3b060c25 100644 --- a/src/ui/mapper/style/CursorStylerMapper.cpp +++ b/src/ui/mapper/style/CursorStylerMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/CursorStylerMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/gui/Cursor.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/style/Styler.h" diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp index b9e89e2e..dfefb921 100644 --- a/src/ui/mapper/style/FocusConditionMapper.cpp +++ b/src/ui/mapper/style/FocusConditionMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/style/FocusConditionMapper.h" #include "cru/ui/style/Condition.h" #include "cru/xml/XmlNode.h" diff --git a/src/ui/mapper/style/FontStylerMapper.cpp b/src/ui/mapper/style/FontStylerMapper.cpp index 884832ee..3b1817ac 100644 --- a/src/ui/mapper/style/FontStylerMapper.cpp +++ b/src/ui/mapper/style/FontStylerMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/FontStylerMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/MapperRegistry.h" namespace cru::ui::mapper::style { diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp index 97767b14..0110edd9 100644 --- a/src/ui/mapper/style/HoverConditionMapper.cpp +++ b/src/ui/mapper/style/HoverConditionMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/HoverConditionMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp index 397162f1..a36e70d2 100644 --- a/src/ui/mapper/style/NoConditionMapper.cpp +++ b/src/ui/mapper/style/NoConditionMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/NoConditionMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp index 7b932dbc..521c57ae 100644 --- a/src/ui/mapper/style/OrConditionMapper.cpp +++ b/src/ui/mapper/style/OrConditionMapper.cpp @@ -1,5 +1,5 @@ #include "cru/ui/mapper/style/OrConditionMapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/mapper/style/IConditionMapper.h" #include "cru/ui/style/Condition.h" diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp index 2ab13c90..2eb5b0a2 100644 --- a/src/ui/mapper/style/StyleRuleMapper.cpp +++ b/src/ui/mapper/style/StyleRuleMapper.cpp @@ -1,7 +1,7 @@ #include "cru/ui/mapper/style/StyleRuleMapper.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Exception.h" -#include "cru/common/log/Logger.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Exception.h" +#include "cru/base/log/Logger.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/mapper/style/IConditionMapper.h" #include "cru/ui/mapper/style/IStylerMapper.h" diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp index 1392af1e..81a1aa60 100644 --- a/src/ui/render/BorderRenderObject.cpp +++ b/src/ui/render/BorderRenderObject.cpp @@ -1,7 +1,7 @@ #include "cru/ui/render/BorderRenderObject.h" #include "../Helper.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/graphics/Geometry.h" #include "cru/platform/graphics/Painter.h" diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp index 988e7590..7bbf9d57 100644 --- a/src/ui/render/FlexLayoutRenderObject.cpp +++ b/src/ui/render/FlexLayoutRenderObject.cpp @@ -1,6 +1,6 @@ #include "cru/ui/render/FlexLayoutRenderObject.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/ui/render/LayoutHelper.h" #include <algorithm> diff --git a/src/ui/render/LayoutHelper.cpp b/src/ui/render/LayoutHelper.cpp index a9121321..bbd3c116 100644 --- a/src/ui/render/LayoutHelper.cpp +++ b/src/ui/render/LayoutHelper.cpp @@ -1,6 +1,6 @@ #include "cru/ui/render/LayoutHelper.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" namespace cru::ui::render { float CalculateAnchorByAlignment(Alignment alignment, float start_point, diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp index a370f749..64411036 100644 --- a/src/ui/render/RenderObject.cpp +++ b/src/ui/render/RenderObject.cpp @@ -1,7 +1,7 @@ #include "cru/ui/render/RenderObject.h" -#include "cru/common/Exception.h" -#include "cru/common/log/Logger.h" +#include "cru/base/Exception.h" +#include "cru/base/log/Logger.h" #include "cru/platform/GraphicsBase.h" #include "cru/ui/DebugFlags.h" #include "cru/ui/controls/Control.h" diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp index 3e578d37..326f7504 100644 --- a/src/ui/render/ScrollBar.cpp +++ b/src/ui/render/ScrollBar.cpp @@ -1,7 +1,7 @@ #include "cru/ui/render/ScrollBar.h" #include "../Helper.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/GraphicsBase.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/graphics/Geometry.h" diff --git a/src/ui/render/StackLayoutRenderObject.cpp b/src/ui/render/StackLayoutRenderObject.cpp index 9ca9bf02..d71c5749 100644 --- a/src/ui/render/StackLayoutRenderObject.cpp +++ b/src/ui/render/StackLayoutRenderObject.cpp @@ -1,6 +1,6 @@ #include "cru/ui/render/StackLayoutRenderObject.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/ui/render/LayoutHelper.h" #include "cru/ui/render/MeasureRequirement.h" diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp index 135c2d02..14e45080 100644 --- a/src/ui/render/TextRenderObject.cpp +++ b/src/ui/render/TextRenderObject.cpp @@ -1,7 +1,7 @@ #include "cru/ui/render/TextRenderObject.h" #include "../Helper.h" -#include "cru/common/log/Logger.h" +#include "cru/base/log/Logger.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/graphics/Painter.h" #include "cru/platform/graphics/TextLayout.h" diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp index f7cdf7fd..a0de03dc 100644 --- a/src/ui/style/Condition.cpp +++ b/src/ui/style/Condition.cpp @@ -1,8 +1,8 @@ #include "cru/ui/style/Condition.h" #include <memory> -#include "cru/common/ClonablePtr.h" -#include "cru/common/Event.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Event.h" #include "cru/ui/controls/Control.h" #include "cru/ui/controls/ICheckableControl.h" #include "cru/ui/controls/IClickableControl.h" diff --git a/src/ui/style/StyleRuleSet.cpp b/src/ui/style/StyleRuleSet.cpp index 7b6454ec..ab3a2d01 100644 --- a/src/ui/style/StyleRuleSet.cpp +++ b/src/ui/style/StyleRuleSet.cpp @@ -1,5 +1,5 @@ #include "cru/ui/style/StyleRuleSet.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/controls/Control.h" #include "cru/ui/model/IListChangeNotify.h" diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp index 3d7ff1f9..a4e3ac25 100644 --- a/src/ui/style/Styler.cpp +++ b/src/ui/style/Styler.cpp @@ -1,7 +1,7 @@ #include "cru/ui/style/Styler.h" #include "../Helper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" #include "cru/ui/controls/Control.h" diff --git a/test/common/Event2Test.cpp b/test/common/Event2Test.cpp index 0d3222cc..0c67f28e 100644 --- a/test/common/Event2Test.cpp +++ b/test/common/Event2Test.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Event2.h" +#include "cru/base/Event2.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/HandlerRegistryTest.cpp b/test/common/HandlerRegistryTest.cpp index 03e190e3..aacef70f 100644 --- a/test/common/HandlerRegistryTest.cpp +++ b/test/common/HandlerRegistryTest.cpp @@ -1,4 +1,4 @@ -#include "cru/common/HandlerRegistry.h" +#include "cru/base/HandlerRegistry.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/PropertyTreeTest.cpp b/test/common/PropertyTreeTest.cpp index a14fe924..24d7ca9e 100644 --- a/test/common/PropertyTreeTest.cpp +++ b/test/common/PropertyTreeTest.cpp @@ -1,4 +1,4 @@ -#include "cru/common/PropertyTree.h" +#include "cru/base/PropertyTree.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/SelfResolvableTest.cpp b/test/common/SelfResolvableTest.cpp index 36b8cd6f..c214bd77 100644 --- a/test/common/SelfResolvableTest.cpp +++ b/test/common/SelfResolvableTest.cpp @@ -1,5 +1,5 @@ -#include "cru/common/Base.h" -#include "cru/common/SelfResolvable.h" +#include "cru/base/Base.h" +#include "cru/base/SelfResolvable.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/StringTest.cpp b/test/common/StringTest.cpp index adbd5598..9ed351e5 100644 --- a/test/common/StringTest.cpp +++ b/test/common/StringTest.cpp @@ -1,5 +1,5 @@ -#include "cru/common/Format.h" -#include "cru/common/String.h" +#include "cru/base/Format.h" +#include "cru/base/String.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/StringToNumberConverterTest.cpp b/test/common/StringToNumberConverterTest.cpp index d4bb36f4..82062bdb 100644 --- a/test/common/StringToNumberConverterTest.cpp +++ b/test/common/StringToNumberConverterTest.cpp @@ -1,5 +1,5 @@ -#include "cru/common/Exception.h" -#include "cru/common/StringToNumberConverter.h" +#include "cru/base/Exception.h" +#include "cru/base/StringToNumberConverter.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/StringUtilTest.cpp b/test/common/StringUtilTest.cpp index 613243c5..1da6e963 100644 --- a/test/common/StringUtilTest.cpp +++ b/test/common/StringUtilTest.cpp @@ -1,5 +1,5 @@ -#include "cru/common/String.h" -#include "cru/common/StringUtil.h" +#include "cru/base/String.h" +#include "cru/base/StringUtil.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/SubProcessTest.cpp b/test/common/SubProcessTest.cpp index 03f9d221..d353dec0 100644 --- a/test/common/SubProcessTest.cpp +++ b/test/common/SubProcessTest.cpp @@ -1,5 +1,5 @@ -#include "cru/common/String.h" -#include "cru/common/SubProcess.h" +#include "cru/base/String.h" +#include "cru/base/SubProcess.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/platform/unix/UnixFileStreamTest.cpp b/test/common/platform/unix/UnixFileStreamTest.cpp index 0f9d9834..fa99aa29 100644 --- a/test/common/platform/unix/UnixFileStreamTest.cpp +++ b/test/common/platform/unix/UnixFileStreamTest.cpp @@ -1,4 +1,4 @@ -#include "cru/common/platform/unix/UnixFileStream.h" +#include "cru/base/platform/unix/UnixFileStream.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/platform/win/StreamConvertTest.cpp b/test/common/platform/win/StreamConvertTest.cpp index f49d18dc..90ebb568 100644 --- a/test/common/platform/win/StreamConvertTest.cpp +++ b/test/common/platform/win/StreamConvertTest.cpp @@ -1,7 +1,7 @@ -#include "cru/common/io/OpenFileFlag.h" -#include "cru/common/platform/win/Exception.h" -#include "cru/common/platform/win/StreamConvert.h" -#include "cru/common/platform/win/Win32FileStream.h" +#include "cru/base/io/OpenFileFlag.h" +#include "cru/base/platform/win/Exception.h" +#include "cru/base/platform/win/StreamConvert.h" +#include "cru/base/platform/win/Win32FileStream.h" #include <catch2/catch_test_macros.hpp> diff --git a/test/common/platform/win/Win32FileStreamTest.cpp b/test/common/platform/win/Win32FileStreamTest.cpp index d5de451b..dc2f49d4 100644 --- a/test/common/platform/win/Win32FileStreamTest.cpp +++ b/test/common/platform/win/Win32FileStreamTest.cpp @@ -1,5 +1,5 @@ -#include "cru/common/io/OpenFileFlag.h" -#include "cru/common/platform/win/Win32FileStream.h" +#include "cru/base/io/OpenFileFlag.h" +#include "cru/base/platform/win/Win32FileStream.h" #include <catch2/catch_test_macros.hpp> |