Osx remove Resource.h.

1 files changed, 14 insertions, 18 deletions

diff --git a/include/cru/platform/graphics/quartz/Geometry.h b/include/cru/platform/graphics/quartz/Geometry.h
index 18e2e25e..e13d268e 100644
--- a/include/cru/platform/graphics/quartz/Geometry.h
+++ b/include/cru/platform/graphics/quartz/Geometry.h
@@ -1,27 +1,23 @@
 #pragma once
-#include "Resource.h"
-#include "cru/platform/graphics/Geometry.h"
+#include "Base.h"
 
-#include <memory>
+#include <cru/platform/graphics/Geometry.h>
 
 #include <CoreGraphics/CoreGraphics.h>
+#include <memory>
 
 namespace cru::platform::graphics::quartz {
 class QuartzGeometry : public OsxQuartzResource, public virtual IGeometry {
  public:
-  QuartzGeometry(IGraphicsFactory *graphics_factory, CGPathRef cg_path);
-
-  CRU_DELETE_COPY(QuartzGeometry)
-  CRU_DELETE_MOVE(QuartzGeometry)
-
+  QuartzGeometry(IGraphicsFactory* graphics_factory, CGPathRef cg_path);
   ~QuartzGeometry() override;
 
   CGPathRef GetCGPath() const { return cg_path_; }
 
-  bool FillContains(const Point &point) override;
+  bool FillContains(const Point& point) override;
   Rect GetBounds() override;
 
-  std::unique_ptr<IGeometry> Transform(const Matrix &matrix) override;
+  std::unique_ptr<IGeometry> Transform(const Matrix& matrix) override;
   std::unique_ptr<IGeometry> CreateStrokeGeometry(float width) override;
 
  private:
@@ -31,7 +27,7 @@ class QuartzGeometry : public OsxQuartzResource, public virtual IGeometry {
 class QuartzGeometryBuilder : public OsxQuartzResource,
                               public virtual IGeometryBuilder {
  public:
-  explicit QuartzGeometryBuilder(IGraphicsFactory *graphics_factory);
+  explicit QuartzGeometryBuilder(IGraphicsFactory* graphics_factory);
 
   CRU_DELETE_COPY(QuartzGeometryBuilder)
   CRU_DELETE_MOVE(QuartzGeometryBuilder)
@@ -40,13 +36,13 @@ class QuartzGeometryBuilder : public OsxQuartzResource,
 
   Point GetCurrentPosition() override;
 
-  void MoveTo(const Point &point) override;
-  void LineTo(const Point &point) override;
-  void CubicBezierTo(const Point &start_control_point,
-                     const Point &end_control_point,
-                     const Point &end_point) override;
-  void QuadraticBezierTo(const Point &control_point,
-                         const Point &end_point) override;
+  void MoveTo(const Point& point) override;
+  void LineTo(const Point& point) override;
+  void CubicBezierTo(const Point& start_control_point,
+                     const Point& end_control_point,
+                     const Point& end_point) override;
+  void QuadraticBezierTo(const Point& control_point,
+                         const Point& end_point) override;
   void CloseFigure(bool close) override;
 
   std::unique_ptr<IGeometry> Build() override;