summaryrefslogtreecommitdiff
path: root/Servers/WindowServer
diff options
context:
space:
mode:
Diffstat (limited to 'Servers/WindowServer')
-rw-r--r--Servers/WindowServer/WSClientConnection.cpp2
-rw-r--r--Servers/WindowServer/WSClientConnection.h2
-rw-r--r--Servers/WindowServer/WSCompositor.h2
-rw-r--r--Servers/WindowServer/WSCursor.h2
-rw-r--r--Servers/WindowServer/WSMenu.cpp2
-rw-r--r--Servers/WindowServer/WSMenuBar.cpp2
-rw-r--r--Servers/WindowServer/WSMenuItem.cpp2
-rw-r--r--Servers/WindowServer/WSWindow.h2
-rw-r--r--Servers/WindowServer/WSWindowManager.h1
-rw-r--r--Servers/WindowServer/WSWindowSwitcher.cpp2
10 files changed, 9 insertions, 10 deletions
diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
index d95aee9e50..8ac8598f01 100644
--- a/Servers/WindowServer/WSClientConnection.cpp
+++ b/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>
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index 6987a2921b..7d8a809228 100644
--- a/Servers/WindowServer/WSClientConnection.h
+++ b/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>
diff --git a/Servers/WindowServer/WSCompositor.h b/Servers/WindowServer/WSCompositor.h
index a8ab9dd9ae..7c113d84a7 100644
--- a/Servers/WindowServer/WSCompositor.h
+++ b/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;
diff --git a/Servers/WindowServer/WSCursor.h b/Servers/WindowServer/WSCursor.h
index 6db202ddd6..b1d8456111 100644
--- a/Servers/WindowServer/WSCursor.h
+++ b/Servers/WindowServer/WSCursor.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
enum class WSStandardCursor {
None = 0,
diff --git a/Servers/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp
index fb1b1444bb..f5531367c9 100644
--- a/Servers/WindowServer/WSMenu.cpp
+++ b/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>
diff --git a/Servers/WindowServer/WSMenuBar.cpp b/Servers/WindowServer/WSMenuBar.cpp
index f4e5a65ce3..8c5bcebeab 100644
--- a/Servers/WindowServer/WSMenuBar.cpp
+++ b/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)
diff --git a/Servers/WindowServer/WSMenuItem.cpp b/Servers/WindowServer/WSMenuItem.cpp
index e2daa4e2dd..27bd38af52 100644
--- a/Servers/WindowServer/WSMenuItem.cpp
+++ b/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)
diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
index b8935f0627..a8499be0ca 100644
--- a/Servers/WindowServer/WSWindow.h
+++ b/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>
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index 7077477097..74bf3285e2 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -51,7 +51,6 @@ class WSClientWantsToPaintMessage;
class WSWindow;
class WSClientConnection;
class WSWindowSwitcher;
-class GraphicsBitmap;
class WSButton;
enum class ResizeDirection {
diff --git a/Servers/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp
index 34d325d5a9..8e622ee230 100644
--- a/Servers/WindowServer/WSWindowSwitcher.cpp
+++ b/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>