Skip to content

Commit e873d27

Browse files
committed
LibGfx: Switch a bunch of API's from taking StringView to String
These were all getting converted into String internally anyway.
1 parent 050648b commit e873d27

File tree

12 files changed

+17
-17
lines changed

12 files changed

+17
-17
lines changed

Userland/Libraries/LibGfx/BMPLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ struct BMPLoadingContext {
186186

187187
static RefPtr<Bitmap> load_bmp_impl(const u8*, size_t);
188188

189-
RefPtr<Gfx::Bitmap> load_bmp(const StringView& path)
189+
RefPtr<Gfx::Bitmap> load_bmp(String const& path)
190190
{
191191
auto file_or_error = MappedFile::map(path);
192192
if (file_or_error.is_error())

Userland/Libraries/LibGfx/BMPLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
namespace Gfx {
3333

34-
RefPtr<Gfx::Bitmap> load_bmp(const StringView& path);
34+
RefPtr<Gfx::Bitmap> load_bmp(String const& path);
3535
RefPtr<Gfx::Bitmap> load_bmp_from_memory(const u8*, size_t);
3636

3737
struct BMPLoadingContext;

Userland/Libraries/LibGfx/Bitmap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ RefPtr<Bitmap> Bitmap::create_wrapper(BitmapFormat format, const IntSize& size,
143143
return adopt(*new Bitmap(format, size, scale_factor, pitch, data));
144144
}
145145

146-
RefPtr<Bitmap> Bitmap::load_from_file(const StringView& path, int scale_factor)
146+
RefPtr<Bitmap> Bitmap::load_from_file(String const& path, int scale_factor)
147147
{
148148
if (scale_factor > 1 && path.starts_with("/res/")) {
149149
LexicalPath lexical_path { path };
@@ -439,11 +439,11 @@ Bitmap::~Bitmap()
439439
delete[] m_palette;
440440
}
441441

442-
void Bitmap::set_mmap_name([[maybe_unused]] const StringView& name)
442+
void Bitmap::set_mmap_name([[maybe_unused]] String const& name)
443443
{
444444
VERIFY(m_needs_munmap);
445445
#ifdef __serenity__
446-
::set_mmap_name(m_data, size_in_bytes(), name.to_string().characters());
446+
::set_mmap_name(m_data, size_in_bytes(), name.characters());
447447
#endif
448448
}
449449

Userland/Libraries/LibGfx/Bitmap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class Bitmap : public RefCounted<Bitmap> {
117117
static RefPtr<Bitmap> create_shareable(BitmapFormat, const IntSize&, int intrinsic_scale = 1);
118118
static RefPtr<Bitmap> create_purgeable(BitmapFormat, const IntSize&, int intrinsic_scale = 1);
119119
static RefPtr<Bitmap> create_wrapper(BitmapFormat, const IntSize&, int intrinsic_scale, size_t pitch, void*);
120-
static RefPtr<Bitmap> load_from_file(const StringView& path, int scale_factor = 1);
120+
static RefPtr<Bitmap> load_from_file(String const& path, int scale_factor = 1);
121121
static RefPtr<Bitmap> create_with_anon_fd(BitmapFormat, int anon_fd, const IntSize&, int intrinsic_scale, const Vector<RGBA32>& palette, ShouldCloseAnonymousFile);
122122
static RefPtr<Bitmap> create_from_serialized_byte_buffer(ByteBuffer&& buffer);
123123
static bool is_path_a_supported_image_format(const StringView& path)
@@ -221,7 +221,7 @@ class Bitmap : public RefCounted<Bitmap> {
221221
bool has_alpha_channel() const { return m_format == BitmapFormat::BGRA8888; }
222222
BitmapFormat format() const { return m_format; }
223223

224-
void set_mmap_name(const StringView&);
224+
void set_mmap_name(String const&);
225225

226226
static constexpr size_t size_in_bytes(size_t pitch, int physical_height) { return pitch * physical_height; }
227227
size_t size_in_bytes() const { return size_in_bytes(m_pitch, physical_height()); }

Userland/Libraries/LibGfx/BitmapFont.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ String BitmapFont::type_name_by_type(FontTypes type)
190190
VERIFY_NOT_REACHED();
191191
}
192192

193-
RefPtr<BitmapFont> BitmapFont::load_from_file(const StringView& path)
193+
RefPtr<BitmapFont> BitmapFont::load_from_file(String const& path)
194194
{
195195
if (Core::File::is_device(path))
196196
return nullptr;
@@ -207,7 +207,7 @@ RefPtr<BitmapFont> BitmapFont::load_from_file(const StringView& path)
207207
return font;
208208
}
209209

210-
bool BitmapFont::write_to_file(const StringView& path)
210+
bool BitmapFont::write_to_file(String const& path)
211211
{
212212
FontFileHeader header;
213213
memset(&header, 0, sizeof(FontFileHeader));

Userland/Libraries/LibGfx/BitmapFont.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class BitmapFont : public Font {
5050
NonnullRefPtr<Font> clone() const;
5151
static NonnullRefPtr<BitmapFont> create(u8 glyph_height, u8 glyph_width, bool fixed, FontTypes type);
5252

53-
static RefPtr<BitmapFont> load_from_file(const StringView& path);
54-
bool write_to_file(const StringView& path);
53+
static RefPtr<BitmapFont> load_from_file(String const& path);
54+
bool write_to_file(String const& path);
5555

5656
~BitmapFont();
5757

Userland/Libraries/LibGfx/GIFLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ struct GIFLoadingContext {
104104
RefPtr<Gfx::Bitmap> prev_frame_buffer;
105105
};
106106

107-
RefPtr<Gfx::Bitmap> load_gif(const StringView& path)
107+
RefPtr<Gfx::Bitmap> load_gif(String const& path)
108108
{
109109
auto file_or_error = MappedFile::map(path);
110110
if (file_or_error.is_error())

Userland/Libraries/LibGfx/GIFLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
namespace Gfx {
3333

34-
RefPtr<Gfx::Bitmap> load_gif(const StringView& path);
34+
RefPtr<Gfx::Bitmap> load_gif(String const& path);
3535
RefPtr<Gfx::Bitmap> load_gif_from_memory(const u8*, size_t);
3636

3737
struct GIFLoadingContext;

Userland/Libraries/LibGfx/JPGLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ static RefPtr<Gfx::Bitmap> load_jpg_impl(const u8* data, size_t data_size)
12521252
return context.bitmap;
12531253
}
12541254

1255-
RefPtr<Gfx::Bitmap> load_jpg(const StringView& path)
1255+
RefPtr<Gfx::Bitmap> load_jpg(String const& path)
12561256
{
12571257
auto file_or_error = MappedFile::map(path);
12581258
if (file_or_error.is_error())

Userland/Libraries/LibGfx/JPGLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
namespace Gfx {
3535

36-
RefPtr<Gfx::Bitmap> load_jpg(const StringView& path);
36+
RefPtr<Gfx::Bitmap> load_jpg(String const& path);
3737
RefPtr<Gfx::Bitmap> load_jpg_from_memory(const u8* data, size_t length);
3838

3939
struct JPGLoadingContext;

0 commit comments

Comments
 (0)