Merge platform/Resource.h to Base.h.

8 files changed, 19 insertions, 24 deletions

diff --git a/src/platform/Resource.cpp b/src/platform/Base.cpp
index b530bd0c..c660ad13 100644
--- a/src/platform/Resource.cpp
+++ b/src/platform/Base.cpp
@@ -1,4 +1,4 @@
-#include "cru/platform/Resource.h"
+#include "cru/platform/Base.h"
 
 namespace cru::platform {
 std::string IPlatformResource::GetDebugString() { return {}; }
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index a917f81f..4cb6b9e8 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_library(CruPlatformBase
+	Base.cpp
 	Color.cpp
 	Exception.cpp
 	GraphicsBase.cpp
-	Resource.cpp
 )
 target_link_libraries(CruPlatformBase PUBLIC CruBase)
 target_compile_definitions(CruPlatformBase PRIVATE CRU_PLATFORM_EXPORT_API)
diff --git a/src/platform/graphics/cairo/Base.cpp b/src/platform/graphics/cairo/Base.cpp
index 3e24efc9..6019c9db 100644
--- a/src/platform/graphics/cairo/Base.cpp
+++ b/src/platform/graphics/cairo/Base.cpp
@@ -1,4 +1,6 @@
 #include "cru/platform/graphics/cairo/Base.h"
+#include "cru/platform/graphics/cairo/CairoGraphicsFactory.h"
+
 #include <cairo/cairo.h>
 
 namespace cru::platform::graphics::cairo {
@@ -15,4 +17,17 @@ Matrix Convert(const cairo_matrix_t* matrix) {
 }
 
 Matrix Convert(const cairo_matrix_t& matrix) { return Convert(&matrix); }
+
+static const std::string kCairoGraphicsPlatformId("cairo");
+
+CairoResource::CairoResource(CairoGraphicsFactory* factory)
+    : factory_(factory) {}
+
+CairoResource::~CairoResource() {}
+
+std::string CairoResource::GetPlatformId() const {
+  return kCairoGraphicsPlatformId;
+}
+
+IGraphicsFactory* CairoResource::GetGraphicsFactory() { return factory_; }
 }  // namespace cru::platform::graphics::cairo
diff --git a/src/platform/graphics/cairo/CMakeLists.txt b/src/platform/graphics/cairo/CMakeLists.txt
index 8dcba709..b00262a3 100644
--- a/src/platform/graphics/cairo/CMakeLists.txt
+++ b/src/platform/graphics/cairo/CMakeLists.txt
@@ -6,7 +6,6 @@ add_library(CruPlatformGraphicsCairo
 	CairoImage.cpp
 	CairoImageFactory.cpp
 	CairoPainter.cpp
-	CairoResource.cpp
 	PangoFont.cpp
 	PangoTextLayout.cpp
 )
diff --git a/src/platform/graphics/cairo/CairoGraphicsFactory.cpp b/src/platform/graphics/cairo/CairoGraphicsFactory.cpp
index 7414e14f..cc7c4dcf 100644
--- a/src/platform/graphics/cairo/CairoGraphicsFactory.cpp
+++ b/src/platform/graphics/cairo/CairoGraphicsFactory.cpp
@@ -1,8 +1,8 @@
 #include "cru/platform/graphics/cairo/CairoGraphicsFactory.h"
+#include "cru/platform/graphics/cairo/Base.h"
 #include "cru/platform/graphics/cairo/CairoBrush.h"
 #include "cru/platform/graphics/cairo/CairoGeometry.h"
 #include "cru/platform/graphics/cairo/CairoImageFactory.h"
-#include "cru/platform/graphics/cairo/CairoResource.h"
 #include "cru/platform/graphics/cairo/PangoFont.h"
 #include "cru/platform/graphics/cairo/PangoTextLayout.h"
 
diff --git a/src/platform/graphics/cairo/CairoImageFactory.cpp b/src/platform/graphics/cairo/CairoImageFactory.cpp
index 6225247a..070eb245 100644
--- a/src/platform/graphics/cairo/CairoImageFactory.cpp
+++ b/src/platform/graphics/cairo/CairoImageFactory.cpp
@@ -1,8 +1,8 @@
 #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"
-#include "cru/platform/graphics/cairo/CairoResource.h"
 
 #include <png.h>
 #include <memory>
diff --git a/src/platform/graphics/cairo/CairoPainter.cpp b/src/platform/graphics/cairo/CairoPainter.cpp
index d043e686..f2a2ce50 100644
--- a/src/platform/graphics/cairo/CairoPainter.cpp
+++ b/src/platform/graphics/cairo/CairoPainter.cpp
@@ -1,5 +1,4 @@
 #include "cru/platform/graphics/cairo/CairoPainter.h"
-#include "cru/base/Exception.h"
 #include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/Exception.h"
@@ -7,7 +6,6 @@
 #include "cru/platform/graphics/cairo/CairoBrush.h"
 #include "cru/platform/graphics/cairo/CairoGeometry.h"
 #include "cru/platform/graphics/cairo/CairoImage.h"
-#include "cru/platform/graphics/cairo/CairoResource.h"
 #include "cru/platform/graphics/cairo/PangoTextLayout.h"
 
 #include <cairo.h>
diff --git a/src/platform/graphics/cairo/CairoResource.cpp b/src/platform/graphics/cairo/CairoResource.cpp
deleted file mode 100644
index f8ce9666..00000000
--- a/src/platform/graphics/cairo/CairoResource.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "cru/platform/graphics/cairo/CairoResource.h"
-#include "cru/platform/graphics/cairo/CairoGraphicsFactory.h"
-
-namespace cru::platform::graphics::cairo {
-static const std::string kCairoGraphicsPlatformId("cairo");
-
-CairoResource::CairoResource(CairoGraphicsFactory* factory)
-    : factory_(factory) {}
-
-CairoResource::~CairoResource() {}
-
-std::string CairoResource::GetPlatformId() const {
-  return kCairoGraphicsPlatformId;
-}
-
-IGraphicsFactory* CairoResource::GetGraphicsFactory() { return factory_; }
-}  // namespace cru::platform::graphics::cairo