diff options
Diffstat (limited to 'Libraries')
29 files changed, 35 insertions, 35 deletions
diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h index 5904107789..e4981e85d6 100644 --- a/Libraries/LibGUI/GAction.h +++ b/Libraries/LibGUI/GAction.h @@ -34,7 +34,7 @@ #include <AK/String.h> #include <AK/WeakPtr.h> #include <AK/Weakable.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGUI/GShortcut.h> #include <LibGUI/GWindow.h> diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h index 57cb41fa7e..7b4ff16c24 100644 --- a/Libraries/LibGUI/GButton.h +++ b/Libraries/LibGUI/GButton.h @@ -28,7 +28,7 @@ #include <AK/Function.h> #include <AK/String.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/StylePainter.h> #include <LibGfx/TextAlignment.h> #include <LibGUI/GAbstractButton.h> diff --git a/Libraries/LibGUI/GDragOperation.cpp b/Libraries/LibGUI/GDragOperation.cpp index a8b506f0c7..2524d202c4 100644 --- a/Libraries/LibGUI/GDragOperation.cpp +++ b/Libraries/LibGUI/GDragOperation.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGUI/GDragOperation.h> #include <LibGUI/GWindowServerConnection.h> diff --git a/Libraries/LibGUI/GFileSystemModel.cpp b/Libraries/LibGUI/GFileSystemModel.cpp index 9f349e1511..d68fdf0c81 100644 --- a/Libraries/LibGUI/GFileSystemModel.cpp +++ b/Libraries/LibGUI/GFileSystemModel.cpp @@ -27,7 +27,7 @@ #include <AK/FileSystemPath.h> #include <AK/StringBuilder.h> #include <LibCore/CDirIterator.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGUI/GFileSystemModel.h> #include <LibGUI/GPainter.h> #include <LibThread/BackgroundAction.h> diff --git a/Libraries/LibGUI/GIcon.h b/Libraries/LibGUI/GIcon.h index 6199f4c473..63e772c75b 100644 --- a/Libraries/LibGUI/GIcon.h +++ b/Libraries/LibGUI/GIcon.h @@ -27,7 +27,7 @@ #pragma once #include <AK/HashMap.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> class GIconImpl : public RefCounted<GIconImpl> { public: diff --git a/Libraries/LibGUI/GLabel.cpp b/Libraries/LibGUI/GLabel.cpp index f0f2cb087f..336b3598f6 100644 --- a/Libraries/LibGUI/GLabel.cpp +++ b/Libraries/LibGUI/GLabel.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/Palette.h> #include <LibGUI/GLabel.h> #include <LibGUI/GPainter.h> diff --git a/Libraries/LibGUI/GRadioButton.cpp b/Libraries/LibGUI/GRadioButton.cpp index 325f72a89d..eda447398c 100644 --- a/Libraries/LibGUI/GRadioButton.cpp +++ b/Libraries/LibGUI/GRadioButton.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/StylePainter.h> #include <LibGUI/GPainter.h> #include <LibGUI/GRadioButton.h> diff --git a/Libraries/LibGUI/GResizeCorner.cpp b/Libraries/LibGUI/GResizeCorner.cpp index d109fbaec9..b4e3880101 100644 --- a/Libraries/LibGUI/GResizeCorner.cpp +++ b/Libraries/LibGUI/GResizeCorner.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/Palette.h> #include <LibGUI/GPainter.h> #include <LibGUI/GResizeCorner.h> diff --git a/Libraries/LibGUI/GScrollBar.cpp b/Libraries/LibGUI/GScrollBar.cpp index 8fa8471963..415b38de7f 100644 --- a/Libraries/LibGUI/GScrollBar.cpp +++ b/Libraries/LibGUI/GScrollBar.cpp @@ -25,7 +25,7 @@ */ #include <LibGfx/CharacterBitmap.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/Palette.h> #include <LibGfx/StylePainter.h> #include <LibGUI/GPainter.h> diff --git a/Libraries/LibGUI/GVariant.cpp b/Libraries/LibGUI/GVariant.cpp index 303cbc055d..aaa39e11ca 100644 --- a/Libraries/LibGUI/GVariant.cpp +++ b/Libraries/LibGUI/GVariant.cpp @@ -396,7 +396,7 @@ String Variant::to_string() const case Type::String: return as_string(); case Type::Bitmap: - return "[GraphicsBitmap]"; + return "[Gfx::Bitmap]"; case Type::Icon: return "[GIcon]"; case Type::Color: diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/GVariant.h index 12f522b410..6ef98da39a 100644 --- a/Libraries/LibGUI/GVariant.h +++ b/Libraries/LibGUI/GVariant.h @@ -28,7 +28,7 @@ #include <AK/String.h> #include <LibGfx/Font.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGUI/GIcon.h> namespace AK { diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp index 025eaaa26f..2b0a8edbb4 100644 --- a/Libraries/LibGUI/GWidget.cpp +++ b/Libraries/LibGUI/GWidget.cpp @@ -26,7 +26,7 @@ #include <AK/Assertions.h> #include <AK/JsonObject.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/Palette.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp index 111ffbd4ad..1fb7e7e84f 100644 --- a/Libraries/LibGUI/GWindow.cpp +++ b/Libraries/LibGUI/GWindow.cpp @@ -28,7 +28,7 @@ #include <AK/JsonObject.h> #include <AK/NeverDestroyed.h> #include <AK/SharedBuffer.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> #include <LibGUI/GEvent.h> diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h index 35dd5645ec..7cf6eaa913 100644 --- a/Libraries/LibGUI/GWindow.h +++ b/Libraries/LibGUI/GWindow.h @@ -31,7 +31,7 @@ #include <AK/String.h> #include <AK/WeakPtr.h> #include <LibCore/CObject.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/Rect.h> #include <LibGUI/GWindowType.h> diff --git a/Libraries/LibGfx/GraphicsBitmap.cpp b/Libraries/LibGfx/Bitmap.cpp index d48cfa7d03..55d2cbc98d 100644 --- a/Libraries/LibGfx/GraphicsBitmap.cpp +++ b/Libraries/LibGfx/Bitmap.cpp @@ -25,7 +25,7 @@ */ #include <AK/MappedFile.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/PNGLoader.h> #include <errno.h> #include <fcntl.h> diff --git a/Libraries/LibGfx/GraphicsBitmap.h b/Libraries/LibGfx/Bitmap.h index 7c64eafd1b..7c64eafd1b 100644 --- a/Libraries/LibGfx/GraphicsBitmap.h +++ b/Libraries/LibGfx/Bitmap.h diff --git a/Libraries/LibGfx/Emoji.cpp b/Libraries/LibGfx/Emoji.cpp index bb0fc3910e..530a6716aa 100644 --- a/Libraries/LibGfx/Emoji.cpp +++ b/Libraries/LibGfx/Emoji.cpp @@ -27,7 +27,7 @@ #include <AK/HashMap.h> #include <AK/String.h> #include <LibGfx/Emoji.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> namespace Gfx { diff --git a/Libraries/LibGfx/Font.cpp b/Libraries/LibGfx/Font.cpp index d8ea312793..ddfb4705d1 100644 --- a/Libraries/LibGfx/Font.cpp +++ b/Libraries/LibGfx/Font.cpp @@ -26,7 +26,7 @@ #include "Font.h" #include "Emoji.h" -#include "GraphicsBitmap.h" +#include "Bitmap.h" #include <AK/BufferStream.h> #include <AK/MappedFile.h> #include <AK/StdLibExtras.h> diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp index 8ec1a052ee..84da808835 100644 --- a/Libraries/LibGfx/GIFLoader.cpp +++ b/Libraries/LibGfx/GIFLoader.cpp @@ -42,7 +42,7 @@ RefPtr<Gfx::Bitmap> load_gif(const StringView& path) return nullptr; auto bitmap = load_gif_impl((const u8*)mapped_file.data(), mapped_file.size()); if (bitmap) - bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters())); + bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters())); return bitmap; } @@ -50,7 +50,7 @@ RefPtr<Gfx::Bitmap> load_gif_from_memory(const u8* data, size_t length) { auto bitmap = load_gif_impl(data, length); if (bitmap) - bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height())); + bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height())); return bitmap; } diff --git a/Libraries/LibGfx/GIFLoader.h b/Libraries/LibGfx/GIFLoader.h index b18eafa0b0..5f509402a3 100644 --- a/Libraries/LibGfx/GIFLoader.h +++ b/Libraries/LibGfx/GIFLoader.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/ImageDecoder.h> namespace Gfx { diff --git a/Libraries/LibGfx/Makefile b/Libraries/LibGfx/Makefile index c7d4da3efc..96fc1a064d 100644 --- a/Libraries/LibGfx/Makefile +++ b/Libraries/LibGfx/Makefile @@ -1,18 +1,18 @@ OBJS = \ + Bitmap.o \ CharacterBitmap.o \ Color.o \ DisjointRectSet.o \ + Emoji.o \ Font.o \ - GraphicsBitmap.o \ - Painter.o \ - PNGLoader.o \ GIFLoader.o \ ImageDecoder.o \ + PNGLoader.o \ + Painter.o \ + Palette.o \ Rect.o \ StylePainter.o \ - SystemTheme.o \ - Palette.o \ - Emoji.o + SystemTheme.o LIBRARY = libgfx.a diff --git a/Libraries/LibGfx/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp index f194adde89..0b293dbac7 100644 --- a/Libraries/LibGfx/PNGLoader.cpp +++ b/Libraries/LibGfx/PNGLoader.cpp @@ -179,7 +179,7 @@ RefPtr<Gfx::Bitmap> load_png(const StringView& path) return nullptr; auto bitmap = load_png_impl((const u8*)mapped_file.data(), mapped_file.size()); if (bitmap) - bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters())); + bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters())); return bitmap; } @@ -187,7 +187,7 @@ RefPtr<Gfx::Bitmap> load_png_from_memory(const u8* data, size_t length) { auto bitmap = load_png_impl(data, length); if (bitmap) - bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height())); + bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height())); return bitmap; } diff --git a/Libraries/LibGfx/PNGLoader.h b/Libraries/LibGfx/PNGLoader.h index c5217d5276..ec2e1ec03c 100644 --- a/Libraries/LibGfx/PNGLoader.h +++ b/Libraries/LibGfx/PNGLoader.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/ImageDecoder.h> namespace Gfx { diff --git a/Libraries/LibGfx/Painter.cpp b/Libraries/LibGfx/Painter.cpp index 00c1e9d050..c6b0091bc5 100644 --- a/Libraries/LibGfx/Painter.cpp +++ b/Libraries/LibGfx/Painter.cpp @@ -27,7 +27,7 @@ #include "Painter.h" #include "Emoji.h" #include "Font.h" -#include "GraphicsBitmap.h" +#include "Bitmap.h" #include <AK/Assertions.h> #include <AK/StdLibExtras.h> #include <AK/StringBuilder.h> diff --git a/Libraries/LibGfx/StylePainter.cpp b/Libraries/LibGfx/StylePainter.cpp index db5a99a095..6d086fd325 100644 --- a/Libraries/LibGfx/StylePainter.cpp +++ b/Libraries/LibGfx/StylePainter.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/Painter.h> #include <LibGfx/Palette.h> #include <LibGfx/StylePainter.h> diff --git a/Libraries/LibHTML/CSS/StyleValue.cpp b/Libraries/LibHTML/CSS/StyleValue.cpp index 17398c8cbd..591e8bdcaa 100644 --- a/Libraries/LibHTML/CSS/StyleValue.cpp +++ b/Libraries/LibHTML/CSS/StyleValue.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/PNGLoader.h> #include <LibHTML/CSS/StyleValue.h> #include <LibHTML/DOM/Document.h> diff --git a/Libraries/LibHTML/CSS/StyleValue.h b/Libraries/LibHTML/CSS/StyleValue.h index f2a1dd76b3..b65677af0a 100644 --- a/Libraries/LibHTML/CSS/StyleValue.h +++ b/Libraries/LibHTML/CSS/StyleValue.h @@ -33,7 +33,7 @@ #include <AK/URL.h> #include <AK/WeakPtr.h> #include <LibGfx/Color.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibHTML/CSS/Length.h> #include <LibHTML/CSS/PropertyID.h> diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.h b/Libraries/LibHTML/DOM/HTMLImageElement.h index be8466f3be..7035b1706d 100644 --- a/Libraries/LibHTML/DOM/HTMLImageElement.h +++ b/Libraries/LibHTML/DOM/HTMLImageElement.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/ImageDecoder.h> #include <LibHTML/DOM/HTMLElement.h> diff --git a/Libraries/LibVT/TerminalWidget.h b/Libraries/LibVT/TerminalWidget.h index 42287df246..30cd591fb7 100644 --- a/Libraries/LibVT/TerminalWidget.h +++ b/Libraries/LibVT/TerminalWidget.h @@ -30,7 +30,7 @@ #include <LibCore/CConfigFile.h> #include <LibCore/CNotifier.h> #include <LibCore/CTimer.h> -#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Bitmap.h> #include <LibGfx/Rect.h> #include <LibGUI/GFrame.h> #include <LibVT/Terminal.h> |