summaryrefslogtreecommitdiff
path: root/Libraries
diff options
context:
space:
mode:
Diffstat (limited to 'Libraries')
-rw-r--r--Libraries/LibGUI/AboutDialog.cpp (renamed from Libraries/LibGUI/GAboutDialog.cpp)10
-rw-r--r--Libraries/LibGUI/AboutDialog.h (renamed from Libraries/LibGUI/GAboutDialog.h)2
-rw-r--r--Libraries/LibGUI/AbstractButton.cpp (renamed from Libraries/LibGUI/GAbstractButton.cpp)4
-rw-r--r--Libraries/LibGUI/AbstractButton.h (renamed from Libraries/LibGUI/GAbstractButton.h)2
-rw-r--r--Libraries/LibGUI/AbstractTableView.cpp (renamed from Libraries/LibGUI/GAbstractTableView.cpp)10
-rw-r--r--Libraries/LibGUI/AbstractTableView.h (renamed from Libraries/LibGUI/GAbstractTableView.h)2
-rw-r--r--Libraries/LibGUI/AbstractView.cpp (renamed from Libraries/LibGUI/GAbstractView.cpp)14
-rw-r--r--Libraries/LibGUI/AbstractView.h (renamed from Libraries/LibGUI/GAbstractView.h)6
-rw-r--r--Libraries/LibGUI/Action.cpp (renamed from Libraries/LibGUI/GAction.cpp)10
-rw-r--r--Libraries/LibGUI/Action.h (renamed from Libraries/LibGUI/GAction.h)4
-rw-r--r--Libraries/LibGUI/ActionGroup.cpp (renamed from Libraries/LibGUI/GActionGroup.cpp)4
-rw-r--r--Libraries/LibGUI/ActionGroup.h (renamed from Libraries/LibGUI/GActionGroup.h)0
-rw-r--r--Libraries/LibGUI/Application.cpp (renamed from Libraries/LibGUI/GApplication.cpp)16
-rw-r--r--Libraries/LibGUI/Application.h (renamed from Libraries/LibGUI/GApplication.h)2
-rw-r--r--Libraries/LibGUI/BoxLayout.cpp (renamed from Libraries/LibGUI/GBoxLayout.cpp)2
-rw-r--r--Libraries/LibGUI/BoxLayout.h (renamed from Libraries/LibGUI/GBoxLayout.h)4
-rw-r--r--Libraries/LibGUI/Button.cpp (renamed from Libraries/LibGUI/GButton.cpp)8
-rw-r--r--Libraries/LibGUI/Button.h (renamed from Libraries/LibGUI/GButton.h)2
-rw-r--r--Libraries/LibGUI/CheckBox.cpp (renamed from Libraries/LibGUI/GCheckBox.cpp)4
-rw-r--r--Libraries/LibGUI/CheckBox.h (renamed from Libraries/LibGUI/GCheckBox.h)2
-rw-r--r--Libraries/LibGUI/Clipboard.cpp (renamed from Libraries/LibGUI/GClipboard.cpp)4
-rw-r--r--Libraries/LibGUI/Clipboard.h (renamed from Libraries/LibGUI/GClipboard.h)0
-rw-r--r--Libraries/LibGUI/ColorPicker.cpp (renamed from Libraries/LibGUI/GColorPicker.cpp)12
-rw-r--r--Libraries/LibGUI/ColorPicker.h (renamed from Libraries/LibGUI/GColorPicker.h)2
-rw-r--r--Libraries/LibGUI/ColumnsView.cpp (renamed from Libraries/LibGUI/GColumnsView.cpp)6
-rw-r--r--Libraries/LibGUI/ColumnsView.h (renamed from Libraries/LibGUI/GColumnsView.h)2
-rw-r--r--Libraries/LibGUI/ComboBox.cpp (renamed from Libraries/LibGUI/GComboBox.cpp)14
-rw-r--r--Libraries/LibGUI/ComboBox.h (renamed from Libraries/LibGUI/GComboBox.h)4
-rw-r--r--Libraries/LibGUI/Command.cpp (renamed from Libraries/LibGUI/GCommand.cpp)2
-rw-r--r--Libraries/LibGUI/Command.h (renamed from Libraries/LibGUI/GCommand.h)0
-rw-r--r--Libraries/LibGUI/Desktop.cpp (renamed from Libraries/LibGUI/GDesktop.cpp)4
-rw-r--r--Libraries/LibGUI/Desktop.h (renamed from Libraries/LibGUI/GDesktop.h)0
-rw-r--r--Libraries/LibGUI/Dialog.cpp (renamed from Libraries/LibGUI/GDialog.cpp)6
-rw-r--r--Libraries/LibGUI/Dialog.h (renamed from Libraries/LibGUI/GDialog.h)2
-rw-r--r--Libraries/LibGUI/DragOperation.cpp (renamed from Libraries/LibGUI/GDragOperation.cpp)4
-rw-r--r--Libraries/LibGUI/DragOperation.h (renamed from Libraries/LibGUI/GDragOperation.h)0
-rw-r--r--Libraries/LibGUI/Event.h (renamed from Libraries/LibGUI/GEvent.h)2
-rw-r--r--Libraries/LibGUI/FilePicker.cpp (renamed from Libraries/LibGUI/GFilePicker.cpp)22
-rw-r--r--Libraries/LibGUI/FilePicker.h (renamed from Libraries/LibGUI/GFilePicker.h)4
-rw-r--r--Libraries/LibGUI/FileSystemModel.cpp (renamed from Libraries/LibGUI/GFileSystemModel.cpp)4
-rw-r--r--Libraries/LibGUI/FileSystemModel.h (renamed from Libraries/LibGUI/GFileSystemModel.h)2
-rw-r--r--Libraries/LibGUI/FontDatabase.cpp (renamed from Libraries/LibGUI/GFontDatabase.cpp)2
-rw-r--r--Libraries/LibGUI/FontDatabase.h (renamed from Libraries/LibGUI/GFontDatabase.h)0
-rw-r--r--Libraries/LibGUI/Frame.cpp (renamed from Libraries/LibGUI/GFrame.cpp)4
-rw-r--r--Libraries/LibGUI/Frame.h (renamed from Libraries/LibGUI/GFrame.h)2
-rw-r--r--Libraries/LibGUI/GroupBox.cpp (renamed from Libraries/LibGUI/GGroupBox.cpp)4
-rw-r--r--Libraries/LibGUI/GroupBox.h (renamed from Libraries/LibGUI/GGroupBox.h)2
-rw-r--r--Libraries/LibGUI/Icon.cpp (renamed from Libraries/LibGUI/GIcon.cpp)2
-rw-r--r--Libraries/LibGUI/Icon.h (renamed from Libraries/LibGUI/GIcon.h)0
-rw-r--r--Libraries/LibGUI/InputBox.cpp (renamed from Libraries/LibGUI/GInputBox.cpp)10
-rw-r--r--Libraries/LibGUI/InputBox.h (renamed from Libraries/LibGUI/GInputBox.h)2
-rw-r--r--Libraries/LibGUI/ItemView.cpp (renamed from Libraries/LibGUI/GItemView.cpp)10
-rw-r--r--Libraries/LibGUI/ItemView.h (renamed from Libraries/LibGUI/GItemView.h)4
-rw-r--r--Libraries/LibGUI/JsonArrayModel.cpp (renamed from Libraries/LibGUI/GJsonArrayModel.cpp)2
-rw-r--r--Libraries/LibGUI/JsonArrayModel.h (renamed from Libraries/LibGUI/GJsonArrayModel.h)2
-rw-r--r--Libraries/LibGUI/Label.cpp (renamed from Libraries/LibGUI/GLabel.cpp)4
-rw-r--r--Libraries/LibGUI/Label.h (renamed from Libraries/LibGUI/GLabel.h)2
-rw-r--r--Libraries/LibGUI/Layout.cpp (renamed from Libraries/LibGUI/GLayout.cpp)4
-rw-r--r--Libraries/LibGUI/Layout.h (renamed from Libraries/LibGUI/GLayout.h)2
-rw-r--r--Libraries/LibGUI/LazyWidget.cpp (renamed from Libraries/LibGUI/GLazyWidget.cpp)2
-rw-r--r--Libraries/LibGUI/LazyWidget.h (renamed from Libraries/LibGUI/GLazyWidget.h)2
-rw-r--r--Libraries/LibGUI/ListView.cpp (renamed from Libraries/LibGUI/GListView.cpp)6
-rw-r--r--Libraries/LibGUI/ListView.h (renamed from Libraries/LibGUI/GListView.h)4
-rw-r--r--Libraries/LibGUI/Makefile126
-rw-r--r--Libraries/LibGUI/Margins.h (renamed from Libraries/LibGUI/GMargins.h)0
-rw-r--r--Libraries/LibGUI/Menu.cpp (renamed from Libraries/LibGUI/GMenu.cpp)8
-rw-r--r--Libraries/LibGUI/Menu.h (renamed from Libraries/LibGUI/GMenu.h)2
-rw-r--r--Libraries/LibGUI/MenuBar.cpp (renamed from Libraries/LibGUI/GMenuBar.cpp)4
-rw-r--r--Libraries/LibGUI/MenuBar.h (renamed from Libraries/LibGUI/GMenuBar.h)2
-rw-r--r--Libraries/LibGUI/MenuItem.cpp (renamed from Libraries/LibGUI/GMenuItem.cpp)8
-rw-r--r--Libraries/LibGUI/MenuItem.h (renamed from Libraries/LibGUI/GMenuItem.h)0
-rw-r--r--Libraries/LibGUI/MessageBox.cpp (renamed from Libraries/LibGUI/GMessageBox.cpp)8
-rw-r--r--Libraries/LibGUI/MessageBox.h (renamed from Libraries/LibGUI/GMessageBox.h)2
-rw-r--r--Libraries/LibGUI/Model.cpp (renamed from Libraries/LibGUI/GModel.cpp)4
-rw-r--r--Libraries/LibGUI/Model.h (renamed from Libraries/LibGUI/GModel.h)4
-rw-r--r--Libraries/LibGUI/ModelEditingDelegate.h (renamed from Libraries/LibGUI/GModelEditingDelegate.h)6
-rw-r--r--Libraries/LibGUI/ModelIndex.h (renamed from Libraries/LibGUI/GModelIndex.h)0
-rw-r--r--Libraries/LibGUI/ModelSelection.cpp (renamed from Libraries/LibGUI/GModelSelection.cpp)4
-rw-r--r--Libraries/LibGUI/ModelSelection.h (renamed from Libraries/LibGUI/GModelSelection.h)2
-rw-r--r--Libraries/LibGUI/Painter.cpp (renamed from Libraries/LibGUI/GPainter.cpp)6
-rw-r--r--Libraries/LibGUI/Painter.h (renamed from Libraries/LibGUI/GPainter.h)0
-rw-r--r--Libraries/LibGUI/ProgressBar.cpp (renamed from Libraries/LibGUI/GProgressBar.cpp)4
-rw-r--r--Libraries/LibGUI/ProgressBar.h (renamed from Libraries/LibGUI/GProgressBar.h)2
-rw-r--r--Libraries/LibGUI/RadioButton.cpp (renamed from Libraries/LibGUI/GRadioButton.cpp)4
-rw-r--r--Libraries/LibGUI/RadioButton.h (renamed from Libraries/LibGUI/GRadioButton.h)2
-rw-r--r--Libraries/LibGUI/ResizeCorner.cpp (renamed from Libraries/LibGUI/GResizeCorner.cpp)6
-rw-r--r--Libraries/LibGUI/ResizeCorner.h (renamed from Libraries/LibGUI/GResizeCorner.h)2
-rw-r--r--Libraries/LibGUI/ScrollBar.cpp (renamed from Libraries/LibGUI/GScrollBar.cpp)4
-rw-r--r--Libraries/LibGUI/ScrollBar.h (renamed from Libraries/LibGUI/GScrollBar.h)2
-rw-r--r--Libraries/LibGUI/ScrollableWidget.cpp (renamed from Libraries/LibGUI/GScrollableWidget.cpp)4
-rw-r--r--Libraries/LibGUI/ScrollableWidget.h (renamed from Libraries/LibGUI/GScrollableWidget.h)2
-rw-r--r--Libraries/LibGUI/Shortcut.cpp (renamed from Libraries/LibGUI/GShortcut.cpp)2
-rw-r--r--Libraries/LibGUI/Shortcut.h (renamed from Libraries/LibGUI/GShortcut.h)0
-rw-r--r--Libraries/LibGUI/Slider.cpp (renamed from Libraries/LibGUI/GSlider.cpp)4
-rw-r--r--Libraries/LibGUI/Slider.h (renamed from Libraries/LibGUI/GSlider.h)2
-rw-r--r--Libraries/LibGUI/SortingProxyModel.cpp (renamed from Libraries/LibGUI/GSortingProxyModel.cpp)4
-rw-r--r--Libraries/LibGUI/SortingProxyModel.h (renamed from Libraries/LibGUI/GSortingProxyModel.h)2
-rw-r--r--Libraries/LibGUI/SpinBox.cpp (renamed from Libraries/LibGUI/GSpinBox.cpp)6
-rw-r--r--Libraries/LibGUI/SpinBox.h (renamed from Libraries/LibGUI/GSpinBox.h)2
-rw-r--r--Libraries/LibGUI/Splitter.cpp (renamed from Libraries/LibGUI/GSplitter.cpp)6
-rw-r--r--Libraries/LibGUI/Splitter.h (renamed from Libraries/LibGUI/GSplitter.h)2
-rw-r--r--Libraries/LibGUI/StackWidget.cpp (renamed from Libraries/LibGUI/GStackWidget.cpp)4
-rw-r--r--Libraries/LibGUI/StackWidget.h (renamed from Libraries/LibGUI/GStackWidget.h)2
-rw-r--r--Libraries/LibGUI/StatusBar.cpp (renamed from Libraries/LibGUI/GStatusBar.cpp)10
-rw-r--r--Libraries/LibGUI/StatusBar.h (renamed from Libraries/LibGUI/GStatusBar.h)2
-rw-r--r--Libraries/LibGUI/TabWidget.cpp (renamed from Libraries/LibGUI/GTabWidget.cpp)6
-rw-r--r--Libraries/LibGUI/TabWidget.h (renamed from Libraries/LibGUI/GTabWidget.h)2
-rw-r--r--Libraries/LibGUI/TableView.cpp (renamed from Libraries/LibGUI/GTableView.cpp)16
-rw-r--r--Libraries/LibGUI/TableView.h (renamed from Libraries/LibGUI/GTableView.h)4
-rw-r--r--Libraries/LibGUI/TextBox.cpp (renamed from Libraries/LibGUI/GTextBox.cpp)2
-rw-r--r--Libraries/LibGUI/TextBox.h (renamed from Libraries/LibGUI/GTextBox.h)2
-rw-r--r--Libraries/LibGUI/TextDocument.cpp (renamed from Libraries/LibGUI/GTextDocument.cpp)4
-rw-r--r--Libraries/LibGUI/TextDocument.h (renamed from Libraries/LibGUI/GTextDocument.h)4
-rw-r--r--Libraries/LibGUI/TextEditor.cpp (renamed from Libraries/LibGUI/GTextEditor.cpp)18
-rw-r--r--Libraries/LibGUI/TextEditor.h (renamed from Libraries/LibGUI/GTextEditor.h)6
-rw-r--r--Libraries/LibGUI/TextPosition.h (renamed from Libraries/LibGUI/GTextPosition.h)0
-rw-r--r--Libraries/LibGUI/TextRange.h (renamed from Libraries/LibGUI/GTextRange.h)2
-rw-r--r--Libraries/LibGUI/ToolBar.cpp (renamed from Libraries/LibGUI/GToolBar.cpp)12
-rw-r--r--Libraries/LibGUI/ToolBar.h (renamed from Libraries/LibGUI/GToolBar.h)2
-rw-r--r--Libraries/LibGUI/TreeView.cpp (renamed from Libraries/LibGUI/GTreeView.cpp)6
-rw-r--r--Libraries/LibGUI/TreeView.h (renamed from Libraries/LibGUI/GTreeView.h)2
-rw-r--r--Libraries/LibGUI/UndoStack.cpp (renamed from Libraries/LibGUI/GUndoStack.cpp)2
-rw-r--r--Libraries/LibGUI/UndoStack.h (renamed from Libraries/LibGUI/GUndoStack.h)2
-rw-r--r--Libraries/LibGUI/Variant.cpp (renamed from Libraries/LibGUI/GVariant.cpp)2
-rw-r--r--Libraries/LibGUI/Variant.h (renamed from Libraries/LibGUI/GVariant.h)2
-rw-r--r--Libraries/LibGUI/Widget.cpp (renamed from Libraries/LibGUI/GWidget.cpp)36
-rw-r--r--Libraries/LibGUI/Widget.h (renamed from Libraries/LibGUI/GWidget.h)4
-rw-r--r--Libraries/LibGUI/Window.cpp (renamed from Libraries/LibGUI/GWindow.cpp)14
-rw-r--r--Libraries/LibGUI/Window.h (renamed from Libraries/LibGUI/GWindow.h)2
-rw-r--r--Libraries/LibGUI/WindowServerConnection.cpp (renamed from Libraries/LibGUI/GWindowServerConnection.cpp)20
-rw-r--r--Libraries/LibGUI/WindowServerConnection.h (renamed from Libraries/LibGUI/GWindowServerConnection.h)0
-rw-r--r--Libraries/LibGUI/WindowType.h (renamed from Libraries/LibGUI/GWindowType.h)0
-rw-r--r--Libraries/LibHTML/DOM/Document.cpp2
-rw-r--r--Libraries/LibHTML/DOM/HTMLInputElement.cpp4
-rw-r--r--Libraries/LibHTML/DOMTreeModel.h2
-rw-r--r--Libraries/LibHTML/HtmlView.cpp8
-rw-r--r--Libraries/LibHTML/HtmlView.h2
-rw-r--r--Libraries/LibHTML/Layout/LayoutBlock.cpp2
-rw-r--r--Libraries/LibHTML/Layout/LayoutBox.cpp2
-rw-r--r--Libraries/LibHTML/Layout/LayoutImage.cpp2
-rw-r--r--Libraries/LibHTML/Layout/LayoutListItemMarker.cpp2
-rw-r--r--Libraries/LibHTML/Layout/LayoutNode.cpp2
-rw-r--r--Libraries/LibHTML/Layout/LayoutText.cpp2
-rw-r--r--Libraries/LibHTML/Layout/LayoutWidget.cpp4
-rw-r--r--Libraries/LibHTML/Layout/LineBoxFragment.cpp2
-rw-r--r--Libraries/LibHTML/StylePropertiesModel.h2
-rw-r--r--Libraries/LibVT/TerminalWidget.cpp14
-rw-r--r--Libraries/LibVT/TerminalWidget.h2
148 files changed, 384 insertions, 384 deletions
diff --git a/Libraries/LibGUI/GAboutDialog.cpp b/Libraries/LibGUI/AboutDialog.cpp
index e1719211cc..1e7418e01f 100644
--- a/Libraries/LibGUI/GAboutDialog.cpp
+++ b/Libraries/LibGUI/AboutDialog.cpp
@@ -24,11 +24,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAboutDialog.h b/Libraries/LibGUI/AboutDialog.h
index 2a6947c367..265f8c2fa0 100644
--- a/Libraries/LibGUI/GAboutDialog.h
+++ b/Libraries/LibGUI/AboutDialog.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GDialog.h>
+#include <LibGUI/Dialog.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAbstractButton.cpp b/Libraries/LibGUI/AbstractButton.cpp
index a913e80a0a..fe22935c9b 100644
--- a/Libraries/LibGUI/GAbstractButton.cpp
+++ b/Libraries/LibGUI/AbstractButton.cpp
@@ -25,8 +25,8 @@
*/
#include <LibGfx/Palette.h>
-#include <LibGUI/GAbstractButton.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/AbstractButton.h>
+#include <LibGUI/Painter.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAbstractButton.h b/Libraries/LibGUI/AbstractButton.h
index 2944f1b9d1..515c8e0bf1 100644
--- a/Libraries/LibGUI/GAbstractButton.h
+++ b/Libraries/LibGUI/AbstractButton.h
@@ -28,7 +28,7 @@
#include <LibCore/Timer.h>
#include <LibGfx/TextAlignment.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAbstractTableView.cpp b/Libraries/LibGUI/AbstractTableView.cpp
index 18cb8ef688..13b87c48d7 100644
--- a/Libraries/LibGUI/GAbstractTableView.cpp
+++ b/Libraries/LibGUI/AbstractTableView.cpp
@@ -26,11 +26,11 @@
#include <AK/StringBuilder.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GAbstractTableView.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
+#include <LibGUI/AbstractTableView.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAbstractTableView.h b/Libraries/LibGUI/AbstractTableView.h
index 77ce48a70d..2ec222ca01 100644
--- a/Libraries/LibGUI/GAbstractTableView.h
+++ b/Libraries/LibGUI/AbstractTableView.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GAbstractView.h>
+#include <LibGUI/AbstractView.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAbstractView.cpp b/Libraries/LibGUI/AbstractView.cpp
index 65a58a1b4d..5929f16762 100644
--- a/Libraries/LibGUI/GAbstractView.cpp
+++ b/Libraries/LibGUI/AbstractView.cpp
@@ -26,13 +26,13 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
-#include <LibGUI/GAbstractView.h>
-#include <LibGUI/GDragOperation.h>
-#include <LibGUI/GModel.h>
-#include <LibGUI/GModelEditingDelegate.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GTextBox.h>
+#include <LibGUI/AbstractView.h>
+#include <LibGUI/DragOperation.h>
+#include <LibGUI/Model.h>
+#include <LibGUI/ModelEditingDelegate.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/TextBox.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAbstractView.h b/Libraries/LibGUI/AbstractView.h
index 7137c8c74d..c098e661f6 100644
--- a/Libraries/LibGUI/GAbstractView.h
+++ b/Libraries/LibGUI/AbstractView.h
@@ -27,9 +27,9 @@
#pragma once
#include <AK/Function.h>
-#include <LibGUI/GModel.h>
-#include <LibGUI/GModelSelection.h>
-#include <LibGUI/GScrollableWidget.h>
+#include <LibGUI/Model.h>
+#include <LibGUI/ModelSelection.h>
+#include <LibGUI/ScrollableWidget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAction.cpp b/Libraries/LibGUI/Action.cpp
index 184a73610e..f0a34fef54 100644
--- a/Libraries/LibGUI/GAction.cpp
+++ b/Libraries/LibGUI/Action.cpp
@@ -24,11 +24,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GAction.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GMenuItem.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/MenuItem.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/Action.h
index e4981e85d6..d3b7a52ceb 100644
--- a/Libraries/LibGUI/GAction.h
+++ b/Libraries/LibGUI/Action.h
@@ -35,8 +35,8 @@
#include <AK/WeakPtr.h>
#include <AK/Weakable.h>
#include <LibGfx/Bitmap.h>
-#include <LibGUI/GShortcut.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Shortcut.h>
+#include <LibGUI/Window.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GActionGroup.cpp b/Libraries/LibGUI/ActionGroup.cpp
index cb469ddd57..5f8d5d4514 100644
--- a/Libraries/LibGUI/GActionGroup.cpp
+++ b/Libraries/LibGUI/ActionGroup.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GAction.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/ActionGroup.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GActionGroup.h b/Libraries/LibGUI/ActionGroup.h
index 9816e0db30..9816e0db30 100644
--- a/Libraries/LibGUI/GActionGroup.h
+++ b/Libraries/LibGUI/ActionGroup.h
diff --git a/Libraries/LibGUI/GApplication.cpp b/Libraries/LibGUI/Application.cpp
index 21c13e00c1..88b88e1ed5 100644
--- a/Libraries/LibGUI/GApplication.cpp
+++ b/Libraries/LibGUI/Application.cpp
@@ -25,14 +25,14 @@
*/
#include <LibGfx/Palette.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GWindow.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Window.h>
+#include <LibGUI/WindowServerConnection.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GApplication.h b/Libraries/LibGUI/Application.h
index e26b0c4c63..973672a0da 100644
--- a/Libraries/LibGUI/GApplication.h
+++ b/Libraries/LibGUI/Application.h
@@ -30,7 +30,7 @@
#include <AK/HashMap.h>
#include <AK/OwnPtr.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GShortcut.h>
+#include <LibGUI/Shortcut.h>
namespace AK {
class SharedBuffer;
diff --git a/Libraries/LibGUI/GBoxLayout.cpp b/Libraries/LibGUI/BoxLayout.cpp
index b22f185484..5395cf67f6 100644
--- a/Libraries/LibGUI/GBoxLayout.cpp
+++ b/Libraries/LibGUI/BoxLayout.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GBoxLayout.h>
+#include <LibGUI/BoxLayout.h>
#include <stdio.h>
//#define GBOXLAYOUT_DEBUG
diff --git a/Libraries/LibGUI/GBoxLayout.h b/Libraries/LibGUI/BoxLayout.h
index 887ce9b982..5f517adb55 100644
--- a/Libraries/LibGUI/GBoxLayout.h
+++ b/Libraries/LibGUI/BoxLayout.h
@@ -26,8 +26,8 @@
#pragma once
-#include <LibGUI/GLayout.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Layout.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GButton.cpp b/Libraries/LibGUI/Button.cpp
index 0947b56a41..30fdde5955 100644
--- a/Libraries/LibGUI/GButton.cpp
+++ b/Libraries/LibGUI/Button.cpp
@@ -27,10 +27,10 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Painter.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/Button.h
index 7b4ff16c24..d6a0eb415a 100644
--- a/Libraries/LibGUI/GButton.h
+++ b/Libraries/LibGUI/Button.h
@@ -31,7 +31,7 @@
#include <LibGfx/Bitmap.h>
#include <LibGfx/StylePainter.h>
#include <LibGfx/TextAlignment.h>
-#include <LibGUI/GAbstractButton.h>
+#include <LibGUI/AbstractButton.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GCheckBox.cpp b/Libraries/LibGUI/CheckBox.cpp
index d24a6b7ff9..8b5ca9c060 100644
--- a/Libraries/LibGUI/GCheckBox.cpp
+++ b/Libraries/LibGUI/CheckBox.cpp
@@ -28,8 +28,8 @@
#include <LibGfx/CharacterBitmap.h>
#include <LibGfx/Palette.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GCheckBox.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/Painter.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GCheckBox.h b/Libraries/LibGUI/CheckBox.h
index 9045a03b2b..0c395097f1 100644
--- a/Libraries/LibGUI/GCheckBox.h
+++ b/Libraries/LibGUI/CheckBox.h
@@ -28,7 +28,7 @@
#include <AK/Function.h>
#include <AK/String.h>
-#include <LibGUI/GAbstractButton.h>
+#include <LibGUI/AbstractButton.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GClipboard.cpp b/Libraries/LibGUI/Clipboard.cpp
index 04925ac389..fb93155795 100644
--- a/Libraries/LibGUI/GClipboard.cpp
+++ b/Libraries/LibGUI/Clipboard.cpp
@@ -25,8 +25,8 @@
*/
#include <AK/SharedBuffer.h>
-#include <LibGUI/GClipboard.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Clipboard.h>
+#include <LibGUI/WindowServerConnection.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GClipboard.h b/Libraries/LibGUI/Clipboard.h
index 832ef0e334..832ef0e334 100644
--- a/Libraries/LibGUI/GClipboard.h
+++ b/Libraries/LibGUI/Clipboard.h
diff --git a/Libraries/LibGUI/GColorPicker.cpp b/Libraries/LibGUI/ColorPicker.cpp
index d281a63123..461ad5d0fa 100644
--- a/Libraries/LibGUI/GColorPicker.cpp
+++ b/Libraries/LibGUI/ColorPicker.cpp
@@ -24,12 +24,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GColorPicker.h>
-#include <LibGUI/GFrame.h>
-#include <LibGUI/GSpinBox.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/ColorPicker.h>
+#include <LibGUI/Frame.h>
+#include <LibGUI/SpinBox.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GColorPicker.h b/Libraries/LibGUI/ColorPicker.h
index eb902b8519..d45350db30 100644
--- a/Libraries/LibGUI/GColorPicker.h
+++ b/Libraries/LibGUI/ColorPicker.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GDialog.h>
+#include <LibGUI/Dialog.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GColumnsView.cpp b/Libraries/LibGUI/ColumnsView.cpp
index d12f5895d4..068ea0b73e 100644
--- a/Libraries/LibGUI/GColumnsView.cpp
+++ b/Libraries/LibGUI/ColumnsView.cpp
@@ -25,9 +25,9 @@
*/
#include <LibGfx/CharacterBitmap.h>
-#include <LibGUI/GColumnsView.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
+#include <LibGUI/ColumnsView.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GColumnsView.h b/Libraries/LibGUI/ColumnsView.h
index 30248bf9c6..34245fc7bc 100644
--- a/Libraries/LibGUI/GColumnsView.h
+++ b/Libraries/LibGUI/ColumnsView.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/Vector.h>
-#include <LibGUI/GAbstractView.h>
+#include <LibGUI/AbstractView.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GComboBox.cpp b/Libraries/LibGUI/ComboBox.cpp
index 30a14b295b..db8161d649 100644
--- a/Libraries/LibGUI/GComboBox.cpp
+++ b/Libraries/LibGUI/ComboBox.cpp
@@ -24,13 +24,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GButton.h>
-#include <LibGUI/GComboBox.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GListView.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/ComboBox.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/ListView.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/Window.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GComboBox.h b/Libraries/LibGUI/ComboBox.h
index 26142c04b4..d5f3ae45f1 100644
--- a/Libraries/LibGUI/GComboBox.h
+++ b/Libraries/LibGUI/ComboBox.h
@@ -26,8 +26,8 @@
#pragma once
-#include <LibGUI/GListView.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/ListView.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GCommand.cpp b/Libraries/LibGUI/Command.cpp
index 53c6bfa41f..7799a1e944 100644
--- a/Libraries/LibGUI/GCommand.cpp
+++ b/Libraries/LibGUI/Command.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GCommand.h>
+#include <LibGUI/Command.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GCommand.h b/Libraries/LibGUI/Command.h
index 5bf13e1f75..5bf13e1f75 100644
--- a/Libraries/LibGUI/GCommand.h
+++ b/Libraries/LibGUI/Command.h
diff --git a/Libraries/LibGUI/GDesktop.cpp b/Libraries/LibGUI/Desktop.cpp
index 3d90fd0e06..65f2479839 100644
--- a/Libraries/LibGUI/GDesktop.cpp
+++ b/Libraries/LibGUI/Desktop.cpp
@@ -25,8 +25,8 @@
*/
#include <LibCore/ConfigFile.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/WindowServerConnection.h>
#include <string.h>
#include <unistd.h>
diff --git a/Libraries/LibGUI/GDesktop.h b/Libraries/LibGUI/Desktop.h
index 4105609e82..4105609e82 100644
--- a/Libraries/LibGUI/GDesktop.h
+++ b/Libraries/LibGUI/Desktop.h
diff --git a/Libraries/LibGUI/GDialog.cpp b/Libraries/LibGUI/Dialog.cpp
index 5b71db89fc..68db140a18 100644
--- a/Libraries/LibGUI/GDialog.cpp
+++ b/Libraries/LibGUI/Dialog.cpp
@@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GDialog.h>
-#include <LibGUI/GEvent.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/Dialog.h>
+#include <LibGUI/Event.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GDialog.h b/Libraries/LibGUI/Dialog.h
index 83e325fc55..2f7753be0c 100644
--- a/Libraries/LibGUI/GDialog.h
+++ b/Libraries/LibGUI/Dialog.h
@@ -27,7 +27,7 @@
#pragma once
#include <LibCore/EventLoop.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Window.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GDragOperation.cpp b/Libraries/LibGUI/DragOperation.cpp
index c6c55ed39c..6b10cb6841 100644
--- a/Libraries/LibGUI/GDragOperation.cpp
+++ b/Libraries/LibGUI/DragOperation.cpp
@@ -25,8 +25,8 @@
*/
#include <LibGfx/Bitmap.h>
-#include <LibGUI/GDragOperation.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/DragOperation.h>
+#include <LibGUI/WindowServerConnection.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GDragOperation.h b/Libraries/LibGUI/DragOperation.h
index 602d836bf5..602d836bf5 100644
--- a/Libraries/LibGUI/GDragOperation.h
+++ b/Libraries/LibGUI/DragOperation.h
diff --git a/Libraries/LibGUI/GEvent.h b/Libraries/LibGUI/Event.h
index c5319ba9e6..7b6b472176 100644
--- a/Libraries/LibGUI/GEvent.h
+++ b/Libraries/LibGUI/Event.h
@@ -30,7 +30,7 @@
#include <LibCore/Event.h>
#include <LibGfx/Point.h>
#include <LibGfx/Rect.h>
-#include <LibGUI/GWindowType.h>
+#include <LibGUI/WindowType.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GFilePicker.cpp b/Libraries/LibGUI/FilePicker.cpp
index 5ecce36849..3044921c7a 100644
--- a/Libraries/LibGUI/GFilePicker.cpp
+++ b/Libraries/LibGUI/FilePicker.cpp
@@ -26,17 +26,17 @@
#include <AK/FileSystemPath.h>
#include <AK/Function.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GFilePicker.h>
-#include <LibGUI/GFileSystemModel.h>
-#include <LibGUI/GInputBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GSortingProxyModel.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GToolBar.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/FilePicker.h>
+#include <LibGUI/FileSystemModel.h>
+#include <LibGUI/InputBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/SortingProxyModel.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/ToolBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GFilePicker.h b/Libraries/LibGUI/FilePicker.h
index d94754ff5c..910202ac54 100644
--- a/Libraries/LibGUI/GFilePicker.h
+++ b/Libraries/LibGUI/FilePicker.h
@@ -27,8 +27,8 @@
#include <AK/FileSystemPath.h>
#include <AK/Optional.h>
#include <LibCore/UserInfo.h>
-#include <LibGUI/GDialog.h>
-#include <LibGUI/GTableView.h>
+#include <LibGUI/Dialog.h>
+#include <LibGUI/TableView.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GFileSystemModel.cpp b/Libraries/LibGUI/FileSystemModel.cpp
index bbd07d3400..c14e51e498 100644
--- a/Libraries/LibGUI/GFileSystemModel.cpp
+++ b/Libraries/LibGUI/FileSystemModel.cpp
@@ -28,8 +28,8 @@
#include <AK/StringBuilder.h>
#include <LibCore/DirIterator.h>
#include <LibGfx/Bitmap.h>
-#include <LibGUI/GFileSystemModel.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/FileSystemModel.h>
+#include <LibGUI/Painter.h>
#include <LibThread/BackgroundAction.h>
#include <dirent.h>
#include <grp.h>
diff --git a/Libraries/LibGUI/GFileSystemModel.h b/Libraries/LibGUI/FileSystemModel.h
index 7cbced4113..9b54c4b0a3 100644
--- a/Libraries/LibGUI/GFileSystemModel.h
+++ b/Libraries/LibGUI/FileSystemModel.h
@@ -29,7 +29,7 @@
#include <AK/HashMap.h>
#include <AK/NonnullOwnPtrVector.h>
#include <LibCore/Notifier.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
#include <sys/stat.h>
#include <time.h>
diff --git a/Libraries/LibGUI/GFontDatabase.cpp b/Libraries/LibGUI/FontDatabase.cpp
index 310c2cf6e7..8c03572bd7 100644
--- a/Libraries/LibGUI/GFontDatabase.cpp
+++ b/Libraries/LibGUI/FontDatabase.cpp
@@ -27,7 +27,7 @@
#include <AK/QuickSort.h>
#include <LibCore/DirIterator.h>
#include <LibGfx/Font.h>
-#include <LibGUI/GFontDatabase.h>
+#include <LibGUI/FontDatabase.h>
#include <dirent.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/Libraries/LibGUI/GFontDatabase.h b/Libraries/LibGUI/FontDatabase.h
index 153cebff39..153cebff39 100644
--- a/Libraries/LibGUI/GFontDatabase.h
+++ b/Libraries/LibGUI/FontDatabase.h
diff --git a/Libraries/LibGUI/GFrame.cpp b/Libraries/LibGUI/Frame.cpp
index 6ab72bd863..6c9dfdc7a9 100644
--- a/Libraries/LibGUI/GFrame.cpp
+++ b/Libraries/LibGUI/Frame.cpp
@@ -25,8 +25,8 @@
*/
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GFrame.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Frame.h>
+#include <LibGUI/Painter.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GFrame.h b/Libraries/LibGUI/Frame.h
index 35b966aa45..1d78703c73 100644
--- a/Libraries/LibGUI/GFrame.h
+++ b/Libraries/LibGUI/Frame.h
@@ -27,7 +27,7 @@
#pragma once
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GGroupBox.cpp b/Libraries/LibGUI/GroupBox.cpp
index 817593d974..9f1263d8df 100644
--- a/Libraries/LibGUI/GGroupBox.cpp
+++ b/Libraries/LibGUI/GroupBox.cpp
@@ -26,8 +26,8 @@
#include <LibGfx/Palette.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/Painter.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GGroupBox.h b/Libraries/LibGUI/GroupBox.h
index 1198deffc2..5d9d38fad0 100644
--- a/Libraries/LibGUI/GGroupBox.h
+++ b/Libraries/LibGUI/GroupBox.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GIcon.cpp b/Libraries/LibGUI/Icon.cpp
index 65a1cd98ab..c04913d0e8 100644
--- a/Libraries/LibGUI/GIcon.cpp
+++ b/Libraries/LibGUI/Icon.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GIcon.h>
+#include <LibGUI/Icon.h>
GIcon::GIcon()
: m_impl(GIconImpl::create())
diff --git a/Libraries/LibGUI/GIcon.h b/Libraries/LibGUI/Icon.h
index 63e772c75b..63e772c75b 100644
--- a/Libraries/LibGUI/GIcon.h
+++ b/Libraries/LibGUI/Icon.h
diff --git a/Libraries/LibGUI/GInputBox.cpp b/Libraries/LibGUI/InputBox.cpp
index f75381e5b9..7c224e1dcb 100644
--- a/Libraries/LibGUI/GInputBox.cpp
+++ b/Libraries/LibGUI/InputBox.cpp
@@ -24,11 +24,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GInputBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GTextEditor.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/InputBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/TextEditor.h>
#include <stdio.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GInputBox.h b/Libraries/LibGUI/InputBox.h
index ab7a0c3b09..a65263b05d 100644
--- a/Libraries/LibGUI/GInputBox.h
+++ b/Libraries/LibGUI/InputBox.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GDialog.h>
+#include <LibGUI/Dialog.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GItemView.cpp b/Libraries/LibGUI/ItemView.cpp
index b5991d634f..5c0dd5c76a 100644
--- a/Libraries/LibGUI/GItemView.cpp
+++ b/Libraries/LibGUI/ItemView.cpp
@@ -27,11 +27,11 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GDragOperation.h>
-#include <LibGUI/GItemView.h>
-#include <LibGUI/GModel.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
+#include <LibGUI/DragOperation.h>
+#include <LibGUI/ItemView.h>
+#include <LibGUI/Model.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GItemView.h b/Libraries/LibGUI/ItemView.h
index 61a024dce9..08900cdb30 100644
--- a/Libraries/LibGUI/GItemView.h
+++ b/Libraries/LibGUI/ItemView.h
@@ -28,8 +28,8 @@
#include <AK/Function.h>
#include <AK/HashMap.h>
-#include <LibGUI/GAbstractView.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/AbstractView.h>
+#include <LibGUI/Model.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GJsonArrayModel.cpp b/Libraries/LibGUI/JsonArrayModel.cpp
index d585c30973..26e3754ab3 100644
--- a/Libraries/LibGUI/GJsonArrayModel.cpp
+++ b/Libraries/LibGUI/JsonArrayModel.cpp
@@ -26,7 +26,7 @@
#include <AK/JsonObject.h>
#include <LibCore/File.h>
-#include <LibGUI/GJsonArrayModel.h>
+#include <LibGUI/JsonArrayModel.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GJsonArrayModel.h b/Libraries/LibGUI/JsonArrayModel.h
index 7f8659813f..e29838c60f 100644
--- a/Libraries/LibGUI/GJsonArrayModel.h
+++ b/Libraries/LibGUI/JsonArrayModel.h
@@ -28,7 +28,7 @@
#include <AK/JsonArray.h>
#include <AK/JsonObject.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GLabel.cpp b/Libraries/LibGUI/Label.cpp
index 336b3598f6..14f272cb94 100644
--- a/Libraries/LibGUI/GLabel.cpp
+++ b/Libraries/LibGUI/Label.cpp
@@ -26,8 +26,8 @@
#include <LibGfx/Bitmap.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Painter.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GLabel.h b/Libraries/LibGUI/Label.h
index ba6aa4bc83..95378ed10e 100644
--- a/Libraries/LibGUI/GLabel.h
+++ b/Libraries/LibGUI/Label.h
@@ -27,7 +27,7 @@
#pragma once
#include <LibGfx/TextAlignment.h>
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
namespace Gfx {
class Bitmap;
diff --git a/Libraries/LibGUI/GLayout.cpp b/Libraries/LibGUI/Layout.cpp
index e83da15ac2..98dde762f4 100644
--- a/Libraries/LibGUI/GLayout.cpp
+++ b/Libraries/LibGUI/Layout.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GLayout.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Layout.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GLayout.h b/Libraries/LibGUI/Layout.h
index d302d18712..645836e919 100644
--- a/Libraries/LibGUI/GLayout.h
+++ b/Libraries/LibGUI/Layout.h
@@ -30,7 +30,7 @@
#include <AK/OwnPtr.h>
#include <AK/Vector.h>
#include <AK/WeakPtr.h>
-#include <LibGUI/GMargins.h>
+#include <LibGUI/Margins.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GLazyWidget.cpp b/Libraries/LibGUI/LazyWidget.cpp
index c8826e347e..9de6f79d1b 100644
--- a/Libraries/LibGUI/GLazyWidget.cpp
+++ b/Libraries/LibGUI/LazyWidget.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GLazyWidget.h>
+#include <LibGUI/LazyWidget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GLazyWidget.h b/Libraries/LibGUI/LazyWidget.h
index 75c4d6a382..887a53ede0 100644
--- a/Libraries/LibGUI/GLazyWidget.h
+++ b/Libraries/LibGUI/LazyWidget.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GListView.cpp b/Libraries/LibGUI/ListView.cpp
index c0b3f6b5d5..dd7329ed97 100644
--- a/Libraries/LibGUI/GListView.cpp
+++ b/Libraries/LibGUI/ListView.cpp
@@ -26,9 +26,9 @@
#include <Kernel/KeyCode.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GListView.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
+#include <LibGUI/ListView.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GListView.h b/Libraries/LibGUI/ListView.h
index 79c10f81c6..d1dffc4f91 100644
--- a/Libraries/LibGUI/GListView.h
+++ b/Libraries/LibGUI/ListView.h
@@ -28,8 +28,8 @@
#include <AK/Function.h>
#include <AK/HashMap.h>
-#include <LibGUI/GAbstractView.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/AbstractView.h>
+#include <LibGUI/Model.h>
namespace GUI {
diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile
index c83a4bfe52..2b731e3ff4 100644
--- a/Libraries/LibGUI/Makefile
+++ b/Libraries/LibGUI/Makefile
@@ -1,70 +1,70 @@
OBJS = \
- GPainter.o \
- GButton.o \
- GCheckBox.o \
- GWindowServerConnection.o \
- GLabel.o \
- GTextBox.o \
- GScrollBar.o \
- GStatusBar.o \
- GWidget.o \
- GLayout.o \
- GBoxLayout.o \
- GColorPicker.o \
- GMenuBar.o \
- GMenu.o \
- GMenuItem.o \
- GApplication.o \
- GAction.o \
- GActionGroup.o \
- GFontDatabase.o \
- GToolBar.o \
- GTableView.o \
- GModel.o \
- GVariant.o \
- GShortcut.o \
- GTextEditor.o \
- GTextDocument.o \
- GClipboard.o \
- GSortingProxyModel.o \
- GStackWidget.o \
- GScrollableWidget.o \
- GMessageBox.o \
- GInputBox.o \
- GDialog.o \
- GDesktop.o \
- GProgressBar.o \
- GAbstractView.o \
- GAbstractTableView.o \
- GItemView.o \
- GIcon.o \
- GFrame.o \
- GTreeView.o \
- GFileSystemModel.o \
- GFilePicker.o \
- GColumnsView.o \
- GSplitter.o \
- GSpinBox.o \
- GGroupBox.o \
- GSlider.o \
- GResizeCorner.o \
- GTabWidget.o \
- GRadioButton.o \
- GAbstractButton.o \
- GListView.o \
- GComboBox.o \
- GJsonArrayModel.o \
- GAboutDialog.o \
- GModelSelection.o \
- GLazyWidget.o \
- GCommand.o \
- GUndoStack.o \
- GDragOperation.o \
- GWindow.o
+ AboutDialog.o \
+ AbstractButton.o \
+ AbstractTableView.o \
+ AbstractView.o \
+ Action.o \
+ ActionGroup.o \
+ Application.o \
+ BoxLayout.o \
+ Button.o \
+ CheckBox.o \
+ Clipboard.o \
+ ColorPicker.o \
+ ColumnsView.o \
+ ComboBox.o \
+ Command.o \
+ Desktop.o \
+ Dialog.o \
+ DragOperation.o \
+ FilePicker.o \
+ FileSystemModel.o \
+ FontDatabase.o \
+ Frame.o \
+ GroupBox.o \
+ Icon.o \
+ InputBox.o \
+ ItemView.o \
+ JsonArrayModel.o \
+ Label.o \
+ Layout.o \
+ LazyWidget.o \
+ ListView.o \
+ Menu.o \
+ MenuBar.o \
+ MenuItem.o \
+ MessageBox.o \
+ Model.o \
+ ModelSelection.o \
+ Painter.o \
+ ProgressBar.o \
+ RadioButton.o \
+ ResizeCorner.o \
+ ScrollBar.o \
+ ScrollableWidget.o \
+ Shortcut.o \
+ Slider.o \
+ SortingProxyModel.o \
+ SpinBox.o \
+ Splitter.o \
+ StackWidget.o \
+ StatusBar.o \
+ TabWidget.o \
+ TableView.o \
+ TextBox.o \
+ TextDocument.o \
+ TextEditor.o \
+ ToolBar.o \
+ TreeView.o \
+ UndoStack.o \
+ Variant.o \
+ Widget.o \
+ Window.o \
+ WindowServerConnection.o
LIBRARY = libgui.a
-GWindowServerConnection.cpp: ../../Servers/WindowServer/WindowServerEndpoint.h
+Application.cpp: ../../Servers/WindowServer/WindowServerEndpoint.h
../../Servers/WindowServer/WindowServerEndpoint.h:
@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
diff --git a/Libraries/LibGUI/GMargins.h b/Libraries/LibGUI/Margins.h
index fc25e58cf3..fc25e58cf3 100644
--- a/Libraries/LibGUI/GMargins.h
+++ b/Libraries/LibGUI/Margins.h
diff --git a/Libraries/LibGUI/GMenu.cpp b/Libraries/LibGUI/Menu.cpp
index 0d62d5bf90..eefce0c871 100644
--- a/Libraries/LibGUI/GMenu.cpp
+++ b/Libraries/LibGUI/Menu.cpp
@@ -25,10 +25,10 @@
*/
#include <AK/HashMap.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/WindowServerConnection.h>
//#define MENU_DEBUG
diff --git a/Libraries/LibGUI/GMenu.h b/Libraries/LibGUI/Menu.h
index 5c3b9616b3..67bb97c7e6 100644
--- a/Libraries/LibGUI/GMenu.h
+++ b/Libraries/LibGUI/Menu.h
@@ -30,7 +30,7 @@
#include <AK/NonnullOwnPtrVector.h>
#include <AK/NonnullRefPtr.h>
#include <LibCore/Object.h>
-#include <LibGUI/GMenuItem.h>
+#include <LibGUI/MenuItem.h>
namespace Gfx {
class Point;
diff --git a/Libraries/LibGUI/GMenuBar.cpp b/Libraries/LibGUI/MenuBar.cpp
index 13de0f7fc9..c674c77443 100644
--- a/Libraries/LibGUI/GMenuBar.cpp
+++ b/Libraries/LibGUI/MenuBar.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/WindowServerConnection.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GMenuBar.h b/Libraries/LibGUI/MenuBar.h
index 53d88ef5f3..2e94696d5a 100644
--- a/Libraries/LibGUI/GMenuBar.h
+++ b/Libraries/LibGUI/MenuBar.h
@@ -28,7 +28,7 @@
#include <AK/Badge.h>
#include <AK/NonnullOwnPtrVector.h>
-#include <LibGUI/GMenu.h>
+#include <LibGUI/Menu.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GMenuItem.cpp b/Libraries/LibGUI/MenuItem.cpp
index 75dbf179bc..1a5dd05eec 100644
--- a/Libraries/LibGUI/GMenuItem.cpp
+++ b/Libraries/LibGUI/MenuItem.cpp
@@ -24,10 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuItem.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuItem.h>
+#include <LibGUI/WindowServerConnection.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GMenuItem.h b/Libraries/LibGUI/MenuItem.h
index d243dba7b4..d243dba7b4 100644
--- a/Libraries/LibGUI/GMenuItem.h
+++ b/Libraries/LibGUI/MenuItem.h
diff --git a/Libraries/LibGUI/GMessageBox.cpp b/Libraries/LibGUI/MessageBox.cpp
index 56e2f3886f..24bde0c882 100644
--- a/Libraries/LibGUI/GMessageBox.cpp
+++ b/Libraries/LibGUI/MessageBox.cpp
@@ -24,10 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GMessageBox.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/MessageBox.h>
#include <stdio.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GMessageBox.h b/Libraries/LibGUI/MessageBox.h
index f4287fc844..d8f04a02bd 100644
--- a/Libraries/LibGUI/GMessageBox.h
+++ b/Libraries/LibGUI/MessageBox.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GDialog.h>
+#include <LibGUI/Dialog.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GModel.cpp b/Libraries/LibGUI/Model.cpp
index d83cb9ffa4..219555587a 100644
--- a/Libraries/LibGUI/GModel.cpp
+++ b/Libraries/LibGUI/Model.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GAbstractView.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/AbstractView.h>
+#include <LibGUI/Model.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GModel.h b/Libraries/LibGUI/Model.h
index b5c4747ba6..5195abfd70 100644
--- a/Libraries/LibGUI/GModel.h
+++ b/Libraries/LibGUI/Model.h
@@ -32,8 +32,8 @@
#include <AK/RefCounted.h>
#include <AK/String.h>
#include <LibGfx/TextAlignment.h>
-#include <LibGUI/GModelIndex.h>
-#include <LibGUI/GVariant.h>
+#include <LibGUI/ModelIndex.h>
+#include <LibGUI/Variant.h>
namespace Gfx {
class Font;
diff --git a/Libraries/LibGUI/GModelEditingDelegate.h b/Libraries/LibGUI/ModelEditingDelegate.h
index 2276c9c348..5b8efeed20 100644
--- a/Libraries/LibGUI/GModelEditingDelegate.h
+++ b/Libraries/LibGUI/ModelEditingDelegate.h
@@ -26,9 +26,9 @@
#pragma once
-#include <LibGUI/GModel.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Model.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GModelIndex.h b/Libraries/LibGUI/ModelIndex.h
index 2b2481fbc1..2b2481fbc1 100644
--- a/Libraries/LibGUI/GModelIndex.h
+++ b/Libraries/LibGUI/ModelIndex.h
diff --git a/Libraries/LibGUI/GModelSelection.cpp b/Libraries/LibGUI/ModelSelection.cpp
index 2e191e8b90..df7689323c 100644
--- a/Libraries/LibGUI/GModelSelection.cpp
+++ b/Libraries/LibGUI/ModelSelection.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GAbstractView.h>
-#include <LibGUI/GModelSelection.h>
+#include <LibGUI/AbstractView.h>
+#include <LibGUI/ModelSelection.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GModelSelection.h b/Libraries/LibGUI/ModelSelection.h
index ec86d02e03..b6452a35bd 100644
--- a/Libraries/LibGUI/GModelSelection.h
+++ b/Libraries/LibGUI/ModelSelection.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/HashTable.h>
-#include <LibGUI/GModelIndex.h>
+#include <LibGUI/ModelIndex.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GPainter.cpp b/Libraries/LibGUI/Painter.cpp
index c9305593e3..0dd3e3fbcb 100644
--- a/Libraries/LibGUI/GPainter.cpp
+++ b/Libraries/LibGUI/Painter.cpp
@@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
namespace GUI {
Painter::Painter(Gfx::Bitmap& bitmap)
diff --git a/Libraries/LibGUI/GPainter.h b/Libraries/LibGUI/Painter.h
index a243e01cf4..a243e01cf4 100644
--- a/Libraries/LibGUI/GPainter.h
+++ b/Libraries/LibGUI/Painter.h
diff --git a/Libraries/LibGUI/GProgressBar.cpp b/Libraries/LibGUI/ProgressBar.cpp
index c2c22cde4f..4e55e3720b 100644
--- a/Libraries/LibGUI/GProgressBar.cpp
+++ b/Libraries/LibGUI/ProgressBar.cpp
@@ -25,8 +25,8 @@
*/
#include <AK/StringBuilder.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GProgressBar.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ProgressBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GProgressBar.h b/Libraries/LibGUI/ProgressBar.h
index e75cf160f9..39507bfb7a 100644
--- a/Libraries/LibGUI/GProgressBar.h
+++ b/Libraries/LibGUI/ProgressBar.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GRadioButton.cpp b/Libraries/LibGUI/RadioButton.cpp
index 5cb02f5333..51b12b9d3d 100644
--- a/Libraries/LibGUI/GRadioButton.cpp
+++ b/Libraries/LibGUI/RadioButton.cpp
@@ -26,8 +26,8 @@
#include <LibGfx/Bitmap.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GRadioButton.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/RadioButton.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GRadioButton.h b/Libraries/LibGUI/RadioButton.h
index 8e9b8ccc19..e22e6ca568 100644
--- a/Libraries/LibGUI/GRadioButton.h
+++ b/Libraries/LibGUI/RadioButton.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GAbstractButton.h>
+#include <LibGUI/AbstractButton.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GResizeCorner.cpp b/Libraries/LibGUI/ResizeCorner.cpp
index b4e3880101..7db9c08007 100644
--- a/Libraries/LibGUI/GResizeCorner.cpp
+++ b/Libraries/LibGUI/ResizeCorner.cpp
@@ -26,9 +26,9 @@
#include <LibGfx/Bitmap.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GResizeCorner.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ResizeCorner.h>
+#include <LibGUI/Window.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GResizeCorner.h b/Libraries/LibGUI/ResizeCorner.h
index 59921dbb39..ff4778ac07 100644
--- a/Libraries/LibGUI/GResizeCorner.h
+++ b/Libraries/LibGUI/ResizeCorner.h
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GScrollBar.cpp b/Libraries/LibGUI/ScrollBar.cpp
index 5f35ca2dbd..c50f3fb7b4 100644
--- a/Libraries/LibGUI/GScrollBar.cpp
+++ b/Libraries/LibGUI/ScrollBar.cpp
@@ -28,8 +28,8 @@
#include <LibGfx/Bitmap.h>
#include <LibGfx/Palette.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GScrollBar.h b/Libraries/LibGUI/ScrollBar.h
index f3f494f228..8283ef3f76 100644
--- a/Libraries/LibGUI/GScrollBar.h
+++ b/Libraries/LibGUI/ScrollBar.h
@@ -28,7 +28,7 @@
#include <AK/Function.h>
#include <LibCore/Timer.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GScrollableWidget.cpp b/Libraries/LibGUI/ScrollableWidget.cpp
index daf6fe2b5b..d5fe7de93a 100644
--- a/Libraries/LibGUI/GScrollableWidget.cpp
+++ b/Libraries/LibGUI/ScrollableWidget.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GScrollableWidget.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/ScrollableWidget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GScrollableWidget.h b/Libraries/LibGUI/ScrollableWidget.h
index 2b8888e014..78278579df 100644
--- a/Libraries/LibGUI/GScrollableWidget.h
+++ b/Libraries/LibGUI/ScrollableWidget.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GShortcut.cpp b/Libraries/LibGUI/Shortcut.cpp
index 982a1eadd6..37fa479450 100644
--- a/Libraries/LibGUI/GShortcut.cpp
+++ b/Libraries/LibGUI/Shortcut.cpp
@@ -25,7 +25,7 @@
*/
#include <AK/StringBuilder.h>
-#include <LibGUI/GShortcut.h>
+#include <LibGUI/Shortcut.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GShortcut.h b/Libraries/LibGUI/Shortcut.h
index 6497451fd0..6497451fd0 100644
--- a/Libraries/LibGUI/GShortcut.h
+++ b/Libraries/LibGUI/Shortcut.h
diff --git a/Libraries/LibGUI/GSlider.cpp b/Libraries/LibGUI/Slider.cpp
index 24a5736f93..5e4c47de71 100644
--- a/Libraries/LibGUI/GSlider.cpp
+++ b/Libraries/LibGUI/Slider.cpp
@@ -25,8 +25,8 @@
*/
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GSlider.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Slider.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GSlider.h b/Libraries/LibGUI/Slider.h
index d3bbc06e0e..3bd8611497 100644
--- a/Libraries/LibGUI/GSlider.h
+++ b/Libraries/LibGUI/Slider.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GSortingProxyModel.cpp b/Libraries/LibGUI/SortingProxyModel.cpp
index 482ed7db62..2244e8a00e 100644
--- a/Libraries/LibGUI/GSortingProxyModel.cpp
+++ b/Libraries/LibGUI/SortingProxyModel.cpp
@@ -25,8 +25,8 @@
*/
#include <AK/QuickSort.h>
-#include <LibGUI/GAbstractView.h>
-#include <LibGUI/GSortingProxyModel.h>
+#include <LibGUI/AbstractView.h>
+#include <LibGUI/SortingProxyModel.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/Libraries/LibGUI/GSortingProxyModel.h b/Libraries/LibGUI/SortingProxyModel.h
index d976013bd9..ff056851a2 100644
--- a/Libraries/LibGUI/GSortingProxyModel.h
+++ b/Libraries/LibGUI/SortingProxyModel.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GSpinBox.cpp b/Libraries/LibGUI/SpinBox.cpp
index 09eda858cb..cf093b5bed 100644
--- a/Libraries/LibGUI/GSpinBox.cpp
+++ b/Libraries/LibGUI/SpinBox.cpp
@@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GButton.h>
-#include <LibGUI/GSpinBox.h>
-#include <LibGUI/GTextEditor.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/SpinBox.h>
+#include <LibGUI/TextEditor.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GSpinBox.h b/Libraries/LibGUI/SpinBox.h
index b4d86e58c9..c4485674f0 100644
--- a/Libraries/LibGUI/GSpinBox.h
+++ b/Libraries/LibGUI/SpinBox.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GSplitter.cpp b/Libraries/LibGUI/Splitter.cpp
index 30d500a356..a319266017 100644
--- a/Libraries/LibGUI/GSplitter.cpp
+++ b/Libraries/LibGUI/Splitter.cpp
@@ -25,9 +25,9 @@
*/
#include <LibGfx/Palette.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/Window.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GSplitter.h b/Libraries/LibGUI/Splitter.h
index 06c56d5b55..15b1a6f9e7 100644
--- a/Libraries/LibGUI/GSplitter.h
+++ b/Libraries/LibGUI/Splitter.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GStackWidget.cpp b/Libraries/LibGUI/StackWidget.cpp
index 358b86a1e8..2b33f187df 100644
--- a/Libraries/LibGUI/GStackWidget.cpp
+++ b/Libraries/LibGUI/StackWidget.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GStackWidget.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/StackWidget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GStackWidget.h b/Libraries/LibGUI/StackWidget.h
index aadc1d4a26..7aba7f83b0 100644
--- a/Libraries/LibGUI/GStackWidget.h
+++ b/Libraries/LibGUI/StackWidget.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GStatusBar.cpp b/Libraries/LibGUI/StatusBar.cpp
index 5805012b84..7e0699a4d9 100644
--- a/Libraries/LibGUI/GStatusBar.cpp
+++ b/Libraries/LibGUI/StatusBar.cpp
@@ -25,11 +25,11 @@
*/
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GResizeCorner.h>
-#include <LibGUI/GStatusBar.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ResizeCorner.h>
+#include <LibGUI/StatusBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GStatusBar.h b/Libraries/LibGUI/StatusBar.h
index 8b9b7fe9f3..d2d80cd9bd 100644
--- a/Libraries/LibGUI/GStatusBar.h
+++ b/Libraries/LibGUI/StatusBar.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTabWidget.cpp b/Libraries/LibGUI/TabWidget.cpp
index be19e88eba..f389f6fa3a 100644
--- a/Libraries/LibGUI/GTabWidget.cpp
+++ b/Libraries/LibGUI/TabWidget.cpp
@@ -26,9 +26,9 @@
#include <LibGfx/Palette.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GTabWidget.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/TabWidget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTabWidget.h b/Libraries/LibGUI/TabWidget.h
index b771a5feb0..ad573933d8 100644
--- a/Libraries/LibGUI/GTabWidget.h
+++ b/Libraries/LibGUI/TabWidget.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTableView.cpp b/Libraries/LibGUI/TableView.cpp
index cc45d85c6c..7cb853178e 100644
--- a/Libraries/LibGUI/GTableView.cpp
+++ b/Libraries/LibGUI/TableView.cpp
@@ -27,14 +27,14 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GModel.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GTableView.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Model.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/TableView.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/Window.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTableView.h b/Libraries/LibGUI/TableView.h
index 25ff332d45..a21e6f9375 100644
--- a/Libraries/LibGUI/GTableView.h
+++ b/Libraries/LibGUI/TableView.h
@@ -28,8 +28,8 @@
#include <AK/Function.h>
#include <AK/HashMap.h>
-#include <LibGUI/GAbstractTableView.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/AbstractTableView.h>
+#include <LibGUI/Model.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTextBox.cpp b/Libraries/LibGUI/TextBox.cpp
index 36a8f691b8..5e04fb71ce 100644
--- a/Libraries/LibGUI/GTextBox.cpp
+++ b/Libraries/LibGUI/TextBox.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GTextBox.h>
+#include <LibGUI/TextBox.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTextBox.h b/Libraries/LibGUI/TextBox.h
index 38214a50c7..1989ad9825 100644
--- a/Libraries/LibGUI/GTextBox.h
+++ b/Libraries/LibGUI/TextBox.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/Function.h>
-#include <LibGUI/GTextEditor.h>
+#include <LibGUI/TextEditor.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTextDocument.cpp b/Libraries/LibGUI/TextDocument.cpp
index 90bb89910f..fd3d74afdf 100644
--- a/Libraries/LibGUI/GTextDocument.cpp
+++ b/Libraries/LibGUI/TextDocument.cpp
@@ -26,8 +26,8 @@
#include <AK/StringBuilder.h>
#include <LibCore/Timer.h>
-#include <LibGUI/GTextDocument.h>
-#include <LibGUI/GTextEditor.h>
+#include <LibGUI/TextDocument.h>
+#include <LibGUI/TextEditor.h>
#include <ctype.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTextDocument.h b/Libraries/LibGUI/TextDocument.h
index f9f6a93c61..3fdbe45651 100644
--- a/Libraries/LibGUI/GTextDocument.h
+++ b/Libraries/LibGUI/TextDocument.h
@@ -34,8 +34,8 @@
#include <LibCore/Timer.h>
#include <LibGfx/Color.h>
#include <LibGfx/Font.h>
-#include <LibGUI/GTextRange.h>
-#include <LibGUI/GUndoStack.h>
+#include <LibGUI/TextRange.h>
+#include <LibGUI/UndoStack.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTextEditor.cpp b/Libraries/LibGUI/TextEditor.cpp
index 9260a33678..61e7377cd3 100644
--- a/Libraries/LibGUI/GTextEditor.cpp
+++ b/Libraries/LibGUI/TextEditor.cpp
@@ -28,15 +28,15 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GClipboard.h>
-#include <LibGUI/GFontDatabase.h>
-#include <LibGUI/GInputBox.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Clipboard.h>
+#include <LibGUI/FontDatabase.h>
+#include <LibGUI/InputBox.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/Window.h>
#include <ctype.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/Libraries/LibGUI/GTextEditor.h b/Libraries/LibGUI/TextEditor.h
index 5f92a043cc..88a0a6a762 100644
--- a/Libraries/LibGUI/GTextEditor.h
+++ b/Libraries/LibGUI/TextEditor.h
@@ -32,9 +32,9 @@
#include <AK/NonnullRefPtrVector.h>
#include <LibCore/Timer.h>
#include <LibGfx/TextAlignment.h>
-#include <LibGUI/GScrollableWidget.h>
-#include <LibGUI/GTextDocument.h>
-#include <LibGUI/GTextRange.h>
+#include <LibGUI/ScrollableWidget.h>
+#include <LibGUI/TextDocument.h>
+#include <LibGUI/TextRange.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTextPosition.h b/Libraries/LibGUI/TextPosition.h
index 86eb5116e7..86eb5116e7 100644
--- a/Libraries/LibGUI/GTextPosition.h
+++ b/Libraries/LibGUI/TextPosition.h
diff --git a/Libraries/LibGUI/GTextRange.h b/Libraries/LibGUI/TextRange.h
index 6d309a7951..ce4b93fc9b 100644
--- a/Libraries/LibGUI/GTextRange.h
+++ b/Libraries/LibGUI/TextRange.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/LogStream.h>
-#include <LibGUI/GTextPosition.h>
+#include <LibGUI/TextPosition.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GToolBar.cpp b/Libraries/LibGUI/ToolBar.cpp
index 93046c6ed4..fc0a6ca349 100644
--- a/Libraries/LibGUI/GToolBar.cpp
+++ b/Libraries/LibGUI/ToolBar.cpp
@@ -25,12 +25,12 @@
*/
#include <LibGfx/Palette.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GToolBar.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ToolBar.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GToolBar.h b/Libraries/LibGUI/ToolBar.h
index 81ebb336a8..575207299e 100644
--- a/Libraries/LibGUI/GToolBar.h
+++ b/Libraries/LibGUI/ToolBar.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/NonnullOwnPtrVector.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GTreeView.cpp b/Libraries/LibGUI/TreeView.cpp
index 8bdc5e23fc..10ccbc6815 100644
--- a/Libraries/LibGUI/GTreeView.cpp
+++ b/Libraries/LibGUI/TreeView.cpp
@@ -25,9 +25,9 @@
*/
#include <LibGfx/Palette.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GTreeView.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/TreeView.h>
//#define DEBUG_ITEM_RECTS
diff --git a/Libraries/LibGUI/GTreeView.h b/Libraries/LibGUI/TreeView.h
index 2f47288409..cc47b2bcdd 100644
--- a/Libraries/LibGUI/GTreeView.h
+++ b/Libraries/LibGUI/TreeView.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GAbstractTableView.h>
+#include <LibGUI/AbstractTableView.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GUndoStack.cpp b/Libraries/LibGUI/UndoStack.cpp
index 433b040aed..76c38eaca9 100644
--- a/Libraries/LibGUI/GUndoStack.cpp
+++ b/Libraries/LibGUI/UndoStack.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GUndoStack.h>
+#include <LibGUI/UndoStack.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GUndoStack.h b/Libraries/LibGUI/UndoStack.h
index d45b53d704..1893ad5ec1 100644
--- a/Libraries/LibGUI/GUndoStack.h
+++ b/Libraries/LibGUI/UndoStack.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/NonnullOwnPtrVector.h>
-#include <LibGUI/GCommand.h>
+#include <LibGUI/Command.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GVariant.cpp b/Libraries/LibGUI/Variant.cpp
index aaa39e11ca..4ee6bf3f2c 100644
--- a/Libraries/LibGUI/GVariant.cpp
+++ b/Libraries/LibGUI/Variant.cpp
@@ -25,7 +25,7 @@
*/
#include <AK/JsonValue.h>
-#include <LibGUI/GVariant.h>
+#include <LibGUI/Variant.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/Variant.h
index 557709ea10..1a95ae2280 100644
--- a/Libraries/LibGUI/GVariant.h
+++ b/Libraries/LibGUI/Variant.h
@@ -29,7 +29,7 @@
#include <AK/String.h>
#include <LibGfx/Font.h>
#include <LibGfx/Bitmap.h>
-#include <LibGUI/GIcon.h>
+#include <LibGUI/Icon.h>
namespace AK {
class JsonValue;
diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/Widget.cpp
index dc5406bdd4..5ca0d6d707 100644
--- a/Libraries/LibGUI/GWidget.cpp
+++ b/Libraries/LibGUI/Widget.cpp
@@ -28,24 +28,24 @@
#include <AK/JsonObject.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Palette.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GCheckBox.h>
-#include <LibGUI/GEvent.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GLayout.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GRadioButton.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GSlider.h>
-#include <LibGUI/GSpinBox.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/Event.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Layout.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/RadioButton.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Slider.h>
+#include <LibGUI/SpinBox.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
+#include <LibGUI/WindowServerConnection.h>
#include <unistd.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GWidget.h b/Libraries/LibGUI/Widget.h
index b83dcd3e14..ef2af59fdc 100644
--- a/Libraries/LibGUI/GWidget.h
+++ b/Libraries/LibGUI/Widget.h
@@ -37,8 +37,8 @@
#include <LibGfx/Palette.h>
#include <LibGfx/Rect.h>
#include <LibGfx/SystemTheme.h>
-#include <LibGUI/GEvent.h>
-#include <LibGUI/GShortcut.h>
+#include <LibGUI/Event.h>
+#include <LibGUI/Shortcut.h>
#define REGISTER_GWIDGET(class_name) \
extern WidgetClassRegistration registration_##class_name; \
diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/Window.cpp
index 1e0cdb2ab9..c93e9d00e8 100644
--- a/Libraries/LibGUI/GWindow.cpp
+++ b/Libraries/LibGUI/Window.cpp
@@ -29,13 +29,13 @@
#include <AK/NeverDestroyed.h>
#include <AK/SharedBuffer.h>
#include <LibGfx/Bitmap.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GEvent.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Event.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
+#include <LibGUI/WindowServerConnection.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/Window.h
index 470d725c78..7bd5003cce 100644
--- a/Libraries/LibGUI/GWindow.h
+++ b/Libraries/LibGUI/Window.h
@@ -33,7 +33,7 @@
#include <LibCore/Object.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Rect.h>
-#include <LibGUI/GWindowType.h>
+#include <LibGUI/WindowType.h>
namespace GUI {
diff --git a/Libraries/LibGUI/GWindowServerConnection.cpp b/Libraries/LibGUI/WindowServerConnection.cpp
index 901c869d07..3ea6a6a572 100644
--- a/Libraries/LibGUI/GWindowServerConnection.cpp
+++ b/Libraries/LibGUI/WindowServerConnection.cpp
@@ -26,16 +26,16 @@
#include <LibGfx/Palette.h>
#include <LibGfx/SystemTheme.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GClipboard.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GDragOperation.h>
-#include <LibGUI/GEvent.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Clipboard.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/DragOperation.h>
+#include <LibGUI/Event.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
+#include <LibGUI/WindowServerConnection.h>
//#define GEVENTLOOP_DEBUG
diff --git a/Libraries/LibGUI/GWindowServerConnection.h b/Libraries/LibGUI/WindowServerConnection.h
index 5579be5d13..5579be5d13 100644
--- a/Libraries/LibGUI/GWindowServerConnection.h
+++ b/Libraries/LibGUI/WindowServerConnection.h
diff --git a/Libraries/LibGUI/GWindowType.h b/Libraries/LibGUI/WindowType.h
index 44f342212a..44f342212a 100644
--- a/Libraries/LibGUI/GWindowType.h
+++ b/Libraries/LibGUI/WindowType.h
diff --git a/Libraries/LibHTML/DOM/Document.cpp b/Libraries/LibHTML/DOM/Document.cpp
index 06ed704169..5243bf9a5d 100644
--- a/Libraries/LibHTML/DOM/Document.cpp
+++ b/Libraries/LibHTML/DOM/Document.cpp
@@ -27,7 +27,7 @@
#include <AK/FileSystemPath.h>
#include <AK/StringBuilder.h>
#include <LibCore/Timer.h>
-#include <LibGUI/GApplication.h>
+#include <LibGUI/Application.h>
#include <LibHTML/CSS/StyleResolver.h>
#include <LibHTML/DOM/Document.h>
#include <LibHTML/DOM/DocumentType.h>
diff --git a/Libraries/LibHTML/DOM/HTMLInputElement.cpp b/Libraries/LibHTML/DOM/HTMLInputElement.cpp
index bf0619ec7c..238eb71a67 100644
--- a/Libraries/LibHTML/DOM/HTMLInputElement.cpp
+++ b/Libraries/LibHTML/DOM/HTMLInputElement.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GButton.h>
-#include <LibGUI/GTextBox.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/TextBox.h>
#include <LibHTML/DOM/Document.h>
#include <LibHTML/DOM/HTMLFormElement.h>
#include <LibHTML/DOM/HTMLInputElement.h>
diff --git a/Libraries/LibHTML/DOMTreeModel.h b/Libraries/LibHTML/DOMTreeModel.h
index 17cf1d0677..96cb6d4a05 100644
--- a/Libraries/LibHTML/DOMTreeModel.h
+++ b/Libraries/LibHTML/DOMTreeModel.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
class Document;
diff --git a/Libraries/LibHTML/HtmlView.cpp b/Libraries/LibHTML/HtmlView.cpp
index f3907cafb2..259fae0231 100644
--- a/Libraries/LibHTML/HtmlView.cpp
+++ b/Libraries/LibHTML/HtmlView.cpp
@@ -26,10 +26,10 @@
#include <AK/FileSystemPath.h>
#include <LibCore/File.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Window.h>
#include <LibGfx/PNGLoader.h>
#include <LibHTML/DOM/Element.h>
#include <LibHTML/DOM/ElementFactory.h>
diff --git a/Libraries/LibHTML/HtmlView.h b/Libraries/LibHTML/HtmlView.h
index 8b165d2778..cb3da961cd 100644
--- a/Libraries/LibHTML/HtmlView.h
+++ b/Libraries/LibHTML/HtmlView.h
@@ -26,7 +26,7 @@
#pragma once
#include <AK/URL.h>
-#include <LibGUI/GScrollableWidget.h>
+#include <LibGUI/ScrollableWidget.h>
#include <LibHTML/DOM/Document.h>
class Frame;
diff --git a/Libraries/LibHTML/Layout/LayoutBlock.cpp b/Libraries/LibHTML/Layout/LayoutBlock.cpp
index f64034719e..570b1f762a 100644
--- a/Libraries/LibHTML/Layout/LayoutBlock.cpp
+++ b/Libraries/LibHTML/Layout/LayoutBlock.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibHTML/CSS/StyleResolver.h>
#include <LibHTML/DOM/Element.h>
#include <LibHTML/Layout/LayoutBlock.h>
diff --git a/Libraries/LibHTML/Layout/LayoutBox.cpp b/Libraries/LibHTML/Layout/LayoutBox.cpp
index 95811c9fdd..51a7bd0292 100644
--- a/Libraries/LibHTML/Layout/LayoutBox.cpp
+++ b/Libraries/LibHTML/Layout/LayoutBox.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibHTML/DOM/Document.h>
#include <LibHTML/DOM/HTMLBodyElement.h>
#include <LibHTML/Frame.h>
diff --git a/Libraries/LibHTML/Layout/LayoutImage.cpp b/Libraries/LibHTML/Layout/LayoutImage.cpp
index 4cf6416568..22fccfebd5 100644
--- a/Libraries/LibHTML/Layout/LayoutImage.cpp
+++ b/Libraries/LibHTML/Layout/LayoutImage.cpp
@@ -26,7 +26,7 @@
#include <LibGfx/Font.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibHTML/Layout/LayoutImage.h>
LayoutImage::LayoutImage(const HTMLImageElement& element, NonnullRefPtr<StyleProperties> style)
diff --git a/Libraries/LibHTML/Layout/LayoutListItemMarker.cpp b/Libraries/LibHTML/Layout/LayoutListItemMarker.cpp
index 03d793f1f0..835c68f005 100644
--- a/Libraries/LibHTML/Layout/LayoutListItemMarker.cpp
+++ b/Libraries/LibHTML/Layout/LayoutListItemMarker.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibHTML/Layout/LayoutListItemMarker.h>
LayoutListItemMarker::LayoutListItemMarker()
diff --git a/Libraries/LibHTML/Layout/LayoutNode.cpp b/Libraries/LibHTML/Layout/LayoutNode.cpp
index 5ca86a9200..d1ec2f7453 100644
--- a/Libraries/LibHTML/Layout/LayoutNode.cpp
+++ b/Libraries/LibHTML/Layout/LayoutNode.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibHTML/DOM/Document.h>
#include <LibHTML/DOM/Element.h>
#include <LibHTML/Frame.h>
diff --git a/Libraries/LibHTML/Layout/LayoutText.cpp b/Libraries/LibHTML/Layout/LayoutText.cpp
index 2b557bf6ff..f97d856cb3 100644
--- a/Libraries/LibHTML/Layout/LayoutText.cpp
+++ b/Libraries/LibHTML/Layout/LayoutText.cpp
@@ -28,7 +28,7 @@
#include <AK/Utf8View.h>
#include <LibCore/DirIterator.h>
#include <LibGfx/Font.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibHTML/DOM/Document.h>
#include <LibHTML/Layout/LayoutBlock.h>
#include <LibHTML/Layout/LayoutText.h>
diff --git a/Libraries/LibHTML/Layout/LayoutWidget.cpp b/Libraries/LibHTML/Layout/LayoutWidget.cpp
index 4ef901bc70..9db153a4a0 100644
--- a/Libraries/LibHTML/Layout/LayoutWidget.cpp
+++ b/Libraries/LibHTML/Layout/LayoutWidget.cpp
@@ -26,8 +26,8 @@
#include <LibGfx/Font.h>
#include <LibGfx/StylePainter.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Widget.h>
#include <LibHTML/Layout/LayoutWidget.h>
LayoutWidget::LayoutWidget(const Element& element, GUI::Widget& widget)
diff --git a/Libraries/LibHTML/Layout/LineBoxFragment.cpp b/Libraries/LibHTML/Layout/LineBoxFragment.cpp
index 31d14886cc..a8d1211983 100644
--- a/Libraries/LibHTML/Layout/LineBoxFragment.cpp
+++ b/Libraries/LibHTML/Layout/LineBoxFragment.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
#include <LibHTML/Layout/LayoutDocument.h>
#include <LibHTML/Layout/LayoutText.h>
#include <LibHTML/Layout/LineBoxFragment.h>
diff --git a/Libraries/LibHTML/StylePropertiesModel.h b/Libraries/LibHTML/StylePropertiesModel.h
index 5a8ed15284..ed6a09810e 100644
--- a/Libraries/LibHTML/StylePropertiesModel.h
+++ b/Libraries/LibHTML/StylePropertiesModel.h
@@ -25,7 +25,7 @@
*/
#include <AK/NonnullRefPtrVector.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
class StyleProperties;
diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp
index d5bddf33b9..4e6f9614cc 100644
--- a/Libraries/LibVT/TerminalWidget.cpp
+++ b/Libraries/LibVT/TerminalWidget.cpp
@@ -31,13 +31,13 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibGfx/Font.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GClipboard.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Clipboard.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Window.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/Libraries/LibVT/TerminalWidget.h b/Libraries/LibVT/TerminalWidget.h
index 21cb791f48..a1b994dd9a 100644
--- a/Libraries/LibVT/TerminalWidget.h
+++ b/Libraries/LibVT/TerminalWidget.h
@@ -32,7 +32,7 @@
#include <LibCore/Timer.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Rect.h>
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
#include <LibVT/Terminal.h>
namespace GUI {