summaryrefslogtreecommitdiff
path: root/Servers
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-02-06 12:04:00 +0100
committerAndreas Kling <kling@serenityos.org>2020-02-06 12:04:00 +0100
commit9ac94d393e02c8e725d58affd03b1fd0e0c45552 (patch)
tree7152a9134e30bf1b965c6e8f9e5b8f71098da861 /Servers
parent11580babbfb1b8ae0acab2400f11d905c35642f5 (diff)
downloadserenity-9ac94d393e02c8e725d58affd03b1fd0e0c45552.zip
LibGfx: Rename from LibDraw :^)
Diffstat (limited to 'Servers')
-rw-r--r--Servers/WindowServer/Makefile2
-rw-r--r--Servers/WindowServer/WSButton.cpp6
-rw-r--r--Servers/WindowServer/WSButton.h2
-rw-r--r--Servers/WindowServer/WSClientConnection.cpp4
-rw-r--r--Servers/WindowServer/WSClientConnection.h2
-rw-r--r--Servers/WindowServer/WSCompositor.cpp6
-rw-r--r--Servers/WindowServer/WSCompositor.h4
-rw-r--r--Servers/WindowServer/WSCursor.h2
-rw-r--r--Servers/WindowServer/WSEvent.h2
-rw-r--r--Servers/WindowServer/WSMenu.cpp12
-rw-r--r--Servers/WindowServer/WSMenu.h2
-rw-r--r--Servers/WindowServer/WSMenuBar.cpp2
-rw-r--r--Servers/WindowServer/WSMenuItem.cpp2
-rw-r--r--Servers/WindowServer/WSMenuItem.h2
-rw-r--r--Servers/WindowServer/WSMenuManager.cpp6
-rw-r--r--Servers/WindowServer/WSScreen.h6
-rw-r--r--Servers/WindowServer/WSWindow.h6
-rw-r--r--Servers/WindowServer/WSWindowFrame.cpp8
-rw-r--r--Servers/WindowServer/WSWindowManager.cpp10
-rw-r--r--Servers/WindowServer/WSWindowManager.h10
-rw-r--r--Servers/WindowServer/WSWindowSwitcher.cpp6
-rw-r--r--Servers/WindowServer/WSWindowSwitcher.h2
-rw-r--r--Servers/WindowServer/main.cpp4
23 files changed, 54 insertions, 54 deletions
diff --git a/Servers/WindowServer/Makefile b/Servers/WindowServer/Makefile
index 1ba3e8ae92..8310f2f6ac 100644
--- a/Servers/WindowServer/Makefile
+++ b/Servers/WindowServer/Makefile
@@ -18,7 +18,7 @@ OBJS = \
PROGRAM = WindowServer
-LIB_DEPS = Draw Core Thread Pthread IPC
+LIB_DEPS = Gfx Core Thread Pthread IPC
*.cpp: WindowServerEndpoint.h WindowClientEndpoint.h
diff --git a/Servers/WindowServer/WSButton.cpp b/Servers/WindowServer/WSButton.cpp
index 6647fea516..fd901fd6e7 100644
--- a/Servers/WindowServer/WSButton.cpp
+++ b/Servers/WindowServer/WSButton.cpp
@@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
#include <WindowServer/WSButton.h>
#include <WindowServer/WSEvent.h>
#include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSButton.h b/Servers/WindowServer/WSButton.h
index b00c53e433..ac25210bdc 100644
--- a/Servers/WindowServer/WSButton.h
+++ b/Servers/WindowServer/WSButton.h
@@ -29,7 +29,7 @@
#include <AK/Function.h>
#include <AK/NonnullRefPtr.h>
#include <AK/Weakable.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
namespace Gfx {
class CharacterBitmap;
diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
index b4ac4482bf..d95aee9e50 100644
--- a/Servers/WindowServer/WSClientConnection.cpp
+++ b/Servers/WindowServer/WSClientConnection.cpp
@@ -25,8 +25,8 @@
*/
#include <AK/SharedBuffer.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/SystemTheme.h>
#include <WindowServer/WSClientConnection.h>
#include <WindowServer/WSClipboard.h>
#include <WindowServer/WSCompositor.h>
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index 6ada823903..6987a2921b 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 <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
#include <LibIPC/IClientConnection.h>
#include <WindowServer/WSEvent.h>
#include <WindowServer/WindowServerEndpoint.h>
diff --git a/Servers/WindowServer/WSCompositor.cpp b/Servers/WindowServer/WSCompositor.cpp
index a28b6d3f85..ef8afeaf63 100644
--- a/Servers/WindowServer/WSCompositor.cpp
+++ b/Servers/WindowServer/WSCompositor.cpp
@@ -30,9 +30,9 @@
#include "WSScreen.h"
#include "WSWindow.h"
#include "WSWindowManager.h"
-#include <LibDraw/Font.h>
-#include <LibDraw/PNGLoader.h>
-#include <LibDraw/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/PNGLoader.h>
+#include <LibGfx/Painter.h>
#include <LibThread/BackgroundAction.h>
// #define COMPOSITOR_DEBUG
diff --git a/Servers/WindowServer/WSCompositor.h b/Servers/WindowServer/WSCompositor.h
index 3202855802..a8ab9dd9ae 100644
--- a/Servers/WindowServer/WSCompositor.h
+++ b/Servers/WindowServer/WSCompositor.h
@@ -30,8 +30,8 @@
#include <AK/RefPtr.h>
#include <LibCore/CObject.h>
#include <LibCore/CTimer.h>
-#include <LibDraw/DisjointRectSet.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/DisjointRectSet.h>
+#include <LibGfx/GraphicsBitmap.h>
namespace Gfx {
class Painter;
diff --git a/Servers/WindowServer/WSCursor.h b/Servers/WindowServer/WSCursor.h
index 0e60324d07..6db202ddd6 100644
--- a/Servers/WindowServer/WSCursor.h
+++ b/Servers/WindowServer/WSCursor.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
enum class WSStandardCursor {
None = 0,
diff --git a/Servers/WindowServer/WSEvent.h b/Servers/WindowServer/WSEvent.h
index ebb5e53529..f909dc5cc9 100644
--- a/Servers/WindowServer/WSEvent.h
+++ b/Servers/WindowServer/WSEvent.h
@@ -29,7 +29,7 @@
#include <AK/String.h>
#include <Kernel/KeyCode.h>
#include <LibCore/CEvent.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
#include <WindowServer/WSCursor.h>
#include <WindowServer/WSWindowType.h>
diff --git a/Servers/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp
index 805e0ad302..fb1b1444bb 100644
--- a/Servers/WindowServer/WSMenu.cpp
+++ b/Servers/WindowServer/WSMenu.cpp
@@ -33,12 +33,12 @@
#include "WSScreen.h"
#include "WSWindow.h"
#include "WSWindowManager.h"
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
-#include <LibDraw/Triangle.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
+#include <LibGfx/Triangle.h>
#include <WindowServer/WSClientConnection.h>
#include <WindowServer/WindowClientEndpoint.h>
diff --git a/Servers/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h
index a8f501651d..2a0f615bbc 100644
--- a/Servers/WindowServer/WSMenu.h
+++ b/Servers/WindowServer/WSMenu.h
@@ -30,7 +30,7 @@
#include <AK/String.h>
#include <AK/WeakPtr.h>
#include <LibCore/CObject.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
#include <WindowServer/WSCursor.h>
#include <WindowServer/WSMenuItem.h>
#include <WindowServer/WSWindow.h>
diff --git a/Servers/WindowServer/WSMenuBar.cpp b/Servers/WindowServer/WSMenuBar.cpp
index 0d1ada276c..f4e5a65ce3 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 <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
WSMenuBar::WSMenuBar(WSClientConnection& client, int menubar_id)
: m_client(client)
diff --git a/Servers/WindowServer/WSMenuItem.cpp b/Servers/WindowServer/WSMenuItem.cpp
index 7af94f1604..e2daa4e2dd 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 <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.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/WSMenuItem.h b/Servers/WindowServer/WSMenuItem.h
index 5c049d63c9..6547fdb936 100644
--- a/Servers/WindowServer/WSMenuItem.h
+++ b/Servers/WindowServer/WSMenuItem.h
@@ -28,7 +28,7 @@
#include <AK/Function.h>
#include <AK/String.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
namespace Gfx {
class Bitmap;
diff --git a/Servers/WindowServer/WSMenuManager.cpp b/Servers/WindowServer/WSMenuManager.cpp
index 7bc2f89860..0250fb06c4 100644
--- a/Servers/WindowServer/WSMenuManager.cpp
+++ b/Servers/WindowServer/WSMenuManager.cpp
@@ -27,9 +27,9 @@
#include <AK/FileSystemPath.h>
#include <AK/QuickSort.h>
#include <LibCore/CDirIterator.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/PNGLoader.h>
-#include <LibDraw/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/PNGLoader.h>
+#include <LibGfx/Painter.h>
#include <WindowServer/WSMenuManager.h>
#include <WindowServer/WSScreen.h>
#include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSScreen.h b/Servers/WindowServer/WSScreen.h
index 7fc02b982c..34b6234380 100644
--- a/Servers/WindowServer/WSScreen.h
+++ b/Servers/WindowServer/WSScreen.h
@@ -27,9 +27,9 @@
#pragma once
#include <Kernel/KeyCode.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/Rect.h>
-#include <LibDraw/Size.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/Rect.h>
+#include <LibGfx/Size.h>
struct MousePacket;
diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
index 8bc9f3cb52..b8935f0627 100644
--- a/Servers/WindowServer/WSWindow.h
+++ b/Servers/WindowServer/WSWindow.h
@@ -29,9 +29,9 @@
#include <AK/InlineLinkedList.h>
#include <AK/String.h>
#include <LibCore/CObject.h>
-#include <LibDraw/DisjointRectSet.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/DisjointRectSet.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Rect.h>
#include <WindowServer/WSWindowFrame.h>
#include <WindowServer/WSWindowType.h>
diff --git a/Servers/WindowServer/WSWindowFrame.cpp b/Servers/WindowServer/WSWindowFrame.cpp
index 80c1f0a28c..998f4d863f 100644
--- a/Servers/WindowServer/WSWindowFrame.cpp
+++ b/Servers/WindowServer/WSWindowFrame.cpp
@@ -24,10 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
#include <WindowServer/WSButton.h>
#include <WindowServer/WSCompositor.h>
#include <WindowServer/WSEvent.h>
diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp
index 4a76de3027..daa6f873d6 100644
--- a/Servers/WindowServer/WSWindowManager.cpp
+++ b/Servers/WindowServer/WSWindowManager.cpp
@@ -35,11 +35,11 @@
#include <AK/LogStream.h>
#include <AK/StdLibExtras.h>
#include <AK/Vector.h>
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
+#include <LibGfx/SystemTheme.h>
#include <WindowServer/WSButton.h>
#include <WindowServer/WSClientConnection.h>
#include <WindowServer/WSCursor.h>
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index 63e59b128d..7077477097 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -32,11 +32,11 @@
#include <AK/WeakPtr.h>
#include <LibCore/CConfigFile.h>
#include <LibCore/CElapsedTimer.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/DisjointRectSet.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/DisjointRectSet.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/Rect.h>
#include <WindowServer/WSCursor.h>
#include <WindowServer/WSEvent.h>
#include <WindowServer/WSMenuBar.h>
diff --git a/Servers/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp
index f7e8b2b8b9..34d325d5a9 100644
--- a/Servers/WindowServer/WSWindowSwitcher.cpp
+++ b/Servers/WindowServer/WSWindowSwitcher.cpp
@@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibDraw/Font.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/StylePainter.h>
#include <WindowServer/WSEvent.h>
#include <WindowServer/WSScreen.h>
#include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSWindowSwitcher.h b/Servers/WindowServer/WSWindowSwitcher.h
index 192640b127..a82011d612 100644
--- a/Servers/WindowServer/WSWindowSwitcher.h
+++ b/Servers/WindowServer/WSWindowSwitcher.h
@@ -29,7 +29,7 @@
#include <AK/Vector.h>
#include <AK/WeakPtr.h>
#include <LibCore/CObject.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
namespace Gfx {
class Painter;
diff --git a/Servers/WindowServer/main.cpp b/Servers/WindowServer/main.cpp
index 4a0a4f5ab9..e9187b7917 100644
--- a/Servers/WindowServer/main.cpp
+++ b/Servers/WindowServer/main.cpp
@@ -25,8 +25,8 @@
*/
#include <LibCore/CConfigFile.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/SystemTheme.h>
#include <WindowServer/WSCompositor.h>
#include <WindowServer/WSEventLoop.h>
#include <WindowServer/WSScreen.h>