From 9ac94d393e02c8e725d58affd03b1fd0e0c45552 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 6 Feb 2020 12:04:00 +0100 Subject: [PATCH] LibGfx: Rename from LibDraw :^) --- Applications/About/Makefile | 2 +- Applications/Browser/Makefile | 2 +- Applications/Calculator/Makefile | 2 +- Applications/Calculator/main.cpp | 2 +- Applications/ChanViewer/Makefile | 2 +- Applications/ChanViewer/main.cpp | 2 +- Applications/DisplayProperties/DisplayProperties.cpp | 2 +- Applications/DisplayProperties/DisplayProperties.h | 4 ++-- Applications/DisplayProperties/Makefile | 2 +- Applications/DisplayProperties/main.cpp | 2 +- Applications/FileManager/Makefile | 2 +- Applications/FileManager/main.cpp | 2 +- Applications/FontEditor/GlyphMapWidget.cpp | 2 +- Applications/FontEditor/Makefile | 2 +- Applications/FontEditor/main.cpp | 2 +- Applications/Help/Makefile | 2 +- Applications/Help/ManualModel.cpp | 2 +- Applications/Help/main.cpp | 2 +- Applications/HexEditor/HexEditor.cpp | 2 +- Applications/HexEditor/HexEditor.h | 2 +- Applications/HexEditor/HexEditorWidget.cpp | 2 +- Applications/HexEditor/Makefile | 2 +- Applications/HexEditor/main.cpp | 2 +- Applications/IRCClient/IRCAppWindow.cpp | 2 +- Applications/IRCClient/IRCLogBuffer.h | 2 +- Applications/IRCClient/Makefile | 2 +- Applications/PaintBrush/BucketTool.cpp | 2 +- Applications/PaintBrush/EllipseTool.cpp | 2 +- Applications/PaintBrush/EllipseTool.h | 2 +- Applications/PaintBrush/EraseTool.h | 2 +- Applications/PaintBrush/LineTool.h | 2 +- Applications/PaintBrush/Makefile | 2 +- Applications/PaintBrush/PaintableWidget.cpp | 4 ++-- Applications/PaintBrush/PenTool.h | 2 +- Applications/PaintBrush/PickerTool.cpp | 2 +- Applications/PaintBrush/RectangleTool.cpp | 2 +- Applications/PaintBrush/RectangleTool.h | 2 +- Applications/PaintBrush/SprayTool.cpp | 2 +- Applications/PaintBrush/ToolboxWidget.cpp | 2 +- Applications/PaintBrush/main.cpp | 2 +- Applications/Piano/Makefile | 2 +- Applications/Piano/Music.h | 2 +- Applications/Piano/main.cpp | 2 +- Applications/QuickShow/Makefile | 2 +- Applications/QuickShow/QSWidget.cpp | 2 +- Applications/QuickShow/main.cpp | 2 +- Applications/SoundPlayer/Makefile | 2 +- Applications/SoundPlayer/main.cpp | 2 +- Applications/SystemDialog/Makefile | 2 +- Applications/SystemMonitor/Makefile | 2 +- Applications/SystemMonitor/MemoryStatsWidget.cpp | 2 +- Applications/SystemMonitor/main.cpp | 2 +- Applications/Taskbar/Makefile | 2 +- Applications/Taskbar/WindowList.h | 2 +- Applications/Terminal/Makefile | 2 +- Applications/Terminal/main.cpp | 2 +- Applications/TextEditor/Makefile | 2 +- Applications/TextEditor/TextEditorWidget.cpp | 2 +- Applications/TextEditor/main.cpp | 2 +- Applications/Welcome/Makefile | 2 +- Applications/Welcome/TextWidget.cpp | 2 +- Applications/Welcome/TextWidget.h | 2 +- Applications/Welcome/main.cpp | 2 +- Demos/Fire/Fire.cpp | 4 ++-- Demos/Fire/Makefile | 2 +- Demos/HelloWorld/Makefile | 2 +- Demos/HelloWorld2/Makefile | 2 +- Demos/WidgetGallery/Makefile | 2 +- DevTools/HackStudio/CursorTool.h | 2 +- DevTools/HackStudio/Makefile | 2 +- DevTools/IPCCompiler/main.cpp | 4 ++-- DevTools/Inspector/Makefile | 2 +- DevTools/Inspector/RemoteObjectGraphModel.cpp | 2 +- DevTools/ProfileViewer/Makefile | 2 +- DevTools/VisualBuilder/Makefile | 2 +- DevTools/VisualBuilder/VBForm.cpp | 2 +- DevTools/VisualBuilder/VBWidget.h | 2 +- DevTools/VisualBuilder/VBWidgetPropertyModel.cpp | 2 +- DevTools/VisualBuilder/main.cpp | 2 +- Games/Minesweeper/Makefile | 2 +- Games/Minesweeper/main.cpp | 2 +- Games/Snake/Makefile | 2 +- Games/Snake/SnakeGame.cpp | 2 +- Games/Snake/main.cpp | 2 +- Libraries/LibCore/CConfigFile.h | 2 +- Libraries/LibGUI/GAbstractButton.cpp | 2 +- Libraries/LibGUI/GAbstractButton.h | 2 +- Libraries/LibGUI/GAbstractTableView.cpp | 2 +- Libraries/LibGUI/GAction.h | 2 +- Libraries/LibGUI/GApplication.cpp | 2 +- Libraries/LibGUI/GApplication.h | 2 +- Libraries/LibGUI/GButton.cpp | 2 +- Libraries/LibGUI/GButton.h | 6 +++--- Libraries/LibGUI/GCheckBox.cpp | 6 +++--- Libraries/LibGUI/GColumnsView.cpp | 2 +- Libraries/LibGUI/GDesktop.h | 2 +- Libraries/LibGUI/GDragOperation.cpp | 2 +- Libraries/LibGUI/GEvent.h | 4 ++-- Libraries/LibGUI/GFilePicker.cpp | 2 +- Libraries/LibGUI/GFileSystemModel.cpp | 2 +- Libraries/LibGUI/GFontDatabase.cpp | 2 +- Libraries/LibGUI/GFrame.cpp | 2 +- Libraries/LibGUI/GFrame.h | 2 +- Libraries/LibGUI/GGroupBox.cpp | 4 ++-- Libraries/LibGUI/GIcon.h | 2 +- Libraries/LibGUI/GItemView.cpp | 2 +- Libraries/LibGUI/GLabel.cpp | 4 ++-- Libraries/LibGUI/GLabel.h | 2 +- Libraries/LibGUI/GListView.cpp | 2 +- Libraries/LibGUI/GModel.h | 2 +- Libraries/LibGUI/GPainter.h | 2 +- Libraries/LibGUI/GRadioButton.cpp | 4 ++-- Libraries/LibGUI/GResizeCorner.cpp | 4 ++-- Libraries/LibGUI/GScrollBar.cpp | 8 ++++---- Libraries/LibGUI/GSlider.cpp | 2 +- Libraries/LibGUI/GSplitter.cpp | 2 +- Libraries/LibGUI/GStatusBar.cpp | 2 +- Libraries/LibGUI/GTabWidget.cpp | 4 ++-- Libraries/LibGUI/GTableView.cpp | 2 +- Libraries/LibGUI/GTextDocument.h | 4 ++-- Libraries/LibGUI/GTextEditor.cpp | 2 +- Libraries/LibGUI/GTextEditor.h | 2 +- Libraries/LibGUI/GToolBar.cpp | 2 +- Libraries/LibGUI/GTreeView.cpp | 2 +- Libraries/LibGUI/GVariant.h | 4 ++-- Libraries/LibGUI/GWidget.cpp | 4 ++-- Libraries/LibGUI/GWidget.h | 12 ++++++------ Libraries/LibGUI/GWindow.cpp | 2 +- Libraries/LibGUI/GWindow.h | 4 ++-- Libraries/LibGUI/GWindowServerConnection.cpp | 4 ++-- Libraries/{LibDraw => LibGfx}/CharacterBitmap.cpp | 0 Libraries/{LibDraw => LibGfx}/CharacterBitmap.h | 0 Libraries/{LibDraw => LibGfx}/Color.cpp | 4 ++-- Libraries/{LibDraw => LibGfx}/Color.h | 0 Libraries/{LibDraw => LibGfx}/DisjointRectSet.cpp | 2 +- Libraries/{LibDraw => LibGfx}/DisjointRectSet.h | 2 +- Libraries/{LibDraw => LibGfx}/Emoji.cpp | 4 ++-- Libraries/{LibDraw => LibGfx}/Emoji.h | 0 Libraries/{LibDraw => LibGfx}/FloatPoint.h | 2 +- Libraries/{LibDraw => LibGfx}/FloatRect.h | 10 +++++----- Libraries/{LibDraw => LibGfx}/FloatSize.h | 2 +- Libraries/{LibDraw => LibGfx}/Font.cpp | 0 Libraries/{LibDraw => LibGfx}/Font.h | 2 +- Libraries/{LibDraw => LibGfx}/GIFLoader.cpp | 2 +- Libraries/{LibDraw => LibGfx}/GIFLoader.h | 4 ++-- Libraries/{LibDraw => LibGfx}/GraphicsBitmap.cpp | 4 ++-- Libraries/{LibDraw => LibGfx}/GraphicsBitmap.h | 0 Libraries/{LibDraw => LibGfx}/ImageDecoder.cpp | 4 ++-- Libraries/{LibDraw => LibGfx}/ImageDecoder.h | 2 +- Libraries/{LibDraw => LibGfx}/Makefile | 6 +++--- Libraries/{LibDraw => LibGfx}/Orientation.h | 0 Libraries/{LibDraw => LibGfx}/PNGLoader.cpp | 2 +- Libraries/{LibDraw => LibGfx}/PNGLoader.h | 4 ++-- Libraries/{LibDraw => LibGfx}/Painter.cpp | 2 +- Libraries/{LibDraw => LibGfx}/Painter.h | 4 ++-- Libraries/{LibDraw => LibGfx}/Palette.cpp | 2 +- Libraries/{LibDraw => LibGfx}/Palette.h | 2 +- Libraries/{LibDraw => LibGfx}/Point.h | 2 +- Libraries/{LibDraw => LibGfx}/Rect.cpp | 0 Libraries/{LibDraw => LibGfx}/Rect.h | 8 ++++---- Libraries/{LibDraw => LibGfx}/Size.h | 2 +- Libraries/{LibDraw => LibGfx}/StylePainter.cpp | 8 ++++---- Libraries/{LibDraw => LibGfx}/StylePainter.h | 2 +- Libraries/{LibDraw => LibGfx}/SystemTheme.cpp | 2 +- Libraries/{LibDraw => LibGfx}/SystemTheme.h | 2 +- Libraries/{LibDraw => LibGfx}/TextAlignment.h | 0 Libraries/{LibDraw => LibGfx}/TextElision.h | 0 Libraries/{LibDraw => LibGfx}/Triangle.h | 2 +- Libraries/LibHTML/CSS/StyleProperties.h | 2 +- Libraries/LibHTML/CSS/StyleValue.cpp | 4 ++-- Libraries/LibHTML/CSS/StyleValue.h | 4 ++-- Libraries/LibHTML/DOM/HTMLImageElement.cpp | 2 +- Libraries/LibHTML/DOM/HTMLImageElement.h | 4 ++-- Libraries/LibHTML/FontCache.cpp | 2 +- Libraries/LibHTML/Frame.h | 4 ++-- Libraries/LibHTML/HtmlView.cpp | 2 +- Libraries/LibHTML/Layout/BoxModelMetrics.h | 2 +- Libraries/LibHTML/Layout/LayoutBox.h | 2 +- Libraries/LibHTML/Layout/LayoutImage.cpp | 4 ++-- Libraries/LibHTML/Layout/LayoutNode.h | 4 ++-- Libraries/LibHTML/Layout/LayoutText.cpp | 2 +- Libraries/LibHTML/Layout/LayoutWidget.cpp | 4 ++-- Libraries/LibHTML/Layout/LineBoxFragment.h | 2 +- Libraries/LibHTML/RenderingContext.h | 4 ++-- Libraries/LibVT/TerminalWidget.cpp | 2 +- Libraries/LibVT/TerminalWidget.h | 4 ++-- MenuApplets/Audio/Makefile | 2 +- MenuApplets/CPUGraph/Makefile | 2 +- MenuApplets/CPUGraph/main.cpp | 2 +- MenuApplets/Clock/Makefile | 2 +- MenuApplets/Clock/main.cpp | 2 +- Servers/WindowServer/Makefile | 2 +- Servers/WindowServer/WSButton.cpp | 6 +++--- Servers/WindowServer/WSButton.h | 2 +- Servers/WindowServer/WSClientConnection.cpp | 4 ++-- Servers/WindowServer/WSClientConnection.h | 2 +- Servers/WindowServer/WSCompositor.cpp | 6 +++--- Servers/WindowServer/WSCompositor.h | 4 ++-- Servers/WindowServer/WSCursor.h | 2 +- Servers/WindowServer/WSEvent.h | 2 +- Servers/WindowServer/WSMenu.cpp | 12 ++++++------ Servers/WindowServer/WSMenu.h | 2 +- Servers/WindowServer/WSMenuBar.cpp | 2 +- Servers/WindowServer/WSMenuItem.cpp | 2 +- Servers/WindowServer/WSMenuItem.h | 2 +- Servers/WindowServer/WSMenuManager.cpp | 6 +++--- Servers/WindowServer/WSScreen.h | 6 +++--- Servers/WindowServer/WSWindow.h | 6 +++--- Servers/WindowServer/WSWindowFrame.cpp | 8 ++++---- Servers/WindowServer/WSWindowManager.cpp | 10 +++++----- Servers/WindowServer/WSWindowManager.h | 10 +++++----- Servers/WindowServer/WSWindowSwitcher.cpp | 6 +++--- Servers/WindowServer/WSWindowSwitcher.h | 2 +- Servers/WindowServer/main.cpp | 4 ++-- Userland/Makefile | 2 +- 215 files changed, 291 insertions(+), 291 deletions(-) rename Libraries/{LibDraw => LibGfx}/CharacterBitmap.cpp (100%) rename Libraries/{LibDraw => LibGfx}/CharacterBitmap.h (100%) rename Libraries/{LibDraw => LibGfx}/Color.cpp (99%) rename Libraries/{LibDraw => LibGfx}/Color.h (100%) rename Libraries/{LibDraw => LibGfx}/DisjointRectSet.cpp (98%) rename Libraries/{LibDraw => LibGfx}/DisjointRectSet.h (98%) rename Libraries/{LibDraw => LibGfx}/Emoji.cpp (96%) rename Libraries/{LibDraw => LibGfx}/Emoji.h (100%) rename Libraries/{LibDraw => LibGfx}/FloatPoint.h (99%) rename Libraries/{LibDraw => LibGfx}/FloatRect.h (98%) rename Libraries/{LibDraw => LibGfx}/FloatSize.h (99%) rename Libraries/{LibDraw => LibGfx}/Font.cpp (100%) rename Libraries/{LibDraw => LibGfx}/Font.h (99%) rename Libraries/{LibDraw => LibGfx}/GIFLoader.cpp (99%) rename Libraries/{LibDraw => LibGfx}/GIFLoader.h (96%) rename Libraries/{LibDraw => LibGfx}/GraphicsBitmap.cpp (98%) rename Libraries/{LibDraw => LibGfx}/GraphicsBitmap.h (100%) rename Libraries/{LibDraw => LibGfx}/ImageDecoder.cpp (96%) rename Libraries/{LibDraw => LibGfx}/ImageDecoder.h (98%) rename Libraries/{LibDraw => LibGfx}/Makefile (72%) rename Libraries/{LibDraw => LibGfx}/Orientation.h (100%) rename Libraries/{LibDraw => LibGfx}/PNGLoader.cpp (99%) rename Libraries/{LibDraw => LibGfx}/PNGLoader.h (96%) rename Libraries/{LibDraw => LibGfx}/Painter.cpp (99%) rename Libraries/{LibDraw => LibGfx}/Painter.h (98%) rename Libraries/{LibDraw => LibGfx}/Palette.cpp (98%) rename Libraries/{LibDraw => LibGfx}/Palette.h (99%) rename Libraries/{LibDraw => LibGfx}/Point.h (99%) rename Libraries/{LibDraw => LibGfx}/Rect.cpp (100%) rename Libraries/{LibDraw => LibGfx}/Rect.h (98%) rename Libraries/{LibDraw => LibGfx}/Size.h (99%) rename Libraries/{LibDraw => LibGfx}/StylePainter.cpp (99%) rename Libraries/{LibDraw => LibGfx}/StylePainter.h (98%) rename Libraries/{LibDraw => LibGfx}/SystemTheme.cpp (99%) rename Libraries/{LibDraw => LibGfx}/SystemTheme.h (98%) rename Libraries/{LibDraw => LibGfx}/TextAlignment.h (100%) rename Libraries/{LibDraw => LibGfx}/TextElision.h (100%) rename Libraries/{LibDraw => LibGfx}/Triangle.h (99%) diff --git a/Applications/About/Makefile b/Applications/About/Makefile index cb2e9db167..928c8c530c 100755 --- a/Applications/About/Makefile +++ b/Applications/About/Makefile @@ -3,7 +3,7 @@ OBJS = \ PROGRAM = About -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core DEFINES += -DGIT_COMMIT=\"`git rev-parse --short HEAD`\" -DGIT_BRANCH=\"`git rev-parse --abbrev-ref HEAD`\" -DGIT_CHANGES=\"`git diff-index --quiet HEAD -- && echo "tracked"|| echo "untracked"`\" diff --git a/Applications/Browser/Makefile b/Applications/Browser/Makefile index 9e9a6d9485..12f28553cb 100755 --- a/Applications/Browser/Makefile +++ b/Applications/Browser/Makefile @@ -4,7 +4,7 @@ OBJS = \ PROGRAM = Browser -LIB_DEPS = GUI HTML Draw IPC Protocol Core +LIB_DEPS = GUI HTML Gfx IPC Protocol Core main.cpp: ../../Libraries/LibHTML/CSS/PropertyID.h ../../Libraries/LibHTML/CSS/PropertyID.h: diff --git a/Applications/Calculator/Makefile b/Applications/Calculator/Makefile index 59827aed5e..05ab47eb2d 100644 --- a/Applications/Calculator/Makefile +++ b/Applications/Calculator/Makefile @@ -6,6 +6,6 @@ OBJS = \ PROGRAM = Calculator -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core include ../../Makefile.common diff --git a/Applications/Calculator/main.cpp b/Applications/Calculator/main.cpp index 7f19003c8c..f12d416a8a 100644 --- a/Applications/Calculator/main.cpp +++ b/Applications/Calculator/main.cpp @@ -25,7 +25,7 @@ */ #include "CalculatorWidget.h" -#include +#include #include #include #include diff --git a/Applications/ChanViewer/Makefile b/Applications/ChanViewer/Makefile index 45affe18ea..9b2eefcc28 100755 --- a/Applications/ChanViewer/Makefile +++ b/Applications/ChanViewer/Makefile @@ -5,6 +5,6 @@ OBJS = \ PROGRAM = ChanViewer -LIB_DEPS = GUI Draw IPC Thread Pthread Core +LIB_DEPS = GUI Gfx IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp index b8ded65910..3013fe1d0f 100644 --- a/Applications/ChanViewer/main.cpp +++ b/Applications/ChanViewer/main.cpp @@ -26,7 +26,7 @@ #include "BoardListModel.h" #include "ThreadCatalogModel.h" -#include +#include #include #include #include diff --git a/Applications/DisplayProperties/DisplayProperties.cpp b/Applications/DisplayProperties/DisplayProperties.cpp index 57d5639d71..1a10013a95 100644 --- a/Applications/DisplayProperties/DisplayProperties.cpp +++ b/Applications/DisplayProperties/DisplayProperties.cpp @@ -28,7 +28,7 @@ #include "ItemListModel.h" #include #include -#include +#include #include #include #include diff --git a/Applications/DisplayProperties/DisplayProperties.h b/Applications/DisplayProperties/DisplayProperties.h index 0b678ee7d3..3f1d0649a6 100644 --- a/Applications/DisplayProperties/DisplayProperties.h +++ b/Applications/DisplayProperties/DisplayProperties.h @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/Applications/DisplayProperties/Makefile b/Applications/DisplayProperties/Makefile index ff79479d91..1492cbda6c 100644 --- a/Applications/DisplayProperties/Makefile +++ b/Applications/DisplayProperties/Makefile @@ -4,6 +4,6 @@ OBJS = \ PROGRAM = DisplayProperties -LIB_DEPS = GUI Draw IPC Thread Pthread Core +LIB_DEPS = GUI Gfx IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/DisplayProperties/main.cpp b/Applications/DisplayProperties/main.cpp index 3dea4c6424..cb765bbbd2 100644 --- a/Applications/DisplayProperties/main.cpp +++ b/Applications/DisplayProperties/main.cpp @@ -25,7 +25,7 @@ */ #include "DisplayProperties.h" -#include +#include #include #include #include diff --git a/Applications/FileManager/Makefile b/Applications/FileManager/Makefile index aeb46376d3..0b4fd8793d 100644 --- a/Applications/FileManager/Makefile +++ b/Applications/FileManager/Makefile @@ -6,6 +6,6 @@ OBJS = \ PROGRAM = FileManager -LIB_DEPS = GUI Draw IPC Thread Pthread Core +LIB_DEPS = GUI Gfx IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index 328ad1df1f..15758bf6a2 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Applications/FontEditor/GlyphMapWidget.cpp b/Applications/FontEditor/GlyphMapWidget.cpp index f79b78f4ae..28973ed860 100644 --- a/Applications/FontEditor/GlyphMapWidget.cpp +++ b/Applications/FontEditor/GlyphMapWidget.cpp @@ -25,7 +25,7 @@ */ #include "GlyphMapWidget.h" -#include +#include #include GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font, GUI::Widget* parent) diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile index e1e2904d7b..af40646a99 100644 --- a/Applications/FontEditor/Makefile +++ b/Applications/FontEditor/Makefile @@ -6,7 +6,7 @@ OBJS = \ PROGRAM = FontEditor -LIB_DEPS = GUI Draw Core IPC +LIB_DEPS = GUI Gfx Core IPC FontEditor.cpp: UI_FontEditorBottom.h diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp index a6fb097455..91bbfd2330 100644 --- a/Applications/FontEditor/main.cpp +++ b/Applications/FontEditor/main.cpp @@ -25,7 +25,7 @@ */ #include "FontEditor.h" -#include +#include #include #include #include diff --git a/Applications/Help/Makefile b/Applications/Help/Makefile index 0dd8563666..c6e4923296 100644 --- a/Applications/Help/Makefile +++ b/Applications/Help/Makefile @@ -7,6 +7,6 @@ OBJS = \ PROGRAM = Help -LIB_DEPS = GUI HTML Draw Markdown IPC Protocol Thread Pthread Core +LIB_DEPS = GUI HTML Gfx Markdown IPC Protocol Thread Pthread Core include ../../Makefile.common diff --git a/Applications/Help/ManualModel.cpp b/Applications/Help/ManualModel.cpp index 302228106c..3ed77de1a7 100644 --- a/Applications/Help/ManualModel.cpp +++ b/Applications/Help/ManualModel.cpp @@ -28,7 +28,7 @@ #include "ManualNode.h" #include "ManualPageNode.h" #include "ManualSectionNode.h" -#include +#include static ManualSectionNode s_sections[] = { { "1", "Command-line programs" }, diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index e22f8f03e9..b1663a147a 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -27,7 +27,7 @@ #include "History.h" #include "ManualModel.h" #include -#include +#include #include #include #include diff --git a/Applications/HexEditor/HexEditor.cpp b/Applications/HexEditor/HexEditor.cpp index 310187e9fd..55e920f096 100644 --- a/Applications/HexEditor/HexEditor.cpp +++ b/Applications/HexEditor/HexEditor.cpp @@ -27,7 +27,7 @@ #include "HexEditor.h" #include #include -#include +#include #include #include #include diff --git a/Applications/HexEditor/HexEditor.h b/Applications/HexEditor/HexEditor.h index 82fb591a43..05186ab577 100644 --- a/Applications/HexEditor/HexEditor.h +++ b/Applications/HexEditor/HexEditor.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include class HexEditor : public GUI::ScrollableWidget { diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp index e765e3aac1..538ad6bd40 100644 --- a/Applications/HexEditor/HexEditorWidget.cpp +++ b/Applications/HexEditor/HexEditorWidget.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Applications/HexEditor/Makefile b/Applications/HexEditor/Makefile index 690ee576f5..8231655955 100644 --- a/Applications/HexEditor/Makefile +++ b/Applications/HexEditor/Makefile @@ -5,6 +5,6 @@ OBJS = \ PROGRAM = HexEditor -LIB_DEPS = GUI Draw IPC Thread Pthread Core +LIB_DEPS = GUI Gfx IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/HexEditor/main.cpp b/Applications/HexEditor/main.cpp index f877cdac3d..f5d1d59794 100644 --- a/Applications/HexEditor/main.cpp +++ b/Applications/HexEditor/main.cpp @@ -25,7 +25,7 @@ */ #include "HexEditorWidget.h" -#include +#include #include int main(int argc, char** argv) diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp index ef4e8445ad..46ea2cdc70 100644 --- a/Applications/IRCClient/IRCAppWindow.cpp +++ b/Applications/IRCClient/IRCAppWindow.cpp @@ -28,7 +28,7 @@ #include "IRCChannel.h" #include "IRCWindow.h" #include "IRCWindowListModel.h" -#include +#include #include #include #include diff --git a/Applications/IRCClient/IRCLogBuffer.h b/Applications/IRCClient/IRCLogBuffer.h index 886646f002..d1c7c54041 100644 --- a/Applications/IRCClient/IRCLogBuffer.h +++ b/Applications/IRCClient/IRCLogBuffer.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include class IRCLogBuffer : public RefCounted { diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile index 6a1fb3f612..afe6db9b86 100644 --- a/Applications/IRCClient/Makefile +++ b/Applications/IRCClient/Makefile @@ -11,6 +11,6 @@ OBJS = \ PROGRAM = IRCClient -LIB_DEPS = GUI HTML Draw Protocol IPC Thread Pthread Core +LIB_DEPS = GUI HTML Gfx Protocol IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PaintBrush/BucketTool.cpp index 135bbd58c1..796dd05b57 100644 --- a/Applications/PaintBrush/BucketTool.cpp +++ b/Applications/PaintBrush/BucketTool.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include BucketTool::BucketTool() diff --git a/Applications/PaintBrush/EllipseTool.cpp b/Applications/PaintBrush/EllipseTool.cpp index 3563fba2a7..77179826c0 100644 --- a/Applications/PaintBrush/EllipseTool.cpp +++ b/Applications/PaintBrush/EllipseTool.cpp @@ -26,7 +26,7 @@ #include "EllipseTool.h" #include "PaintableWidget.h" -#include +#include #include #include #include diff --git a/Applications/PaintBrush/EllipseTool.h b/Applications/PaintBrush/EllipseTool.h index a55b8eb911..b1ff1adabc 100644 --- a/Applications/PaintBrush/EllipseTool.h +++ b/Applications/PaintBrush/EllipseTool.h @@ -27,7 +27,7 @@ #pragma once #include "Tool.h" -#include +#include #include namespace GUI { diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PaintBrush/EraseTool.h index 89ebbbc047..5e68b33978 100644 --- a/Applications/PaintBrush/EraseTool.h +++ b/Applications/PaintBrush/EraseTool.h @@ -27,7 +27,7 @@ #pragma once #include "Tool.h" -#include +#include #include namespace GUI { diff --git a/Applications/PaintBrush/LineTool.h b/Applications/PaintBrush/LineTool.h index 42f244b29e..8a1ffdec6c 100644 --- a/Applications/PaintBrush/LineTool.h +++ b/Applications/PaintBrush/LineTool.h @@ -27,7 +27,7 @@ #pragma once #include "Tool.h" -#include +#include #include namespace GUI { diff --git a/Applications/PaintBrush/Makefile b/Applications/PaintBrush/Makefile index 9eac769267..9a055bd2c1 100644 --- a/Applications/PaintBrush/Makefile +++ b/Applications/PaintBrush/Makefile @@ -15,6 +15,6 @@ OBJS = \ PROGRAM = PaintBrush -LIB_DEPS = GUI Draw IPC Thread Pthread Core +LIB_DEPS = GUI Gfx IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/PaintBrush/PaintableWidget.cpp b/Applications/PaintBrush/PaintableWidget.cpp index a423b0e9d0..3b06c514a0 100644 --- a/Applications/PaintBrush/PaintableWidget.cpp +++ b/Applications/PaintBrush/PaintableWidget.cpp @@ -26,8 +26,8 @@ #include "PaintableWidget.h" #include "Tool.h" -#include -#include +#include +#include #include static PaintableWidget* s_the; diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PaintBrush/PenTool.h index 52c1f17257..0ed54a9319 100644 --- a/Applications/PaintBrush/PenTool.h +++ b/Applications/PaintBrush/PenTool.h @@ -27,7 +27,7 @@ #pragma once #include "Tool.h" -#include +#include #include namespace GUI { diff --git a/Applications/PaintBrush/PickerTool.cpp b/Applications/PaintBrush/PickerTool.cpp index 1eccbf9700..b76eadb52a 100644 --- a/Applications/PaintBrush/PickerTool.cpp +++ b/Applications/PaintBrush/PickerTool.cpp @@ -25,7 +25,7 @@ */ #include "PickerTool.h" -#include +#include PickerTool::PickerTool() { diff --git a/Applications/PaintBrush/RectangleTool.cpp b/Applications/PaintBrush/RectangleTool.cpp index d3afc1c6f0..070ca6be84 100644 --- a/Applications/PaintBrush/RectangleTool.cpp +++ b/Applications/PaintBrush/RectangleTool.cpp @@ -26,7 +26,7 @@ #include "RectangleTool.h" #include "PaintableWidget.h" -#include +#include #include #include #include diff --git a/Applications/PaintBrush/RectangleTool.h b/Applications/PaintBrush/RectangleTool.h index 171c376241..1782c592b0 100644 --- a/Applications/PaintBrush/RectangleTool.h +++ b/Applications/PaintBrush/RectangleTool.h @@ -27,7 +27,7 @@ #pragma once #include "Tool.h" -#include +#include namespace GUI { class Menu; diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp index 69083cd1fa..ce1d89d2f7 100644 --- a/Applications/PaintBrush/SprayTool.cpp +++ b/Applications/PaintBrush/SprayTool.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PaintBrush/ToolboxWidget.cpp index cf13fa0296..358781e6a0 100644 --- a/Applications/PaintBrush/ToolboxWidget.cpp +++ b/Applications/PaintBrush/ToolboxWidget.cpp @@ -34,7 +34,7 @@ #include "PickerTool.h" #include "RectangleTool.h" #include "SprayTool.h" -#include +#include #include #include diff --git a/Applications/PaintBrush/main.cpp b/Applications/PaintBrush/main.cpp index bf8401a5df..996d8ae353 100644 --- a/Applications/PaintBrush/main.cpp +++ b/Applications/PaintBrush/main.cpp @@ -27,7 +27,7 @@ #include "PaintableWidget.h" #include "PaletteWidget.h" #include "ToolboxWidget.h" -#include +#include #include #include #include diff --git a/Applications/Piano/Makefile b/Applications/Piano/Makefile index 718820b211..62f3be225d 100644 --- a/Applications/Piano/Makefile +++ b/Applications/Piano/Makefile @@ -9,6 +9,6 @@ OBJS = \ PROGRAM = Piano -LIB_DEPS = GUI Draw Audio IPC Thread Pthread Core +LIB_DEPS = GUI Gfx Audio IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/Piano/Music.h b/Applications/Piano/Music.h index 858edd45d2..cdd787cce8 100644 --- a/Applications/Piano/Music.h +++ b/Applications/Piano/Music.h @@ -28,7 +28,7 @@ #pragma once #include -#include +#include namespace Music { diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp index 25ae0cc817..a01e1141f5 100644 --- a/Applications/Piano/main.cpp +++ b/Applications/Piano/main.cpp @@ -29,7 +29,7 @@ #include "MainWidget.h" #include #include -#include +#include #include #include #include diff --git a/Applications/QuickShow/Makefile b/Applications/QuickShow/Makefile index 9d27bc44f2..c77b2eade3 100644 --- a/Applications/QuickShow/Makefile +++ b/Applications/QuickShow/Makefile @@ -4,6 +4,6 @@ OBJS = \ PROGRAM = QuickShow -LIB_DEPS = GUI Draw Protocol IPC Thread Pthread Core +LIB_DEPS = GUI Gfx Protocol IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp index 02c539513d..db7d204262 100644 --- a/Applications/QuickShow/QSWidget.cpp +++ b/Applications/QuickShow/QSWidget.cpp @@ -26,7 +26,7 @@ #include "QSWidget.h" #include -#include +#include #include #include #include diff --git a/Applications/QuickShow/main.cpp b/Applications/QuickShow/main.cpp index 9c2873b82f..3d472a3e69 100644 --- a/Applications/QuickShow/main.cpp +++ b/Applications/QuickShow/main.cpp @@ -25,7 +25,7 @@ */ #include "QSWidget.h" -#include +#include #include #include #include diff --git a/Applications/SoundPlayer/Makefile b/Applications/SoundPlayer/Makefile index 6c2b4766f5..2d0bc01f50 100644 --- a/Applications/SoundPlayer/Makefile +++ b/Applications/SoundPlayer/Makefile @@ -6,6 +6,6 @@ OBJS = \ PROGRAM = SoundPlayer -LIB_DEPS = GUI Draw Audio IPC Thread Pthread Core +LIB_DEPS = GUI Gfx Audio IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/SoundPlayer/main.cpp b/Applications/SoundPlayer/main.cpp index 927727751e..a26f969d6e 100644 --- a/Applications/SoundPlayer/main.cpp +++ b/Applications/SoundPlayer/main.cpp @@ -26,7 +26,7 @@ #include "SoundPlayerWidget.h" #include -#include +#include #include #include #include diff --git a/Applications/SystemDialog/Makefile b/Applications/SystemDialog/Makefile index 6ccf7690e6..ce009bc506 100755 --- a/Applications/SystemDialog/Makefile +++ b/Applications/SystemDialog/Makefile @@ -3,6 +3,6 @@ OBJS = \ PROGRAM = SystemDialog -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core include ../../Makefile.common diff --git a/Applications/SystemMonitor/Makefile b/Applications/SystemMonitor/Makefile index 392ea5b6d6..99cd6f77c0 100644 --- a/Applications/SystemMonitor/Makefile +++ b/Applications/SystemMonitor/Makefile @@ -13,6 +13,6 @@ OBJS = \ PROGRAM = SystemMonitor -LIB_DEPS = GUI Draw Protocol PCIDB IPC Thread Pthread Core +LIB_DEPS = GUI Gfx Protocol PCIDB IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp index 3fff1dc7cb..d5705e9927 100644 --- a/Applications/SystemMonitor/MemoryStatsWidget.cpp +++ b/Applications/SystemMonitor/MemoryStatsWidget.cpp @@ -28,7 +28,7 @@ #include "GraphWidget.h" #include #include -#include +#include #include #include #include diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp index c6e5ec2988..ddd4a62670 100644 --- a/Applications/SystemMonitor/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -35,7 +35,7 @@ #include "ProcessTableView.h" #include "ProcessUnveiledPathsWidget.h" #include -#include +#include #include #include #include diff --git a/Applications/Taskbar/Makefile b/Applications/Taskbar/Makefile index 9c6463567d..f40e2a3032 100644 --- a/Applications/Taskbar/Makefile +++ b/Applications/Taskbar/Makefile @@ -6,6 +6,6 @@ OBJS = \ PROGRAM = Taskbar -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core include ../../Makefile.common diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h index 38ef9e3409..12a23f5e87 100644 --- a/Applications/Taskbar/WindowList.h +++ b/Applications/Taskbar/WindowList.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include class Window { public: diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile index b005a755aa..5bcea44d5d 100644 --- a/Applications/Terminal/Makefile +++ b/Applications/Terminal/Makefile @@ -3,6 +3,6 @@ OBJS = \ PROGRAM = Terminal -LIB_DEPS = GUI Draw VT IPC Protocol Core +LIB_DEPS = GUI Gfx VT IPC Protocol Core include ../../Makefile.common diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index 4db3cdfea5..8f9efd317e 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Applications/TextEditor/Makefile b/Applications/TextEditor/Makefile index 6a1b53bc44..10d87dff0a 100755 --- a/Applications/TextEditor/Makefile +++ b/Applications/TextEditor/Makefile @@ -4,6 +4,6 @@ OBJS = \ PROGRAM = TextEditor -LIB_DEPS = GUI Draw VT IPC Thread Pthread Core +LIB_DEPS = GUI Gfx VT IPC Thread Pthread Core include ../../Makefile.common diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 45ae429218..a90ae23083 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Applications/TextEditor/main.cpp b/Applications/TextEditor/main.cpp index 6f7f94b055..8eb1f65867 100644 --- a/Applications/TextEditor/main.cpp +++ b/Applications/TextEditor/main.cpp @@ -25,7 +25,7 @@ */ #include "TextEditorWidget.h" -#include +#include #include int main(int argc, char** argv) diff --git a/Applications/Welcome/Makefile b/Applications/Welcome/Makefile index 7299b09e5b..0ad7d06820 100644 --- a/Applications/Welcome/Makefile +++ b/Applications/Welcome/Makefile @@ -5,7 +5,7 @@ OBJS = \ PROGRAM = Welcome -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core .SUFFIXES: .png %.png.o: %.png diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp index 97c687fdf1..c28f185823 100644 --- a/Applications/Welcome/TextWidget.cpp +++ b/Applications/Welcome/TextWidget.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include TextWidget::TextWidget(GUI::Widget* parent) diff --git a/Applications/Welcome/TextWidget.h b/Applications/Welcome/TextWidget.h index a8876638b7..4eb5bad2a6 100644 --- a/Applications/Welcome/TextWidget.h +++ b/Applications/Welcome/TextWidget.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include class TextWidget : public GUI::Frame { diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp index 47231ee1a0..624a3f0e4c 100644 --- a/Applications/Welcome/main.cpp +++ b/Applications/Welcome/main.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp index 659cc4b240..d9e10f2ac1 100644 --- a/Demos/Fire/Fire.cpp +++ b/Demos/Fire/Fire.cpp @@ -42,8 +42,8 @@ * [ ] handle fire bitmap edges better */ -#include -#include +#include +#include #include #include #include diff --git a/Demos/Fire/Makefile b/Demos/Fire/Makefile index 122be1ba31..681ded21c9 100644 --- a/Demos/Fire/Makefile +++ b/Demos/Fire/Makefile @@ -3,6 +3,6 @@ OBJS = \ PROGRAM = Fire -LIB_DEPS = GUI IPC Draw Core +LIB_DEPS = GUI IPC Gfx Core include ../../Makefile.common diff --git a/Demos/HelloWorld/Makefile b/Demos/HelloWorld/Makefile index 41831f8915..30d76744dc 100644 --- a/Demos/HelloWorld/Makefile +++ b/Demos/HelloWorld/Makefile @@ -3,6 +3,6 @@ OBJS = \ PROGRAM = HelloWorld -LIB_DEPS = GUI IPC Draw Core +LIB_DEPS = GUI IPC Gfx Core include ../../Makefile.common diff --git a/Demos/HelloWorld2/Makefile b/Demos/HelloWorld2/Makefile index fd031fa4e1..1bc418efca 100644 --- a/Demos/HelloWorld2/Makefile +++ b/Demos/HelloWorld2/Makefile @@ -3,7 +3,7 @@ OBJS = \ PROGRAM = HelloWorld2 -LIB_DEPS = GUI IPC Draw Core +LIB_DEPS = GUI IPC Gfx Core main.cpp: UI_HelloWorld2.h diff --git a/Demos/WidgetGallery/Makefile b/Demos/WidgetGallery/Makefile index 71e40a40b4..3e3b827187 100644 --- a/Demos/WidgetGallery/Makefile +++ b/Demos/WidgetGallery/Makefile @@ -3,6 +3,6 @@ OBJS = \ PROGRAM = WidgetGallery -LIB_DEPS = GUI IPC Draw Core +LIB_DEPS = GUI IPC Gfx Core include ../../Makefile.common diff --git a/DevTools/HackStudio/CursorTool.h b/DevTools/HackStudio/CursorTool.h index b001030dd9..7fc8368c3d 100644 --- a/DevTools/HackStudio/CursorTool.h +++ b/DevTools/HackStudio/CursorTool.h @@ -28,7 +28,7 @@ #include "Tool.h" #include -#include +#include namespace GUI { class Widget; diff --git a/DevTools/HackStudio/Makefile b/DevTools/HackStudio/Makefile index 4d902305df..144419e524 100644 --- a/DevTools/HackStudio/Makefile +++ b/DevTools/HackStudio/Makefile @@ -18,6 +18,6 @@ OBJS = \ PROGRAM = HackStudio -LIB_DEPS = GUI HTML VT Protocol Markdown Draw IPC Thread Pthread Core +LIB_DEPS = GUI HTML VT Protocol Markdown Gfx IPC Thread Pthread Core include ../../Makefile.common diff --git a/DevTools/IPCCompiler/main.cpp b/DevTools/IPCCompiler/main.cpp index 2b1995c941..c23c8ee1a3 100644 --- a/DevTools/IPCCompiler/main.cpp +++ b/DevTools/IPCCompiler/main.cpp @@ -225,8 +225,8 @@ int main(int argc, char** argv) dbg() << "#pragma once"; dbg() << "#include "; dbg() << "#include "; - dbg() << "#include "; - dbg() << "#include "; + dbg() << "#include "; + dbg() << "#include "; dbg() << "#include "; dbg() << "#include "; dbg() << "#include "; diff --git a/DevTools/Inspector/Makefile b/DevTools/Inspector/Makefile index f2afb507b2..80d6c58563 100644 --- a/DevTools/Inspector/Makefile +++ b/DevTools/Inspector/Makefile @@ -7,6 +7,6 @@ OBJS = \ PROGRAM = Inspector -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core include ../../Makefile.common diff --git a/DevTools/Inspector/RemoteObjectGraphModel.cpp b/DevTools/Inspector/RemoteObjectGraphModel.cpp index 3321183b98..1dd481d25c 100644 --- a/DevTools/Inspector/RemoteObjectGraphModel.cpp +++ b/DevTools/Inspector/RemoteObjectGraphModel.cpp @@ -29,7 +29,7 @@ #include "RemoteProcess.h" #include #include -#include +#include #include #include diff --git a/DevTools/ProfileViewer/Makefile b/DevTools/ProfileViewer/Makefile index 01daf3d50a..745fa429dd 100644 --- a/DevTools/ProfileViewer/Makefile +++ b/DevTools/ProfileViewer/Makefile @@ -6,6 +6,6 @@ OBJS = \ PROGRAM = ProfileViewer -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core include ../../Makefile.common diff --git a/DevTools/VisualBuilder/Makefile b/DevTools/VisualBuilder/Makefile index a29ba982eb..85350423b0 100644 --- a/DevTools/VisualBuilder/Makefile +++ b/DevTools/VisualBuilder/Makefile @@ -9,6 +9,6 @@ OBJS = \ PROGRAM = VisualBuilder -LIB_DEPS = GUI Draw IPC Core +LIB_DEPS = GUI Gfx IPC Core include ../../Makefile.common diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp index 00fa9d04d7..51e1ea9202 100644 --- a/DevTools/VisualBuilder/VBForm.cpp +++ b/DevTools/VisualBuilder/VBForm.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h index 48bee7f478..fd898a7555 100644 --- a/DevTools/VisualBuilder/VBWidget.h +++ b/DevTools/VisualBuilder/VBWidget.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include namespace GUI { diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp index 8acb441694..77ec5cc636 100644 --- a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp +++ b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp @@ -27,7 +27,7 @@ #include "VBWidgetPropertyModel.h" #include "VBProperty.h" #include "VBWidget.h" -#include +#include VBWidgetPropertyModel::VBWidgetPropertyModel(VBWidget& widget) : m_widget(widget) diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp index 421de868af..9cedadc761 100644 --- a/DevTools/VisualBuilder/main.cpp +++ b/DevTools/VisualBuilder/main.cpp @@ -28,7 +28,7 @@ #include "VBPropertiesWindow.h" #include "VBWidget.h" #include "VBWidgetPropertyModel.h" -#include +#include #include #include #include diff --git a/Games/Minesweeper/Makefile b/Games/Minesweeper/Makefile index d0d0afe631..ec87fb5e82 100644 --- a/Games/Minesweeper/Makefile +++ b/Games/Minesweeper/Makefile @@ -4,6 +4,6 @@ OBJS = \ PROGRAM = Minesweeper -LIB_DEPS = GUI IPC Draw Core +LIB_DEPS = GUI IPC Gfx Core include ../../Makefile.common diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp index 657be40720..c159fa9bd1 100644 --- a/Games/Minesweeper/main.cpp +++ b/Games/Minesweeper/main.cpp @@ -26,7 +26,7 @@ #include "Field.h" #include -#include +#include #include #include #include diff --git a/Games/Snake/Makefile b/Games/Snake/Makefile index cff8a85b27..353b28f433 100644 --- a/Games/Snake/Makefile +++ b/Games/Snake/Makefile @@ -4,6 +4,6 @@ OBJS = \ PROGRAM = Snake -LIB_DEPS = GUI IPC Draw Core +LIB_DEPS = GUI IPC Gfx Core include ../../Makefile.common diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp index 2eed90cf6c..21aa51fc0a 100644 --- a/Games/Snake/SnakeGame.cpp +++ b/Games/Snake/SnakeGame.cpp @@ -27,7 +27,7 @@ #include "SnakeGame.h" #include #include -#include +#include #include #include diff --git a/Games/Snake/main.cpp b/Games/Snake/main.cpp index 191c12ff9b..42df1d9799 100644 --- a/Games/Snake/main.cpp +++ b/Games/Snake/main.cpp @@ -25,7 +25,7 @@ */ #include "SnakeGame.h" -#include +#include #include #include #include diff --git a/Libraries/LibCore/CConfigFile.h b/Libraries/LibCore/CConfigFile.h index 15ff959b6f..6a71ff9b88 100644 --- a/Libraries/LibCore/CConfigFile.h +++ b/Libraries/LibCore/CConfigFile.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include namespace Core { diff --git a/Libraries/LibGUI/GAbstractButton.cpp b/Libraries/LibGUI/GAbstractButton.cpp index aa15645fb3..a913e80a0a 100644 --- a/Libraries/LibGUI/GAbstractButton.cpp +++ b/Libraries/LibGUI/GAbstractButton.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include diff --git a/Libraries/LibGUI/GAbstractButton.h b/Libraries/LibGUI/GAbstractButton.h index bc9abc829e..f87c2e1c09 100644 --- a/Libraries/LibGUI/GAbstractButton.h +++ b/Libraries/LibGUI/GAbstractButton.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include #include namespace GUI { diff --git a/Libraries/LibGUI/GAbstractTableView.cpp b/Libraries/LibGUI/GAbstractTableView.cpp index 3b29e49e48..fdaa15b73e 100644 --- a/Libraries/LibGUI/GAbstractTableView.cpp +++ b/Libraries/LibGUI/GAbstractTableView.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h index 20899bb760..5904107789 100644 --- a/Libraries/LibGUI/GAction.h +++ b/Libraries/LibGUI/GAction.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/Libraries/LibGUI/GApplication.cpp b/Libraries/LibGUI/GApplication.cpp index 2dcb83f4ac..90c0796a6f 100644 --- a/Libraries/LibGUI/GApplication.cpp +++ b/Libraries/LibGUI/GApplication.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GApplication.h b/Libraries/LibGUI/GApplication.h index 0c832f71cd..e26b0c4c63 100644 --- a/Libraries/LibGUI/GApplication.h +++ b/Libraries/LibGUI/GApplication.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include namespace AK { diff --git a/Libraries/LibGUI/GButton.cpp b/Libraries/LibGUI/GButton.cpp index 0629c3131f..58c4cd1ff6 100644 --- a/Libraries/LibGUI/GButton.cpp +++ b/Libraries/LibGUI/GButton.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h index 3c0b06e55b..57cb41fa7e 100644 --- a/Libraries/LibGUI/GButton.h +++ b/Libraries/LibGUI/GButton.h @@ -28,9 +28,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace GUI { diff --git a/Libraries/LibGUI/GCheckBox.cpp b/Libraries/LibGUI/GCheckBox.cpp index 18c436cb32..085bfa9b79 100644 --- a/Libraries/LibGUI/GCheckBox.cpp +++ b/Libraries/LibGUI/GCheckBox.cpp @@ -25,9 +25,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Libraries/LibGUI/GColumnsView.cpp b/Libraries/LibGUI/GColumnsView.cpp index 62b1e413b0..65ccbaaf50 100644 --- a/Libraries/LibGUI/GColumnsView.cpp +++ b/Libraries/LibGUI/GColumnsView.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GDesktop.h b/Libraries/LibGUI/GDesktop.h index a41cbfe5c9..376aa1beda 100644 --- a/Libraries/LibGUI/GDesktop.h +++ b/Libraries/LibGUI/GDesktop.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace GUI { diff --git a/Libraries/LibGUI/GDragOperation.cpp b/Libraries/LibGUI/GDragOperation.cpp index ab9c47c57d..a8b506f0c7 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 +#include #include #include diff --git a/Libraries/LibGUI/GEvent.h b/Libraries/LibGUI/GEvent.h index a5a7f87674..745bb8a4b3 100644 --- a/Libraries/LibGUI/GEvent.h +++ b/Libraries/LibGUI/GEvent.h @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include namespace GUI { diff --git a/Libraries/LibGUI/GFilePicker.cpp b/Libraries/LibGUI/GFilePicker.cpp index fa93a1ff96..f329f2d9b6 100644 --- a/Libraries/LibGUI/GFilePicker.cpp +++ b/Libraries/LibGUI/GFilePicker.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GFileSystemModel.cpp b/Libraries/LibGUI/GFileSystemModel.cpp index 8e9152b8ca..9f349e1511 100644 --- a/Libraries/LibGUI/GFileSystemModel.cpp +++ b/Libraries/LibGUI/GFileSystemModel.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GFontDatabase.cpp b/Libraries/LibGUI/GFontDatabase.cpp index a048f7b8eb..b614769d26 100644 --- a/Libraries/LibGUI/GFontDatabase.cpp +++ b/Libraries/LibGUI/GFontDatabase.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GFrame.cpp b/Libraries/LibGUI/GFrame.cpp index 19cb35ac9e..6ab72bd863 100644 --- a/Libraries/LibGUI/GFrame.cpp +++ b/Libraries/LibGUI/GFrame.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include diff --git a/Libraries/LibGUI/GFrame.h b/Libraries/LibGUI/GFrame.h index f5cd7a9efe..cfa6bf6c76 100644 --- a/Libraries/LibGUI/GFrame.h +++ b/Libraries/LibGUI/GFrame.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include namespace GUI { diff --git a/Libraries/LibGUI/GGroupBox.cpp b/Libraries/LibGUI/GGroupBox.cpp index 24928da058..e5aeff6584 100644 --- a/Libraries/LibGUI/GGroupBox.cpp +++ b/Libraries/LibGUI/GGroupBox.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include diff --git a/Libraries/LibGUI/GIcon.h b/Libraries/LibGUI/GIcon.h index d7d7bcfb0f..6199f4c473 100644 --- a/Libraries/LibGUI/GIcon.h +++ b/Libraries/LibGUI/GIcon.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include class GIconImpl : public RefCounted { public: diff --git a/Libraries/LibGUI/GItemView.cpp b/Libraries/LibGUI/GItemView.cpp index 347d4fcc97..17a4567f2d 100644 --- a/Libraries/LibGUI/GItemView.cpp +++ b/Libraries/LibGUI/GItemView.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GLabel.cpp b/Libraries/LibGUI/GLabel.cpp index a3cf44c528..f0f2cb087f 100644 --- a/Libraries/LibGUI/GLabel.cpp +++ b/Libraries/LibGUI/GLabel.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include diff --git a/Libraries/LibGUI/GLabel.h b/Libraries/LibGUI/GLabel.h index 101642bb22..ba6aa4bc83 100644 --- a/Libraries/LibGUI/GLabel.h +++ b/Libraries/LibGUI/GLabel.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include namespace Gfx { diff --git a/Libraries/LibGUI/GListView.cpp b/Libraries/LibGUI/GListView.cpp index dba58108dd..a375a91391 100644 --- a/Libraries/LibGUI/GListView.cpp +++ b/Libraries/LibGUI/GListView.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GModel.h b/Libraries/LibGUI/GModel.h index 19609d8d61..b5c4747ba6 100644 --- a/Libraries/LibGUI/GModel.h +++ b/Libraries/LibGUI/GModel.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/Libraries/LibGUI/GPainter.h b/Libraries/LibGUI/GPainter.h index 70686466f0..a243e01cf4 100644 --- a/Libraries/LibGUI/GPainter.h +++ b/Libraries/LibGUI/GPainter.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace GUI { diff --git a/Libraries/LibGUI/GRadioButton.cpp b/Libraries/LibGUI/GRadioButton.cpp index a0c5538260..325f72a89d 100644 --- a/Libraries/LibGUI/GRadioButton.cpp +++ b/Libraries/LibGUI/GRadioButton.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include diff --git a/Libraries/LibGUI/GResizeCorner.cpp b/Libraries/LibGUI/GResizeCorner.cpp index a39b7cb465..d109fbaec9 100644 --- a/Libraries/LibGUI/GResizeCorner.cpp +++ b/Libraries/LibGUI/GResizeCorner.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibGUI/GScrollBar.cpp b/Libraries/LibGUI/GScrollBar.cpp index 503fd3f7f6..8fa8471963 100644 --- a/Libraries/LibGUI/GScrollBar.cpp +++ b/Libraries/LibGUI/GScrollBar.cpp @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/Libraries/LibGUI/GSlider.cpp b/Libraries/LibGUI/GSlider.cpp index 79f2eef581..c4fd08344e 100644 --- a/Libraries/LibGUI/GSlider.cpp +++ b/Libraries/LibGUI/GSlider.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include diff --git a/Libraries/LibGUI/GSplitter.cpp b/Libraries/LibGUI/GSplitter.cpp index ae6c02b967..30d500a356 100644 --- a/Libraries/LibGUI/GSplitter.cpp +++ b/Libraries/LibGUI/GSplitter.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GStatusBar.cpp b/Libraries/LibGUI/GStatusBar.cpp index 1345a7ac33..7508f560ad 100644 --- a/Libraries/LibGUI/GStatusBar.cpp +++ b/Libraries/LibGUI/GStatusBar.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GTabWidget.cpp b/Libraries/LibGUI/GTabWidget.cpp index dab99d112b..f052e278a8 100644 --- a/Libraries/LibGUI/GTabWidget.cpp +++ b/Libraries/LibGUI/GTabWidget.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibGUI/GTableView.cpp b/Libraries/LibGUI/GTableView.cpp index 403980ae35..f476220d30 100644 --- a/Libraries/LibGUI/GTableView.cpp +++ b/Libraries/LibGUI/GTableView.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GTextDocument.h b/Libraries/LibGUI/GTextDocument.h index 47dbac6324..004939f7f2 100644 --- a/Libraries/LibGUI/GTextDocument.h +++ b/Libraries/LibGUI/GTextDocument.h @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/Libraries/LibGUI/GTextEditor.cpp b/Libraries/LibGUI/GTextEditor.cpp index aca6fa20fa..6940404f6e 100644 --- a/Libraries/LibGUI/GTextEditor.cpp +++ b/Libraries/LibGUI/GTextEditor.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GTextEditor.h b/Libraries/LibGUI/GTextEditor.h index dad205c28d..eb1099f030 100644 --- a/Libraries/LibGUI/GTextEditor.h +++ b/Libraries/LibGUI/GTextEditor.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GToolBar.cpp b/Libraries/LibGUI/GToolBar.cpp index 829d14f7ff..93046c6ed4 100644 --- a/Libraries/LibGUI/GToolBar.cpp +++ b/Libraries/LibGUI/GToolBar.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GTreeView.cpp b/Libraries/LibGUI/GTreeView.cpp index adcd6960b4..cd3f8bf58c 100644 --- a/Libraries/LibGUI/GTreeView.cpp +++ b/Libraries/LibGUI/GTreeView.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/GVariant.h index 61aad13364..12f522b410 100644 --- a/Libraries/LibGUI/GVariant.h +++ b/Libraries/LibGUI/GVariant.h @@ -27,8 +27,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace AK { diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp index 2953c9ac28..025eaaa26f 100644 --- a/Libraries/LibGUI/GWidget.cpp +++ b/Libraries/LibGUI/GWidget.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibGUI/GWidget.h b/Libraries/LibGUI/GWidget.h index ff9edaa03b..512775ddc1 100644 --- a/Libraries/LibGUI/GWidget.h +++ b/Libraries/LibGUI/GWidget.h @@ -31,12 +31,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp index 95620d8861..111ffbd4ad 100644 --- a/Libraries/LibGUI/GWindow.cpp +++ b/Libraries/LibGUI/GWindow.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h index 68c8fd2101..35dd5645ec 100644 --- a/Libraries/LibGUI/GWindow.h +++ b/Libraries/LibGUI/GWindow.h @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include namespace GUI { diff --git a/Libraries/LibGUI/GWindowServerConnection.cpp b/Libraries/LibGUI/GWindowServerConnection.cpp index c8c4db0975..c659b7f5a5 100644 --- a/Libraries/LibGUI/GWindowServerConnection.cpp +++ b/Libraries/LibGUI/GWindowServerConnection.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibDraw/CharacterBitmap.cpp b/Libraries/LibGfx/CharacterBitmap.cpp similarity index 100% rename from Libraries/LibDraw/CharacterBitmap.cpp rename to Libraries/LibGfx/CharacterBitmap.cpp diff --git a/Libraries/LibDraw/CharacterBitmap.h b/Libraries/LibGfx/CharacterBitmap.h similarity index 100% rename from Libraries/LibDraw/CharacterBitmap.h rename to Libraries/LibGfx/CharacterBitmap.h diff --git a/Libraries/LibDraw/Color.cpp b/Libraries/LibGfx/Color.cpp similarity index 99% rename from Libraries/LibDraw/Color.cpp rename to Libraries/LibGfx/Color.cpp index dcfdf90e80..22eb8ecaa5 100644 --- a/Libraries/LibDraw/Color.cpp +++ b/Libraries/LibGfx/Color.cpp @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/Libraries/LibDraw/Color.h b/Libraries/LibGfx/Color.h similarity index 100% rename from Libraries/LibDraw/Color.h rename to Libraries/LibGfx/Color.h diff --git a/Libraries/LibDraw/DisjointRectSet.cpp b/Libraries/LibGfx/DisjointRectSet.cpp similarity index 98% rename from Libraries/LibDraw/DisjointRectSet.cpp rename to Libraries/LibGfx/DisjointRectSet.cpp index af47224f74..68270b983b 100644 --- a/Libraries/LibDraw/DisjointRectSet.cpp +++ b/Libraries/LibGfx/DisjointRectSet.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/DisjointRectSet.h b/Libraries/LibGfx/DisjointRectSet.h similarity index 98% rename from Libraries/LibDraw/DisjointRectSet.h rename to Libraries/LibGfx/DisjointRectSet.h index 9a36abb43e..538dfc9c4c 100644 --- a/Libraries/LibDraw/DisjointRectSet.h +++ b/Libraries/LibGfx/DisjointRectSet.h @@ -27,7 +27,7 @@ #pragma once #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Emoji.cpp b/Libraries/LibGfx/Emoji.cpp similarity index 96% rename from Libraries/LibDraw/Emoji.cpp rename to Libraries/LibGfx/Emoji.cpp index fe8b7e9339..bb0fc3910e 100644 --- a/Libraries/LibDraw/Emoji.cpp +++ b/Libraries/LibGfx/Emoji.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Emoji.h b/Libraries/LibGfx/Emoji.h similarity index 100% rename from Libraries/LibDraw/Emoji.h rename to Libraries/LibGfx/Emoji.h diff --git a/Libraries/LibDraw/FloatPoint.h b/Libraries/LibGfx/FloatPoint.h similarity index 99% rename from Libraries/LibDraw/FloatPoint.h rename to Libraries/LibGfx/FloatPoint.h index 05f16c7cfc..03a685dd19 100644 --- a/Libraries/LibDraw/FloatPoint.h +++ b/Libraries/LibGfx/FloatPoint.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/FloatRect.h b/Libraries/LibGfx/FloatRect.h similarity index 98% rename from Libraries/LibDraw/FloatRect.h rename to Libraries/LibGfx/FloatRect.h index 91ec03eee1..4c3779b34d 100644 --- a/Libraries/LibDraw/FloatRect.h +++ b/Libraries/LibGfx/FloatRect.h @@ -28,11 +28,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace Gfx { diff --git a/Libraries/LibDraw/FloatSize.h b/Libraries/LibGfx/FloatSize.h similarity index 99% rename from Libraries/LibDraw/FloatSize.h rename to Libraries/LibGfx/FloatSize.h index 08376a5fc2..90d4167538 100644 --- a/Libraries/LibDraw/FloatSize.h +++ b/Libraries/LibGfx/FloatSize.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Font.cpp b/Libraries/LibGfx/Font.cpp similarity index 100% rename from Libraries/LibDraw/Font.cpp rename to Libraries/LibGfx/Font.cpp diff --git a/Libraries/LibDraw/Font.h b/Libraries/LibGfx/Font.h similarity index 99% rename from Libraries/LibDraw/Font.h rename to Libraries/LibGfx/Font.h index b164582e84..07fe58d785 100644 --- a/Libraries/LibDraw/Font.h +++ b/Libraries/LibGfx/Font.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp similarity index 99% rename from Libraries/LibDraw/GIFLoader.cpp rename to Libraries/LibGfx/GIFLoader.cpp index 2ef4ea59e8..8ec1a052ee 100644 --- a/Libraries/LibDraw/GIFLoader.cpp +++ b/Libraries/LibGfx/GIFLoader.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include namespace Gfx { diff --git a/Libraries/LibDraw/GIFLoader.h b/Libraries/LibGfx/GIFLoader.h similarity index 96% rename from Libraries/LibDraw/GIFLoader.h rename to Libraries/LibGfx/GIFLoader.h index 06be29aa4b..b18eafa0b0 100644 --- a/Libraries/LibDraw/GIFLoader.h +++ b/Libraries/LibGfx/GIFLoader.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/GraphicsBitmap.cpp b/Libraries/LibGfx/GraphicsBitmap.cpp similarity index 98% rename from Libraries/LibDraw/GraphicsBitmap.cpp rename to Libraries/LibGfx/GraphicsBitmap.cpp index 7b5e00dd2b..d48cfa7d03 100644 --- a/Libraries/LibDraw/GraphicsBitmap.cpp +++ b/Libraries/LibGfx/GraphicsBitmap.cpp @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibDraw/GraphicsBitmap.h b/Libraries/LibGfx/GraphicsBitmap.h similarity index 100% rename from Libraries/LibDraw/GraphicsBitmap.h rename to Libraries/LibGfx/GraphicsBitmap.h diff --git a/Libraries/LibDraw/ImageDecoder.cpp b/Libraries/LibGfx/ImageDecoder.cpp similarity index 96% rename from Libraries/LibDraw/ImageDecoder.cpp rename to Libraries/LibGfx/ImageDecoder.cpp index aae0dbfa01..87a9f79ca1 100644 --- a/Libraries/LibDraw/ImageDecoder.cpp +++ b/Libraries/LibGfx/ImageDecoder.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/ImageDecoder.h b/Libraries/LibGfx/ImageDecoder.h similarity index 98% rename from Libraries/LibDraw/ImageDecoder.h rename to Libraries/LibGfx/ImageDecoder.h index d00a90c4dd..dd3d901173 100644 --- a/Libraries/LibDraw/ImageDecoder.h +++ b/Libraries/LibGfx/ImageDecoder.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Makefile b/Libraries/LibGfx/Makefile similarity index 72% rename from Libraries/LibDraw/Makefile rename to Libraries/LibGfx/Makefile index a0490675aa..c7d4da3efc 100644 --- a/Libraries/LibDraw/Makefile +++ b/Libraries/LibGfx/Makefile @@ -14,11 +14,11 @@ OBJS = \ Palette.o \ Emoji.o -LIBRARY = libdraw.a +LIBRARY = libgfx.a install: - mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibDraw/ - cp *.h $(SERENITY_BASE_DIR)/Root/usr/include/LibDraw/ + mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibGfx/ + cp *.h $(SERENITY_BASE_DIR)/Root/usr/include/LibGfx/ cp $(LIBRARY) $(SERENITY_BASE_DIR)/Root/usr/lib/ include ../../Makefile.common diff --git a/Libraries/LibDraw/Orientation.h b/Libraries/LibGfx/Orientation.h similarity index 100% rename from Libraries/LibDraw/Orientation.h rename to Libraries/LibGfx/Orientation.h diff --git a/Libraries/LibDraw/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp similarity index 99% rename from Libraries/LibDraw/PNGLoader.cpp rename to Libraries/LibGfx/PNGLoader.cpp index 68a9c585b8..f194adde89 100644 --- a/Libraries/LibDraw/PNGLoader.cpp +++ b/Libraries/LibGfx/PNGLoader.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibDraw/PNGLoader.h b/Libraries/LibGfx/PNGLoader.h similarity index 96% rename from Libraries/LibDraw/PNGLoader.h rename to Libraries/LibGfx/PNGLoader.h index c3d5f8e3f8..c5217d5276 100644 --- a/Libraries/LibDraw/PNGLoader.h +++ b/Libraries/LibGfx/PNGLoader.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Painter.cpp b/Libraries/LibGfx/Painter.cpp similarity index 99% rename from Libraries/LibDraw/Painter.cpp rename to Libraries/LibGfx/Painter.cpp index 4cc8bbc42d..00c1e9d050 100644 --- a/Libraries/LibDraw/Painter.cpp +++ b/Libraries/LibGfx/Painter.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibDraw/Painter.h b/Libraries/LibGfx/Painter.h similarity index 98% rename from Libraries/LibDraw/Painter.h rename to Libraries/LibGfx/Painter.h index 638ef9d30e..7e8cfb838f 100644 --- a/Libraries/LibDraw/Painter.h +++ b/Libraries/LibGfx/Painter.h @@ -32,8 +32,8 @@ #include "Size.h" #include #include -#include -#include +#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Palette.cpp b/Libraries/LibGfx/Palette.cpp similarity index 98% rename from Libraries/LibDraw/Palette.cpp rename to Libraries/LibGfx/Palette.cpp index 217c1c9bcf..928387cb97 100644 --- a/Libraries/LibDraw/Palette.cpp +++ b/Libraries/LibGfx/Palette.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Palette.h b/Libraries/LibGfx/Palette.h similarity index 99% rename from Libraries/LibDraw/Palette.h rename to Libraries/LibGfx/Palette.h index 8e05f32b5a..76c7db2826 100644 --- a/Libraries/LibDraw/Palette.h +++ b/Libraries/LibGfx/Palette.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace GUI { class Application; diff --git a/Libraries/LibDraw/Point.h b/Libraries/LibGfx/Point.h similarity index 99% rename from Libraries/LibDraw/Point.h rename to Libraries/LibGfx/Point.h index 8bdd76efbd..1c52b62cfa 100644 --- a/Libraries/LibDraw/Point.h +++ b/Libraries/LibGfx/Point.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Rect.cpp b/Libraries/LibGfx/Rect.cpp similarity index 100% rename from Libraries/LibDraw/Rect.cpp rename to Libraries/LibGfx/Rect.cpp diff --git a/Libraries/LibDraw/Rect.h b/Libraries/LibGfx/Rect.h similarity index 98% rename from Libraries/LibDraw/Rect.h rename to Libraries/LibGfx/Rect.h index 3e9a1d8bfc..29fbba03fa 100644 --- a/Libraries/LibDraw/Rect.h +++ b/Libraries/LibGfx/Rect.h @@ -28,10 +28,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/Size.h b/Libraries/LibGfx/Size.h similarity index 99% rename from Libraries/LibDraw/Size.h rename to Libraries/LibGfx/Size.h index bc027617ca..1430bfb903 100644 --- a/Libraries/LibDraw/Size.h +++ b/Libraries/LibGfx/Size.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/StylePainter.cpp b/Libraries/LibGfx/StylePainter.cpp similarity index 99% rename from Libraries/LibDraw/StylePainter.cpp rename to Libraries/LibGfx/StylePainter.cpp index a94715c3dd..db5a99a095 100644 --- a/Libraries/LibDraw/StylePainter.cpp +++ b/Libraries/LibGfx/StylePainter.cpp @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include +#include +#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/StylePainter.h b/Libraries/LibGfx/StylePainter.h similarity index 98% rename from Libraries/LibDraw/StylePainter.h rename to Libraries/LibGfx/StylePainter.h index 9fd7d415e7..e78d45e066 100644 --- a/Libraries/LibDraw/StylePainter.h +++ b/Libraries/LibGfx/StylePainter.h @@ -26,7 +26,7 @@ #pragma once -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/SystemTheme.cpp b/Libraries/LibGfx/SystemTheme.cpp similarity index 99% rename from Libraries/LibDraw/SystemTheme.cpp rename to Libraries/LibGfx/SystemTheme.cpp index 18b7922dfd..312a605a0f 100644 --- a/Libraries/LibDraw/SystemTheme.cpp +++ b/Libraries/LibGfx/SystemTheme.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/SystemTheme.h b/Libraries/LibGfx/SystemTheme.h similarity index 98% rename from Libraries/LibDraw/SystemTheme.h rename to Libraries/LibGfx/SystemTheme.h index a84afb92a1..ae27b84113 100644 --- a/Libraries/LibDraw/SystemTheme.h +++ b/Libraries/LibGfx/SystemTheme.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace Gfx { diff --git a/Libraries/LibDraw/TextAlignment.h b/Libraries/LibGfx/TextAlignment.h similarity index 100% rename from Libraries/LibDraw/TextAlignment.h rename to Libraries/LibGfx/TextAlignment.h diff --git a/Libraries/LibDraw/TextElision.h b/Libraries/LibGfx/TextElision.h similarity index 100% rename from Libraries/LibDraw/TextElision.h rename to Libraries/LibGfx/TextElision.h diff --git a/Libraries/LibDraw/Triangle.h b/Libraries/LibGfx/Triangle.h similarity index 99% rename from Libraries/LibDraw/Triangle.h rename to Libraries/LibGfx/Triangle.h index 23aac1516e..3974f655a6 100644 --- a/Libraries/LibDraw/Triangle.h +++ b/Libraries/LibGfx/Triangle.h @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include namespace Gfx { diff --git a/Libraries/LibHTML/CSS/StyleProperties.h b/Libraries/LibHTML/CSS/StyleProperties.h index fd3fdfae9d..07c997550d 100644 --- a/Libraries/LibHTML/CSS/StyleProperties.h +++ b/Libraries/LibHTML/CSS/StyleProperties.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include namespace Gfx { diff --git a/Libraries/LibHTML/CSS/StyleValue.cpp b/Libraries/LibHTML/CSS/StyleValue.cpp index 09d31914ac..17398c8cbd 100644 --- a/Libraries/LibHTML/CSS/StyleValue.cpp +++ b/Libraries/LibHTML/CSS/StyleValue.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibHTML/CSS/StyleValue.h b/Libraries/LibHTML/CSS/StyleValue.h index 0ab130ea45..f2a1dd76b3 100644 --- a/Libraries/LibHTML/CSS/StyleValue.h +++ b/Libraries/LibHTML/CSS/StyleValue.h @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.cpp b/Libraries/LibHTML/DOM/HTMLImageElement.cpp index 482ea5b981..e4e2e10e1f 100644 --- a/Libraries/LibHTML/DOM/HTMLImageElement.cpp +++ b/Libraries/LibHTML/DOM/HTMLImageElement.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.h b/Libraries/LibHTML/DOM/HTMLImageElement.h index 1d5303db23..be8466f3be 100644 --- a/Libraries/LibHTML/DOM/HTMLImageElement.h +++ b/Libraries/LibHTML/DOM/HTMLImageElement.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include #include class LayoutDocument; diff --git a/Libraries/LibHTML/FontCache.cpp b/Libraries/LibHTML/FontCache.cpp index 00afe06e31..2942d0e1e5 100644 --- a/Libraries/LibHTML/FontCache.cpp +++ b/Libraries/LibHTML/FontCache.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include FontCache& FontCache::the() diff --git a/Libraries/LibHTML/Frame.h b/Libraries/LibHTML/Frame.h index a99e675737..0d98ae4ba5 100644 --- a/Libraries/LibHTML/Frame.h +++ b/Libraries/LibHTML/Frame.h @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include class Document; diff --git a/Libraries/LibHTML/HtmlView.cpp b/Libraries/LibHTML/HtmlView.cpp index a8dbdf169c..e8deca8265 100644 --- a/Libraries/LibHTML/HtmlView.cpp +++ b/Libraries/LibHTML/HtmlView.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/Libraries/LibHTML/Layout/BoxModelMetrics.h b/Libraries/LibHTML/Layout/BoxModelMetrics.h index f8f6f7a8d3..57f146f7d5 100644 --- a/Libraries/LibHTML/Layout/BoxModelMetrics.h +++ b/Libraries/LibHTML/Layout/BoxModelMetrics.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include class BoxModelMetrics { diff --git a/Libraries/LibHTML/Layout/LayoutBox.h b/Libraries/LibHTML/Layout/LayoutBox.h index 6fcd2a5f44..62d67f5119 100644 --- a/Libraries/LibHTML/Layout/LayoutBox.h +++ b/Libraries/LibHTML/Layout/LayoutBox.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include class LayoutBox : public LayoutNodeWithStyleAndBoxModelMetrics { diff --git a/Libraries/LibHTML/Layout/LayoutImage.cpp b/Libraries/LibHTML/Layout/LayoutImage.cpp index c77a412dfa..4cf6416568 100644 --- a/Libraries/LibHTML/Layout/LayoutImage.cpp +++ b/Libraries/LibHTML/Layout/LayoutImage.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include diff --git a/Libraries/LibHTML/Layout/LayoutNode.h b/Libraries/LibHTML/Layout/LayoutNode.h index e1e2470016..2f41c70df4 100644 --- a/Libraries/LibHTML/Layout/LayoutNode.h +++ b/Libraries/LibHTML/Layout/LayoutNode.h @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibHTML/Layout/LayoutText.cpp b/Libraries/LibHTML/Layout/LayoutText.cpp index 7e92654261..7ed3472d28 100644 --- a/Libraries/LibHTML/Layout/LayoutText.cpp +++ b/Libraries/LibHTML/Layout/LayoutText.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibHTML/Layout/LayoutWidget.cpp b/Libraries/LibHTML/Layout/LayoutWidget.cpp index b4ba2cde78..1c5c3ef530 100644 --- a/Libraries/LibHTML/Layout/LayoutWidget.cpp +++ b/Libraries/LibHTML/Layout/LayoutWidget.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include diff --git a/Libraries/LibHTML/Layout/LineBoxFragment.h b/Libraries/LibHTML/Layout/LineBoxFragment.h index 318378914b..8eb30e1832 100644 --- a/Libraries/LibHTML/Layout/LineBoxFragment.h +++ b/Libraries/LibHTML/Layout/LineBoxFragment.h @@ -26,7 +26,7 @@ #pragma once -#include +#include class LayoutNode; class RenderingContext; diff --git a/Libraries/LibHTML/RenderingContext.h b/Libraries/LibHTML/RenderingContext.h index 78df84335d..66814a7981 100644 --- a/Libraries/LibHTML/RenderingContext.h +++ b/Libraries/LibHTML/RenderingContext.h @@ -26,8 +26,8 @@ #pragma once -#include -#include +#include +#include namespace GUI { class Painter; diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp index b6149f21dc..10ce8b7063 100644 --- a/Libraries/LibVT/TerminalWidget.cpp +++ b/Libraries/LibVT/TerminalWidget.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Libraries/LibVT/TerminalWidget.h b/Libraries/LibVT/TerminalWidget.h index ac7c543a40..42287df246 100644 --- a/Libraries/LibVT/TerminalWidget.h +++ b/Libraries/LibVT/TerminalWidget.h @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/MenuApplets/Audio/Makefile b/MenuApplets/Audio/Makefile index 505393a09b..1033e9f303 100755 --- a/MenuApplets/Audio/Makefile +++ b/MenuApplets/Audio/Makefile @@ -2,6 +2,6 @@ OBJS = main.o PROGRAM = Audio.MenuApplet -LIB_DEPS = Audio GUI IPC Draw Thread Pthread Core +LIB_DEPS = Audio GUI IPC Gfx Thread Pthread Core include ../../Makefile.common diff --git a/MenuApplets/CPUGraph/Makefile b/MenuApplets/CPUGraph/Makefile index 608636fa6b..6c144c4a55 100755 --- a/MenuApplets/CPUGraph/Makefile +++ b/MenuApplets/CPUGraph/Makefile @@ -2,6 +2,6 @@ OBJS = main.o PROGRAM = CPUGraph.MenuApplet -LIB_DEPS = GUI IPC Draw Thread Pthread Core +LIB_DEPS = GUI IPC Gfx Thread Pthread Core include ../../Makefile.common diff --git a/MenuApplets/CPUGraph/main.cpp b/MenuApplets/CPUGraph/main.cpp index bfff585f00..03f4ccc7e0 100644 --- a/MenuApplets/CPUGraph/main.cpp +++ b/MenuApplets/CPUGraph/main.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/MenuApplets/Clock/Makefile b/MenuApplets/Clock/Makefile index f68290e9e6..622012ba2a 100755 --- a/MenuApplets/Clock/Makefile +++ b/MenuApplets/Clock/Makefile @@ -2,6 +2,6 @@ OBJS = main.o PROGRAM = Clock.MenuApplet -LIB_DEPS = GUI IPC Draw Core +LIB_DEPS = GUI IPC Gfx Core include ../../Makefile.common \ No newline at end of file diff --git a/MenuApplets/Clock/main.cpp b/MenuApplets/Clock/main.cpp index f0b9af9514..f3fc22db9f 100644 --- a/MenuApplets/Clock/main.cpp +++ b/MenuApplets/Clock/main.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include 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 -#include -#include +#include +#include +#include #include #include #include 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 #include #include -#include +#include 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 -#include -#include +#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 -#include -#include +#include +#include +#include #include // #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 #include #include -#include -#include +#include +#include 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 +#include 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 #include #include -#include +#include #include #include 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 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include 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 #include #include -#include +#include #include #include #include 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 +#include 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 +#include 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 #include -#include +#include 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 #include #include -#include -#include -#include +#include +#include +#include #include #include #include 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 -#include -#include -#include +#include +#include +#include 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 #include #include -#include -#include -#include +#include +#include +#include #include #include 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 -#include -#include -#include +#include +#include +#include +#include #include #include #include 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 #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include 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 #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include 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 -#include -#include +#include +#include +#include #include #include #include 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 #include #include -#include +#include 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 -#include -#include +#include +#include #include #include #include diff --git a/Userland/Makefile b/Userland/Makefile index cede7cf547..717c41425b 100644 --- a/Userland/Makefile +++ b/Userland/Makefile @@ -4,7 +4,7 @@ APPS = ${SRCS:.cpp=} EXTRA_CLEAN = $(APPS) -LIB_DEPS = HTML GUI Draw Audio Protocol IPC Thread Pthread Core PCIDB Markdown +LIB_DEPS = HTML GUI Gfx Audio Protocol IPC Thread Pthread Core PCIDB Markdown include ../Makefile.common