Merge platform/Exception.h Check.h to Base.h.

21 files changed, 30 insertions, 55 deletions

diff --git a/src/platform/Base.cpp b/src/platform/Base.cpp
index c660ad13..fd1dec4e 100644
--- a/src/platform/Base.cpp
+++ b/src/platform/Base.cpp
@@ -1,5 +1,35 @@
 #include "cru/platform/Base.h"
 
+#include <format>
+#include <optional>
+#include <string_view>
+
 namespace cru::platform {
 std::string IPlatformResource::GetDebugString() { return {}; }
+
+PlatformNotMatchException::PlatformNotMatchException(
+    std::string resource_platform, std::string target_platform,
+    std::optional<std::string_view> additional_message)
+    : PlatformException(std::format(
+          "Resource platform '{}' does not match target platform '{}'.",
+          resource_platform_, target_platform_)),
+      resource_platform_(std::move(resource_platform)),
+      target_platform_(std::move(target_platform)) {
+  AppendMessage(additional_message);
+}
+
+PlatformNotMatchException::~PlatformNotMatchException() {}
+
+PlatformUnsupportedException::PlatformUnsupportedException(
+    std::string platform, std::string operation,
+    std::optional<std::string_view> additional_message)
+    : PlatformException(
+          std::format("Operation '{}' is not supported on platform '{}'.",
+                      operation, platform)),
+      platform_(std::move(platform)),
+      operation_(std::move(operation)) {
+  AppendMessage(additional_message);
+}
+
+PlatformUnsupportedException::~PlatformUnsupportedException() {}
 }  // namespace cru::platform
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index 4cb6b9e8..d577d79c 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_library(CruPlatformBase
 	Base.cpp
 	Color.cpp
-	Exception.cpp
 	GraphicsBase.cpp
 )
 target_link_libraries(CruPlatformBase PUBLIC CruBase)
diff --git a/src/platform/Exception.cpp b/src/platform/Exception.cpp
deleted file mode 100644
index 6a718f63..00000000
--- a/src/platform/Exception.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "cru/platform/Exception.h"
-#include "cru/base/Exception.h"
-
-#include <format>
-#include <optional>
-#include <string_view>
-
-namespace cru::platform {
-PlatformNotMatchException::PlatformNotMatchException(
-    std::string resource_platform, std::string target_platform,
-    std::optional<std::string_view> additional_message)
-    : PlatformException(std::format(
-          "Resource platform '{}' does not match target platform '{}'.",
-          resource_platform_, target_platform_)),
-      resource_platform_(std::move(resource_platform)),
-      target_platform_(std::move(target_platform)) {
-  AppendMessage(additional_message);
-}
-
-PlatformNotMatchException::~PlatformNotMatchException() {}
-
-PlatformUnsupportedException::PlatformUnsupportedException(
-    std::string platform, std::string operation,
-    std::optional<std::string_view> additional_message)
-    : PlatformException(
-          std::format("Operation '{}' is not supported on platform '{}'.",
-                      operation, platform)),
-      platform_(std::move(platform)),
-      operation_(std::move(operation)) {
-  AppendMessage(additional_message);
-}
-
-PlatformUnsupportedException::~PlatformUnsupportedException() {}
-}  // namespace cru::platform
diff --git a/src/platform/graphics/Geometry.cpp b/src/platform/graphics/Geometry.cpp
index 4189ef72..3d88a644 100644
--- a/src/platform/graphics/Geometry.cpp
+++ b/src/platform/graphics/Geometry.cpp
@@ -2,7 +2,6 @@
 
 #include "cru/base/Exception.h"
 #include "cru/base/StringUtil.h"
-#include "cru/platform/Exception.h"
 #include "cru/platform/graphics/Factory.h"
 
 #include <cmath>
diff --git a/src/platform/graphics/SvgGeometryBuilderMixin.cpp b/src/platform/graphics/SvgGeometryBuilderMixin.cpp
index 0863e5eb..35faaf4b 100644
--- a/src/platform/graphics/SvgGeometryBuilderMixin.cpp
+++ b/src/platform/graphics/SvgGeometryBuilderMixin.cpp
@@ -1,5 +1,4 @@
 #include "cru/platform/graphics/SvgGeometryBuilderMixin.h"
-#include "cru/platform/Exception.h"
 
 #include <string>
 
diff --git a/src/platform/graphics/cairo/CairoImageFactory.cpp b/src/platform/graphics/cairo/CairoImageFactory.cpp
index 070eb245..a634d135 100644
--- a/src/platform/graphics/cairo/CairoImageFactory.cpp
+++ b/src/platform/graphics/cairo/CairoImageFactory.cpp
@@ -1,6 +1,5 @@
 #include "cru/platform/graphics/cairo/CairoImageFactory.h"
 #include "cru/base/Exception.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/cairo/Base.h"
 #include "cru/platform/graphics/cairo/CairoImage.h"
 
diff --git a/src/platform/graphics/cairo/CairoPainter.cpp b/src/platform/graphics/cairo/CairoPainter.cpp
index f2a2ce50..a0a28337 100644
--- a/src/platform/graphics/cairo/CairoPainter.cpp
+++ b/src/platform/graphics/cairo/CairoPainter.cpp
@@ -1,7 +1,5 @@
 #include "cru/platform/graphics/cairo/CairoPainter.h"
 #include "cru/base/log/Logger.h"
-#include "cru/platform/Check.h"
-#include "cru/platform/Exception.h"
 #include "cru/platform/graphics/cairo/Base.h"
 #include "cru/platform/graphics/cairo/CairoBrush.h"
 #include "cru/platform/graphics/cairo/CairoGeometry.h"
diff --git a/src/platform/graphics/cairo/PangoTextLayout.cpp b/src/platform/graphics/cairo/PangoTextLayout.cpp
index f8ed20c7..9d301031 100644
--- a/src/platform/graphics/cairo/PangoTextLayout.cpp
+++ b/src/platform/graphics/cairo/PangoTextLayout.cpp
@@ -1,5 +1,4 @@
 #include "cru/platform/graphics/cairo/PangoTextLayout.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/GraphicsBase.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/cairo/CairoGraphicsFactory.h"
diff --git a/src/platform/graphics/direct2d/ImageFactory.cpp b/src/platform/graphics/direct2d/ImageFactory.cpp
index aff411c4..df162561 100644
--- a/src/platform/graphics/direct2d/ImageFactory.cpp
+++ b/src/platform/graphics/direct2d/ImageFactory.cpp
@@ -1,7 +1,6 @@
 #include "cru/platform/graphics/direct2d/ImageFactory.h"
 #include "cru/base/platform/win/Exception.h"
 #include "cru/base/platform/win/StreamConvert.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
 #include "cru/platform/graphics/direct2d/Image.h"
diff --git a/src/platform/graphics/direct2d/Painter.cpp b/src/platform/graphics/direct2d/Painter.cpp
index fabcdafd..c62947e0 100644
--- a/src/platform/graphics/direct2d/Painter.cpp
+++ b/src/platform/graphics/direct2d/Painter.cpp
@@ -1,7 +1,6 @@
 #include "cru/platform/graphics/direct2d/Painter.h"
 
 #include "cru/base/log/Logger.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Brush.h"
 #include "cru/platform/graphics/direct2d/ConvertUtil.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
diff --git a/src/platform/graphics/direct2d/TextLayout.cpp b/src/platform/graphics/direct2d/TextLayout.cpp
index 906d64ec..1abaa383 100644
--- a/src/platform/graphics/direct2d/TextLayout.cpp
+++ b/src/platform/graphics/direct2d/TextLayout.cpp
@@ -3,7 +3,6 @@
 
 #include "cru/base/StringUtil.h"
 #include "cru/base/log/Logger.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
 #include "cru/platform/graphics/direct2d/Font.h"
diff --git a/src/platform/graphics/quartz/Factory.cpp b/src/platform/graphics/quartz/Factory.cpp
index 69e9c607..3a489212 100644
--- a/src/platform/graphics/quartz/Factory.cpp
+++ b/src/platform/graphics/quartz/Factory.cpp
@@ -1,6 +1,5 @@
 #include "cru/platform/graphics/quartz/Factory.h"
 
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/ImageFactory.h"
 #include "cru/platform/graphics/quartz/Brush.h"
 #include "cru/platform/graphics/quartz/Font.h"
diff --git a/src/platform/graphics/quartz/ImageFactory.cpp b/src/platform/graphics/quartz/ImageFactory.cpp
index 69fa502d..87b2ff36 100644
--- a/src/platform/graphics/quartz/ImageFactory.cpp
+++ b/src/platform/graphics/quartz/ImageFactory.cpp
@@ -1,7 +1,6 @@
 #include "cru/platform/graphics/quartz/ImageFactory.h"
 #include "cru/base/Exception.h"
 #include "cru/base/Osx.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/Image.h"
 #include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Image.h"
diff --git a/src/platform/graphics/quartz/Painter.cpp b/src/platform/graphics/quartz/Painter.cpp
index 45dee716..b825f28c 100644
--- a/src/platform/graphics/quartz/Painter.cpp
+++ b/src/platform/graphics/quartz/Painter.cpp
@@ -5,9 +5,7 @@
 #include "cru/platform/graphics/quartz/Geometry.h"
 #include "cru/platform/graphics/quartz/Image.h"
 #include "cru/platform/graphics/quartz/TextLayout.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/Color.h"
-#include "cru/platform/Exception.h"
 
 namespace cru::platform::graphics::quartz {
 QuartzCGContextPainter::QuartzCGContextPainter(
diff --git a/src/platform/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp
index 87f85b77..b7a015c1 100644
--- a/src/platform/graphics/quartz/TextLayout.cpp
+++ b/src/platform/graphics/quartz/TextLayout.cpp
@@ -2,7 +2,6 @@
 #include "cru/base/Base.h"
 #include "cru/base/Osx.h"
 #include "cru/base/StringUtil.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Resource.h"
diff --git a/src/platform/graphics/web_canvas/Painter.cpp b/src/platform/graphics/web_canvas/Painter.cpp
index c9184165..e875b0cd 100644
--- a/src/platform/graphics/web_canvas/Painter.cpp
+++ b/src/platform/graphics/web_canvas/Painter.cpp
@@ -1,4 +1,3 @@
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/web_canvas/WebCanvasBrush.h"
 #include "cru/platform/graphics/web_canvas/WebCanvasGraphicsFactory.h"
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index 65d31ab8..ca2de573 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -6,7 +6,6 @@
 #include "cru/base/Osx.h"
 #include "cru/base/Range.h"
 #include "cru/base/log/Logger.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Painter.h"
diff --git a/src/platform/gui/sdl/Window.cpp b/src/platform/gui/sdl/Window.cpp
index 3737cae0..1c2d53bc 100644
--- a/src/platform/gui/sdl/Window.cpp
+++ b/src/platform/gui/sdl/Window.cpp
@@ -1,6 +1,5 @@
 #include "cru/platform/gui/sdl/Window.h"
 #include "cru/base/Base.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/GraphicsBase.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/graphics/Painter.h"
diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp
index 9a9a7275..35f79a66 100644
--- a/src/platform/gui/win/Window.cpp
+++ b/src/platform/gui/win/Window.cpp
@@ -3,7 +3,6 @@
 #include "WindowManager.h"
 #include "cru/base/StringUtil.h"
 #include "cru/base/log/Logger.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/graphics/direct2d/WindowPainter.h"
 #include "cru/platform/gui/DebugFlags.h"
diff --git a/src/platform/gui/xcb/InputMethod.cpp b/src/platform/gui/xcb/InputMethod.cpp
index 5ee06ab4..d6d4b9e7 100644
--- a/src/platform/gui/xcb/InputMethod.cpp
+++ b/src/platform/gui/xcb/InputMethod.cpp
@@ -1,6 +1,5 @@
 #include "cru/platform/gui/xcb/InputMethod.h"
 #include "cru/base/log/Logger.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/gui/xcb/Input.h"
 #include "cru/platform/gui/xcb/UiApplication.h"
 #include "cru/platform/gui/xcb/Window.h"
diff --git a/src/platform/gui/xcb/Window.cpp b/src/platform/gui/xcb/Window.cpp
index 003afc40..96483e04 100644
--- a/src/platform/gui/xcb/Window.cpp
+++ b/src/platform/gui/xcb/Window.cpp
@@ -2,7 +2,6 @@
 #include "cru/base/Base.h"
 #include "cru/base/Guard.h"
 #include "cru/base/log/Logger.h"
-#include "cru/platform/Check.h"
 #include "cru/platform/GraphicsBase.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/graphics/Painter.h"