RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 20:52:45 +00:00
Code Issues Activity Actions

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

Browse source
This commit is contained in:
Andreas Kling 2020-02-06 12:07:05 +01:00
parent 9ac94d393e
commit c39d44fc2e
46 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/PaintBrush/BucketTool.cpp
View file

@ -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()

2
Applications/PaintBrush/PaintableWidget.cpp
View file

@ -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>

2
Applications/PaintBrush/PickerTool.cpp
View file

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

2
Applications/PaintBrush/SprayTool.cpp
View file

@ -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>

2
Applications/QuickShow/QSWidget.cpp
View file

@ -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>

2
Demos/Fire/Fire.cpp
View file

@ -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>

2
Games/Snake/SnakeGame.cpp
View file

@ -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>

2
Libraries/LibGUI/GAction.h
View file

@ -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>

2
Libraries/LibGUI/GButton.h
View file

@ -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>

2
Libraries/LibGUI/GDragOperation.cpp
View file

@ -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>

2
Libraries/LibGUI/GFileSystemModel.cpp
View file

@ -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>

2
Libraries/LibGUI/GIcon.h
View file

@ -27,7 +27,7 @@
#pragma once
#include <AK/HashMap.h>
#include <LibGfx/GraphicsBitmap.h>
#include <LibGfx/Bitmap.h>
class GIconImpl : public RefCounted<GIconImpl> {
public:

2
Libraries/LibGUI/GLabel.cpp
View file

@ -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>

2
Libraries/LibGUI/GRadioButton.cpp
View file

@ -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>

2
Libraries/LibGUI/GResizeCorner.cpp
View file

@ -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>

2
Libraries/LibGUI/GScrollBar.cpp
View file

@ -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>

2
Libraries/LibGUI/GVariant.cpp
View file

@ -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:

2
Libraries/LibGUI/GVariant.h
View file

@ -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 {

2
Libraries/LibGUI/GWidget.cpp
View file

@ -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>

2
Libraries/LibGUI/GWindow.cpp
View file

@ -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>

2
Libraries/LibGUI/GWindow.h
View file

@ -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>

2
Libraries/LibGfx/GraphicsBitmap.cpp → Libraries/LibGfx/Bitmap.cpp
View file

@ -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>

0
Libraries/LibGfx/GraphicsBitmap.h → Libraries/LibGfx/Bitmap.h
View file

2
Libraries/LibGfx/Emoji.cpp
View file

@ -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 {

2
Libraries/LibGfx/Font.cpp
View file

@ -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>

4
Libraries/LibGfx/GIFLoader.cpp
View file

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

2
Libraries/LibGfx/GIFLoader.h
View file

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

12
Libraries/LibGfx/Makefile
View file

@ -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

4
Libraries/LibGfx/PNGLoader.cpp
View file

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

2
Libraries/LibGfx/PNGLoader.h
View file

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

2
Libraries/LibGfx/Painter.cpp
View file

@ -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>

2
Libraries/LibGfx/StylePainter.cpp
View file

@ -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>

2
Libraries/LibHTML/CSS/StyleValue.cpp
View file

@ -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>

2
Libraries/LibHTML/CSS/StyleValue.h
View file

@ -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>

2
Libraries/LibHTML/DOM/HTMLImageElement.h
View file

@ -26,7 +26,7 @@
#pragma once
#include <LibGfx/GraphicsBitmap.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h>
#include <LibHTML/DOM/HTMLElement.h>

2
Libraries/LibVT/TerminalWidget.h
View file

@ -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>

2
Servers/WindowServer/WSClientConnection.cpp
View file

@ -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>

2
Servers/WindowServer/WSClientConnection.h
View file

@ -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>

2
Servers/WindowServer/WSCompositor.h
View file

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

2
Servers/WindowServer/WSCursor.h
View file

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

2
Servers/WindowServer/WSMenu.cpp
View file

@ -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>

2
Servers/WindowServer/WSMenuBar.cpp
View file

@ -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)

2
Servers/WindowServer/WSMenuItem.cpp
View file

@ -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)

2
Servers/WindowServer/WSWindow.h
View file

@ -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>

1
Servers/WindowServer/WSWindowManager.h
View file

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

2
Servers/WindowServer/WSWindowSwitcher.cpp
View file

@ -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>