From 06f16479ae1b727252404b763b60c924e3fe7903 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Mon, 3 Nov 2025 20:04:52 +0800 Subject: Remove Object2. --- include/cru/platform/graphics/NullPainter.h | 4 ---- include/cru/platform/graphics/cairo/Base.h | 4 ---- include/cru/platform/graphics/direct2d/Resource.h | 3 --- include/cru/platform/graphics/direct2d/WindowRenderTarget.h | 4 ---- include/cru/platform/graphics/web_canvas/WebCanvasResource.h | 4 ---- 5 files changed, 19 deletions(-) (limited to 'include/cru/platform/graphics') diff --git a/include/cru/platform/graphics/NullPainter.h b/include/cru/platform/graphics/NullPainter.h index 29ed8a3e..f335e16d 100644 --- a/include/cru/platform/graphics/NullPainter.h +++ b/include/cru/platform/graphics/NullPainter.h @@ -7,10 +7,6 @@ namespace cru::platform::graphics { class NullPainter : public Object, public virtual IPainter { public: NullPainter() = default; - - CRU_DELETE_COPY(NullPainter) - CRU_DELETE_MOVE(NullPainter) - ~NullPainter() override = default; public: diff --git a/include/cru/platform/graphics/cairo/Base.h b/include/cru/platform/graphics/cairo/Base.h index 4338d7f7..350c9ea4 100644 --- a/include/cru/platform/graphics/cairo/Base.h +++ b/include/cru/platform/graphics/cairo/Base.h @@ -26,10 +26,6 @@ class CRU_PLATFORM_GRAPHICS_CAIRO_API CairoResource public virtual IGraphicsResource { public: explicit CairoResource(CairoGraphicsFactory* factory); - - CRU_DELETE_COPY(CairoResource) - CRU_DELETE_MOVE(CairoResource) - ~CairoResource() override; std::string GetPlatformId() const override; diff --git a/include/cru/platform/graphics/direct2d/Resource.h b/include/cru/platform/graphics/direct2d/Resource.h index ca67a463..b8dd42ab 100644 --- a/include/cru/platform/graphics/direct2d/Resource.h +++ b/include/cru/platform/graphics/direct2d/Resource.h @@ -18,9 +18,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectResource DirectResource() = default; public: - CRU_DELETE_COPY(DirectResource) - CRU_DELETE_MOVE(DirectResource) - ~DirectResource() override = default; public: diff --git a/include/cru/platform/graphics/direct2d/WindowRenderTarget.h b/include/cru/platform/graphics/direct2d/WindowRenderTarget.h index f77ce471..19b32df9 100644 --- a/include/cru/platform/graphics/direct2d/WindowRenderTarget.h +++ b/include/cru/platform/graphics/direct2d/WindowRenderTarget.h @@ -6,10 +6,6 @@ namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowRenderTarget : public Object { public: D2DWindowRenderTarget(DirectGraphicsFactory* factory, HWND hwnd); - - CRU_DELETE_COPY(D2DWindowRenderTarget) - CRU_DELETE_MOVE(D2DWindowRenderTarget) - ~D2DWindowRenderTarget() override = default; public: diff --git a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h index e3866f38..dbe83225 100644 --- a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h +++ b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h @@ -11,10 +11,6 @@ class WebCanvasResource : public Object, public virtual IPlatformResource { static const std::string kPlatformId; explicit WebCanvasResource(WebCanvasGraphicsFactory* factory); - - CRU_DELETE_COPY(WebCanvasResource) - CRU_DELETE_MOVE(WebCanvasResource) - ~WebCanvasResource() override; public: -- cgit v1.2.3