LibGfx: Rename GraphicsBitmap.{cpp,h} => Bitmap.{cpp,h}

Applications/PaintBrush/BucketTool.cpp

@@ -29,7 +29,7 @@
 #include <AK/Queue.h>
 #include <AK/SinglyLinkedList.h>
 #include <LibGUI/GPainter.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <stdio.h>
 
 BucketTool::BucketTool()

Applications/PaintBrush/PaintableWidget.cpp

@@ -26,7 +26,7 @@
 
 #include "PaintableWidget.h"
 #include "Tool.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 

Applications/PaintBrush/PickerTool.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "PickerTool.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 PickerTool::PickerTool()
 {

Applications/PaintBrush/SprayTool.cpp

@@ -31,7 +31,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <stdio.h>
 #include <LibM/math.h>
 

Applications/QuickShow/QSWidget.cpp

@@ -26,7 +26,7 @@
 
 #include "QSWidget.h"
 #include <AK/URL.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGUI/GMessageBox.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWindow.h>

Demos/Fire/Fire.cpp

@@ -42,7 +42,7 @@
  *  [ ] handle fire bitmap edges better
 */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GLabel.h>

Games/Snake/SnakeGame.cpp

@@ -27,7 +27,7 @@
 #include "SnakeGame.h"
 #include <LibGUI/GFontDatabase.h>
 #include <LibGUI/GPainter.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <stdlib.h>
 #include <time.h>
 

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>
 

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>

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>
 

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>

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:

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>

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>

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>

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>

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:

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 {

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>

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>

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>
 

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>

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 {
 

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>

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;
 }
 

Libraries/LibGfx/GIFLoader.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {

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 \
+    SystemTheme.o
-    Palette.o \
-    Emoji.o
 
 LIBRARY = libgfx.a
 

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;
 }
 

Libraries/LibGfx/PNGLoader.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {

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>

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>

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>

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>
 

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>
 

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>

Servers/WindowServer/WSClientConnection.cpp

@@ -25,7 +25,7 @@
  */
 
 #include <AK/SharedBuffer.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/SystemTheme.h>
 #include <WindowServer/WSClientConnection.h>
 #include <WindowServer/WSClipboard.h>

Servers/WindowServer/WSClientConnection.h

@@ -31,7 +31,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibIPC/IClientConnection.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WindowServerEndpoint.h>

Servers/WindowServer/WSCompositor.h

@@ -31,7 +31,7 @@
 #include <LibCore/CObject.h>
 #include <LibCore/CTimer.h>
 #include <LibGfx/DisjointRectSet.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 namespace Gfx {
 class Painter;

Servers/WindowServer/WSCursor.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 enum class WSStandardCursor {
     None = 0,

Servers/WindowServer/WSMenu.cpp

@@ -35,7 +35,7 @@
 #include "WSWindowManager.h"
 #include <LibGfx/CharacterBitmap.h>
 #include <LibGfx/Font.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/StylePainter.h>
 #include <LibGfx/Triangle.h>

Servers/WindowServer/WSMenuBar.cpp

@@ -27,7 +27,7 @@
 #include "WSMenuBar.h"
 #include "WSMenu.h"
 #include "WSMenuItem.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 WSMenuBar::WSMenuBar(WSClientConnection& client, int menubar_id)
     : m_client(client)

Servers/WindowServer/WSMenuItem.cpp

@@ -28,7 +28,7 @@
 #include "WSClientConnection.h"
 #include "WSMenu.h"
 #include "WSWindowManager.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 WSMenuItem::WSMenuItem(WSMenu& menu, unsigned identifier, const String& text, const String& shortcut_text, bool enabled, bool checkable, bool checked, const Gfx::Bitmap* icon)
     : m_menu(menu)

Servers/WindowServer/WSWindow.h

@@ -30,7 +30,7 @@
 #include <AK/String.h>
 #include <LibCore/CObject.h>
 #include <LibGfx/DisjointRectSet.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Rect.h>
 #include <WindowServer/WSWindowFrame.h>
 #include <WindowServer/WSWindowType.h>

Servers/WindowServer/WSWindowManager.h

@@ -51,7 +51,6 @@ class WSClientWantsToPaintMessage;
 class WSWindow;
 class WSClientConnection;
 class WSWindowSwitcher;
-class GraphicsBitmap;
 class WSButton;
 
 enum class ResizeDirection {

Servers/WindowServer/WSWindowSwitcher.cpp

@@ -25,7 +25,7 @@
  */
 
 #include <LibGfx/Font.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/StylePainter.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSScreen.h>