From 74bb9cd27242b9320f99ff4d2b50c3051576cc14 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 8 Feb 2022 16:53:51 +0800 Subject: ... --- src/common/Base.cpp | 2 +- src/common/Exception.cpp | 2 +- src/common/Format.cpp | 2 +- src/common/Logger.cpp | 2 +- src/common/PropertyTree.cpp | 4 +- src/common/String.cpp | 6 +- src/common/StringUtil.cpp | 6 +- src/common/io/MemoryStream.cpp | 2 +- src/common/io/Resource.cpp | 4 +- src/common/io/Stream.cpp | 2 +- src/common/platform/Exception.cpp | 2 +- src/common/platform/osx/Convert.cpp | 2 +- src/common/platform/osx/Exception.cpp | 2 +- src/common/platform/unix/ErrnoException.cpp | 4 +- src/common/platform/unix/UnixFileStream.cpp | 8 +- src/common/platform/win/BridgeComStream.cpp | 4 +- src/common/platform/win/BrigdeComStream.h | 43 ++++++++ src/common/platform/win/BrigdeComStream.hpp | 43 -------- src/common/platform/win/ComAutoInit.cpp | 4 +- src/common/platform/win/Exception.cpp | 4 +- src/common/platform/win/StreamConvert.cpp | 16 +-- src/common/platform/win/Win32FileStream.cpp | 6 +- src/osx/Resource.cpp | 2 +- src/osx/graphics/quartz/Brush.cpp | 6 +- src/osx/graphics/quartz/Convert.cpp | 2 +- src/osx/graphics/quartz/Factory.cpp | 18 ++-- src/osx/graphics/quartz/Font.cpp | 8 +- src/osx/graphics/quartz/Geometry.cpp | 2 +- src/osx/graphics/quartz/Image.cpp | 4 +- src/osx/graphics/quartz/ImageFactory.cpp | 8 +- src/osx/graphics/quartz/Painter.cpp | 22 ++--- src/osx/graphics/quartz/Resource.cpp | 2 +- src/osx/graphics/quartz/TextLayout.cpp | 18 ++-- src/osx/gui/Clipboard.mm | 6 +- src/osx/gui/ClipboardPrivate.h | 4 +- src/osx/gui/Cursor.mm | 10 +- src/osx/gui/CursorPrivate.h | 2 +- src/osx/gui/InputMethod.mm | 8 +- src/osx/gui/InputMethodPrivate.h | 2 +- src/osx/gui/Keyboard.mm | 2 +- src/osx/gui/KeyboardPrivate.h | 2 +- src/osx/gui/Menu.mm | 4 +- src/osx/gui/MenuPrivate.h | 2 +- src/osx/gui/Resource.cpp | 2 +- src/osx/gui/UiApplication.mm | 24 ++--- src/osx/gui/Window.mm | 28 +++--- src/osx/gui/WindowPrivate.h | 10 +- src/parse/Grammar.cpp | 8 +- src/parse/Nonterminal.cpp | 2 +- src/parse/ParsingAlgorithm.cpp | 2 +- src/parse/ParsingAlgorithmContext.cpp | 2 +- src/parse/ParsingContext.cpp | 4 +- src/parse/ParsingTreeNode.cpp | 2 +- src/parse/Production.cpp | 2 +- src/parse/RecursiveDescentAlgorithm.cpp | 6 +- src/parse/RecursiveDescentAlgorithmContext.cpp | 4 +- src/parse/Symbol.cpp | 2 +- src/parse/Terminal.cpp | 2 +- src/parse/TokenType.cpp | 2 +- src/platform/Color.cpp | 2 +- src/platform/ForDllExport.cpp | 4 +- src/platform/bootstrap/Bootstrap.cpp | 6 +- src/platform/graphics/ForDllExport.cpp | 18 ++-- src/platform/graphics/NullPainter.cpp | 2 +- src/platform/gui/Keyboard.cpp | 2 +- src/platform/gui/Menu.cpp | 2 +- src/platform/gui/UiApplication.cpp | 2 +- src/theme_builder/components/MainWindow.cpp | 8 +- src/theme_builder/components/MainWindow.h | 28 ++++++ src/theme_builder/components/MainWindow.hpp | 28 ------ .../components/StyleRuleSetEditor.cpp | 2 +- src/theme_builder/components/StyleRuleSetEditor.h | 22 +++++ .../components/StyleRuleSetEditor.hpp | 22 ----- src/theme_builder/main.cpp | 4 +- src/toml/TomlDocument.cpp | 2 +- src/toml/TomlParser.cpp | 4 +- src/ui/Helper.cpp | 6 +- src/ui/Helper.h | 16 +++ src/ui/Helper.hpp | 16 --- src/ui/ThemeManager.cpp | 22 ++--- src/ui/components/Component.cpp | 2 +- src/ui/components/Menu.cpp | 20 ++-- src/ui/controls/Button.cpp | 16 +-- src/ui/controls/Container.cpp | 8 +- src/ui/controls/ContentControl.cpp | 2 +- src/ui/controls/Control.cpp | 18 ++-- src/ui/controls/FlexLayout.cpp | 4 +- src/ui/controls/LayoutControl.cpp | 4 +- src/ui/controls/NoChildControl.cpp | 2 +- src/ui/controls/Popup.cpp | 10 +- src/ui/controls/RootControl.cpp | 18 ++-- src/ui/controls/ScrollView.cpp | 6 +- src/ui/controls/StackLayout.cpp | 4 +- src/ui/controls/TextBlock.cpp | 10 +- src/ui/controls/TextBox.cpp | 16 +-- src/ui/controls/TextHostControlService.cpp | 46 ++++----- src/ui/controls/Window.cpp | 14 +-- src/ui/events/MouseEventArgs.cpp | 8 +- src/ui/helper/ClickDetector.cpp | 6 +- src/ui/helper/ShortcutHub.cpp | 8 +- src/ui/host/LayoutPaintCycler.cpp | 8 +- src/ui/host/RoutedEventDispatch.h | 110 +++++++++++++++++++++ src/ui/host/RoutedEventDispatch.hpp | 110 --------------------- src/ui/host/WindowHost.cpp | 26 ++--- src/ui/mapper/BorderStyleMapper.cpp | 16 +-- src/ui/mapper/BrushMapper.cpp | 16 +-- src/ui/mapper/ColorMapper.cpp | 2 +- src/ui/mapper/CornerRadiusMapper.cpp | 6 +- src/ui/mapper/CursorMapper.cpp | 10 +- src/ui/mapper/FontMapper.cpp | 6 +- src/ui/mapper/Mapper.cpp | 2 +- src/ui/mapper/MapperRegistry.cpp | 40 ++++---- src/ui/mapper/PointMapper.cpp | 2 +- src/ui/mapper/SizeMapper.cpp | 2 +- src/ui/mapper/ThicknessMapper.cpp | 4 +- src/ui/mapper/style/AndConditionMapper.cpp | 12 +-- src/ui/mapper/style/BorderStylerMapper.cpp | 12 +-- src/ui/mapper/style/ClickStateConditionMapper.cpp | 10 +- src/ui/mapper/style/CursorStylerMapper.cpp | 10 +- src/ui/mapper/style/FocusConditionMapper.cpp | 8 +- src/ui/mapper/style/HoverConditionMapper.cpp | 6 +- src/ui/mapper/style/NoConditionMapper.cpp | 6 +- src/ui/mapper/style/OrConditionMapper.cpp | 12 +-- src/ui/mapper/style/StyleRuleMapper.cpp | 16 +-- src/ui/mapper/style/StyleRuleSetMapper.cpp | 8 +- src/ui/render/BorderRenderObject.cpp | 20 ++-- src/ui/render/CanvasRenderObject.cpp | 2 +- src/ui/render/FlexLayoutRenderObject.cpp | 12 +-- src/ui/render/LayoutHelper.cpp | 4 +- src/ui/render/RenderObject.cpp | 16 +-- src/ui/render/ScrollBar.cpp | 34 +++---- src/ui/render/ScrollRenderObject.cpp | 12 +-- src/ui/render/StackLayoutRenderObject.cpp | 8 +- src/ui/render/TextRenderObject.cpp | 16 +-- src/ui/style/Condition.cpp | 12 +-- src/ui/style/StyleRule.cpp | 2 +- src/ui/style/StyleRuleSet.cpp | 6 +- src/ui/style/Styler.cpp | 16 +-- src/win/ForDllExport.cpp | 4 +- src/win/graphics/direct/Brush.cpp | 8 +- src/win/graphics/direct/Factory.cpp | 18 ++-- src/win/graphics/direct/Font.cpp | 8 +- src/win/graphics/direct/Geometry.cpp | 8 +- src/win/graphics/direct/Image.cpp | 10 +- src/win/graphics/direct/ImageFactory.cpp | 10 +- src/win/graphics/direct/Painter.cpp | 18 ++-- src/win/graphics/direct/Resource.cpp | 4 +- src/win/graphics/direct/TextLayout.cpp | 12 +-- src/win/graphics/direct/WindowPainter.cpp | 8 +- src/win/graphics/direct/WindowRenderTarget.cpp | 6 +- src/win/gui/Clipboard.cpp | 8 +- src/win/gui/Cursor.cpp | 6 +- src/win/gui/GodWindow.cpp | 10 +- src/win/gui/InputMethod.cpp | 16 +-- src/win/gui/Keyboard.cpp | 2 +- src/win/gui/Resource.cpp | 4 +- src/win/gui/TimerManager.cpp | 6 +- src/win/gui/TimerManager.h | 61 ++++++++++++ src/win/gui/TimerManager.hpp | 61 ------------ src/win/gui/UiApplication.cpp | 32 +++--- src/win/gui/Window.cpp | 32 +++--- src/win/gui/WindowClass.cpp | 4 +- src/win/gui/WindowManager.cpp | 8 +- src/win/gui/WindowManager.h | 51 ++++++++++ src/win/gui/WindowManager.hpp | 51 ---------- src/xml/XmlNode.cpp | 2 +- src/xml/XmlParser.cpp | 4 +- 167 files changed, 969 insertions(+), 969 deletions(-) create mode 100644 src/common/platform/win/BrigdeComStream.h delete mode 100644 src/common/platform/win/BrigdeComStream.hpp create mode 100644 src/theme_builder/components/MainWindow.h delete mode 100644 src/theme_builder/components/MainWindow.hpp create mode 100644 src/theme_builder/components/StyleRuleSetEditor.h delete mode 100644 src/theme_builder/components/StyleRuleSetEditor.hpp create mode 100644 src/ui/Helper.h delete mode 100644 src/ui/Helper.hpp create mode 100644 src/ui/host/RoutedEventDispatch.h delete mode 100644 src/ui/host/RoutedEventDispatch.hpp create mode 100644 src/win/gui/TimerManager.h delete mode 100644 src/win/gui/TimerManager.hpp create mode 100644 src/win/gui/WindowManager.h delete mode 100644 src/win/gui/WindowManager.hpp (limited to 'src') diff --git a/src/common/Base.cpp b/src/common/Base.cpp index dbbc0d61..b6d39fef 100644 --- a/src/common/Base.cpp +++ b/src/common/Base.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Base.hpp" +#include "cru/common/Base.h" #include diff --git a/src/common/Exception.cpp b/src/common/Exception.cpp index 779c65d6..86816720 100644 --- a/src/common/Exception.cpp +++ b/src/common/Exception.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Exception.hpp" +#include "cru/common/Exception.h" namespace cru { Exception::Exception() {} diff --git a/src/common/Format.cpp b/src/common/Format.cpp index 2d3b50eb..3362db65 100644 --- a/src/common/Format.cpp +++ b/src/common/Format.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Format.hpp" +#include "cru/common/Format.h" namespace cru { namespace details { diff --git a/src/common/Logger.cpp b/src/common/Logger.cpp index 3034c0ad..49261396 100644 --- a/src/common/Logger.cpp +++ b/src/common/Logger.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Logger.hpp" +#include "cru/common/Logger.h" #include #include diff --git a/src/common/PropertyTree.cpp b/src/common/PropertyTree.cpp index cc3e9cb5..b587becb 100644 --- a/src/common/PropertyTree.cpp +++ b/src/common/PropertyTree.cpp @@ -1,6 +1,6 @@ -#include "cru/common/PropertyTree.hpp" +#include "cru/common/PropertyTree.h" #include -#include "cru/common/Exception.hpp" +#include "cru/common/Exception.h" namespace cru { String PropertySubTreeRef::CombineKey(StringView left, StringView right) { diff --git a/src/common/String.cpp b/src/common/String.cpp index a43c2abd..22008f6d 100644 --- a/src/common/String.cpp +++ b/src/common/String.cpp @@ -1,6 +1,6 @@ -#include "cru/common/String.hpp" -#include "cru/common/Exception.hpp" -#include "cru/common/StringUtil.hpp" +#include "cru/common/String.h" +#include "cru/common/Exception.h" +#include "cru/common/StringUtil.h" #include #include diff --git a/src/common/StringUtil.cpp b/src/common/StringUtil.cpp index 2bec815d..f584fd4e 100644 --- a/src/common/StringUtil.cpp +++ b/src/common/StringUtil.cpp @@ -1,6 +1,6 @@ -#include "cru/common/StringUtil.hpp" -#include "cru/common/Base.hpp" -#include "cru/common/Exception.hpp" +#include "cru/common/StringUtil.h" +#include "cru/common/Base.h" +#include "cru/common/Exception.h" namespace cru { using details::ExtractBits; diff --git a/src/common/io/MemoryStream.cpp b/src/common/io/MemoryStream.cpp index dcb7a032..7507875b 100644 --- a/src/common/io/MemoryStream.cpp +++ b/src/common/io/MemoryStream.cpp @@ -1,4 +1,4 @@ -#include "cru/common/io/MemoryStream.hpp" +#include "cru/common/io/MemoryStream.h" namespace cru::io { MemoryStream::~MemoryStream() { diff --git a/src/common/io/Resource.cpp b/src/common/io/Resource.cpp index da16b578..0ee7f753 100644 --- a/src/common/io/Resource.cpp +++ b/src/common/io/Resource.cpp @@ -1,5 +1,5 @@ -#include "cru/common/io/Resource.hpp" -#include "cru/common/Exception.hpp" +#include "cru/common/io/Resource.h" +#include "cru/common/Exception.h" #if defined(CRU_PLATFORM_OSX) #include diff --git a/src/common/io/Stream.cpp b/src/common/io/Stream.cpp index ad1dbd0e..bc045f03 100644 --- a/src/common/io/Stream.cpp +++ b/src/common/io/Stream.cpp @@ -1,4 +1,4 @@ -#include "cru/common/io/Stream.hpp" +#include "cru/common/io/Stream.h" namespace cru::io { Index Stream::Tell() { return Seek(0, SeekOrigin::Current); } diff --git a/src/common/platform/Exception.cpp b/src/common/platform/Exception.cpp index c13c8b1e..1c5db390 100644 --- a/src/common/platform/Exception.cpp +++ b/src/common/platform/Exception.cpp @@ -1 +1 @@ -#include "cru/common/platform/Exception.hpp" +#include "cru/common/platform/Exception.h" diff --git a/src/common/platform/osx/Convert.cpp b/src/common/platform/osx/Convert.cpp index e5105698..4792df1f 100644 --- a/src/common/platform/osx/Convert.cpp +++ b/src/common/platform/osx/Convert.cpp @@ -1,4 +1,4 @@ -#include "cru/common/platform/osx/Convert.hpp" +#include "cru/common/platform/osx/Convert.h" namespace cru::platform::osx { CFStringRef Convert(const String& string) { diff --git a/src/common/platform/osx/Exception.cpp b/src/common/platform/osx/Exception.cpp index b02fd458..e03faa4c 100644 --- a/src/common/platform/osx/Exception.cpp +++ b/src/common/platform/osx/Exception.cpp @@ -1 +1 @@ -#include "cru/common/platform//osx/Exception.hpp" +#include "cru/common/platform//osx/Exception.h" diff --git a/src/common/platform/unix/ErrnoException.cpp b/src/common/platform/unix/ErrnoException.cpp index 14e6a5a2..f2171943 100644 --- a/src/common/platform/unix/ErrnoException.cpp +++ b/src/common/platform/unix/ErrnoException.cpp @@ -1,6 +1,6 @@ -#include "cru/common/platform/unix/ErrnoException.hpp" +#include "cru/common/platform/unix/ErrnoException.h" -#include "cru/common/Format.hpp" +#include "cru/common/Format.h" #include diff --git a/src/common/platform/unix/UnixFileStream.cpp b/src/common/platform/unix/UnixFileStream.cpp index dd883497..cf268288 100644 --- a/src/common/platform/unix/UnixFileStream.cpp +++ b/src/common/platform/unix/UnixFileStream.cpp @@ -1,7 +1,7 @@ -#include "cru/common/platform/unix/UnixFileStream.hpp" -#include "cru/common/Format.hpp" -#include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/platform/unix/ErrnoException.hpp" +#include "cru/common/platform/unix/UnixFileStream.h" +#include "cru/common/Format.h" +#include "cru/common/io/OpenFileFlag.h" +#include "cru/common/platform/unix/ErrnoException.h" #include #include diff --git a/src/common/platform/win/BridgeComStream.cpp b/src/common/platform/win/BridgeComStream.cpp index 48ba8154..4c83fd45 100644 --- a/src/common/platform/win/BridgeComStream.cpp +++ b/src/common/platform/win/BridgeComStream.cpp @@ -1,5 +1,5 @@ -#include "BrigdeComStream.hpp" -#include "cru/common/io/Stream.hpp" +#include "BrigdeComStream.h" +#include "cru/common/io/Stream.h" namespace cru::platform::win { BridgeComStream::BridgeComStream(io::Stream *stream) diff --git a/src/common/platform/win/BrigdeComStream.h b/src/common/platform/win/BrigdeComStream.h new file mode 100644 index 00000000..7c8a79d1 --- /dev/null +++ b/src/common/platform/win/BrigdeComStream.h @@ -0,0 +1,43 @@ +#pragma once +#include "cru/common/platform/win/WinPreConfig.h" + +#include "cru/common/io/Stream.h" + +#include + +namespace cru::platform::win { +class BridgeComStream : public IStream { + public: + explicit BridgeComStream(io::Stream* stream); + + CRU_DELETE_COPY(BridgeComStream) + CRU_DELETE_MOVE(BridgeComStream) + + ~BridgeComStream(); + + public: + ULONG AddRef() override; + ULONG Release() override; + HRESULT QueryInterface(REFIID riid, void** ppvObject) override; + + HRESULT Read(void* pv, ULONG cb, ULONG* pcbRead) override; + HRESULT Write(const void* pv, ULONG cb, ULONG* pcbWritten) override; + HRESULT Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER* plibNewPosition) override; + HRESULT SetSize(ULARGE_INTEGER libNewSize) override; + HRESULT CopyTo(IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, + ULARGE_INTEGER* pcbWritten) override; + HRESULT Commit(DWORD grfCommitFlags) override; + HRESULT Revert() override; + HRESULT LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, + DWORD dwLockType) override; + HRESULT UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, + DWORD dwLockType) override; + HRESULT Stat(STATSTG* pstatstg, DWORD grfStatFlag) override; + HRESULT Clone(IStream** ppstm) override; + + private: + io::Stream* stream_; + ULONG ref_count_; +}; +} // namespace cru::platform::win diff --git a/src/common/platform/win/BrigdeComStream.hpp b/src/common/platform/win/BrigdeComStream.hpp deleted file mode 100644 index 228c16f6..00000000 --- a/src/common/platform/win/BrigdeComStream.hpp +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once -#include "cru/common/platform/win/WinPreConfig.hpp" - -#include "cru/common/io/Stream.hpp" - -#include - -namespace cru::platform::win { -class BridgeComStream : public IStream { - public: - explicit BridgeComStream(io::Stream* stream); - - CRU_DELETE_COPY(BridgeComStream) - CRU_DELETE_MOVE(BridgeComStream) - - ~BridgeComStream(); - - public: - ULONG AddRef() override; - ULONG Release() override; - HRESULT QueryInterface(REFIID riid, void** ppvObject) override; - - HRESULT Read(void* pv, ULONG cb, ULONG* pcbRead) override; - HRESULT Write(const void* pv, ULONG cb, ULONG* pcbWritten) override; - HRESULT Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, - ULARGE_INTEGER* plibNewPosition) override; - HRESULT SetSize(ULARGE_INTEGER libNewSize) override; - HRESULT CopyTo(IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, - ULARGE_INTEGER* pcbWritten) override; - HRESULT Commit(DWORD grfCommitFlags) override; - HRESULT Revert() override; - HRESULT LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, - DWORD dwLockType) override; - HRESULT UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, - DWORD dwLockType) override; - HRESULT Stat(STATSTG* pstatstg, DWORD grfStatFlag) override; - HRESULT Clone(IStream** ppstm) override; - - private: - io::Stream* stream_; - ULONG ref_count_; -}; -} // namespace cru::platform::win diff --git a/src/common/platform/win/ComAutoInit.cpp b/src/common/platform/win/ComAutoInit.cpp index e336be59..55a53a8d 100644 --- a/src/common/platform/win/ComAutoInit.cpp +++ b/src/common/platform/win/ComAutoInit.cpp @@ -1,5 +1,5 @@ -#include "cru/common/platform/win/ComAutoInit.hpp" -#include "cru/common/platform/win/Exception.hpp" +#include "cru/common/platform/win/ComAutoInit.h" +#include "cru/common/platform/win/Exception.h" #include diff --git a/src/common/platform/win/Exception.cpp b/src/common/platform/win/Exception.cpp index 70cfcb3c..a20e8a31 100644 --- a/src/common/platform/win/Exception.cpp +++ b/src/common/platform/win/Exception.cpp @@ -1,5 +1,5 @@ -#include "cru/common/platform/win/Exception.hpp" -#include "cru/common/Format.hpp" +#include "cru/common/platform/win/Exception.h" +#include "cru/common/Format.h" #include diff --git a/src/common/platform/win/StreamConvert.cpp b/src/common/platform/win/StreamConvert.cpp index 1d077573..8e2648c2 100644 --- a/src/common/platform/win/StreamConvert.cpp +++ b/src/common/platform/win/StreamConvert.cpp @@ -1,11 +1,11 @@ -#include "cru/common/platform/win/StreamConvert.hpp" -#include "BrigdeComStream.hpp" -#include "cru/common/Exception.hpp" -#include "cru/common/io/MemoryStream.hpp" -#include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/platform/win/ComAutoInit.hpp" -#include "cru/common/platform/win/Exception.hpp" -#include "cru/common/platform/win/Win32FileStream.hpp" +#include "cru/common/platform/win/StreamConvert.h" +#include "BrigdeComStream.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 #include diff --git a/src/common/platform/win/Win32FileStream.cpp b/src/common/platform/win/Win32FileStream.cpp index db3a1e01..92420bbe 100644 --- a/src/common/platform/win/Win32FileStream.cpp +++ b/src/common/platform/win/Win32FileStream.cpp @@ -1,7 +1,7 @@ -#include "cru/common/platform/win/Win32FileStream.hpp" +#include "cru/common/platform/win/Win32FileStream.h" -#include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/platform/win/Exception.hpp" +#include "cru/common/io/OpenFileFlag.h" +#include "cru/common/platform/win/Exception.h" #include #include diff --git a/src/osx/Resource.cpp b/src/osx/Resource.cpp index e8140856..dbf15d48 100644 --- a/src/osx/Resource.cpp +++ b/src/osx/Resource.cpp @@ -1 +1 @@ -#include "cru/osx/Resource.hpp" +#include "cru/osx/Resource.h" diff --git a/src/osx/graphics/quartz/Brush.cpp b/src/osx/graphics/quartz/Brush.cpp index 637ce34f..cfb8f635 100644 --- a/src/osx/graphics/quartz/Brush.cpp +++ b/src/osx/graphics/quartz/Brush.cpp @@ -1,6 +1,6 @@ -#include "cru/osx/graphics/quartz/Brush.hpp" -#include "cru/common/String.hpp" -#include "cru/common/Format.hpp" +#include "cru/osx/graphics/quartz/Brush.h" +#include "cru/common/String.h" +#include "cru/common/Format.h" namespace cru::platform::graphics::osx::quartz { QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphicsFactory* graphics_factory, diff --git a/src/osx/graphics/quartz/Convert.cpp b/src/osx/graphics/quartz/Convert.cpp index 1cd7ea1d..993b5b61 100644 --- a/src/osx/graphics/quartz/Convert.cpp +++ b/src/osx/graphics/quartz/Convert.cpp @@ -1,4 +1,4 @@ -#include "cru/osx/graphics/quartz/Convert.hpp" +#include "cru/osx/graphics/quartz/Convert.h" #include namespace cru::platform::graphics::osx::quartz { diff --git a/src/osx/graphics/quartz/Factory.cpp b/src/osx/graphics/quartz/Factory.cpp index 570fd099..283341e5 100644 --- a/src/osx/graphics/quartz/Factory.cpp +++ b/src/osx/graphics/quartz/Factory.cpp @@ -1,12 +1,12 @@ -#include "cru/osx/graphics/quartz/Factory.hpp" - -#include "cru/osx/graphics/quartz/Brush.hpp" -#include "cru/osx/graphics/quartz/Font.hpp" -#include "cru/osx/graphics/quartz/Geometry.hpp" -#include "cru/osx/graphics/quartz/ImageFactory.hpp" -#include "cru/osx/graphics/quartz/TextLayout.hpp" -#include "cru/platform/Check.hpp" -#include "cru/platform/graphics/ImageFactory.hpp" +#include "cru/osx/graphics/quartz/Factory.h" + +#include "cru/osx/graphics/quartz/Brush.h" +#include "cru/osx/graphics/quartz/Font.h" +#include "cru/osx/graphics/quartz/Geometry.h" +#include "cru/osx/graphics/quartz/ImageFactory.h" +#include "cru/osx/graphics/quartz/TextLayout.h" +#include "cru/platform/Check.h" +#include "cru/platform/graphics/ImageFactory.h" #include diff --git a/src/osx/graphics/quartz/Font.cpp b/src/osx/graphics/quartz/Font.cpp index 1499bda6..605a1453 100644 --- a/src/osx/graphics/quartz/Font.cpp +++ b/src/osx/graphics/quartz/Font.cpp @@ -1,8 +1,8 @@ -#include "cru/osx/graphics/quartz/Font.hpp" +#include "cru/osx/graphics/quartz/Font.h" -#include "cru/osx/Convert.hpp" -#include "cru/osx/graphics/quartz/Convert.hpp" -#include "cru/osx/graphics/quartz/Resource.hpp" +#include "cru/osx/Convert.h" +#include "cru/osx/graphics/quartz/Convert.h" +#include "cru/osx/graphics/quartz/Resource.h" namespace cru::platform::graphics::osx::quartz { using cru::platform::osx::Convert; diff --git a/src/osx/graphics/quartz/Geometry.cpp b/src/osx/graphics/quartz/Geometry.cpp index 4ad9a7f3..284f5c4d 100644 --- a/src/osx/graphics/quartz/Geometry.cpp +++ b/src/osx/graphics/quartz/Geometry.cpp @@ -1,4 +1,4 @@ -#include "cru/osx/graphics/quartz/Geometry.hpp" +#include "cru/osx/graphics/quartz/Geometry.h" #include diff --git a/src/osx/graphics/quartz/Image.cpp b/src/osx/graphics/quartz/Image.cpp index e2664322..db10da76 100644 --- a/src/osx/graphics/quartz/Image.cpp +++ b/src/osx/graphics/quartz/Image.cpp @@ -1,5 +1,5 @@ -#include "cru/osx/graphics/quartz/Image.hpp" -#include "cru/osx/graphics/quartz/Convert.hpp" +#include "cru/osx/graphics/quartz/Image.h" +#include "cru/osx/graphics/quartz/Convert.h" namespace cru::platform::graphics::osx::quartz { QuartzImage::QuartzImage(IGraphicsFactory* graphics_factory, diff --git a/src/osx/graphics/quartz/ImageFactory.cpp b/src/osx/graphics/quartz/ImageFactory.cpp index c59ff126..7796ef3a 100644 --- a/src/osx/graphics/quartz/ImageFactory.cpp +++ b/src/osx/graphics/quartz/ImageFactory.cpp @@ -1,7 +1,7 @@ -#include "cru/osx/graphics/quartz/ImageFactory.hpp" -#include "cru/osx/graphics/quartz/Convert.hpp" -#include "cru/osx/graphics/quartz/Image.hpp" -#include "cru/platform/graphics/Image.hpp" +#include "cru/osx/graphics/quartz/ImageFactory.h" +#include "cru/osx/graphics/quartz/Convert.h" +#include "cru/osx/graphics/quartz/Image.h" +#include "cru/platform/graphics/Image.h" #include diff --git a/src/osx/graphics/quartz/Painter.cpp b/src/osx/graphics/quartz/Painter.cpp index 173cf47a..d74e456b 100644 --- a/src/osx/graphics/quartz/Painter.cpp +++ b/src/osx/graphics/quartz/Painter.cpp @@ -1,14 +1,14 @@ -#include "cru/osx/graphics/quartz/Painter.hpp" - -#include "cru/common/Logger.hpp" -#include "cru/osx/graphics/quartz/Brush.hpp" -#include "cru/osx/graphics/quartz/Convert.hpp" -#include "cru/osx/graphics/quartz/Geometry.hpp" -#include "cru/osx/graphics/quartz/Image.hpp" -#include "cru/osx/graphics/quartz/TextLayout.hpp" -#include "cru/platform/Check.hpp" -#include "cru/platform/Color.hpp" -#include "cru/platform/Exception.hpp" +#include "cru/osx/graphics/quartz/Painter.h" + +#include "cru/common/Logger.h" +#include "cru/osx/graphics/quartz/Brush.h" +#include "cru/osx/graphics/quartz/Convert.h" +#include "cru/osx/graphics/quartz/Geometry.h" +#include "cru/osx/graphics/quartz/Image.h" +#include "cru/osx/graphics/quartz/TextLayout.h" +#include "cru/platform/Check.h" +#include "cru/platform/Color.h" +#include "cru/platform/Exception.h" namespace cru::platform::graphics::osx::quartz { QuartzCGContextPainter::QuartzCGContextPainter( diff --git a/src/osx/graphics/quartz/Resource.cpp b/src/osx/graphics/quartz/Resource.cpp index 3ee09cdd..00bd5c94 100644 --- a/src/osx/graphics/quartz/Resource.cpp +++ b/src/osx/graphics/quartz/Resource.cpp @@ -1 +1 @@ -#include "cru/osx/graphics/quartz/Resource.hpp" +#include "cru/osx/graphics/quartz/Resource.h" diff --git a/src/osx/graphics/quartz/TextLayout.cpp b/src/osx/graphics/quartz/TextLayout.cpp index 3f33acdb..5d44c2e1 100644 --- a/src/osx/graphics/quartz/TextLayout.cpp +++ b/src/osx/graphics/quartz/TextLayout.cpp @@ -1,12 +1,12 @@ -#include "cru/osx/graphics/quartz/TextLayout.hpp" -#include "cru/common/Base.hpp" -#include "cru/common/StringUtil.hpp" -#include "cru/osx/Convert.hpp" -#include "cru/osx/graphics/quartz/Convert.hpp" -#include "cru/osx/graphics/quartz/Resource.hpp" -#include "cru/platform/Check.hpp" -#include "cru/platform/graphics/Base.hpp" -#include "cru/common/Format.hpp" +#include "cru/osx/graphics/quartz/TextLayout.h" +#include "cru/common/Base.h" +#include "cru/common/StringUtil.h" +#include "cru/osx/Convert.h" +#include "cru/osx/graphics/quartz/Convert.h" +#include "cru/osx/graphics/quartz/Resource.h" +#include "cru/platform/Check.h" +#include "cru/platform/graphics/Base.h" +#include "cru/common/Format.h" #include #include diff --git a/src/osx/gui/Clipboard.mm b/src/osx/gui/Clipboard.mm index f9515d59..b37efce2 100644 --- a/src/osx/gui/Clipboard.mm +++ b/src/osx/gui/Clipboard.mm @@ -1,8 +1,8 @@ -#include "cru/osx/gui/Clipboard.hpp" +#include "cru/osx/gui/Clipboard.h" #include "ClipboardPrivate.h" -#include "cru/common/Logger.hpp" -#include "cru/osx/Convert.hpp" +#include "cru/common/Logger.h" +#include "cru/osx/Convert.h" #include diff --git a/src/osx/gui/ClipboardPrivate.h b/src/osx/gui/ClipboardPrivate.h index 2a12973c..93fe5448 100644 --- a/src/osx/gui/ClipboardPrivate.h +++ b/src/osx/gui/ClipboardPrivate.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/Base.hpp" -#include "cru/osx/gui/Clipboard.hpp" +#include "cru/common/Base.h" +#include "cru/osx/gui/Clipboard.h" #include diff --git a/src/osx/gui/Cursor.mm b/src/osx/gui/Cursor.mm index 30b0f0fd..13bdc858 100644 --- a/src/osx/gui/Cursor.mm +++ b/src/osx/gui/Cursor.mm @@ -1,10 +1,10 @@ -#include "cru/osx/gui/Cursor.hpp" +#include "cru/osx/gui/Cursor.h" #include "CursorPrivate.h" -#include "cru/osx/Exception.hpp" -#include "cru/osx/gui/Resource.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" +#include "cru/osx/Exception.h" +#include "cru/osx/gui/Resource.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" #include diff --git a/src/osx/gui/CursorPrivate.h b/src/osx/gui/CursorPrivate.h index 5daf09f7..c840e286 100644 --- a/src/osx/gui/CursorPrivate.h +++ b/src/osx/gui/CursorPrivate.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/osx/gui/Cursor.hpp" +#include "cru/osx/gui/Cursor.h" #import diff --git a/src/osx/gui/InputMethod.mm b/src/osx/gui/InputMethod.mm index 45b50318..3a961209 100644 --- a/src/osx/gui/InputMethod.mm +++ b/src/osx/gui/InputMethod.mm @@ -1,11 +1,11 @@ -#include "cru/osx/gui/InputMethod.hpp" +#include "cru/osx/gui/InputMethod.h" #import #include "InputMethodPrivate.h" #include "WindowPrivate.h" -#include "cru/common/Logger.hpp" -#include "cru/osx/Convert.hpp" -#include "cru/osx/gui/Window.hpp" +#include "cru/common/Logger.h" +#include "cru/osx/Convert.h" +#include "cru/osx/gui/Window.h" namespace cru::platform::gui::osx { namespace details { diff --git a/src/osx/gui/InputMethodPrivate.h b/src/osx/gui/InputMethodPrivate.h index b0d7e4f8..1df21b37 100644 --- a/src/osx/gui/InputMethodPrivate.h +++ b/src/osx/gui/InputMethodPrivate.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/osx/gui/InputMethod.hpp" +#include "cru/osx/gui/InputMethod.h" #include diff --git a/src/osx/gui/Keyboard.mm b/src/osx/gui/Keyboard.mm index 16d363fc..3e78eecb 100644 --- a/src/osx/gui/Keyboard.mm +++ b/src/osx/gui/Keyboard.mm @@ -1,4 +1,4 @@ -#include "cru/osx/gui/Keyboard.hpp" +#include "cru/osx/gui/Keyboard.h" #import #import diff --git a/src/osx/gui/KeyboardPrivate.h b/src/osx/gui/KeyboardPrivate.h index 4d18bab6..b98ea5d4 100644 --- a/src/osx/gui/KeyboardPrivate.h +++ b/src/osx/gui/KeyboardPrivate.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/osx/gui/Keyboard.hpp" +#include "cru/osx/gui/Keyboard.h" #import diff --git a/src/osx/gui/Menu.mm b/src/osx/gui/Menu.mm index 53e69520..5d0fd4d5 100644 --- a/src/osx/gui/Menu.mm +++ b/src/osx/gui/Menu.mm @@ -1,8 +1,8 @@ -#include "cru/osx/gui/Menu.hpp" +#include "cru/osx/gui/Menu.h" #import "MenuPrivate.h" #include "KeyboardPrivate.h" -#include "cru/common/platform/osx/Convert.hpp" +#include "cru/common/platform/osx/Convert.h" #import diff --git a/src/osx/gui/MenuPrivate.h b/src/osx/gui/MenuPrivate.h index 02b34422..d5269312 100644 --- a/src/osx/gui/MenuPrivate.h +++ b/src/osx/gui/MenuPrivate.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/osx/gui/Menu.hpp" +#include "cru/osx/gui/Menu.h" #import #import diff --git a/src/osx/gui/Resource.cpp b/src/osx/gui/Resource.cpp index 3e9782e2..a6be5d75 100644 --- a/src/osx/gui/Resource.cpp +++ b/src/osx/gui/Resource.cpp @@ -1,4 +1,4 @@ -#include "cru/osx/gui/Resource.hpp" +#include "cru/osx/gui/Resource.h" namespace cru::platform::gui::osx { OsxGuiResource::OsxGuiResource(IUiApplication* ui_application) diff --git a/src/osx/gui/UiApplication.mm b/src/osx/gui/UiApplication.mm index b80df598..20ce82d3 100644 --- a/src/osx/gui/UiApplication.mm +++ b/src/osx/gui/UiApplication.mm @@ -1,17 +1,17 @@ -#include "cru/osx/gui/UiApplication.hpp" +#include "cru/osx/gui/UiApplication.h" #include "ClipboardPrivate.h" -#include "cru/common/Logger.hpp" -#include "cru/common/platform/osx/Convert.hpp" -#include "cru/osx/graphics/quartz/Factory.hpp" -#include "cru/osx/gui/Clipboard.hpp" -#include "cru/osx/gui/Cursor.hpp" -#include "cru/osx/gui/Menu.hpp" -#include "cru/osx/gui/Window.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/platform/gui/Window.hpp" +#include "cru/common/Logger.h" +#include "cru/common/platform/osx/Convert.h" +#include "cru/osx/graphics/quartz/Factory.h" +#include "cru/osx/gui/Clipboard.h" +#include "cru/osx/gui/Cursor.h" +#include "cru/osx/gui/Menu.h" +#include "cru/osx/gui/Window.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/platform/gui/Window.h" #include #include diff --git a/src/osx/gui/Window.mm b/src/osx/gui/Window.mm index f9891d86..f8a72599 100644 --- a/src/osx/gui/Window.mm +++ b/src/osx/gui/Window.mm @@ -1,21 +1,21 @@ -#include "cru/osx/gui/Window.hpp" +#include "cru/osx/gui/Window.h" #include "WindowPrivate.h" #include "CursorPrivate.h" #include "InputMethodPrivate.h" -#include "cru/common/Logger.hpp" -#include "cru/common/Range.hpp" -#include "cru/osx/Convert.hpp" -#include "cru/osx/graphics/quartz/Convert.hpp" -#include "cru/osx/graphics/quartz/Painter.hpp" -#include "cru/osx/gui/Cursor.hpp" -#include "cru/osx/gui/InputMethod.hpp" -#include "cru/osx/gui/Keyboard.hpp" -#include "cru/osx/gui/Resource.hpp" -#include "cru/osx/gui/UiApplication.hpp" -#include "cru/platform/Check.hpp" -#include "cru/platform/graphics/NullPainter.hpp" -#include "cru/platform/gui/TimerHelper.hpp" +#include "cru/common/Logger.h" +#include "cru/common/Range.h" +#include "cru/osx/Convert.h" +#include "cru/osx/graphics/quartz/Convert.h" +#include "cru/osx/graphics/quartz/Painter.h" +#include "cru/osx/gui/Cursor.h" +#include "cru/osx/gui/InputMethod.h" +#include "cru/osx/gui/Keyboard.h" +#include "cru/osx/gui/Resource.h" +#include "cru/osx/gui/UiApplication.h" +#include "cru/platform/Check.h" +#include "cru/platform/graphics/NullPainter.h" +#include "cru/platform/gui/TimerHelper.h" #include #include diff --git a/src/osx/gui/WindowPrivate.h b/src/osx/gui/WindowPrivate.h index 9e7ef2d7..cdd34246 100644 --- a/src/osx/gui/WindowPrivate.h +++ b/src/osx/gui/WindowPrivate.h @@ -1,10 +1,10 @@ #pragma once -#include "cru/osx/gui/Window.hpp" +#include "cru/osx/gui/Window.h" -#include "cru/common/Event.hpp" -#include "cru/osx/gui/Cursor.hpp" -#include "cru/platform/gui/TimerHelper.hpp" -#include "cru/platform/gui/Window.hpp" +#include "cru/common/Event.h" +#include "cru/osx/gui/Cursor.h" +#include "cru/platform/gui/TimerHelper.h" +#include "cru/platform/gui/Window.h" #import diff --git a/src/parse/Grammar.cpp b/src/parse/Grammar.cpp index 52933f91..17978adc 100644 --- a/src/parse/Grammar.cpp +++ b/src/parse/Grammar.cpp @@ -1,7 +1,7 @@ -#include "cru/parse/Grammar.hpp" -#include "cru/common/String.hpp" -#include "cru/parse/Symbol.hpp" -#include "cru/common/Format.hpp" +#include "cru/parse/Grammar.h" +#include "cru/common/String.h" +#include "cru/parse/Symbol.h" +#include "cru/common/Format.h" #include #include diff --git a/src/parse/Nonterminal.cpp b/src/parse/Nonterminal.cpp index 4d60d3d3..4fb33695 100644 --- a/src/parse/Nonterminal.cpp +++ b/src/parse/Nonterminal.cpp @@ -1,4 +1,4 @@ -#include "cru/parse/Nonterminal.hpp" +#include "cru/parse/Nonterminal.h" namespace cru::parse { Nonterminal::Nonterminal(Grammar* grammar, String name) diff --git a/src/parse/ParsingAlgorithm.cpp b/src/parse/ParsingAlgorithm.cpp index 03059e01..b7968ed1 100644 --- a/src/parse/ParsingAlgorithm.cpp +++ b/src/parse/ParsingAlgorithm.cpp @@ -1 +1 @@ -#include "cru/parse/ParsingAlgorithm.hpp" +#include "cru/parse/ParsingAlgorithm.h" diff --git a/src/parse/ParsingAlgorithmContext.cpp b/src/parse/ParsingAlgorithmContext.cpp index 686ba3e5..e98fe477 100644 --- a/src/parse/ParsingAlgorithmContext.cpp +++ b/src/parse/ParsingAlgorithmContext.cpp @@ -1,4 +1,4 @@ -#include "cru/parse/ParsingAlgorithmContext.hpp" +#include "cru/parse/ParsingAlgorithmContext.h" namespace cru::parse { ParsingAlgorithmContext::ParsingAlgorithmContext(Grammar* grammar, diff --git a/src/parse/ParsingContext.cpp b/src/parse/ParsingContext.cpp index 25a7a133..e46e9e93 100644 --- a/src/parse/ParsingContext.cpp +++ b/src/parse/ParsingContext.cpp @@ -1,5 +1,5 @@ -#include "cru/parse/ParsingContext.hpp" -#include "cru/parse/ParsingAlgorithmContext.hpp" +#include "cru/parse/ParsingContext.h" +#include "cru/parse/ParsingAlgorithmContext.h" namespace cru::parse { ParsingContext::ParsingContext( diff --git a/src/parse/ParsingTreeNode.cpp b/src/parse/ParsingTreeNode.cpp index 23bbf803..76d91533 100644 --- a/src/parse/ParsingTreeNode.cpp +++ b/src/parse/ParsingTreeNode.cpp @@ -1,4 +1,4 @@ -#include "cru/parse/ParsingTreeNode.hpp" +#include "cru/parse/ParsingTreeNode.h" namespace cru::parse { ParsingTreeNode::ParsingTreeNode(Symbol* symbol, Production* production) diff --git a/src/parse/Production.cpp b/src/parse/Production.cpp index 52ec46ab..1552874f 100644 --- a/src/parse/Production.cpp +++ b/src/parse/Production.cpp @@ -1,4 +1,4 @@ -#include "cru/parse/Production.hpp" +#include "cru/parse/Production.h" namespace cru::parse { Production::Production(Grammar* grammar, String name, Nonterminal* left, diff --git a/src/parse/RecursiveDescentAlgorithm.cpp b/src/parse/RecursiveDescentAlgorithm.cpp index 8ff2571d..45bc500f 100644 --- a/src/parse/RecursiveDescentAlgorithm.cpp +++ b/src/parse/RecursiveDescentAlgorithm.cpp @@ -1,6 +1,6 @@ -#include "cru/parse/RecursiveDescentAlgorithm.hpp" -#include "cru/parse/ParsingAlgorithmContext.hpp" -#include "cru/parse/RecursiveDescentAlgorithmContext.hpp" +#include "cru/parse/RecursiveDescentAlgorithm.h" +#include "cru/parse/ParsingAlgorithmContext.h" +#include "cru/parse/RecursiveDescentAlgorithmContext.h" namespace cru::parse { bool RecursiveDescentAlgorithm::CanHandle(Grammar *grammar) const { diff --git a/src/parse/RecursiveDescentAlgorithmContext.cpp b/src/parse/RecursiveDescentAlgorithmContext.cpp index acfd9eee..90508d68 100644 --- a/src/parse/RecursiveDescentAlgorithmContext.cpp +++ b/src/parse/RecursiveDescentAlgorithmContext.cpp @@ -1,5 +1,5 @@ -#include "cru/parse/RecursiveDescentAlgorithmContext.hpp" -#include "cru/parse/ParsingTreeNode.hpp" +#include "cru/parse/RecursiveDescentAlgorithmContext.h" +#include "cru/parse/ParsingTreeNode.h" namespace cru::parse { RecursiveDescentAlgorithmContext::RecursiveDescentAlgorithmContext( diff --git a/src/parse/Symbol.cpp b/src/parse/Symbol.cpp index bcedc490..fe4cc47c 100644 --- a/src/parse/Symbol.cpp +++ b/src/parse/Symbol.cpp @@ -1,4 +1,4 @@ -#include "cru/parse/Symbol.hpp" +#include "cru/parse/Symbol.h" namespace cru::parse { Symbol::Symbol(Grammar* grammar, String name) diff --git a/src/parse/Terminal.cpp b/src/parse/Terminal.cpp index acd9576e..421836f7 100644 --- a/src/parse/Terminal.cpp +++ b/src/parse/Terminal.cpp @@ -1,4 +1,4 @@ -#include "cru/parse/Terminal.hpp" +#include "cru/parse/Terminal.h" namespace cru::parse { Terminal::Terminal(Grammar* grammar, String name) : Symbol(grammar, name) {} diff --git a/src/parse/TokenType.cpp b/src/parse/TokenType.cpp index 9b06d56f..386b1401 100644 --- a/src/parse/TokenType.cpp +++ b/src/parse/TokenType.cpp @@ -1,4 +1,4 @@ -#include "cru/parse/TokenType.hpp" +#include "cru/parse/TokenType.h" namespace cru::parse { TokenType::TokenType(String name) : name_(std::move(name)) {} diff --git a/src/platform/Color.cpp b/src/platform/Color.cpp index cced498c..b39865a8 100644 --- a/src/platform/Color.cpp +++ b/src/platform/Color.cpp @@ -1,4 +1,4 @@ -#include "cru/platform/Color.hpp" +#include "cru/platform/Color.h" #include #include diff --git a/src/platform/ForDllExport.cpp b/src/platform/ForDllExport.cpp index 743a9efa..a0421317 100644 --- a/src/platform/ForDllExport.cpp +++ b/src/platform/ForDllExport.cpp @@ -1,2 +1,2 @@ -#include "cru/platform/Exception.hpp" -#include "cru/platform/Resource.hpp" +#include "cru/platform/Exception.h" +#include "cru/platform/Resource.h" diff --git a/src/platform/bootstrap/Bootstrap.cpp b/src/platform/bootstrap/Bootstrap.cpp index c167be19..2c8bae5d 100644 --- a/src/platform/bootstrap/Bootstrap.cpp +++ b/src/platform/bootstrap/Bootstrap.cpp @@ -1,8 +1,8 @@ -#include "cru/platform/bootstrap/Bootstrap.hpp" -#include "cru/osx/gui/UiApplication.hpp" +#include "cru/platform/bootstrap/Bootstrap.h" +#include "cru/osx/gui/UiApplication.h" #ifdef CRU_PLATFORM_WINDOWS -#include "cru/win/gui/UiApplication.hpp" +#include "cru/win/gui/UiApplication.h" #else #endif diff --git a/src/platform/graphics/ForDllExport.cpp b/src/platform/graphics/ForDllExport.cpp index a67030b8..901f8201 100644 --- a/src/platform/graphics/ForDllExport.cpp +++ b/src/platform/graphics/ForDllExport.cpp @@ -1,9 +1,9 @@ -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/graphics/Font.hpp" -#include "cru/platform/graphics/Geometry.hpp" -#include "cru/platform/graphics/Image.hpp" -#include "cru/platform/graphics/ImageFactory.hpp" -#include "cru/platform/graphics/Painter.hpp" -#include "cru/platform/graphics/Resource.hpp" -#include "cru/platform/graphics/TextLayout.hpp" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/graphics/Font.h" +#include "cru/platform/graphics/Geometry.h" +#include "cru/platform/graphics/Image.h" +#include "cru/platform/graphics/ImageFactory.h" +#include "cru/platform/graphics/Painter.h" +#include "cru/platform/graphics/Resource.h" +#include "cru/platform/graphics/TextLayout.h" diff --git a/src/platform/graphics/NullPainter.cpp b/src/platform/graphics/NullPainter.cpp index 1b02ea07..858aafd7 100644 --- a/src/platform/graphics/NullPainter.cpp +++ b/src/platform/graphics/NullPainter.cpp @@ -1 +1 @@ -#include "cru/platform/graphics/NullPainter.hpp" +#include "cru/platform/graphics/NullPainter.h" diff --git a/src/platform/gui/Keyboard.cpp b/src/platform/gui/Keyboard.cpp index 08be37c9..775995c2 100644 --- a/src/platform/gui/Keyboard.cpp +++ b/src/platform/gui/Keyboard.cpp @@ -1,4 +1,4 @@ -#include "cru/platform/gui/Keyboard.hpp" +#include "cru/platform/gui/Keyboard.h" #include #include diff --git a/src/platform/gui/Menu.cpp b/src/platform/gui/Menu.cpp index 7b02a8a4..dcfb84b3 100644 --- a/src/platform/gui/Menu.cpp +++ b/src/platform/gui/Menu.cpp @@ -1,4 +1,4 @@ -#include "cru/platform/gui/Menu.hpp" +#include "cru/platform/gui/Menu.h" namespace cru::platform::gui { std::vector IMenu::GetItems() { diff --git a/src/platform/gui/UiApplication.cpp b/src/platform/gui/UiApplication.cpp index e58d34c9..e565ce49 100644 --- a/src/platform/gui/UiApplication.cpp +++ b/src/platform/gui/UiApplication.cpp @@ -1,4 +1,4 @@ -#include "cru/platform/gui/UiApplication.hpp" +#include "cru/platform/gui/UiApplication.h" namespace cru::platform::gui { IUiApplication* IUiApplication::instance = nullptr; diff --git a/src/theme_builder/components/MainWindow.cpp b/src/theme_builder/components/MainWindow.cpp index d52193f1..31530491 100644 --- a/src/theme_builder/components/MainWindow.cpp +++ b/src/theme_builder/components/MainWindow.cpp @@ -1,7 +1,7 @@ -#include "MainWindow.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/controls/StackLayout.hpp" -#include "cru/ui/controls/TextBlock.hpp" +#include "MainWindow.h" +#include "cru/ui/Base.h" +#include "cru/ui/controls/StackLayout.h" +#include "cru/ui/controls/TextBlock.h" namespace cru::theme_builder { using namespace cru::ui; diff --git a/src/theme_builder/components/MainWindow.h b/src/theme_builder/components/MainWindow.h new file mode 100644 index 00000000..101b678e --- /dev/null +++ b/src/theme_builder/components/MainWindow.h @@ -0,0 +1,28 @@ +#pragma once +#include "cru/ui/components/Component.h" +#include "cru/ui/controls/Button.h" +#include "cru/ui/controls/FlexLayout.h" +#include "cru/ui/controls/StackLayout.h" +#include "cru/ui/controls/Window.h" + +namespace cru::theme_builder { +class MainWindow : public ui::components::Component { + public: + MainWindow(); + + CRU_DELETE_COPY(MainWindow) + CRU_DELETE_MOVE(MainWindow) + + ~MainWindow() override; + + ui::controls::Control* GetRootControl() override { return window_; } + + void Show(); + + private: + ui::controls::Window* window_; + ui::controls::FlexLayout* main_layout_; + ui::controls::StackLayout* preview_layout_; + ui::controls::Button* preview_button_; +}; +} // namespace cru::theme_builder diff --git a/src/theme_builder/components/MainWindow.hpp b/src/theme_builder/components/MainWindow.hpp deleted file mode 100644 index ef37b7a2..00000000 --- a/src/theme_builder/components/MainWindow.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once -#include "cru/ui/components/Component.hpp" -#include "cru/ui/controls/Button.hpp" -#include "cru/ui/controls/FlexLayout.hpp" -#include "cru/ui/controls/StackLayout.hpp" -#include "cru/ui/controls/Window.hpp" - -namespace cru::theme_builder { -class MainWindow : public ui::components::Component { - public: - MainWindow(); - - CRU_DELETE_COPY(MainWindow) - CRU_DELETE_MOVE(MainWindow) - - ~MainWindow() override; - - ui::controls::Control* GetRootControl() override { return window_; } - - void Show(); - - private: - ui::controls::Window* window_; - ui::controls::FlexLayout* main_layout_; - ui::controls::StackLayout* preview_layout_; - ui::controls::Button* preview_button_; -}; -} // namespace cru::theme_builder diff --git a/src/theme_builder/components/StyleRuleSetEditor.cpp b/src/theme_builder/components/StyleRuleSetEditor.cpp index be6fd8d6..933706a3 100644 --- a/src/theme_builder/components/StyleRuleSetEditor.cpp +++ b/src/theme_builder/components/StyleRuleSetEditor.cpp @@ -1,4 +1,4 @@ -#include "StyleRuleSetEditor.hpp" +#include "StyleRuleSetEditor.h" namespace cru::theme_builder { StyleRuleSetEditor::StyleRuleSetEditor() {} diff --git a/src/theme_builder/components/StyleRuleSetEditor.h b/src/theme_builder/components/StyleRuleSetEditor.h new file mode 100644 index 00000000..ecb3ee95 --- /dev/null +++ b/src/theme_builder/components/StyleRuleSetEditor.h @@ -0,0 +1,22 @@ +#pragma once +#include "cru/ui/components/Component.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/controls/FlexLayout.h" + +namespace cru::theme_builder { +class StyleRuleSetEditor : public ui::components::Component { + public: + StyleRuleSetEditor(); + + CRU_DELETE_COPY(StyleRuleSetEditor) + CRU_DELETE_MOVE(StyleRuleSetEditor) + + ~StyleRuleSetEditor() override; + + public: + ui::controls::Control* GetRootControl() override { return main_layout_; } + + private: + ui::controls::FlexLayout* main_layout_; +}; +} // namespace cru::theme_builder diff --git a/src/theme_builder/components/StyleRuleSetEditor.hpp b/src/theme_builder/components/StyleRuleSetEditor.hpp deleted file mode 100644 index 8bf55229..00000000 --- a/src/theme_builder/components/StyleRuleSetEditor.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once -#include "cru/ui/components/Component.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/controls/FlexLayout.hpp" - -namespace cru::theme_builder { -class StyleRuleSetEditor : public ui::components::Component { - public: - StyleRuleSetEditor(); - - CRU_DELETE_COPY(StyleRuleSetEditor) - CRU_DELETE_MOVE(StyleRuleSetEditor) - - ~StyleRuleSetEditor() override; - - public: - ui::controls::Control* GetRootControl() override { return main_layout_; } - - private: - ui::controls::FlexLayout* main_layout_; -}; -} // namespace cru::theme_builder diff --git a/src/theme_builder/main.cpp b/src/theme_builder/main.cpp index 8c79f2c0..7e7faa3d 100644 --- a/src/theme_builder/main.cpp +++ b/src/theme_builder/main.cpp @@ -1,5 +1,5 @@ -#include "components/MainWindow.hpp" -#include "cru/platform/bootstrap/Bootstrap.hpp" +#include "components/MainWindow.h" +#include "cru/platform/bootstrap/Bootstrap.h" int main() { using namespace cru::theme_builder; diff --git a/src/toml/TomlDocument.cpp b/src/toml/TomlDocument.cpp index 052af170..e9351538 100644 --- a/src/toml/TomlDocument.cpp +++ b/src/toml/TomlDocument.cpp @@ -1,4 +1,4 @@ -#include "cru/toml/TomlDocument.hpp" +#include "cru/toml/TomlDocument.h" namespace cru::toml { std::optional TomlSection::GetValue(const String& key) const { diff --git a/src/toml/TomlParser.cpp b/src/toml/TomlParser.cpp index 5a11404e..7c29e0be 100644 --- a/src/toml/TomlParser.cpp +++ b/src/toml/TomlParser.cpp @@ -1,5 +1,5 @@ -#include "cru/toml/TomlParser.hpp" -#include "cru/toml/TomlDocument.hpp" +#include "cru/toml/TomlParser.h" +#include "cru/toml/TomlDocument.h" namespace cru::toml { TomlParser::TomlParser(String input) : input_(std::move(input)) {} diff --git a/src/ui/Helper.cpp b/src/ui/Helper.cpp index a5ab3a72..abfd001b 100644 --- a/src/ui/Helper.cpp +++ b/src/ui/Helper.cpp @@ -1,7 +1,7 @@ -#include "Helper.hpp" +#include "Helper.h" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/gui/UiApplication.hpp" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/gui/UiApplication.h" namespace cru::ui { using cru::platform::graphics::IGraphicsFactory; diff --git a/src/ui/Helper.h b/src/ui/Helper.h new file mode 100644 index 00000000..8bee72a6 --- /dev/null +++ b/src/ui/Helper.h @@ -0,0 +1,16 @@ +#pragma once +#include "cru/ui/Base.h" + +namespace cru::platform { +namespace graphics { +struct IGraphicsFactory; +} +namespace native { +struct IUiApplication; +} // namespace native +} // namespace cru::platform + +namespace cru::ui { +cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory(); +cru::platform::gui::IUiApplication* GetUiApplication(); +} // namespace cru::ui diff --git a/src/ui/Helper.hpp b/src/ui/Helper.hpp deleted file mode 100644 index 23d24b66..00000000 --- a/src/ui/Helper.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once -#include "cru/ui/Base.hpp" - -namespace cru::platform { -namespace graphics { -struct IGraphicsFactory; -} -namespace native { -struct IUiApplication; -} // namespace native -} // namespace cru::platform - -namespace cru::ui { -cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory(); -cru::platform::gui::IUiApplication* GetUiApplication(); -} // namespace cru::ui diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp index 528097ab..4649f70f 100644 --- a/src/ui/ThemeManager.cpp +++ b/src/ui/ThemeManager.cpp @@ -1,14 +1,14 @@ -#include "cru/ui/ThemeManager.hpp" - -#include "Helper.hpp" -#include "cru/common/StringUtil.hpp" -#include "cru/common/io/FileStream.hpp" -#include "cru/common/io/Resource.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" -#include "cru/xml/XmlParser.hpp" +#include "cru/ui/ThemeManager.h" + +#include "Helper.h" +#include "cru/common/StringUtil.h" +#include "cru/common/io/FileStream.h" +#include "cru/common/io/Resource.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/style/StyleRuleSet.h" +#include "cru/xml/XmlParser.h" namespace cru::ui { ThemeManager* ThemeManager::GetInstance() { diff --git a/src/ui/components/Component.cpp b/src/ui/components/Component.cpp index 5b62ffc9..ddf65515 100644 --- a/src/ui/components/Component.cpp +++ b/src/ui/components/Component.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/components/Component.hpp" +#include "cru/ui/components/Component.h" namespace cru::ui::components { diff --git a/src/ui/components/Menu.cpp b/src/ui/components/Menu.cpp index 22415cd3..873e7ce0 100644 --- a/src/ui/components/Menu.cpp +++ b/src/ui/components/Menu.cpp @@ -1,14 +1,14 @@ -#include "cru/ui/components/Menu.hpp" +#include "cru/ui/components/Menu.h" #include -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/controls/Button.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/controls/FlexLayout.hpp" -#include "cru/ui/controls/TextBlock.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" +#include "cru/platform/gui/Window.h" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/controls/Button.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/controls/FlexLayout.h" +#include "cru/ui/controls/TextBlock.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/style/StyleRuleSet.h" namespace cru::ui::components { MenuItem::MenuItem() { diff --git a/src/ui/controls/Button.cpp b/src/ui/controls/Button.cpp index 1f649819..e42bfae7 100644 --- a/src/ui/controls/Button.cpp +++ b/src/ui/controls/Button.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/controls/Button.hpp" +#include "cru/ui/controls/Button.h" -#include "../Helper.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/render/BorderRenderObject.hpp" +#include "../Helper.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/render/BorderRenderObject.h" namespace cru::ui::controls { Button::Button() : click_detector_(this) { diff --git a/src/ui/controls/Container.cpp b/src/ui/controls/Container.cpp index 30129f64..92ac3847 100644 --- a/src/ui/controls/Container.cpp +++ b/src/ui/controls/Container.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/controls/Container.hpp" +#include "cru/ui/controls/Container.h" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/render/BorderRenderObject.hpp" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/render/BorderRenderObject.h" +#include "cru/ui/render/RenderObject.h" namespace cru::ui::controls { Container::Container() { diff --git a/src/ui/controls/ContentControl.cpp b/src/ui/controls/ContentControl.cpp index 8c6f0b00..8b421e09 100644 --- a/src/ui/controls/ContentControl.cpp +++ b/src/ui/controls/ContentControl.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/controls/ContentControl.hpp" +#include "cru/ui/controls/ContentControl.h" namespace cru::ui::controls { Control* ContentControl::GetChild() const { diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp index 04199d1d..bda8cb35 100644 --- a/src/ui/controls/Control.cpp +++ b/src/ui/controls/Control.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/controls/Control.hpp" - -#include "cru/common/Base.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/RenderObject.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" +#include "cru/ui/controls/Control.h" + +#include "cru/common/Base.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/Base.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/RenderObject.h" +#include "cru/ui/style/StyleRuleSet.h" #include diff --git a/src/ui/controls/FlexLayout.cpp b/src/ui/controls/FlexLayout.cpp index e390241f..02ebb031 100644 --- a/src/ui/controls/FlexLayout.cpp +++ b/src/ui/controls/FlexLayout.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/controls/FlexLayout.hpp" +#include "cru/ui/controls/FlexLayout.h" -#include "cru/ui/render/FlexLayoutRenderObject.hpp" +#include "cru/ui/render/FlexLayoutRenderObject.h" namespace cru::ui::controls { using render::FlexLayoutRenderObject; diff --git a/src/ui/controls/LayoutControl.cpp b/src/ui/controls/LayoutControl.cpp index e5a38445..5c67bc86 100644 --- a/src/ui/controls/LayoutControl.cpp +++ b/src/ui/controls/LayoutControl.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/controls/LayoutControl.hpp" +#include "cru/ui/controls/LayoutControl.h" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/ui/render/RenderObject.h" namespace cru::ui::controls { void LayoutControl::ClearChildren() { diff --git a/src/ui/controls/NoChildControl.cpp b/src/ui/controls/NoChildControl.cpp index c62c5819..29177828 100644 --- a/src/ui/controls/NoChildControl.cpp +++ b/src/ui/controls/NoChildControl.cpp @@ -1,3 +1,3 @@ -#include "cru/ui/controls/NoChildControl.hpp" +#include "cru/ui/controls/NoChildControl.h" namespace cru::ui::controls {} diff --git a/src/ui/controls/Popup.cpp b/src/ui/controls/Popup.cpp index b386165b..238ddbd4 100644 --- a/src/ui/controls/Popup.cpp +++ b/src/ui/controls/Popup.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/controls/Popup.hpp" +#include "cru/ui/controls/Popup.h" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/controls/RootControl.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/controls/RootControl.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/StackLayoutRenderObject.h" #include diff --git a/src/ui/controls/RootControl.cpp b/src/ui/controls/RootControl.cpp index dbf037fc..ac4d4d6d 100644 --- a/src/ui/controls/RootControl.cpp +++ b/src/ui/controls/RootControl.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/controls/RootControl.hpp" - -#include "cru/common/Base.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/Base.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/controls/RootControl.h" + +#include "cru/common/Base.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/Window.h" +#include "cru/ui/Base.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/Base.h" +#include "cru/ui/render/StackLayoutRenderObject.h" #include "gsl/pointers" #include diff --git a/src/ui/controls/ScrollView.cpp b/src/ui/controls/ScrollView.cpp index 66c1d620..e87ede4b 100644 --- a/src/ui/controls/ScrollView.cpp +++ b/src/ui/controls/ScrollView.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/controls/ScrollView.hpp" +#include "cru/ui/controls/ScrollView.h" -#include "cru/ui/render/RenderObject.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" +#include "cru/ui/render/RenderObject.h" +#include "cru/ui/render/ScrollRenderObject.h" #include diff --git a/src/ui/controls/StackLayout.cpp b/src/ui/controls/StackLayout.cpp index 667e6755..7e45a555 100644 --- a/src/ui/controls/StackLayout.cpp +++ b/src/ui/controls/StackLayout.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/controls/StackLayout.hpp" +#include "cru/ui/controls/StackLayout.h" #include -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/render/StackLayoutRenderObject.h" namespace cru::ui::controls { using render::StackLayoutRenderObject; diff --git a/src/ui/controls/TextBlock.cpp b/src/ui/controls/TextBlock.cpp index b4d327f3..80d9fe34 100644 --- a/src/ui/controls/TextBlock.cpp +++ b/src/ui/controls/TextBlock.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/controls/TextBlock.hpp" +#include "cru/ui/controls/TextBlock.h" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/render/CanvasRenderObject.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" -#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/render/CanvasRenderObject.h" +#include "cru/ui/render/StackLayoutRenderObject.h" +#include "cru/ui/render/TextRenderObject.h" namespace cru::ui::controls { using render::TextRenderObject; diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp index a5c8480e..11b77e99 100644 --- a/src/ui/controls/TextBox.cpp +++ b/src/ui/controls/TextBox.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/controls/TextBox.hpp" - -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/render/BorderRenderObject.hpp" -#include "cru/ui/render/CanvasRenderObject.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" -#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/controls/TextBox.h" + +#include "cru/ui/ThemeManager.h" +#include "cru/ui/render/BorderRenderObject.h" +#include "cru/ui/render/CanvasRenderObject.h" +#include "cru/ui/render/ScrollRenderObject.h" +#include "cru/ui/render/StackLayoutRenderObject.h" +#include "cru/ui/render/TextRenderObject.h" namespace cru::ui::controls { using render::BorderRenderObject; diff --git a/src/ui/controls/TextHostControlService.cpp b/src/ui/controls/TextHostControlService.cpp index 0f136034..c537a86e 100644 --- a/src/ui/controls/TextHostControlService.cpp +++ b/src/ui/controls/TextHostControlService.cpp @@ -1,26 +1,26 @@ -#include "cru/ui/controls/TextHostControlService.hpp" - -#include "../Helper.hpp" -#include "cru/common/Base.hpp" -#include "cru/common/Logger.hpp" -#include "cru/common/String.hpp" -#include "cru/common/StringUtil.hpp" -#include "cru/platform/graphics/Font.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/Clipboard.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/InputMethod.hpp" -#include "cru/platform/gui/Keyboard.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/components/Menu.hpp" -#include "cru/ui/events/UiEvents.hpp" -#include "cru/ui/helper/ShortcutHub.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" -#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/controls/TextHostControlService.h" + +#include "../Helper.h" +#include "cru/common/Base.h" +#include "cru/common/Logger.h" +#include "cru/common/String.h" +#include "cru/common/StringUtil.h" +#include "cru/platform/graphics/Font.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/Clipboard.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/InputMethod.h" +#include "cru/platform/gui/Keyboard.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/platform/gui/Window.h" +#include "cru/ui/Base.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/components/Menu.h" +#include "cru/ui/events/UiEvents.h" +#include "cru/ui/helper/ShortcutHub.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/ScrollRenderObject.h" +#include "cru/ui/render/TextRenderObject.h" #include diff --git a/src/ui/controls/Window.cpp b/src/ui/controls/Window.cpp index 76203f22..998395f3 100644 --- a/src/ui/controls/Window.cpp +++ b/src/ui/controls/Window.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/controls/Window.hpp" +#include "cru/ui/controls/Window.h" -#include "cru/common/Base.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/ui/controls/RootControl.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/Base.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/common/Base.h" +#include "cru/platform/gui/Base.h" +#include "cru/ui/controls/RootControl.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/Base.h" +#include "cru/ui/render/StackLayoutRenderObject.h" namespace cru::ui::controls { Window* Window::Create(Control* attached_control) { diff --git a/src/ui/events/MouseEventArgs.cpp b/src/ui/events/MouseEventArgs.cpp index 39424c65..cad860d7 100644 --- a/src/ui/events/MouseEventArgs.cpp +++ b/src/ui/events/MouseEventArgs.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/events/MouseEventArgs.hpp" +#include "cru/ui/events/MouseEventArgs.h" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/ui/controls/Control.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/RenderObject.h" namespace cru::ui::events { Point MouseEventArgs::GetPoint(render::RenderObject* render_object) const { diff --git a/src/ui/helper/ClickDetector.cpp b/src/ui/helper/ClickDetector.cpp index d8d51327..6d4f38c1 100644 --- a/src/ui/helper/ClickDetector.cpp +++ b/src/ui/helper/ClickDetector.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/helper/ClickDetector.hpp" +#include "cru/ui/helper/ClickDetector.h" -#include "cru/common/Logger.hpp" -#include "cru/ui/DebugFlags.hpp" +#include "cru/common/Logger.h" +#include "cru/ui/DebugFlags.h" #include diff --git a/src/ui/helper/ShortcutHub.cpp b/src/ui/helper/ShortcutHub.cpp index c0b6c5d8..3df07409 100644 --- a/src/ui/helper/ShortcutHub.cpp +++ b/src/ui/helper/ShortcutHub.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/helper/ShortcutHub.hpp" +#include "cru/ui/helper/ShortcutHub.h" -#include "cru/common/Logger.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/controls/Control.hpp" +#include "cru/common/Logger.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/controls/Control.h" #include #include diff --git a/src/ui/host/LayoutPaintCycler.cpp b/src/ui/host/LayoutPaintCycler.cpp index fd581e00..7f8523d4 100644 --- a/src/ui/host/LayoutPaintCycler.cpp +++ b/src/ui/host/LayoutPaintCycler.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/host/LayoutPaintCycler.hpp" +#include "cru/ui/host/LayoutPaintCycler.h" #include -#include "../Helper.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/host/WindowHost.hpp" +#include "../Helper.h" +#include "cru/ui/Base.h" +#include "cru/ui/host/WindowHost.h" namespace cru::ui::host { LayoutPaintCycler::LayoutPaintCycler(WindowHost* host) : host_(host) { diff --git a/src/ui/host/RoutedEventDispatch.h b/src/ui/host/RoutedEventDispatch.h new file mode 100644 index 00000000..ae1421ee --- /dev/null +++ b/src/ui/host/RoutedEventDispatch.h @@ -0,0 +1,110 @@ +#pragma once +#include "cru/common/Logger.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/controls/Control.h" + +#include + +namespace cru::ui { +// Dispatch the event. +// +// This will raise routed event of the control and its parent and parent's +// parent ... (until "last_receiver" if it's not nullptr) with appropriate args. +// +// First tunnel from top to bottom possibly stopped by "handled" flag in +// EventArgs. Second bubble from bottom to top possibly stopped by "handled" +// flag in EventArgs. Last direct to each control. +// +// Args is of type "EventArgs". The first init argument is "sender", which is +// automatically bound to each receiving control. The second init argument is +// "original_sender", which is unchanged. And "args" will be perfectly forwarded +// as the rest arguments. +template +void DispatchEvent( + const std::u16string_view& event_name, + controls::Control* const original_sender, + events::RoutedEvent* (controls::Control::*event_ptr)(), + controls::Control* const last_receiver, Args&&... args) { + CRU_UNUSED(event_name) + + if (original_sender == last_receiver) { + if constexpr (debug_flags::routed_event) + log::Debug( + "Routed event {} no need to dispatch (original_sender == " + "last_receiver). Original sender is {}.", + event_name, original_sender->GetControlType()); + return; + } + + std::vector receive_list; + + auto parent = original_sender; + while (parent != last_receiver) { + receive_list.push_back(parent); + parent = parent->GetParent(); + } + + if constexpr (debug_flags::routed_event) { + std::u16string log = u"Dispatch routed event "; + log += event_name; + log += u". Path (parent first): "; + auto i = receive_list.crbegin(); + const auto end = --receive_list.crend(); + for (; i != end; ++i) { + log += (*i)->GetControlType(); + log += u" -> "; + } + log += (*i)->GetControlType(); + log::Debug(log); + } + + auto handled = false; + + int count = 0; + + // tunnel + for (auto i = receive_list.crbegin(); i != receive_list.crend(); ++i) { + count++; + EventArgs event_args(*i, original_sender, std::forward(args)...); + static_cast*>(((*i)->*event_ptr)()->Tunnel()) + ->Raise(event_args); + if (event_args.IsHandled()) { + handled = true; + if constexpr (debug_flags::routed_event) + log::Debug( + u"Routed event is short-circuit in TUNNEL at {}-st control (count " + u"from parent).", + count); + break; + } + } + + // bubble + if (!handled) { + for (auto i : receive_list) { + count--; + EventArgs event_args(i, original_sender, std::forward(args)...); + static_cast*>((i->*event_ptr)()->Bubble()) + ->Raise(event_args); + if (event_args.IsHandled()) { + if constexpr (debug_flags::routed_event) + log::Debug( + u"Routed event is short-circuit in BUBBLE at {}-st control " + u"(count from parent).", + count); + break; + } + } + } + + // direct + for (auto i : receive_list) { + EventArgs event_args(i, original_sender, std::forward(args)...); + static_cast*>((i->*event_ptr)()->Direct()) + ->Raise(event_args); + } + + if constexpr (debug_flags::routed_event) + log::Debug(u"Routed event dispatch finished."); +} +} // namespace cru::ui diff --git a/src/ui/host/RoutedEventDispatch.hpp b/src/ui/host/RoutedEventDispatch.hpp deleted file mode 100644 index 027ddbe4..00000000 --- a/src/ui/host/RoutedEventDispatch.hpp +++ /dev/null @@ -1,110 +0,0 @@ -#pragma once -#include "cru/common/Logger.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/controls/Control.hpp" - -#include - -namespace cru::ui { -// Dispatch the event. -// -// This will raise routed event of the control and its parent and parent's -// parent ... (until "last_receiver" if it's not nullptr) with appropriate args. -// -// First tunnel from top to bottom possibly stopped by "handled" flag in -// EventArgs. Second bubble from bottom to top possibly stopped by "handled" -// flag in EventArgs. Last direct to each control. -// -// Args is of type "EventArgs". The first init argument is "sender", which is -// automatically bound to each receiving control. The second init argument is -// "original_sender", which is unchanged. And "args" will be perfectly forwarded -// as the rest arguments. -template -void DispatchEvent( - const std::u16string_view& event_name, - controls::Control* const original_sender, - events::RoutedEvent* (controls::Control::*event_ptr)(), - controls::Control* const last_receiver, Args&&... args) { - CRU_UNUSED(event_name) - - if (original_sender == last_receiver) { - if constexpr (debug_flags::routed_event) - log::Debug( - "Routed event {} no need to dispatch (original_sender == " - "last_receiver). Original sender is {}.", - event_name, original_sender->GetControlType()); - return; - } - - std::vector receive_list; - - auto parent = original_sender; - while (parent != last_receiver) { - receive_list.push_back(parent); - parent = parent->GetParent(); - } - - if constexpr (debug_flags::routed_event) { - std::u16string log = u"Dispatch routed event "; - log += event_name; - log += u". Path (parent first): "; - auto i = receive_list.crbegin(); - const auto end = --receive_list.crend(); - for (; i != end; ++i) { - log += (*i)->GetControlType(); - log += u" -> "; - } - log += (*i)->GetControlType(); - log::Debug(log); - } - - auto handled = false; - - int count = 0; - - // tunnel - for (auto i = receive_list.crbegin(); i != receive_list.crend(); ++i) { - count++; - EventArgs event_args(*i, original_sender, std::forward(args)...); - static_cast*>(((*i)->*event_ptr)()->Tunnel()) - ->Raise(event_args); - if (event_args.IsHandled()) { - handled = true; - if constexpr (debug_flags::routed_event) - log::Debug( - u"Routed event is short-circuit in TUNNEL at {}-st control (count " - u"from parent).", - count); - break; - } - } - - // bubble - if (!handled) { - for (auto i : receive_list) { - count--; - EventArgs event_args(i, original_sender, std::forward(args)...); - static_cast*>((i->*event_ptr)()->Bubble()) - ->Raise(event_args); - if (event_args.IsHandled()) { - if constexpr (debug_flags::routed_event) - log::Debug( - u"Routed event is short-circuit in BUBBLE at {}-st control " - u"(count from parent).", - count); - break; - } - } - } - - // direct - for (auto i : receive_list) { - EventArgs event_args(i, original_sender, std::forward(args)...); - static_cast*>((i->*event_ptr)()->Direct()) - ->Raise(event_args); - } - - if constexpr (debug_flags::routed_event) - log::Debug(u"Routed event dispatch finished."); -} -} // namespace cru::ui diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp index 9766e85e..26d48f89 100644 --- a/src/ui/host/WindowHost.cpp +++ b/src/ui/host/WindowHost.cpp @@ -1,16 +1,16 @@ -#include "cru/ui/host/WindowHost.hpp" - -#include "RoutedEventDispatch.hpp" -#include "cru/common/Base.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Painter.hpp" -#include "cru/platform/gui/InputMethod.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/host/LayoutPaintCycler.hpp" -#include "cru/ui/render/MeasureRequirement.hpp" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/ui/host/WindowHost.h" + +#include "RoutedEventDispatch.h" +#include "cru/common/Base.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Painter.h" +#include "cru/platform/gui/InputMethod.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/platform/gui/Window.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/host/LayoutPaintCycler.h" +#include "cru/ui/render/MeasureRequirement.h" +#include "cru/ui/render/RenderObject.h" #include #include diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp index 1209df07..8daa9d1b 100644 --- a/src/ui/mapper/BorderStyleMapper.cpp +++ b/src/ui/mapper/BorderStyleMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/BorderStyleMapper.hpp" -#include "../Helper.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/BorderStyleMapper.h" +#include "../Helper.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper { using namespace xml; diff --git a/src/ui/mapper/BrushMapper.cpp b/src/ui/mapper/BrushMapper.cpp index bfaef507..737508ce 100644 --- a/src/ui/mapper/BrushMapper.cpp +++ b/src/ui/mapper/BrushMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/BrushMapper.hpp" -#include "../Helper.hpp" -#include "cru/platform/Color.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/mapper/ColorMapper.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/BrushMapper.h" +#include "../Helper.h" +#include "cru/platform/Color.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/mapper/ColorMapper.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/xml/XmlNode.h" #include diff --git a/src/ui/mapper/ColorMapper.cpp b/src/ui/mapper/ColorMapper.cpp index 063b2359..54359727 100644 --- a/src/ui/mapper/ColorMapper.cpp +++ b/src/ui/mapper/ColorMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/ColorMapper.hpp" +#include "cru/ui/mapper/ColorMapper.h" namespace cru::ui::mapper { bool ColorMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/CornerRadiusMapper.cpp b/src/ui/mapper/CornerRadiusMapper.cpp index 9c8855a3..673432e1 100644 --- a/src/ui/mapper/CornerRadiusMapper.cpp +++ b/src/ui/mapper/CornerRadiusMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/CornerRadiusMapper.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/PointMapper.hpp" +#include "cru/ui/mapper/CornerRadiusMapper.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/PointMapper.h" namespace cru::ui::mapper { bool CornerRadiusMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp index ad9c2bbf..3a916fd1 100644 --- a/src/ui/mapper/CursorMapper.cpp +++ b/src/ui/mapper/CursorMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/CursorMapper.hpp" -#include "../Helper.hpp" -#include "cru/common/Exception.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" +#include "cru/ui/mapper/CursorMapper.h" +#include "../Helper.h" +#include "cru/common/Exception.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" namespace cru::ui::mapper { using cru::platform::gui::ICursor; diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp index 26a17c5f..8f64d5aa 100644 --- a/src/ui/mapper/FontMapper.cpp +++ b/src/ui/mapper/FontMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/FontMapper.hpp" -#include "../Helper.hpp" -#include "cru/platform/graphics/Factory.hpp" +#include "cru/ui/mapper/FontMapper.h" +#include "../Helper.h" +#include "cru/platform/graphics/Factory.h" namespace cru::ui::mapper { bool FontMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/Mapper.cpp b/src/ui/mapper/Mapper.cpp index 93a83d8a..40653118 100644 --- a/src/ui/mapper/Mapper.cpp +++ b/src/ui/mapper/Mapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/Mapper.hpp" +#include "cru/ui/mapper/Mapper.h" #include diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp index 121a65e7..83105b9b 100644 --- a/src/ui/mapper/MapperRegistry.cpp +++ b/src/ui/mapper/MapperRegistry.cpp @@ -1,23 +1,23 @@ -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/BorderStyleMapper.hpp" -#include "cru/ui/mapper/BrushMapper.hpp" -#include "cru/ui/mapper/ColorMapper.hpp" -#include "cru/ui/mapper/CornerRadiusMapper.hpp" -#include "cru/ui/mapper/CursorMapper.hpp" -#include "cru/ui/mapper/FontMapper.hpp" -#include "cru/ui/mapper/PointMapper.hpp" -#include "cru/ui/mapper/SizeMapper.hpp" -#include "cru/ui/mapper/ThicknessMapper.hpp" -#include "cru/ui/mapper/style/AndConditionMapper.hpp" -#include "cru/ui/mapper/style/BorderStylerMapper.hpp" -#include "cru/ui/mapper/style/ClickStateConditionMapper.hpp" -#include "cru/ui/mapper/style/CursorStylerMapper.hpp" -#include "cru/ui/mapper/style/FocusConditionMapper.hpp" -#include "cru/ui/mapper/style/HoverConditionMapper.hpp" -#include "cru/ui/mapper/style/NoConditionMapper.hpp" -#include "cru/ui/mapper/style/OrConditionMapper.hpp" -#include "cru/ui/mapper/style/StyleRuleMapper.hpp" -#include "cru/ui/mapper/style/StyleRuleSetMapper.hpp" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/BorderStyleMapper.h" +#include "cru/ui/mapper/BrushMapper.h" +#include "cru/ui/mapper/ColorMapper.h" +#include "cru/ui/mapper/CornerRadiusMapper.h" +#include "cru/ui/mapper/CursorMapper.h" +#include "cru/ui/mapper/FontMapper.h" +#include "cru/ui/mapper/PointMapper.h" +#include "cru/ui/mapper/SizeMapper.h" +#include "cru/ui/mapper/ThicknessMapper.h" +#include "cru/ui/mapper/style/AndConditionMapper.h" +#include "cru/ui/mapper/style/BorderStylerMapper.h" +#include "cru/ui/mapper/style/ClickStateConditionMapper.h" +#include "cru/ui/mapper/style/CursorStylerMapper.h" +#include "cru/ui/mapper/style/FocusConditionMapper.h" +#include "cru/ui/mapper/style/HoverConditionMapper.h" +#include "cru/ui/mapper/style/NoConditionMapper.h" +#include "cru/ui/mapper/style/OrConditionMapper.h" +#include "cru/ui/mapper/style/StyleRuleMapper.h" +#include "cru/ui/mapper/style/StyleRuleSetMapper.h" namespace cru::ui::mapper { MapperRegistry *MapperRegistry::GetInstance() { diff --git a/src/ui/mapper/PointMapper.cpp b/src/ui/mapper/PointMapper.cpp index efafc6ce..ca7729b4 100644 --- a/src/ui/mapper/PointMapper.cpp +++ b/src/ui/mapper/PointMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/PointMapper.hpp" +#include "cru/ui/mapper/PointMapper.h" namespace cru::ui::mapper { bool PointMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/SizeMapper.cpp b/src/ui/mapper/SizeMapper.cpp index dfc83cca..0fcf1c53 100644 --- a/src/ui/mapper/SizeMapper.cpp +++ b/src/ui/mapper/SizeMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/SizeMapper.hpp" +#include "cru/ui/mapper/SizeMapper.h" namespace cru::ui::mapper { bool SizeMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp index b72f952c..6ddd52ea 100644 --- a/src/ui/mapper/ThicknessMapper.cpp +++ b/src/ui/mapper/ThicknessMapper.cpp @@ -1,5 +1,5 @@ -#include "cru/ui/mapper/ThicknessMapper.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/ThicknessMapper.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper { bool ThicknessMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp index e07e514c..dd8784d5 100644 --- a/src/ui/mapper/style/AndConditionMapper.cpp +++ b/src/ui/mapper/style/AndConditionMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/AndConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/AndConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool AndConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) { diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp index 8a5df83d..95dd28ee 100644 --- a/src/ui/mapper/style/BorderStylerMapper.cpp +++ b/src/ui/mapper/style/BorderStylerMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/BorderStylerMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" -#include "cru/ui/style/Styler.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/BorderStylerMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" +#include "cru/ui/style/Styler.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { using cru::ui::style::ApplyBorderStyleInfo; diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp index 8e162a86..7c1200ef 100644 --- a/src/ui/mapper/style/ClickStateConditionMapper.cpp +++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/ClickStateConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/common/Exception.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/mapper/style/ClickStateConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/common/Exception.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { bool ClickStateConditionMapper::XmlElementIsOfThisType( diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp index c63d451c..103d9d82 100644 --- a/src/ui/mapper/style/CursorStylerMapper.cpp +++ b/src/ui/mapper/style/CursorStylerMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/CursorStylerMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/mapper/style/CursorStylerMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/Styler.h" namespace cru::ui::mapper::style { bool CursorStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp index 46f9f2c7..5df4443d 100644 --- a/src/ui/mapper/style/FocusConditionMapper.cpp +++ b/src/ui/mapper/style/FocusConditionMapper.cpp @@ -1,7 +1,7 @@ -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/style/FocusConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/style/FocusConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp index b78c12e9..4f92e9f6 100644 --- a/src/ui/mapper/style/HoverConditionMapper.cpp +++ b/src/ui/mapper/style/HoverConditionMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/style/HoverConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/mapper/style/HoverConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { using namespace cru::ui::style; diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp index 03aae69f..397162f1 100644 --- a/src/ui/mapper/style/NoConditionMapper.cpp +++ b/src/ui/mapper/style/NoConditionMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/style/NoConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/NoConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool NoConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp index a91f5130..7b932dbc 100644 --- a/src/ui/mapper/style/OrConditionMapper.cpp +++ b/src/ui/mapper/style/OrConditionMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/OrConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/OrConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool OrConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) { diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp index fea102ed..1ca45a6e 100644 --- a/src/ui/mapper/style/StyleRuleMapper.cpp +++ b/src/ui/mapper/style/StyleRuleMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/style/StyleRuleMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/mapper/style/IStylerMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/ui/style/StyleRule.hpp" -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/mapper/style/StyleRuleMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/mapper/style/IStylerMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/ui/style/StyleRule.h" +#include "cru/ui/style/Styler.h" namespace cru::ui::mapper::style { using namespace ui::style; diff --git a/src/ui/mapper/style/StyleRuleSetMapper.cpp b/src/ui/mapper/style/StyleRuleSetMapper.cpp index b9199d27..7552e25f 100644 --- a/src/ui/mapper/style/StyleRuleSetMapper.cpp +++ b/src/ui/mapper/style/StyleRuleSetMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/StyleRuleSetMapper.hpp" +#include "cru/ui/mapper/style/StyleRuleSetMapper.h" #include -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/StyleRule.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/StyleRule.h" +#include "cru/ui/style/StyleRuleSet.h" namespace cru::ui::mapper::style { using namespace cru::ui::style; diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp index 9b886348..61af27bc 100644 --- a/src/ui/render/BorderRenderObject.cpp +++ b/src/ui/render/BorderRenderObject.cpp @@ -1,13 +1,13 @@ -#include "cru/ui/render/BorderRenderObject.hpp" - -#include "../Helper.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/graphics/Geometry.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" +#include "cru/ui/render/BorderRenderObject.h" + +#include "../Helper.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/graphics/Geometry.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" #include diff --git a/src/ui/render/CanvasRenderObject.cpp b/src/ui/render/CanvasRenderObject.cpp index bf1155e1..985a2dae 100644 --- a/src/ui/render/CanvasRenderObject.cpp +++ b/src/ui/render/CanvasRenderObject.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/render/CanvasRenderObject.hpp" +#include "cru/ui/render/CanvasRenderObject.h" namespace cru::ui::render { CanvasRenderObject::CanvasRenderObject() : RenderObject(ChildMode::None) {} diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp index 0e76995b..e4d16169 100644 --- a/src/ui/render/FlexLayoutRenderObject.cpp +++ b/src/ui/render/FlexLayoutRenderObject.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/render/FlexLayoutRenderObject.hpp" +#include "cru/ui/render/FlexLayoutRenderObject.h" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/render/LayoutHelper.hpp" -#include "cru/ui/render/MeasureRequirement.hpp" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/render/LayoutHelper.h" +#include "cru/ui/render/MeasureRequirement.h" #include #include diff --git a/src/ui/render/LayoutHelper.cpp b/src/ui/render/LayoutHelper.cpp index 5854a945..d7f6df8a 100644 --- a/src/ui/render/LayoutHelper.cpp +++ b/src/ui/render/LayoutHelper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/render/LayoutHelper.hpp" +#include "cru/ui/render/LayoutHelper.h" -#include "cru/common/Logger.hpp" +#include "cru/common/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 75bf1380..00488425 100644 --- a/src/ui/render/RenderObject.cpp +++ b/src/ui/render/RenderObject.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/render/RenderObject.hpp" - -#include "cru/common/Logger.hpp" -#include "cru/platform/GraphicsBase.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/host/WindowHost.hpp" +#include "cru/ui/render/RenderObject.h" + +#include "cru/common/Logger.h" +#include "cru/platform/GraphicsBase.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/host/WindowHost.h" #include #include diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp index 37aebeaf..e3cc006b 100644 --- a/src/ui/render/ScrollBar.cpp +++ b/src/ui/render/ScrollBar.cpp @@ -1,20 +1,20 @@ -#include "cru/ui/render/ScrollBar.hpp" - -#include "../Helper.hpp" -#include "cru/common/Base.hpp" -#include "cru/platform/GraphicsBase.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/graphics/Geometry.hpp" -#include "cru/platform/graphics/Painter.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/events/UiEvents.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" +#include "cru/ui/render/ScrollBar.h" + +#include "../Helper.h" +#include "cru/common/Base.h" +#include "cru/platform/GraphicsBase.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/graphics/Geometry.h" +#include "cru/platform/graphics/Painter.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/ui/Base.h" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/events/UiEvents.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/ScrollRenderObject.h" #include #include diff --git a/src/ui/render/ScrollRenderObject.cpp b/src/ui/render/ScrollRenderObject.cpp index bd9b8559..2400cc11 100644 --- a/src/ui/render/ScrollRenderObject.cpp +++ b/src/ui/render/ScrollRenderObject.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/render/ScrollRenderObject.hpp" +#include "cru/ui/render/ScrollRenderObject.h" -#include "cru/platform/graphics/Painter.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/render/ScrollBar.hpp" +#include "cru/platform/graphics/Painter.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/render/ScrollBar.h" #include #include diff --git a/src/ui/render/StackLayoutRenderObject.cpp b/src/ui/render/StackLayoutRenderObject.cpp index 1b6cc9fc..ea65fe02 100644 --- a/src/ui/render/StackLayoutRenderObject.cpp +++ b/src/ui/render/StackLayoutRenderObject.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/render/StackLayoutRenderObject.h" -#include "cru/common/Logger.hpp" -#include "cru/ui/render/LayoutHelper.hpp" -#include "cru/ui/render/MeasureRequirement.hpp" +#include "cru/common/Logger.h" +#include "cru/ui/render/LayoutHelper.h" +#include "cru/ui/render/MeasureRequirement.h" #include diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp index f7665beb..675bac3c 100644 --- a/src/ui/render/TextRenderObject.cpp +++ b/src/ui/render/TextRenderObject.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/render/TextRenderObject.hpp" - -#include "../Helper.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/graphics/TextLayout.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/DebugFlags.hpp" +#include "cru/ui/render/TextRenderObject.h" + +#include "../Helper.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/graphics/TextLayout.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/DebugFlags.h" #include #include diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp index f4866c04..b68fd0ee 100644 --- a/src/ui/style/Condition.cpp +++ b/src/ui/style/Condition.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/style/Condition.h" #include -#include "cru/common/ClonablePtr.hpp" -#include "cru/common/Event.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/controls/IClickableControl.hpp" -#include "cru/ui/helper/ClickDetector.hpp" +#include "cru/common/ClonablePtr.h" +#include "cru/common/Event.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/controls/IClickableControl.h" +#include "cru/ui/helper/ClickDetector.h" namespace cru::ui::style { CompoundCondition::CompoundCondition( diff --git a/src/ui/style/StyleRule.cpp b/src/ui/style/StyleRule.cpp index 59096fb6..ce823537 100644 --- a/src/ui/style/StyleRule.cpp +++ b/src/ui/style/StyleRule.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/style/StyleRule.hpp" +#include "cru/ui/style/StyleRule.h" namespace cru::ui::style { StyleRule::StyleRule(ClonablePtr condition, diff --git a/src/ui/style/StyleRuleSet.cpp b/src/ui/style/StyleRuleSet.cpp index 88109350..7352f69b 100644 --- a/src/ui/style/StyleRuleSet.cpp +++ b/src/ui/style/StyleRuleSet.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/style/StyleRuleSet.hpp" -#include "cru/common/Event.hpp" -#include "cru/ui/controls/Control.hpp" +#include "cru/ui/style/StyleRuleSet.h" +#include "cru/common/Event.h" +#include "cru/ui/controls/Control.h" #include "gsl/gsl_assert" #include diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp index da3a2247..72e522e0 100644 --- a/src/ui/style/Styler.cpp +++ b/src/ui/style/Styler.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/style/Styler.h" -#include "../Helper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/controls/IBorderControl.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" +#include "../Helper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/controls/IBorderControl.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" namespace cru::ui::style { BorderStyler::BorderStyler(ApplyBorderStyleInfo style) diff --git a/src/win/ForDllExport.cpp b/src/win/ForDllExport.cpp index 4662461b..db1a7cad 100644 --- a/src/win/ForDllExport.cpp +++ b/src/win/ForDllExport.cpp @@ -1,2 +1,2 @@ -#include "cru/win/DebugLogger.hpp" -#include "cru/win/StdOutLogger.hpp" +#include "cru/win/DebugLogger.h" +#include "cru/win/StdOutLogger.h" diff --git a/src/win/graphics/direct/Brush.cpp b/src/win/graphics/direct/Brush.cpp index eb6ea973..362a32ea 100644 --- a/src/win/graphics/direct/Brush.cpp +++ b/src/win/graphics/direct/Brush.cpp @@ -1,8 +1,8 @@ -#include "cru/win/graphics/direct/Brush.hpp" +#include "cru/win/graphics/direct/Brush.h" -#include "cru/win/graphics/direct/ConvertUtil.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" +#include "cru/win/graphics/direct/ConvertUtil.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" namespace cru::platform::graphics::win::direct { D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphicsFactory* factory) diff --git a/src/win/graphics/direct/Factory.cpp b/src/win/graphics/direct/Factory.cpp index bc51cd1a..b948c040 100644 --- a/src/win/graphics/direct/Factory.cpp +++ b/src/win/graphics/direct/Factory.cpp @@ -1,12 +1,12 @@ -#include "cru/win/graphics/direct/Factory.hpp" - -#include "cru/common/Logger.hpp" -#include "cru/win/graphics/direct/Brush.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Font.hpp" -#include "cru/win/graphics/direct/Geometry.hpp" -#include "cru/win/graphics/direct/ImageFactory.hpp" -#include "cru/win/graphics/direct/TextLayout.hpp" +#include "cru/win/graphics/direct/Factory.h" + +#include "cru/common/Logger.h" +#include "cru/win/graphics/direct/Brush.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Font.h" +#include "cru/win/graphics/direct/Geometry.h" +#include "cru/win/graphics/direct/ImageFactory.h" +#include "cru/win/graphics/direct/TextLayout.h" #include #include diff --git a/src/win/graphics/direct/Font.cpp b/src/win/graphics/direct/Font.cpp index 39ba2d8b..f6ec4d5a 100644 --- a/src/win/graphics/direct/Font.cpp +++ b/src/win/graphics/direct/Font.cpp @@ -1,8 +1,8 @@ -#include "cru/win/graphics/direct/Font.hpp" +#include "cru/win/graphics/direct/Font.h" -#include "cru/common/Format.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" +#include "cru/common/Format.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" #include #include diff --git a/src/win/graphics/direct/Geometry.cpp b/src/win/graphics/direct/Geometry.cpp index b37dd9f4..a7427bf5 100644 --- a/src/win/graphics/direct/Geometry.cpp +++ b/src/win/graphics/direct/Geometry.cpp @@ -1,8 +1,8 @@ -#include "cru/win/graphics/direct/Geometry.hpp" +#include "cru/win/graphics/direct/Geometry.h" -#include "cru/win/graphics/direct/ConvertUtil.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" +#include "cru/win/graphics/direct/ConvertUtil.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" namespace cru::platform::graphics::win::direct { D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphicsFactory* factory) diff --git a/src/win/graphics/direct/Image.cpp b/src/win/graphics/direct/Image.cpp index d09a7016..11f5e763 100644 --- a/src/win/graphics/direct/Image.cpp +++ b/src/win/graphics/direct/Image.cpp @@ -1,8 +1,8 @@ -#include "cru/win/graphics/direct/Image.hpp" -#include "cru/common/platform/win/Exception.hpp" -#include "cru/win/graphics/direct/ConvertUtil.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" +#include "cru/win/graphics/direct/Image.h" +#include "cru/common/platform/win/Exception.h" +#include "cru/win/graphics/direct/ConvertUtil.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" namespace cru::platform::graphics::win::direct { Direct2DImage::Direct2DImage(DirectGraphicsFactory* graphics_factory, diff --git a/src/win/graphics/direct/ImageFactory.cpp b/src/win/graphics/direct/ImageFactory.cpp index 7d297ff8..e7794aa5 100644 --- a/src/win/graphics/direct/ImageFactory.cpp +++ b/src/win/graphics/direct/ImageFactory.cpp @@ -1,8 +1,8 @@ -#include "cru/win/graphics/direct/ImageFactory.hpp" -#include "cru/common/platform/win/StreamConvert.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" -#include "cru/win/graphics/direct/Image.hpp" +#include "cru/win/graphics/direct/ImageFactory.h" +#include "cru/common/platform/win/StreamConvert.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" +#include "cru/win/graphics/direct/Image.h" #include diff --git a/src/win/graphics/direct/Painter.cpp b/src/win/graphics/direct/Painter.cpp index 395b1d90..32386877 100644 --- a/src/win/graphics/direct/Painter.cpp +++ b/src/win/graphics/direct/Painter.cpp @@ -1,12 +1,12 @@ -#include "cru/win/graphics/direct/Painter.hpp" - -#include "cru/platform/Check.hpp" -#include "cru/win/graphics/direct/Brush.hpp" -#include "cru/win/graphics/direct/ConvertUtil.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Geometry.hpp" -#include "cru/win/graphics/direct/Image.hpp" -#include "cru/win/graphics/direct/TextLayout.hpp" +#include "cru/win/graphics/direct/Painter.h" + +#include "cru/platform/Check.h" +#include "cru/win/graphics/direct/Brush.h" +#include "cru/win/graphics/direct/ConvertUtil.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Geometry.h" +#include "cru/win/graphics/direct/Image.h" +#include "cru/win/graphics/direct/TextLayout.h" #include diff --git a/src/win/graphics/direct/Resource.cpp b/src/win/graphics/direct/Resource.cpp index 0e9719f4..a9c53ee0 100644 --- a/src/win/graphics/direct/Resource.cpp +++ b/src/win/graphics/direct/Resource.cpp @@ -1,6 +1,6 @@ -#include "cru/win/graphics/direct/Resource.hpp" +#include "cru/win/graphics/direct/Resource.h" -#include "cru/win/graphics/direct/Factory.hpp" +#include "cru/win/graphics/direct/Factory.h" namespace cru::platform::graphics::win::direct { String DirectResource::kPlatformId = u"Windows Direct"; diff --git a/src/win/graphics/direct/TextLayout.cpp b/src/win/graphics/direct/TextLayout.cpp index bec4a972..14e2d3aa 100644 --- a/src/win/graphics/direct/TextLayout.cpp +++ b/src/win/graphics/direct/TextLayout.cpp @@ -1,11 +1,11 @@ -#include "cru/win/graphics/direct/TextLayout.hpp" +#include "cru/win/graphics/direct/TextLayout.h" #include -#include "cru/common/Logger.hpp" -#include "cru/platform/Check.hpp" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" -#include "cru/win/graphics/direct/Font.hpp" +#include "cru/common/Logger.h" +#include "cru/platform/Check.h" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" +#include "cru/win/graphics/direct/Font.h" #include diff --git a/src/win/graphics/direct/WindowPainter.cpp b/src/win/graphics/direct/WindowPainter.cpp index d29ec3ba..0f78119e 100644 --- a/src/win/graphics/direct/WindowPainter.cpp +++ b/src/win/graphics/direct/WindowPainter.cpp @@ -1,8 +1,8 @@ -#include "cru/win/graphics/direct/WindowPainter.hpp" +#include "cru/win/graphics/direct/WindowPainter.h" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" -#include "cru/win/graphics/direct/WindowRenderTarget.hpp" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" +#include "cru/win/graphics/direct/WindowRenderTarget.h" namespace cru::platform::graphics::win::direct { D2DWindowPainter::D2DWindowPainter(D2DWindowRenderTarget* render_target) diff --git a/src/win/graphics/direct/WindowRenderTarget.cpp b/src/win/graphics/direct/WindowRenderTarget.cpp index 020ce4b4..9cbce6a3 100644 --- a/src/win/graphics/direct/WindowRenderTarget.cpp +++ b/src/win/graphics/direct/WindowRenderTarget.cpp @@ -1,7 +1,7 @@ -#include "cru/win/graphics/direct/WindowRenderTarget.hpp" +#include "cru/win/graphics/direct/WindowRenderTarget.h" -#include "cru/win/graphics/direct/Exception.hpp" -#include "cru/win/graphics/direct/Factory.hpp" +#include "cru/win/graphics/direct/Exception.h" +#include "cru/win/graphics/direct/Factory.h" namespace cru::platform::graphics::win::direct { D2DWindowRenderTarget::D2DWindowRenderTarget( diff --git a/src/win/gui/Clipboard.cpp b/src/win/gui/Clipboard.cpp index 62db4ed8..6bb5d1c5 100644 --- a/src/win/gui/Clipboard.cpp +++ b/src/win/gui/Clipboard.cpp @@ -1,8 +1,8 @@ -#include "cru/win/gui/Clipboard.hpp" +#include "cru/win/gui/Clipboard.h" #include -#include "cru/common/Logger.hpp" -#include "cru/win/gui/GodWindow.hpp" -#include "cru/win/gui/UiApplication.hpp" +#include "cru/common/Logger.h" +#include "cru/win/gui/GodWindow.h" +#include "cru/win/gui/UiApplication.h" namespace cru::platform::gui::win { WinClipboard::WinClipboard(WinUiApplication* application) diff --git a/src/win/gui/Cursor.cpp b/src/win/gui/Cursor.cpp index a3a7f824..1d421b59 100644 --- a/src/win/gui/Cursor.cpp +++ b/src/win/gui/Cursor.cpp @@ -1,7 +1,7 @@ -#include "cru/win/gui/Cursor.hpp" +#include "cru/win/gui/Cursor.h" -#include "cru/common/Logger.hpp" -#include "cru/win/gui/Exception.hpp" +#include "cru/common/Logger.h" +#include "cru/win/gui/Exception.h" #include diff --git a/src/win/gui/GodWindow.cpp b/src/win/gui/GodWindow.cpp index 31974339..0c385bea 100644 --- a/src/win/gui/GodWindow.cpp +++ b/src/win/gui/GodWindow.cpp @@ -1,9 +1,9 @@ -#include "cru/win/gui/GodWindow.hpp" +#include "cru/win/gui/GodWindow.h" -#include "cru/common/Logger.hpp" -#include "cru/win/gui/Exception.hpp" -#include "cru/win/gui/UiApplication.hpp" -#include "cru/win/gui/WindowClass.hpp" +#include "cru/common/Logger.h" +#include "cru/win/gui/Exception.h" +#include "cru/win/gui/UiApplication.h" +#include "cru/win/gui/WindowClass.h" namespace cru::platform::gui::win { constexpr auto god_window_class_name = L"GodWindowClass"; diff --git a/src/win/gui/InputMethod.cpp b/src/win/gui/InputMethod.cpp index 47e17109..fedb72fe 100644 --- a/src/win/gui/InputMethod.cpp +++ b/src/win/gui/InputMethod.cpp @@ -1,11 +1,11 @@ -#include "cru/win/gui/InputMethod.hpp" - -#include "cru/common/Logger.hpp" -#include "cru/common/StringUtil.hpp" -#include "cru/platform/Check.hpp" -#include "cru/platform/gui/DebugFlags.hpp" -#include "cru/win/Exception.hpp" -#include "cru/win/gui/Window.hpp" +#include "cru/win/gui/InputMethod.h" + +#include "cru/common/Logger.h" +#include "cru/common/StringUtil.h" +#include "cru/platform/Check.h" +#include "cru/platform/gui/DebugFlags.h" +#include "cru/win/Exception.h" +#include "cru/win/gui/Window.h" #include diff --git a/src/win/gui/Keyboard.cpp b/src/win/gui/Keyboard.cpp index b706b240..124d6109 100644 --- a/src/win/gui/Keyboard.cpp +++ b/src/win/gui/Keyboard.cpp @@ -1,4 +1,4 @@ -#include "cru/win/gui/Keyboard.hpp" +#include "cru/win/gui/Keyboard.h" namespace cru::platform::gui::win { KeyCode VirtualKeyToKeyCode(int virtual_key) { diff --git a/src/win/gui/Resource.cpp b/src/win/gui/Resource.cpp index dc4de173..f45c5df5 100644 --- a/src/win/gui/Resource.cpp +++ b/src/win/gui/Resource.cpp @@ -1,5 +1,5 @@ -#include "cru/win/gui/Resource.hpp" -#include "cru/win/gui/Window.hpp" +#include "cru/win/gui/Resource.h" +#include "cru/win/gui/Window.h" namespace cru::platform::gui::win { String WinNativeResource::kPlatformId = u"Windows"; diff --git a/src/win/gui/TimerManager.cpp b/src/win/gui/TimerManager.cpp index f3da1f09..ce8fead6 100644 --- a/src/win/gui/TimerManager.cpp +++ b/src/win/gui/TimerManager.cpp @@ -1,7 +1,7 @@ -#include "TimerManager.hpp" +#include "TimerManager.h" -#include "cru/win/gui/Base.hpp" -#include "cru/win/gui/Exception.hpp" +#include "cru/win/gui/Base.h" +#include "cru/win/gui/Exception.h" #include "gsl/gsl_util" #include diff --git a/src/win/gui/TimerManager.h b/src/win/gui/TimerManager.h new file mode 100644 index 00000000..c44bd5bd --- /dev/null +++ b/src/win/gui/TimerManager.h @@ -0,0 +1,61 @@ +#pragma once +#include "cru/common/Event.h" +#include "cru/win/WinPreConfig.h" + +#include "cru/common/Base.h" +#include "cru/win/gui/GodWindow.h" +#include "cru/win/gui/WindowNativeMessageEventArgs.h" + +#include +#include +#include +#include + +namespace cru::platform::gui::win { +enum class TimerType { Immediate, Timeout, Interval }; + +struct TimerInfo { + TimerInfo(long long id, TimerType type, int period, + std::function action, UINT_PTR native_timer_id = 0) + : id(id), + type(type), + period(period), + action(std::move(action)), + native_timer_id(native_timer_id) {} + + long long id; + TimerType type; + int period; // in milliseconds + std::function action; + UINT_PTR native_timer_id; +}; + +class TimerManager : public Object { + public: + TimerManager(GodWindow* god_window); + + CRU_DELETE_COPY(TimerManager) + CRU_DELETE_MOVE(TimerManager) + + ~TimerManager() override = default; + + // Period is in milliseconds. When type is immediate, it is not checked and + // used. + long long SetTimer(TimerType type, int period, std::function action); + void CancelTimer(long long id); + + private: + void HandleGodWindowMessage(WindowNativeMessageEventArgs& args); + + void CreateNativeTimer(TimerInfo* info); + void KillNativeTimer(TimerInfo* info); + + private: + GodWindow* god_window_; + + EventRevokerListGuard event_guard_; + + long long next_id_ = 1; + std::unordered_map info_map_; +}; +} // namespace cru::platform::gui::win diff --git a/src/win/gui/TimerManager.hpp b/src/win/gui/TimerManager.hpp deleted file mode 100644 index a8db1075..00000000 --- a/src/win/gui/TimerManager.hpp +++ /dev/null @@ -1,61 +0,0 @@ -#pragma once -#include "cru/common/Event.hpp" -#include "cru/win/WinPreConfig.hpp" - -#include "cru/common/Base.hpp" -#include "cru/win/gui/GodWindow.hpp" -#include "cru/win/gui/WindowNativeMessageEventArgs.hpp" - -#include -#include -#include -#include - -namespace cru::platform::gui::win { -enum class TimerType { Immediate, Timeout, Interval }; - -struct TimerInfo { - TimerInfo(long long id, TimerType type, int period, - std::function action, UINT_PTR native_timer_id = 0) - : id(id), - type(type), - period(period), - action(std::move(action)), - native_timer_id(native_timer_id) {} - - long long id; - TimerType type; - int period; // in milliseconds - std::function action; - UINT_PTR native_timer_id; -}; - -class TimerManager : public Object { - public: - TimerManager(GodWindow* god_window); - - CRU_DELETE_COPY(TimerManager) - CRU_DELETE_MOVE(TimerManager) - - ~TimerManager() override = default; - - // Period is in milliseconds. When type is immediate, it is not checked and - // used. - long long SetTimer(TimerType type, int period, std::function action); - void CancelTimer(long long id); - - private: - void HandleGodWindowMessage(WindowNativeMessageEventArgs& args); - - void CreateNativeTimer(TimerInfo* info); - void KillNativeTimer(TimerInfo* info); - - private: - GodWindow* god_window_; - - EventRevokerListGuard event_guard_; - - long long next_id_ = 1; - std::unordered_map info_map_; -}; -} // namespace cru::platform::gui::win diff --git a/src/win/gui/UiApplication.cpp b/src/win/gui/UiApplication.cpp index 6cacc8b2..59076a9c 100644 --- a/src/win/gui/UiApplication.cpp +++ b/src/win/gui/UiApplication.cpp @@ -1,19 +1,19 @@ -#include "cru/win/gui/UiApplication.hpp" - -#include "TimerManager.hpp" -#include "WindowManager.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/Check.hpp" -#include "cru/win/DebugLogger.hpp" -#include "cru/win/StdOutLogger.hpp" -#include "cru/win/graphics/direct/Factory.hpp" -#include "cru/win/gui/Base.hpp" -#include "cru/win/gui/Clipboard.hpp" -#include "cru/win/gui/Cursor.hpp" -#include "cru/win/gui/Exception.hpp" -#include "cru/win/gui/GodWindow.hpp" -#include "cru/win/gui/InputMethod.hpp" -#include "cru/win/gui/Window.hpp" +#include "cru/win/gui/UiApplication.h" + +#include "TimerManager.h" +#include "WindowManager.h" +#include "cru/common/Logger.h" +#include "cru/platform/Check.h" +#include "cru/win/DebugLogger.h" +#include "cru/win/StdOutLogger.h" +#include "cru/win/graphics/direct/Factory.h" +#include "cru/win/gui/Base.h" +#include "cru/win/gui/Clipboard.h" +#include "cru/win/gui/Cursor.h" +#include "cru/win/gui/Exception.h" +#include "cru/win/gui/GodWindow.h" +#include "cru/win/gui/InputMethod.h" +#include "cru/win/gui/Window.h" namespace cru::platform::gui { std::unique_ptr CreateUiApplication() { diff --git a/src/win/gui/Window.cpp b/src/win/gui/Window.cpp index f30b4e59..ada3d59f 100644 --- a/src/win/gui/Window.cpp +++ b/src/win/gui/Window.cpp @@ -1,19 +1,19 @@ -#include "cru/win/gui/Window.hpp" - -#include "WindowManager.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/Check.hpp" -#include "cru/platform/graphics/NullPainter.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/DebugFlags.hpp" -#include "cru/platform/gui/Window.hpp" -#include "cru/win/graphics/direct/WindowPainter.hpp" -#include "cru/win/gui/Cursor.hpp" -#include "cru/win/gui/Exception.hpp" -#include "cru/win/gui/InputMethod.hpp" -#include "cru/win/gui/Keyboard.hpp" -#include "cru/win/gui/UiApplication.hpp" -#include "cru/win/gui/WindowClass.hpp" +#include "cru/win/gui/Window.h" + +#include "WindowManager.h" +#include "cru/common/Logger.h" +#include "cru/platform/Check.h" +#include "cru/platform/graphics/NullPainter.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/DebugFlags.h" +#include "cru/platform/gui/Window.h" +#include "cru/win/graphics/direct/WindowPainter.h" +#include "cru/win/gui/Cursor.h" +#include "cru/win/gui/Exception.h" +#include "cru/win/gui/InputMethod.h" +#include "cru/win/gui/Keyboard.h" +#include "cru/win/gui/UiApplication.h" +#include "cru/win/gui/WindowClass.h" #include #include diff --git a/src/win/gui/WindowClass.cpp b/src/win/gui/WindowClass.cpp index 9d86d791..25229406 100644 --- a/src/win/gui/WindowClass.cpp +++ b/src/win/gui/WindowClass.cpp @@ -1,6 +1,6 @@ -#include "cru/win/gui/WindowClass.hpp" +#include "cru/win/gui/WindowClass.h" -#include "cru/win/gui/Exception.hpp" +#include "cru/win/gui/Exception.h" namespace cru::platform::gui::win { WindowClass::WindowClass(std::wstring name, WNDPROC window_proc, diff --git a/src/win/gui/WindowManager.cpp b/src/win/gui/WindowManager.cpp index 31b868b9..1e0f797a 100644 --- a/src/win/gui/WindowManager.cpp +++ b/src/win/gui/WindowManager.cpp @@ -1,8 +1,8 @@ -#include "WindowManager.hpp" +#include "WindowManager.h" -#include "cru/win/gui/UiApplication.hpp" -#include "cru/win/gui/Window.hpp" -#include "cru/win/gui/WindowClass.hpp" +#include "cru/win/gui/UiApplication.h" +#include "cru/win/gui/Window.h" +#include "cru/win/gui/WindowClass.h" namespace cru::platform::gui::win { LRESULT __stdcall GeneralWndProc(HWND hWnd, UINT Msg, WPARAM wParam, diff --git a/src/win/gui/WindowManager.h b/src/win/gui/WindowManager.h new file mode 100644 index 00000000..dba3f0a6 --- /dev/null +++ b/src/win/gui/WindowManager.h @@ -0,0 +1,51 @@ +#pragma once +#include "cru/win/WinPreConfig.h" + +#include "cru/common/Base.h" + +#include +#include +#include + +namespace cru::platform::gui::win { +class WinUiApplication; +class WinNativeWindow; +class WindowClass; + +class WindowManager : public Object { + public: + WindowManager(WinUiApplication* application); + + CRU_DELETE_COPY(WindowManager) + CRU_DELETE_MOVE(WindowManager) + + ~WindowManager() override; + + // Get the general window class for creating ordinary window. + WindowClass* GetGeneralWindowClass() const { + return general_window_class_.get(); + } + + // Register a window newly created. + // This function adds the hwnd to hwnd-window map. + // It should be called immediately after a window was created. + void RegisterWindow(HWND hwnd, WinNativeWindow* window); + + // Unregister a window that is going to be destroyed. + // This function removes the hwnd from the hwnd-window map. + // It should be called immediately before a window is going to be destroyed, + void UnregisterWindow(HWND hwnd); + + // Return a pointer to the Window object related to the HWND or nullptr if the + // hwnd is not in the map. + WinNativeWindow* FromHandle(HWND hwnd); + + std::vector GetAllWindows() const; + + private: + WinUiApplication* application_; + + std::unique_ptr general_window_class_; + std::map window_map_; +}; +} // namespace cru::platform::gui::win diff --git a/src/win/gui/WindowManager.hpp b/src/win/gui/WindowManager.hpp deleted file mode 100644 index 3b037f89..00000000 --- a/src/win/gui/WindowManager.hpp +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once -#include "cru/win/WinPreConfig.hpp" - -#include "cru/common/Base.hpp" - -#include -#include -#include - -namespace cru::platform::gui::win { -class WinUiApplication; -class WinNativeWindow; -class WindowClass; - -class WindowManager : public Object { - public: - WindowManager(WinUiApplication* application); - - CRU_DELETE_COPY(WindowManager) - CRU_DELETE_MOVE(WindowManager) - - ~WindowManager() override; - - // Get the general window class for creating ordinary window. - WindowClass* GetGeneralWindowClass() const { - return general_window_class_.get(); - } - - // Register a window newly created. - // This function adds the hwnd to hwnd-window map. - // It should be called immediately after a window was created. - void RegisterWindow(HWND hwnd, WinNativeWindow* window); - - // Unregister a window that is going to be destroyed. - // This function removes the hwnd from the hwnd-window map. - // It should be called immediately before a window is going to be destroyed, - void UnregisterWindow(HWND hwnd); - - // Return a pointer to the Window object related to the HWND or nullptr if the - // hwnd is not in the map. - WinNativeWindow* FromHandle(HWND hwnd); - - std::vector GetAllWindows() const; - - private: - WinUiApplication* application_; - - std::unique_ptr general_window_class_; - std::map window_map_; -}; -} // namespace cru::platform::gui::win diff --git a/src/xml/XmlNode.cpp b/src/xml/XmlNode.cpp index 00437f9b..cfa87dd6 100644 --- a/src/xml/XmlNode.cpp +++ b/src/xml/XmlNode.cpp @@ -1,4 +1,4 @@ -#include "cru/xml/XmlNode.hpp" +#include "cru/xml/XmlNode.h" #include namespace cru::xml { diff --git a/src/xml/XmlParser.cpp b/src/xml/XmlParser.cpp index d0f61542..babb6b00 100644 --- a/src/xml/XmlParser.cpp +++ b/src/xml/XmlParser.cpp @@ -1,5 +1,5 @@ -#include "cru/xml/XmlParser.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/xml/XmlParser.h" +#include "cru/xml/XmlNode.h" namespace cru::xml { XmlParser::XmlParser(String xml) : xml_(std::move(xml)) {} -- cgit v1.2.3