...

7 files changed, 10 insertions, 10 deletions

diff --git a/src/osx/graphics/quartz/Brush.cpp b/src/osx/graphics/quartz/Brush.cpp
index 6e4893b1..41e9d2c5 100644
--- a/src/osx/graphics/quartz/Brush.cpp
+++ b/src/osx/graphics/quartz/Brush.cpp
@@ -1,7 +1,7 @@
 #include "cru/osx/graphics/quartz/Brush.hpp"
 
 namespace cru::platform::graphics::osx::quartz {
-QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphFactory* graphics_factory,
+QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphicsFactory* graphics_factory,
                                              const Color& color)
     : QuartzBrush(graphics_factory), color_(color) {
   cg_color_ =
diff --git a/src/osx/graphics/quartz/Font.cpp b/src/osx/graphics/quartz/Font.cpp
index e6c1dc91..c35f53fa 100644
--- a/src/osx/graphics/quartz/Font.cpp
+++ b/src/osx/graphics/quartz/Font.cpp
@@ -4,7 +4,7 @@
 #include "cru/osx/graphics/quartz/Resource.hpp"
 
 namespace cru::platform::graphics::osx::quartz {
-OsxCTFont::OsxCTFont(IGraphFactory* graphics_factory, const String& name,
+OsxCTFont::OsxCTFont(IGraphicsFactory* graphics_factory, const String& name,
                      float size)
     : OsxQuartzResource(graphics_factory) {
   CFStringRef n = Convert(name);
diff --git a/src/osx/graphics/quartz/Geometry.cpp b/src/osx/graphics/quartz/Geometry.cpp
index 79e6fbb1..4ad9a7f3 100644
--- a/src/osx/graphics/quartz/Geometry.cpp
+++ b/src/osx/graphics/quartz/Geometry.cpp
@@ -3,7 +3,7 @@
 #include <memory>
 
 namespace cru::platform::graphics::osx::quartz {
-QuartzGeometry::QuartzGeometry(IGraphFactory *graphics_factory,
+QuartzGeometry::QuartzGeometry(IGraphicsFactory *graphics_factory,
                                CGPathRef cg_path)
     : OsxQuartzResource(graphics_factory), cg_path_(cg_path) {}
 
@@ -14,7 +14,7 @@ bool QuartzGeometry::FillContains(const Point &point) {
                              kCGPathFill);
 }
 
-QuartzGeometryBuilder::QuartzGeometryBuilder(IGraphFactory *graphics_factory)
+QuartzGeometryBuilder::QuartzGeometryBuilder(IGraphicsFactory *graphics_factory)
     : OsxQuartzResource(graphics_factory) {
   cg_mutable_path_ = CGPathCreateMutable();
 }
@@ -42,7 +42,7 @@ void QuartzGeometryBuilder::QuadraticBezierTo(const Point &control_point,
 }
 
 std::unique_ptr<IGeometry> QuartzGeometryBuilder::Build() {
-  return std::make_unique<QuartzGeometry>(GetGraphFactory(),
+  return std::make_unique<QuartzGeometry>(GetGraphicsFactory(),
                                           CGPathCreateCopy(cg_mutable_path_));
 }
 }  // namespace cru::platform::graphics::osx::quartz
diff --git a/src/osx/graphics/quartz/TextLayout.cpp b/src/osx/graphics/quartz/TextLayout.cpp
index 19fbf57c..d6a19264 100644
--- a/src/osx/graphics/quartz/TextLayout.cpp
+++ b/src/osx/graphics/quartz/TextLayout.cpp
@@ -7,7 +7,7 @@
 #include <limits>
 
 namespace cru::platform::graphics::osx::quartz {
-OsxCTTextLayout::OsxCTTextLayout(IGraphFactory* graphics_factory,
+OsxCTTextLayout::OsxCTTextLayout(IGraphicsFactory* graphics_factory,
                                  std::shared_ptr<OsxCTFont> font,
                                  const String& str)
     : OsxQuartzResource(graphics_factory),
diff --git a/src/ui/Helper.cpp b/src/ui/Helper.cpp
index 88ead993..90b384c4 100644
--- a/src/ui/Helper.cpp
+++ b/src/ui/Helper.cpp
@@ -4,10 +4,10 @@
 #include "cru/platform/gui/UiApplication.hpp"
 
 namespace cru::ui {
-using cru::platform::graphics::IGraphFactory;
+using cru::platform::graphics::IGraphicsFactory;
 using cru::platform::gui::IUiApplication;
 
-IGraphFactory* GetGraphFactory() {
+IGraphicsFactory* GetGraphFactory() {
   return IUiApplication::GetInstance()->GetGraphFactory();
 }
 
diff --git a/src/ui/Helper.hpp b/src/ui/Helper.hpp
index 327f91ff..cf1140dc 100644
--- a/src/ui/Helper.hpp
+++ b/src/ui/Helper.hpp
@@ -12,6 +12,6 @@ struct IUiApplication;
 }  // namespace cru::platform
 
 namespace cru::ui {
-cru::platform::graphics::IGraphFactory* GetGraphFactory();
+cru::platform::graphics::IGraphicsFactory* GetGraphFactory();
 cru::platform::gui::IUiApplication* GetUiApplication();
 }  // namespace cru::ui
diff --git a/src/ui/UiManager.cpp b/src/ui/UiManager.cpp
index b0cc769a..85ca552c 100644
--- a/src/ui/UiManager.cpp
+++ b/src/ui/UiManager.cpp
@@ -20,7 +20,7 @@ using namespace cru::ui::style;
 using namespace cru::ui::helper;
 
 namespace {
-std::unique_ptr<ISolidColorBrush> CreateSolidColorBrush(IGraphFactory* factory,
+std::unique_ptr<ISolidColorBrush> CreateSolidColorBrush(IGraphicsFactory* factory,
                                                         const Color& color) {
   auto brush = factory->CreateSolidColorBrush();
   brush->SetColor(color);