summaryrefslogtreecommitdiff
path: root/Applications/PaintBrush
diff options
context:
space:
mode:
Diffstat (limited to 'Applications/PaintBrush')
-rw-r--r--Applications/PaintBrush/BucketTool.cpp2
-rw-r--r--Applications/PaintBrush/EllipseTool.cpp6
-rw-r--r--Applications/PaintBrush/EllipseTool.h2
-rw-r--r--Applications/PaintBrush/EraseTool.cpp6
-rw-r--r--Applications/PaintBrush/EraseTool.h2
-rw-r--r--Applications/PaintBrush/LineTool.cpp6
-rw-r--r--Applications/PaintBrush/LineTool.h2
-rw-r--r--Applications/PaintBrush/PaintableWidget.cpp2
-rw-r--r--Applications/PaintBrush/PaintableWidget.h2
-rw-r--r--Applications/PaintBrush/PaletteWidget.cpp4
-rw-r--r--Applications/PaintBrush/PaletteWidget.h2
-rw-r--r--Applications/PaintBrush/PenTool.cpp6
-rw-r--r--Applications/PaintBrush/PenTool.h2
-rw-r--r--Applications/PaintBrush/RectangleTool.cpp6
-rw-r--r--Applications/PaintBrush/SprayTool.cpp6
-rw-r--r--Applications/PaintBrush/SprayTool.h4
-rw-r--r--Applications/PaintBrush/ToolboxWidget.cpp4
-rw-r--r--Applications/PaintBrush/ToolboxWidget.h2
-rw-r--r--Applications/PaintBrush/main.cpp18
19 files changed, 42 insertions, 42 deletions
diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PaintBrush/BucketTool.cpp
index a227255979..fa6c95dc8f 100644
--- a/Applications/PaintBrush/BucketTool.cpp
+++ b/Applications/PaintBrush/BucketTool.cpp
@@ -28,7 +28,7 @@
#include "PaintableWidget.h"
#include <AK/Queue.h>
#include <AK/SinglyLinkedList.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibGfx/Bitmap.h>
#include <stdio.h>
diff --git a/Applications/PaintBrush/EllipseTool.cpp b/Applications/PaintBrush/EllipseTool.cpp
index 99aa902575..0824d72b3d 100644
--- a/Applications/PaintBrush/EllipseTool.cpp
+++ b/Applications/PaintBrush/EllipseTool.cpp
@@ -27,9 +27,9 @@
#include "EllipseTool.h"
#include "PaintableWidget.h"
#include <LibGfx/Rect.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
#include <LibM/math.h>
EllipseTool::EllipseTool()
diff --git a/Applications/PaintBrush/EllipseTool.h b/Applications/PaintBrush/EllipseTool.h
index b1ff1adabc..96dc3e15c0 100644
--- a/Applications/PaintBrush/EllipseTool.h
+++ b/Applications/PaintBrush/EllipseTool.h
@@ -28,7 +28,7 @@
#include "Tool.h"
#include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
namespace GUI {
class Menu;
diff --git a/Applications/PaintBrush/EraseTool.cpp b/Applications/PaintBrush/EraseTool.cpp
index 06129de9a9..aa02fbaf20 100644
--- a/Applications/PaintBrush/EraseTool.cpp
+++ b/Applications/PaintBrush/EraseTool.cpp
@@ -26,9 +26,9 @@
#include "EraseTool.h"
#include "PaintableWidget.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
EraseTool::EraseTool()
{
diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PaintBrush/EraseTool.h
index d91eb12c4e..fafa506ffa 100644
--- a/Applications/PaintBrush/EraseTool.h
+++ b/Applications/PaintBrush/EraseTool.h
@@ -28,7 +28,7 @@
#include "Tool.h"
#include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
namespace GUI {
class Menu;
diff --git a/Applications/PaintBrush/LineTool.cpp b/Applications/PaintBrush/LineTool.cpp
index f32af8fec0..8984f52ccd 100644
--- a/Applications/PaintBrush/LineTool.cpp
+++ b/Applications/PaintBrush/LineTool.cpp
@@ -26,9 +26,9 @@
#include "LineTool.h"
#include "PaintableWidget.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
#include <LibM/math.h>
static Gfx::Point constrain_line_angle(const Gfx::Point& start_pos, const Gfx::Point& end_pos, float angle_increment)
diff --git a/Applications/PaintBrush/LineTool.h b/Applications/PaintBrush/LineTool.h
index 8a1ffdec6c..132982314c 100644
--- a/Applications/PaintBrush/LineTool.h
+++ b/Applications/PaintBrush/LineTool.h
@@ -28,7 +28,7 @@
#include "Tool.h"
#include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
namespace GUI {
class Menu;
diff --git a/Applications/PaintBrush/PaintableWidget.cpp b/Applications/PaintBrush/PaintableWidget.cpp
index 20ee4df400..5ea6f89884 100644
--- a/Applications/PaintBrush/PaintableWidget.cpp
+++ b/Applications/PaintBrush/PaintableWidget.cpp
@@ -28,7 +28,7 @@
#include "Tool.h"
#include <LibGfx/Bitmap.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
static PaintableWidget* s_the;
diff --git a/Applications/PaintBrush/PaintableWidget.h b/Applications/PaintBrush/PaintableWidget.h
index 79300c66da..6676ac5bb8 100644
--- a/Applications/PaintBrush/PaintableWidget.h
+++ b/Applications/PaintBrush/PaintableWidget.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
class Tool;
class PaintableWidget final : public GUI::Widget {
diff --git a/Applications/PaintBrush/PaletteWidget.cpp b/Applications/PaintBrush/PaletteWidget.cpp
index dab5ec0696..a2c6b78f56 100644
--- a/Applications/PaintBrush/PaletteWidget.cpp
+++ b/Applications/PaintBrush/PaletteWidget.cpp
@@ -26,8 +26,8 @@
#include "PaletteWidget.h"
#include "PaintableWidget.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GColorPicker.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/ColorPicker.h>
class ColorWidget : public GUI::Frame {
C_OBJECT(ColorWidget)
diff --git a/Applications/PaintBrush/PaletteWidget.h b/Applications/PaintBrush/PaletteWidget.h
index ca2934d32e..897a227010 100644
--- a/Applications/PaintBrush/PaletteWidget.h
+++ b/Applications/PaintBrush/PaletteWidget.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
class PaintableWidget;
diff --git a/Applications/PaintBrush/PenTool.cpp b/Applications/PaintBrush/PenTool.cpp
index 1ba2a01bb1..1cfcf4cde2 100644
--- a/Applications/PaintBrush/PenTool.cpp
+++ b/Applications/PaintBrush/PenTool.cpp
@@ -26,9 +26,9 @@
#include "PenTool.h"
#include "PaintableWidget.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
PenTool::PenTool()
{
diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PaintBrush/PenTool.h
index 0ed54a9319..a91ad08e7d 100644
--- a/Applications/PaintBrush/PenTool.h
+++ b/Applications/PaintBrush/PenTool.h
@@ -28,7 +28,7 @@
#include "Tool.h"
#include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
namespace GUI {
class Menu;
diff --git a/Applications/PaintBrush/RectangleTool.cpp b/Applications/PaintBrush/RectangleTool.cpp
index 5d016ce0af..b6ae419ace 100644
--- a/Applications/PaintBrush/RectangleTool.cpp
+++ b/Applications/PaintBrush/RectangleTool.cpp
@@ -27,9 +27,9 @@
#include "RectangleTool.h"
#include "PaintableWidget.h"
#include <LibGfx/Rect.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
#include <LibM/math.h>
RectangleTool::RectangleTool()
diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp
index 7d2e17fce0..9f29c056bf 100644
--- a/Applications/PaintBrush/SprayTool.cpp
+++ b/Applications/PaintBrush/SprayTool.cpp
@@ -28,9 +28,9 @@
#include "PaintableWidget.h"
#include <AK/Queue.h>
#include <AK/SinglyLinkedList.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
#include <LibGfx/Bitmap.h>
#include <stdio.h>
#include <LibM/math.h>
diff --git a/Applications/PaintBrush/SprayTool.h b/Applications/PaintBrush/SprayTool.h
index 9964c00922..c9abee0fc8 100644
--- a/Applications/PaintBrush/SprayTool.h
+++ b/Applications/PaintBrush/SprayTool.h
@@ -28,8 +28,8 @@
#include "Tool.h"
#include <LibCore/Timer.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/Painter.h>
namespace GUI {
class Menu;
diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PaintBrush/ToolboxWidget.cpp
index 94aa9d54a5..4085311933 100644
--- a/Applications/PaintBrush/ToolboxWidget.cpp
+++ b/Applications/PaintBrush/ToolboxWidget.cpp
@@ -34,8 +34,8 @@
#include "PickerTool.h"
#include "RectangleTool.h"
#include "SprayTool.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
class ToolButton final : public GUI::Button {
C_OBJECT(ToolButton)
diff --git a/Applications/PaintBrush/ToolboxWidget.h b/Applications/PaintBrush/ToolboxWidget.h
index 2906064ac8..7553144da1 100644
--- a/Applications/PaintBrush/ToolboxWidget.h
+++ b/Applications/PaintBrush/ToolboxWidget.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
class ToolboxWidget final : public GUI::Frame {
C_OBJECT(ToolboxWidget)
diff --git a/Applications/PaintBrush/main.cpp b/Applications/PaintBrush/main.cpp
index 3d6468622d..cc02c916dd 100644
--- a/Applications/PaintBrush/main.cpp
+++ b/Applications/PaintBrush/main.cpp
@@ -27,15 +27,15 @@
#include "PaintableWidget.h"
#include "PaletteWidget.h"
#include "ToolboxWidget.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GFilePicker.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/FilePicker.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/Window.h>
#include <stdio.h>
int main(int argc, char** argv)