diff options
Diffstat (limited to 'Libraries')
102 files changed, 143 insertions, 143 deletions
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 <AK/RefPtr.h> #include <AK/String.h> #include <AK/Vector.h> -#include <LibDraw/Color.h> +#include <LibGfx/Color.h> 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 <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GAbstractButton.h> #include <LibGUI/GPainter.h> 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 <LibCore/CTimer.h> -#include <LibDraw/TextAlignment.h> +#include <LibGfx/TextAlignment.h> #include <LibGUI/GWidget.h> 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 <AK/StringBuilder.h> -#include <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GAbstractTableView.h> #include <LibGUI/GAction.h> #include <LibGUI/GMenu.h> 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 <AK/String.h> #include <AK/WeakPtr.h> #include <AK/Weakable.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGfx/GraphicsBitmap.h> #include <LibGUI/GShortcut.h> #include <LibGUI/GWindow.h> 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 <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> #include <LibGUI/GDesktop.h> 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 <AK/Badge.h> #include <AK/HashMap.h> #include <AK/OwnPtr.h> -#include <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GShortcut.h> 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 <AK/StringBuilder.h> #include <Kernel/KeyCode.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GAction.h> #include <LibGUI/GActionGroup.h> #include <LibGUI/GButton.h> 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 <AK/Function.h> #include <AK/String.h> -#include <LibDraw/GraphicsBitmap.h> -#include <LibDraw/StylePainter.h> -#include <LibDraw/TextAlignment.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/StylePainter.h> +#include <LibGfx/TextAlignment.h> #include <LibGUI/GAbstractButton.h> 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 <Kernel/KeyCode.h> -#include <LibDraw/CharacterBitmap.h> -#include <LibDraw/Palette.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/CharacterBitmap.h> +#include <LibGfx/Palette.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GCheckBox.h> #include <LibGUI/GPainter.h> 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 <LibDraw/CharacterBitmap.h> +#include <LibGfx/CharacterBitmap.h> #include <LibGUI/GColumnsView.h> #include <LibGUI/GPainter.h> #include <LibGUI/GScrollBar.h> 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 <AK/Badge.h> #include <AK/Function.h> #include <AK/String.h> -#include <LibDraw/Rect.h> +#include <LibGfx/Rect.h> 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 <LibDraw/GraphicsBitmap.h> +#include <LibGfx/GraphicsBitmap.h> #include <LibGUI/GDragOperation.h> #include <LibGUI/GWindowServerConnection.h> 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 <Kernel/KeyCode.h> #include <LibCore/CEvent.h> -#include <LibDraw/Point.h> -#include <LibDraw/Rect.h> +#include <LibGfx/Point.h> +#include <LibGfx/Rect.h> #include <LibGUI/GWindowType.h> 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 <AK/FileSystemPath.h> #include <AK/Function.h> -#include <LibDraw/PNGLoader.h> +#include <LibGfx/PNGLoader.h> #include <LibGUI/GAction.h> #include <LibGUI/GBoxLayout.h> #include <LibGUI/GButton.h> 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 <AK/FileSystemPath.h> #include <AK/StringBuilder.h> #include <LibCore/CDirIterator.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGfx/GraphicsBitmap.h> #include <LibGUI/GFileSystemModel.h> #include <LibGUI/GPainter.h> #include <LibThread/BackgroundAction.h> 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 <AK/QuickSort.h> #include <LibCore/CDirIterator.h> -#include <LibDraw/Font.h> +#include <LibGfx/Font.h> #include <LibGUI/GFontDatabase.h> #include <dirent.h> #include <stdio.h> 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 <LibDraw/StylePainter.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GFrame.h> #include <LibGUI/GPainter.h> 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 <LibDraw/StylePainter.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GWidget.h> 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 <LibDraw/Palette.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/Palette.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GGroupBox.h> #include <LibGUI/GPainter.h> 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 <AK/HashMap.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGfx/GraphicsBitmap.h> class GIconImpl : public RefCounted<GIconImpl> { 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 <AK/StringBuilder.h> #include <Kernel/KeyCode.h> -#include <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GDragOperation.h> #include <LibGUI/GItemView.h> #include <LibGUI/GModel.h> 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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/Palette.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Palette.h> #include <LibGUI/GLabel.h> #include <LibGUI/GPainter.h> 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 <LibDraw/TextAlignment.h> +#include <LibGfx/TextAlignment.h> #include <LibGUI/GFrame.h> 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 <Kernel/KeyCode.h> -#include <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GListView.h> #include <LibGUI/GPainter.h> #include <LibGUI/GScrollBar.h> 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 <AK/HashTable.h> #include <AK/RefCounted.h> #include <AK/String.h> -#include <LibDraw/TextAlignment.h> +#include <LibGfx/TextAlignment.h> #include <LibGUI/GModelIndex.h> #include <LibGUI/GVariant.h> 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 <LibDraw/Painter.h> +#include <LibGfx/Painter.h> 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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GPainter.h> #include <LibGUI/GRadioButton.h> 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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/Palette.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Palette.h> #include <LibGUI/GPainter.h> #include <LibGUI/GResizeCorner.h> #include <LibGUI/GWindow.h> 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 <LibDraw/CharacterBitmap.h> -#include <LibDraw/GraphicsBitmap.h> -#include <LibDraw/Palette.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/CharacterBitmap.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Palette.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GPainter.h> #include <LibGUI/GScrollBar.h> 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 <LibDraw/StylePainter.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GPainter.h> #include <LibGUI/GSlider.h> 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 <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GBoxLayout.h> #include <LibGUI/GSplitter.h> #include <LibGUI/GWindow.h> 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 <LibDraw/StylePainter.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GBoxLayout.h> #include <LibGUI/GLabel.h> #include <LibGUI/GPainter.h> 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 <LibDraw/Palette.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/Palette.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GBoxLayout.h> #include <LibGUI/GPainter.h> #include <LibGUI/GTabWidget.h> 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 <AK/StringBuilder.h> #include <Kernel/KeyCode.h> -#include <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GAction.h> #include <LibGUI/GMenu.h> #include <LibGUI/GModel.h> 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 <AK/NonnullRefPtr.h> #include <AK/RefCounted.h> #include <LibCore/CTimer.h> -#include <LibDraw/Color.h> -#include <LibDraw/Font.h> +#include <LibGfx/Color.h> +#include <LibGfx/Font.h> #include <LibGUI/GTextRange.h> #include <LibGUI/GUndoStack.h> 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 <AK/QuickSort.h> #include <AK/StringBuilder.h> #include <Kernel/KeyCode.h> -#include <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GAction.h> #include <LibGUI/GClipboard.h> #include <LibGUI/GFontDatabase.h> 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 <AK/NonnullOwnPtrVector.h> #include <AK/NonnullRefPtrVector.h> #include <LibCore/CTimer.h> -#include <LibDraw/TextAlignment.h> +#include <LibGfx/TextAlignment.h> #include <LibGUI/GScrollableWidget.h> #include <LibGUI/GTextDocument.h> #include <LibGUI/GTextRange.h> 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 <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GAction.h> #include <LibGUI/GActionGroup.h> #include <LibGUI/GBoxLayout.h> 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 <LibDraw/Palette.h> +#include <LibGfx/Palette.h> #include <LibGUI/GPainter.h> #include <LibGUI/GScrollBar.h> #include <LibGUI/GTreeView.h> 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 <AK/String.h> -#include <LibDraw/Font.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGfx/Font.h> +#include <LibGfx/GraphicsBitmap.h> #include <LibGUI/GIcon.h> 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 <AK/Assertions.h> #include <AK/JsonObject.h> -#include <LibDraw/GraphicsBitmap.h> -#include <LibDraw/Palette.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Palette.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> #include <LibGUI/GButton.h> 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 <AK/String.h> #include <LibCore/CElapsedTimer.h> #include <LibCore/CObject.h> -#include <LibDraw/Color.h> -#include <LibDraw/Font.h> -#include <LibDraw/Orientation.h> -#include <LibDraw/Palette.h> -#include <LibDraw/Rect.h> -#include <LibDraw/SystemTheme.h> +#include <LibGfx/Color.h> +#include <LibGfx/Font.h> +#include <LibGfx/Orientation.h> +#include <LibGfx/Palette.h> +#include <LibGfx/Rect.h> +#include <LibGfx/SystemTheme.h> #include <LibGUI/GEvent.h> #include <LibGUI/GShortcut.h> 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 <AK/JsonObject.h> #include <AK/NeverDestroyed.h> #include <AK/SharedBuffer.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGfx/GraphicsBitmap.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> #include <LibGUI/GEvent.h> 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 <AK/String.h> #include <AK/WeakPtr.h> #include <LibCore/CObject.h> -#include <LibDraw/GraphicsBitmap.h> -#include <LibDraw/Rect.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Rect.h> #include <LibGUI/GWindowType.h> 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 <LibDraw/Palette.h> -#include <LibDraw/SystemTheme.h> +#include <LibGfx/Palette.h> +#include <LibGfx/SystemTheme.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> #include <LibGUI/GClipboard.h> diff --git a/Libraries/LibDraw/CharacterBitmap.cpp b/Libraries/LibGfx/CharacterBitmap.cpp index d51ff1d080..d51ff1d080 100644 --- a/Libraries/LibDraw/CharacterBitmap.cpp +++ b/Libraries/LibGfx/CharacterBitmap.cpp diff --git a/Libraries/LibDraw/CharacterBitmap.h b/Libraries/LibGfx/CharacterBitmap.h index 0a77d123af..0a77d123af 100644 --- a/Libraries/LibDraw/CharacterBitmap.h +++ b/Libraries/LibGfx/CharacterBitmap.h diff --git a/Libraries/LibDraw/Color.cpp b/Libraries/LibGfx/Color.cpp index dcfdf90e80..22eb8ecaa5 100644 --- a/Libraries/LibDraw/Color.cpp +++ b/Libraries/LibGfx/Color.cpp @@ -25,8 +25,8 @@ */ #include <AK/Assertions.h> -#include <LibDraw/Color.h> -#include <LibDraw/SystemTheme.h> +#include <LibGfx/Color.h> +#include <LibGfx/SystemTheme.h> #include <ctype.h> #include <stdio.h> diff --git a/Libraries/LibDraw/Color.h b/Libraries/LibGfx/Color.h index 395ffa4149..395ffa4149 100644 --- a/Libraries/LibDraw/Color.h +++ b/Libraries/LibGfx/Color.h diff --git a/Libraries/LibDraw/DisjointRectSet.cpp b/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 <LibDraw/DisjointRectSet.h> +#include <LibGfx/DisjointRectSet.h> namespace Gfx { diff --git a/Libraries/LibDraw/DisjointRectSet.h b/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 <AK/Vector.h> -#include <LibDraw/Rect.h> +#include <LibGfx/Rect.h> namespace Gfx { diff --git a/Libraries/LibDraw/Emoji.cpp b/Libraries/LibGfx/Emoji.cpp index fe8b7e9339..bb0fc3910e 100644 --- a/Libraries/LibDraw/Emoji.cpp +++ b/Libraries/LibGfx/Emoji.cpp @@ -26,8 +26,8 @@ #include <AK/HashMap.h> #include <AK/String.h> -#include <LibDraw/Emoji.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGfx/Emoji.h> +#include <LibGfx/GraphicsBitmap.h> namespace Gfx { diff --git a/Libraries/LibDraw/Emoji.h b/Libraries/LibGfx/Emoji.h index 094f2050d7..094f2050d7 100644 --- a/Libraries/LibDraw/Emoji.h +++ b/Libraries/LibGfx/Emoji.h diff --git a/Libraries/LibDraw/FloatPoint.h b/Libraries/LibGfx/FloatPoint.h index 05f16c7cfc..03a685dd19 100644 --- a/Libraries/LibDraw/FloatPoint.h +++ b/Libraries/LibGfx/FloatPoint.h @@ -28,7 +28,7 @@ #include <AK/LogStream.h> #include <AK/String.h> -#include <LibDraw/Orientation.h> +#include <LibGfx/Orientation.h> namespace Gfx { diff --git a/Libraries/LibDraw/FloatRect.h b/Libraries/LibGfx/FloatRect.h index 91ec03eee1..4c3779b34d 100644 --- a/Libraries/LibDraw/FloatRect.h +++ b/Libraries/LibGfx/FloatRect.h @@ -28,11 +28,11 @@ #include <AK/LogStream.h> #include <AK/String.h> -#include <LibDraw/FloatPoint.h> -#include <LibDraw/FloatSize.h> -#include <LibDraw/Orientation.h> -#include <LibDraw/Rect.h> -#include <LibDraw/TextAlignment.h> +#include <LibGfx/FloatPoint.h> +#include <LibGfx/FloatSize.h> +#include <LibGfx/Orientation.h> +#include <LibGfx/Rect.h> +#include <LibGfx/TextAlignment.h> #include <math.h> namespace Gfx { diff --git a/Libraries/LibDraw/FloatSize.h b/Libraries/LibGfx/FloatSize.h index 08376a5fc2..90d4167538 100644 --- a/Libraries/LibDraw/FloatSize.h +++ b/Libraries/LibGfx/FloatSize.h @@ -28,7 +28,7 @@ #include <AK/LogStream.h> #include <AK/String.h> -#include <LibDraw/Orientation.h> +#include <LibGfx/Orientation.h> namespace Gfx { diff --git a/Libraries/LibDraw/Font.cpp b/Libraries/LibGfx/Font.cpp index d8ea312793..d8ea312793 100644 --- a/Libraries/LibDraw/Font.cpp +++ b/Libraries/LibGfx/Font.cpp diff --git a/Libraries/LibDraw/Font.h b/Libraries/LibGfx/Font.h index b164582e84..07fe58d785 100644 --- a/Libraries/LibDraw/Font.h +++ b/Libraries/LibGfx/Font.h @@ -32,7 +32,7 @@ #include <AK/String.h> #include <AK/Types.h> #include <AK/Utf8View.h> -#include <LibDraw/Rect.h> +#include <LibGfx/Rect.h> namespace Gfx { diff --git a/Libraries/LibDraw/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp index 2ef4ea59e8..8ec1a052ee 100644 --- a/Libraries/LibDraw/GIFLoader.cpp +++ b/Libraries/LibGfx/GIFLoader.cpp @@ -28,7 +28,7 @@ #include <AK/ByteBuffer.h> #include <AK/FileSystemPath.h> #include <AK/NonnullOwnPtrVector.h> -#include <LibDraw/GIFLoader.h> +#include <LibGfx/GIFLoader.h> #include <stdio.h> namespace Gfx { diff --git a/Libraries/LibDraw/GIFLoader.h b/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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/ImageDecoder.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/ImageDecoder.h> namespace Gfx { diff --git a/Libraries/LibDraw/GraphicsBitmap.cpp b/Libraries/LibGfx/GraphicsBitmap.cpp index 7b5e00dd2b..d48cfa7d03 100644 --- a/Libraries/LibDraw/GraphicsBitmap.cpp +++ b/Libraries/LibGfx/GraphicsBitmap.cpp @@ -25,8 +25,8 @@ */ #include <AK/MappedFile.h> -#include <LibDraw/GraphicsBitmap.h> -#include <LibDraw/PNGLoader.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/PNGLoader.h> #include <errno.h> #include <fcntl.h> #include <stdio.h> diff --git a/Libraries/LibDraw/GraphicsBitmap.h b/Libraries/LibGfx/GraphicsBitmap.h index 7c64eafd1b..7c64eafd1b 100644 --- a/Libraries/LibDraw/GraphicsBitmap.h +++ b/Libraries/LibGfx/GraphicsBitmap.h diff --git a/Libraries/LibDraw/ImageDecoder.cpp b/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 <LibDraw/ImageDecoder.h> -#include <LibDraw/PNGLoader.h> +#include <LibGfx/ImageDecoder.h> +#include <LibGfx/PNGLoader.h> namespace Gfx { diff --git a/Libraries/LibDraw/ImageDecoder.h b/Libraries/LibGfx/ImageDecoder.h index d00a90c4dd..dd3d901173 100644 --- a/Libraries/LibDraw/ImageDecoder.h +++ b/Libraries/LibGfx/ImageDecoder.h @@ -29,7 +29,7 @@ #include <AK/NonnullRefPtr.h> #include <AK/OwnPtr.h> #include <AK/RefCounted.h> -#include <LibDraw/Size.h> +#include <LibGfx/Size.h> namespace Gfx { diff --git a/Libraries/LibDraw/Makefile b/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 index e83af3f530..e83af3f530 100644 --- a/Libraries/LibDraw/Orientation.h +++ b/Libraries/LibGfx/Orientation.h diff --git a/Libraries/LibDraw/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp index 68a9c585b8..f194adde89 100644 --- a/Libraries/LibDraw/PNGLoader.cpp +++ b/Libraries/LibGfx/PNGLoader.cpp @@ -28,7 +28,7 @@ #include <AK/MappedFile.h> #include <AK/NetworkOrdered.h> #include <LibCore/puff.h> -#include <LibDraw/PNGLoader.h> +#include <LibGfx/PNGLoader.h> #include <fcntl.h> #include <serenity.h> #include <stdio.h> diff --git a/Libraries/LibDraw/PNGLoader.h b/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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/ImageDecoder.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/ImageDecoder.h> namespace Gfx { diff --git a/Libraries/LibDraw/Painter.cpp b/Libraries/LibGfx/Painter.cpp index 4cc8bbc42d..00c1e9d050 100644 --- a/Libraries/LibDraw/Painter.cpp +++ b/Libraries/LibGfx/Painter.cpp @@ -32,7 +32,7 @@ #include <AK/StdLibExtras.h> #include <AK/StringBuilder.h> #include <AK/Utf8View.h> -#include <LibDraw/CharacterBitmap.h> +#include <LibGfx/CharacterBitmap.h> #include <math.h> #include <stdio.h> #include <unistd.h> diff --git a/Libraries/LibDraw/Painter.h b/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 <AK/String.h> #include <AK/Utf8View.h> -#include <LibDraw/TextAlignment.h> -#include <LibDraw/TextElision.h> +#include <LibGfx/TextAlignment.h> +#include <LibGfx/TextElision.h> namespace Gfx { diff --git a/Libraries/LibDraw/Palette.cpp b/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 <LibDraw/Palette.h> +#include <LibGfx/Palette.h> namespace Gfx { diff --git a/Libraries/LibDraw/Palette.h b/Libraries/LibGfx/Palette.h index 8e05f32b5a..76c7db2826 100644 --- a/Libraries/LibDraw/Palette.h +++ b/Libraries/LibGfx/Palette.h @@ -28,7 +28,7 @@ #include <AK/Badge.h> #include <AK/Noncopyable.h> -#include <LibDraw/SystemTheme.h> +#include <LibGfx/SystemTheme.h> namespace GUI { class Application; diff --git a/Libraries/LibDraw/Point.h b/Libraries/LibGfx/Point.h index 8bdd76efbd..1c52b62cfa 100644 --- a/Libraries/LibDraw/Point.h +++ b/Libraries/LibGfx/Point.h @@ -28,7 +28,7 @@ #include <AK/LogStream.h> #include <AK/String.h> -#include <LibDraw/Orientation.h> +#include <LibGfx/Orientation.h> namespace Gfx { diff --git a/Libraries/LibDraw/Rect.cpp b/Libraries/LibGfx/Rect.cpp index 45b47a1549..45b47a1549 100644 --- a/Libraries/LibDraw/Rect.cpp +++ b/Libraries/LibGfx/Rect.cpp diff --git a/Libraries/LibDraw/Rect.h b/Libraries/LibGfx/Rect.h index 3e9a1d8bfc..29fbba03fa 100644 --- a/Libraries/LibDraw/Rect.h +++ b/Libraries/LibGfx/Rect.h @@ -28,10 +28,10 @@ #include <AK/LogStream.h> #include <AK/String.h> -#include <LibDraw/Orientation.h> -#include <LibDraw/Point.h> -#include <LibDraw/Size.h> -#include <LibDraw/TextAlignment.h> +#include <LibGfx/Orientation.h> +#include <LibGfx/Point.h> +#include <LibGfx/Size.h> +#include <LibGfx/TextAlignment.h> namespace Gfx { diff --git a/Libraries/LibDraw/Size.h b/Libraries/LibGfx/Size.h index bc027617ca..1430bfb903 100644 --- a/Libraries/LibDraw/Size.h +++ b/Libraries/LibGfx/Size.h @@ -28,7 +28,7 @@ #include <AK/LogStream.h> #include <AK/String.h> -#include <LibDraw/Orientation.h> +#include <LibGfx/Orientation.h> namespace Gfx { diff --git a/Libraries/LibDraw/StylePainter.cpp b/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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/Painter.h> -#include <LibDraw/Palette.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Painter.h> +#include <LibGfx/Palette.h> +#include <LibGfx/StylePainter.h> namespace Gfx { diff --git a/Libraries/LibDraw/StylePainter.h b/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 <LibDraw/Color.h> +#include <LibGfx/Color.h> namespace Gfx { diff --git a/Libraries/LibDraw/SystemTheme.cpp b/Libraries/LibGfx/SystemTheme.cpp index 18b7922dfd..312a605a0f 100644 --- a/Libraries/LibDraw/SystemTheme.cpp +++ b/Libraries/LibGfx/SystemTheme.cpp @@ -25,7 +25,7 @@ */ #include <LibCore/CConfigFile.h> -#include <LibDraw/SystemTheme.h> +#include <LibGfx/SystemTheme.h> namespace Gfx { diff --git a/Libraries/LibDraw/SystemTheme.h b/Libraries/LibGfx/SystemTheme.h index a84afb92a1..ae27b84113 100644 --- a/Libraries/LibDraw/SystemTheme.h +++ b/Libraries/LibGfx/SystemTheme.h @@ -28,7 +28,7 @@ #include <AK/SharedBuffer.h> #include <AK/Types.h> -#include <LibDraw/Color.h> +#include <LibGfx/Color.h> namespace Gfx { diff --git a/Libraries/LibDraw/TextAlignment.h b/Libraries/LibGfx/TextAlignment.h index 4e527711b8..4e527711b8 100644 --- a/Libraries/LibDraw/TextAlignment.h +++ b/Libraries/LibGfx/TextAlignment.h diff --git a/Libraries/LibDraw/TextElision.h b/Libraries/LibGfx/TextElision.h index cf8cecc001..cf8cecc001 100644 --- a/Libraries/LibDraw/TextElision.h +++ b/Libraries/LibGfx/TextElision.h diff --git a/Libraries/LibDraw/Triangle.h b/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 <LibDraw/Point.h> +#include <LibGfx/Point.h> 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 <AK/HashMap.h> #include <AK/NonnullRefPtr.h> -#include <LibDraw/Font.h> +#include <LibGfx/Font.h> #include <LibHTML/CSS/StyleValue.h> 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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/PNGLoader.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/PNGLoader.h> #include <LibHTML/CSS/StyleValue.h> #include <LibHTML/DOM/Document.h> #include <LibHTML/Frame.h> 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 <AK/StringView.h> #include <AK/URL.h> #include <AK/WeakPtr.h> -#include <LibDraw/Color.h> -#include <LibDraw/GraphicsBitmap.h> +#include <LibGfx/Color.h> +#include <LibGfx/GraphicsBitmap.h> #include <LibHTML/CSS/Length.h> #include <LibHTML/CSS/PropertyID.h> 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 <LibDraw/PNGLoader.h> +#include <LibGfx/PNGLoader.h> #include <LibHTML/CSS/StyleResolver.h> #include <LibHTML/DOM/Document.h> #include <LibHTML/DOM/HTMLImageElement.h> 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 <LibDraw/GraphicsBitmap.h> -#include <LibDraw/ImageDecoder.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/ImageDecoder.h> #include <LibHTML/DOM/HTMLElement.h> 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 <LibDraw/Font.h> +#include <LibGfx/Font.h> #include <LibHTML/FontCache.h> 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 <AK/Noncopyable.h> #include <AK/RefPtr.h> #include <AK/WeakPtr.h> -#include <LibDraw/Rect.h> -#include <LibDraw/Size.h> +#include <LibGfx/Rect.h> +#include <LibGfx/Size.h> #include <LibHTML/TreeNode.h> 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 <AK/FileSystemPath.h> #include <LibCore/CFile.h> -#include <LibDraw/PNGLoader.h> +#include <LibGfx/PNGLoader.h> #include <LibGUI/GApplication.h> #include <LibGUI/GPainter.h> #include <LibGUI/GScrollBar.h> 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 <LibDraw/Size.h> +#include <LibGfx/Size.h> #include <LibHTML/CSS/LengthBox.h> 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 <LibDraw/FloatRect.h> +#include <LibGfx/FloatRect.h> #include <LibHTML/Layout/LayoutNode.h> 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 <LibDraw/Font.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/Font.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GPainter.h> #include <LibHTML/Layout/LayoutImage.h> 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 <AK/NonnullRefPtr.h> #include <AK/Vector.h> -#include <LibDraw/FloatRect.h> -#include <LibDraw/Rect.h> +#include <LibGfx/FloatRect.h> +#include <LibGfx/Rect.h> #include <LibHTML/CSS/StyleProperties.h> #include <LibHTML/Layout/BoxModelMetrics.h> #include <LibHTML/Layout/LayoutPosition.h> 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 <AK/StringBuilder.h> #include <AK/Utf8View.h> #include <LibCore/CDirIterator.h> -#include <LibDraw/Font.h> +#include <LibGfx/Font.h> #include <LibGUI/GPainter.h> #include <LibHTML/DOM/Document.h> #include <LibHTML/Layout/LayoutBlock.h> 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 <LibDraw/Font.h> -#include <LibDraw/StylePainter.h> +#include <LibGfx/Font.h> +#include <LibGfx/StylePainter.h> #include <LibGUI/GPainter.h> #include <LibGUI/GWidget.h> #include <LibHTML/Layout/LayoutWidget.h> 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 <LibDraw/FloatRect.h> +#include <LibGfx/FloatRect.h> 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 <LibDraw/Palette.h> -#include <LibDraw/Rect.h> +#include <LibGfx/Palette.h> +#include <LibGfx/Rect.h> 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 <AK/String.h> #include <AK/StringBuilder.h> #include <Kernel/KeyCode.h> -#include <LibDraw/Font.h> +#include <LibGfx/Font.h> #include <LibGUI/GAction.h> #include <LibGUI/GApplication.h> #include <LibGUI/GClipboard.h> 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 <LibCore/CConfigFile.h> #include <LibCore/CNotifier.h> #include <LibCore/CTimer.h> -#include <LibDraw/GraphicsBitmap.h> -#include <LibDraw/Rect.h> +#include <LibGfx/GraphicsBitmap.h> +#include <LibGfx/Rect.h> #include <LibGUI/GFrame.h> #include <LibVT/Terminal.h> |