From bb17be56d2cd22949bf485c518d543a7e79a6b7d Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 24 Oct 2022 14:04:51 +0200
Subject: a

---
 src/loader.hpp     | 2 +-
 src/tile-atlas.cpp | 2 +-
 src/tile-atlas.hpp | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/loader.hpp b/src/loader.hpp
index f8e0e049..a521cf2d 100644
--- a/src/loader.hpp
+++ b/src/loader.hpp
@@ -15,7 +15,7 @@ struct tile_atlas;
 
 struct loader_
 {
-    virtual std::string shader(Containers::StringView filename) = 0;
+    virtual StringView shader(Containers::StringView filename) = 0;
     virtual Trade::ImageData2D tile_texture(Containers::StringView filename) = 0;
     virtual std::shared_ptr<struct tile_atlas> tile_atlas(Containers::StringView filename, Vector2ub size) = 0;
     static void destroy();
diff --git a/src/tile-atlas.cpp b/src/tile-atlas.cpp
index 3f08bc9c..533cc8e9 100644
--- a/src/tile-atlas.cpp
+++ b/src/tile-atlas.cpp
@@ -7,7 +7,7 @@
 
 namespace floormat {
 
-tile_atlas::tile_atlas(Containers::StringView name, const ImageView2D& image, Vector2ub tile_count) :
+tile_atlas::tile_atlas(StringView name, const ImageView2D& image, Vector2ub tile_count) :
     texcoords_{make_texcoords_array(Vector2ui(image.size()), tile_count)},
     name_{name}, size_{image.size()}, dims_{tile_count}
 {
diff --git a/src/tile-atlas.hpp b/src/tile-atlas.hpp
index 97f9f408..b46cf686 100644
--- a/src/tile-atlas.hpp
+++ b/src/tile-atlas.hpp
@@ -1,8 +1,8 @@
 #pragma once
+#include <Corrade/Containers/String.h>
 #include <Magnum/Magnum.h>
 #include <Magnum/GL/Texture.h>
 #include <array>
-#include <string>
 #include <memory>
 
 namespace std::filesystem { class path; }
@@ -14,7 +14,7 @@ struct tile_atlas final
     using quad = std::array<Vector3, 4>;
     using texcoords = std::array<Vector2, 4>;
 
-    tile_atlas(Containers::StringView name, const ImageView2D& img, Vector2ub tile_count);
+    tile_atlas(StringView name, const ImageView2D& img, Vector2ub tile_count);
 
     texcoords texcoords_for_id(std::size_t id) const;
     static constexpr quad floor_quad(Vector3 center, Vector2 size);
@@ -25,7 +25,7 @@ struct tile_atlas final
     std::size_t num_tiles() const { return Vector2ui{dims_}.product(); }
     Vector2ub num_tiles2() const { return dims_; }
     GL::Texture2D& texture() { return tex_; }
-    Containers::StringView name() const { return name_; }
+    StringView name() const { return name_; }
 
 private:
     static std::unique_ptr<const texcoords[]> make_texcoords_array(Vector2ui pixel_size, Vector2ub tile_count);
@@ -33,7 +33,7 @@ private:
 
     std::unique_ptr<const texcoords[]> texcoords_;
     GL::Texture2D tex_;
-    std::string name_;
+    String name_;
     Vector2ui size_;
     Vector2ub dims_;
 };
-- 
cgit v1.2.3