From 66189169f9aef243cc9883ca28a338b440bcd0cd Mon Sep 17 00:00:00 2001 From: Lenny Maiorani Date: Wed, 16 Mar 2022 17:55:56 -0600 Subject: [PATCH] LibGfx: Change class_name to use StringView instead of char const* This helps make the overall codebase consistent. `class_name()` in `Kernel` is always `StringView`, but not elsewhere. Additionally, this results in the `strlen` (which needs to be done when printing or other operations) always being computed at compile-time. --- Userland/Libraries/LibGfx/Filters/BoxBlurFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/Filter.h | 3 ++- Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/InvertFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/LaplacianFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/SepiaFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/SharpenFilter.h | 3 ++- Userland/Libraries/LibGfx/Filters/SpatialGaussianBlurFilter.h | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Userland/Libraries/LibGfx/Filters/BoxBlurFilter.h b/Userland/Libraries/LibGfx/Filters/BoxBlurFilter.h index 6f69ed0742..d8cf1b7467 100644 --- a/Userland/Libraries/LibGfx/Filters/BoxBlurFilter.h +++ b/Userland/Libraries/LibGfx/Filters/BoxBlurFilter.h @@ -7,6 +7,7 @@ #pragma once #include "GenericConvolutionFilter.h" +#include namespace Gfx { @@ -16,7 +17,7 @@ public: BoxBlurFilter() = default; virtual ~BoxBlurFilter() = default; - virtual const char* class_name() const override { return "BoxBlurFilter"; } + virtual StringView class_name() const override { return "BoxBlurFilter"sv; } }; } diff --git a/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.h b/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.h index 71a36639b9..fdf91caacc 100644 --- a/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.h +++ b/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.h @@ -8,6 +8,7 @@ #include "ColorFilter.h" #include +#include namespace Gfx { class ColorBlindnessFilter : public ColorFilter { @@ -35,7 +36,7 @@ public: } virtual ~ColorBlindnessFilter() = default; - virtual char const* class_name() const override { return "ColorBlindnessFilter"; } + virtual StringView class_name() const override { return "ColorBlindnessFilter"sv; } static NonnullOwnPtr create_protanopia(); static NonnullOwnPtr create_protanomaly(); diff --git a/Userland/Libraries/LibGfx/Filters/Filter.h b/Userland/Libraries/LibGfx/Filters/Filter.h index 558e5695b1..9231c24f33 100644 --- a/Userland/Libraries/LibGfx/Filters/Filter.h +++ b/Userland/Libraries/LibGfx/Filters/Filter.h @@ -6,6 +6,7 @@ #pragma once +#include #include #include @@ -21,7 +22,7 @@ public: }; virtual ~Filter() = default; - virtual const char* class_name() const = 0; + virtual StringView class_name() const = 0; virtual void apply(Bitmap&, IntRect const&, Bitmap const&, IntRect const&, Parameters const&) {}; virtual void apply(Bitmap&, IntRect const&, Bitmap const&, IntRect const&) {}; diff --git a/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h b/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h index 76226a2cb5..f42659fadc 100644 --- a/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h +++ b/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h @@ -7,6 +7,7 @@ #pragma once #include "Filter.h" +#include #include #include @@ -61,7 +62,7 @@ public: GenericConvolutionFilter() = default; virtual ~GenericConvolutionFilter() = default; - virtual const char* class_name() const override { return "GenericConvolutionFilter"; } + virtual StringView class_name() const override { return "GenericConvolutionFilter"sv; } virtual void apply(Bitmap& target_bitmap, const IntRect& target_rect, const Bitmap& source_bitmap, const IntRect& source_rect, const Filter::Parameters& parameters) override { diff --git a/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h b/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h index eef85f41b8..59c32f04f3 100644 --- a/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h +++ b/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h @@ -6,6 +6,7 @@ #pragma once +#include #include namespace Gfx { @@ -15,7 +16,7 @@ public: GrayscaleFilter() = default; virtual ~GrayscaleFilter() = default; - virtual char const* class_name() const override { return "GrayscaleFilter"; } + virtual StringView class_name() const override { return "GrayscaleFilter"sv; } protected: Color convert_color(Color original) override { return original.to_grayscale(); }; diff --git a/Userland/Libraries/LibGfx/Filters/InvertFilter.h b/Userland/Libraries/LibGfx/Filters/InvertFilter.h index 347a7aab50..d0b2251bb7 100644 --- a/Userland/Libraries/LibGfx/Filters/InvertFilter.h +++ b/Userland/Libraries/LibGfx/Filters/InvertFilter.h @@ -6,6 +6,7 @@ #pragma once +#include #include namespace Gfx { @@ -15,7 +16,7 @@ public: InvertFilter() = default; virtual ~InvertFilter() = default; - virtual char const* class_name() const override { return "InvertFilter"; } + virtual StringView class_name() const override { return "InvertFilter"sv; } protected: Color convert_color(Color original) override { return original.inverted(); }; diff --git a/Userland/Libraries/LibGfx/Filters/LaplacianFilter.h b/Userland/Libraries/LibGfx/Filters/LaplacianFilter.h index 0211b2daac..ce780203c4 100644 --- a/Userland/Libraries/LibGfx/Filters/LaplacianFilter.h +++ b/Userland/Libraries/LibGfx/Filters/LaplacianFilter.h @@ -7,6 +7,7 @@ #pragma once #include "GenericConvolutionFilter.h" +#include namespace Gfx { @@ -15,7 +16,7 @@ public: LaplacianFilter() = default; virtual ~LaplacianFilter() = default; - virtual const char* class_name() const override { return "LaplacianFilter"; } + virtual StringView class_name() const override { return "LaplacianFilter"sv; } }; } diff --git a/Userland/Libraries/LibGfx/Filters/SepiaFilter.h b/Userland/Libraries/LibGfx/Filters/SepiaFilter.h index ce5220c6ef..9b94a9e8e0 100644 --- a/Userland/Libraries/LibGfx/Filters/SepiaFilter.h +++ b/Userland/Libraries/LibGfx/Filters/SepiaFilter.h @@ -7,6 +7,7 @@ #pragma once #include +#include #include #include @@ -20,7 +21,7 @@ public: } virtual ~SepiaFilter() = default; - virtual char const* class_name() const override { return "SepiaFilter"; } + virtual StringView class_name() const override { return "SepiaFilter"sv; } protected: Color convert_color(Color original) override { return original.sepia(m_amount); }; diff --git a/Userland/Libraries/LibGfx/Filters/SharpenFilter.h b/Userland/Libraries/LibGfx/Filters/SharpenFilter.h index af0d6f9202..1381e02df2 100644 --- a/Userland/Libraries/LibGfx/Filters/SharpenFilter.h +++ b/Userland/Libraries/LibGfx/Filters/SharpenFilter.h @@ -7,6 +7,7 @@ #pragma once #include "GenericConvolutionFilter.h" +#include namespace Gfx { @@ -15,7 +16,7 @@ public: SharpenFilter() = default; virtual ~SharpenFilter() = default; - virtual const char* class_name() const override { return "SharpenFilter"; } + virtual StringView class_name() const override { return "SharpenFilter"sv; } }; } diff --git a/Userland/Libraries/LibGfx/Filters/SpatialGaussianBlurFilter.h b/Userland/Libraries/LibGfx/Filters/SpatialGaussianBlurFilter.h index dab4ca3d1b..50cfc73bc0 100644 --- a/Userland/Libraries/LibGfx/Filters/SpatialGaussianBlurFilter.h +++ b/Userland/Libraries/LibGfx/Filters/SpatialGaussianBlurFilter.h @@ -8,6 +8,7 @@ #include "GenericConvolutionFilter.h" #include +#include namespace Gfx { @@ -17,6 +18,6 @@ public: SpatialGaussianBlurFilter() = default; virtual ~SpatialGaussianBlurFilter() = default; - virtual const char* class_name() const override { return "SpatialGaussianBlurFilter"; } + virtual StringView class_name() const override { return "SpatialGaussianBlurFilter"sv; } }; }