diff options
| author | Andreas Kling <kling@serenityos.org> | 2020-02-06 20:33:02 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-02-06 20:33:02 +0100 |
| commit | 6a9cc66b976653bf5f0440a6071b736d6d41c183 (patch) | |
| tree | 538a7595db75641409ffb36fad9f31613812c9aa | |
| parent | 2e219255a2f062e9d7da0c9a306e84bde95db2fa (diff) | |
| download | serenity-6a9cc66b976653bf5f0440a6071b736d6d41c183.zip | |
LibGUI: Remove leading G from filenames
316 files changed, 965 insertions, 966 deletions
diff --git a/Applications/About/main.cpp b/Applications/About/main.cpp index a240de5e5d..cc761d7a88 100644 --- a/Applications/About/main.cpp +++ b/Applications/About/main.cpp @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GDesktop.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Desktop.h> +#include <LibGUI/Label.h> +#include <LibGUI/Window.h> #include <sys/utsname.h> #include <stdio.h> diff --git a/Applications/Browser/InspectorWidget.cpp b/Applications/Browser/InspectorWidget.cpp index 5f8925fe17..e9658bae1a 100644 --- a/Applications/Browser/InspectorWidget.cpp +++ b/Applications/Browser/InspectorWidget.cpp @@ -25,11 +25,11 @@ */ #include "InspectorWidget.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GTreeView.h> -#include <LibGUI/GTabWidget.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/TableView.h> +#include <LibGUI/TreeView.h> +#include <LibGUI/TabWidget.h> #include <LibHTML/DOM/Document.h> #include <LibHTML/DOM/Element.h> #include <LibHTML/DOMTreeModel.h> diff --git a/Applications/Browser/InspectorWidget.h b/Applications/Browser/InspectorWidget.h index 96363d1a48..1e8fe54ab3 100644 --- a/Applications/Browser/InspectorWidget.h +++ b/Applications/Browser/InspectorWidget.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> class Document; diff --git a/Applications/Browser/main.cpp b/Applications/Browser/main.cpp index 74944ac096..5f34397ba5 100644 --- a/Applications/Browser/main.cpp +++ b/Applications/Browser/main.cpp @@ -27,16 +27,16 @@ #include "History.h" #include "InspectorWidget.h" #include <LibCore/File.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GStatusBar.h> -#include <LibGUI/GTextBox.h> -#include <LibGUI/GToolBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/StatusBar.h> +#include <LibGUI/TextBox.h> +#include <LibGUI/ToolBar.h> +#include <LibGUI/Window.h> #include <LibHTML/CSS/StyleResolver.h> #include <LibHTML/DOM/Element.h> #include <LibHTML/DOMTreeModel.h> diff --git a/Applications/Calculator/CalculatorWidget.cpp b/Applications/Calculator/CalculatorWidget.cpp index c04713ba4a..4cf348d7d7 100644 --- a/Applications/Calculator/CalculatorWidget.cpp +++ b/Applications/Calculator/CalculatorWidget.cpp @@ -26,9 +26,9 @@ #include "CalculatorWidget.h" #include <AK/Assertions.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GTextBox.h> +#include <LibGUI/Button.h> +#include <LibGUI/Label.h> +#include <LibGUI/TextBox.h> CalculatorWidget::CalculatorWidget(GUI::Widget* parent) : GUI::Widget(parent) diff --git a/Applications/Calculator/CalculatorWidget.h b/Applications/Calculator/CalculatorWidget.h index 8400ca756f..a1cc62584b 100644 --- a/Applications/Calculator/CalculatorWidget.h +++ b/Applications/Calculator/CalculatorWidget.h @@ -29,7 +29,7 @@ #include "Calculator.h" #include "Keypad.h" #include <AK/Vector.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class Button; diff --git a/Applications/Calculator/main.cpp b/Applications/Calculator/main.cpp index c7f3c6871e..298c424ec2 100644 --- a/Applications/Calculator/main.cpp +++ b/Applications/Calculator/main.cpp @@ -25,11 +25,11 @@ */ #include "CalculatorWidget.h" -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Applications/ChanViewer/BoardListModel.h b/Applications/ChanViewer/BoardListModel.h index 3c0f016fa3..6ee6a0bfc7 100644 --- a/Applications/ChanViewer/BoardListModel.h +++ b/Applications/ChanViewer/BoardListModel.h @@ -28,7 +28,7 @@ #include <AK/JsonArray.h> #include <LibCore/HttpJob.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class BoardListModel final : public GUI::Model { public: diff --git a/Applications/ChanViewer/ThreadCatalogModel.h b/Applications/ChanViewer/ThreadCatalogModel.h index 9f4e6ddf65..661e3160e5 100644 --- a/Applications/ChanViewer/ThreadCatalogModel.h +++ b/Applications/ChanViewer/ThreadCatalogModel.h @@ -28,7 +28,7 @@ #include <AK/JsonArray.h> #include <LibCore/HttpJob.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class ThreadCatalogModel final : public GUI::Model { public: diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp index c4a7d11eb2..63879e65d5 100644 --- a/Applications/ChanViewer/main.cpp +++ b/Applications/ChanViewer/main.cpp @@ -26,15 +26,15 @@ #include "BoardListModel.h" #include "ThreadCatalogModel.h" -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GComboBox.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GStatusBar.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/ComboBox.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/StatusBar.h> +#include <LibGUI/TableView.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Applications/DisplayProperties/DisplayProperties.cpp b/Applications/DisplayProperties/DisplayProperties.cpp index bcab4e7c7d..3343351939 100644 --- a/Applications/DisplayProperties/DisplayProperties.cpp +++ b/Applications/DisplayProperties/DisplayProperties.cpp @@ -28,22 +28,22 @@ #include "ItemListModel.h" #include <AK/StringBuilder.h> #include <LibCore/DirIterator.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GDesktop.h> -#include <LibGUI/GFileSystemModel.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GListView.h> -#include <LibGUI/GScrollBar.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GTabWidget.h> -#include <LibGUI/GToolBar.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> -#include <LibGUI/GWindowServerConnection.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Desktop.h> +#include <LibGUI/FileSystemModel.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/Label.h> +#include <LibGUI/ListView.h> +#include <LibGUI/ScrollBar.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/TabWidget.h> +#include <LibGUI/ToolBar.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> +#include <LibGUI/WindowServerConnection.h> #include <Servers/WindowServer/WindowManager.h> DisplayPropertiesWidget::DisplayPropertiesWidget() diff --git a/Applications/DisplayProperties/DisplayProperties.h b/Applications/DisplayProperties/DisplayProperties.h index e4f1926526..6f044d3a52 100644 --- a/Applications/DisplayProperties/DisplayProperties.h +++ b/Applications/DisplayProperties/DisplayProperties.h @@ -32,8 +32,8 @@ #include <LibCore/ConfigFile.h> #include <LibGfx/Color.h> #include <LibGfx/Size.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GLabel.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Label.h> class DisplayPropertiesWidget final { public: diff --git a/Applications/DisplayProperties/ItemListModel.h b/Applications/DisplayProperties/ItemListModel.h index 8b675c3fa7..17b1b412c4 100644 --- a/Applications/DisplayProperties/ItemListModel.h +++ b/Applications/DisplayProperties/ItemListModel.h @@ -28,7 +28,7 @@ #include <AK/NonnullRefPtr.h> #include <AK/Vector.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> template<typename T> class ItemListModel final : public GUI::Model { diff --git a/Applications/DisplayProperties/main.cpp b/Applications/DisplayProperties/main.cpp index b3a05a2d74..7008858e00 100644 --- a/Applications/DisplayProperties/main.cpp +++ b/Applications/DisplayProperties/main.cpp @@ -25,14 +25,14 @@ */ #include "DisplayProperties.h" -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Applications/FileManager/DirectoryView.cpp b/Applications/FileManager/DirectoryView.cpp index e74d9dbe64..a5ecaabc5a 100644 --- a/Applications/FileManager/DirectoryView.cpp +++ b/Applications/FileManager/DirectoryView.cpp @@ -27,7 +27,7 @@ #include "DirectoryView.h" #include <AK/FileSystemPath.h> #include <AK/StringBuilder.h> -#include <LibGUI/GSortingProxyModel.h> +#include <LibGUI/SortingProxyModel.h> #include <stdio.h> #include <unistd.h> diff --git a/Applications/FileManager/DirectoryView.h b/Applications/FileManager/DirectoryView.h index 26fdd46b7a..0b66ed14d4 100644 --- a/Applications/FileManager/DirectoryView.h +++ b/Applications/FileManager/DirectoryView.h @@ -27,11 +27,11 @@ #pragma once #include <AK/Vector.h> -#include <LibGUI/GColumnsView.h> -#include <LibGUI/GFileSystemModel.h> -#include <LibGUI/GItemView.h> -#include <LibGUI/GStackWidget.h> -#include <LibGUI/GTableView.h> +#include <LibGUI/ColumnsView.h> +#include <LibGUI/FileSystemModel.h> +#include <LibGUI/ItemView.h> +#include <LibGUI/StackWidget.h> +#include <LibGUI/TableView.h> #include <sys/stat.h> class DirectoryView final : public GUI::StackWidget { diff --git a/Applications/FileManager/PropertiesDialog.cpp b/Applications/FileManager/PropertiesDialog.cpp index 970ace8655..83bda32aea 100644 --- a/Applications/FileManager/PropertiesDialog.cpp +++ b/Applications/FileManager/PropertiesDialog.cpp @@ -26,11 +26,11 @@ #include "PropertiesDialog.h" #include <AK/StringBuilder.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GCheckBox.h> -#include <LibGUI/GFilePicker.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GTabWidget.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/CheckBox.h> +#include <LibGUI/FilePicker.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/TabWidget.h> #include <limits.h> #include <pwd.h> #include <stdio.h> diff --git a/Applications/FileManager/PropertiesDialog.h b/Applications/FileManager/PropertiesDialog.h index 05ecfa9157..4bf7cd7045 100644 --- a/Applications/FileManager/PropertiesDialog.h +++ b/Applications/FileManager/PropertiesDialog.h @@ -28,11 +28,11 @@ #include <AK/FileSystemPath.h> #include <LibCore/File.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GDialog.h> -#include <LibGUI/GFileSystemModel.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GTextBox.h> +#include <LibGUI/Button.h> +#include <LibGUI/Dialog.h> +#include <LibGUI/FileSystemModel.h> +#include <LibGUI/Label.h> +#include <LibGUI/TextBox.h> class PropertiesDialog final : public GUI::Dialog { C_OBJECT(PropertiesDialog) diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index 8c0c0ec3f5..c37b054117 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -31,25 +31,25 @@ #include <AK/StringBuilder.h> #include <LibCore/ConfigFile.h> #include <LibCore/UserInfo.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GActionGroup.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GClipboard.h> -#include <LibGUI/GFileSystemModel.h> -#include <LibGUI/GInputBox.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GProgressBar.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GStatusBar.h> -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GToolBar.h> -#include <LibGUI/GTreeView.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/ActionGroup.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Clipboard.h> +#include <LibGUI/FileSystemModel.h> +#include <LibGUI/InputBox.h> +#include <LibGUI/Label.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/ProgressBar.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/StatusBar.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/ToolBar.h> +#include <LibGUI/TreeView.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <signal.h> #include <stdio.h> #include <unistd.h> diff --git a/Applications/FontEditor/FontEditor.cpp b/Applications/FontEditor/FontEditor.cpp index dece1538ad..2d275e2b61 100644 --- a/Applications/FontEditor/FontEditor.cpp +++ b/Applications/FontEditor/FontEditor.cpp @@ -29,13 +29,13 @@ #include "GlyphMapWidget.h" #include "UI_FontEditorBottom.h" #include <AK/StringBuilder.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GCheckBox.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GSpinBox.h> -#include <LibGUI/GTextBox.h> +#include <LibGUI/Button.h> +#include <LibGUI/CheckBox.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/Label.h> +#include <LibGUI/Painter.h> +#include <LibGUI/SpinBox.h> +#include <LibGUI/TextBox.h> #include <stdlib.h> FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::Font>&& edited_font, GUI::Widget* parent) diff --git a/Applications/FontEditor/FontEditor.h b/Applications/FontEditor/FontEditor.h index 82f609c313..002d8969c1 100644 --- a/Applications/FontEditor/FontEditor.h +++ b/Applications/FontEditor/FontEditor.h @@ -27,7 +27,7 @@ #pragma once #include <AK/Function.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> class GlyphEditorWidget; class GlyphMapWidget; diff --git a/Applications/FontEditor/GlyphEditorWidget.cpp b/Applications/FontEditor/GlyphEditorWidget.cpp index 3fc9ccffc5..8dbb0de9a8 100644 --- a/Applications/FontEditor/GlyphEditorWidget.cpp +++ b/Applications/FontEditor/GlyphEditorWidget.cpp @@ -25,7 +25,7 @@ */ #include "GlyphEditorWidget.h" -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> GlyphEditorWidget::GlyphEditorWidget(Gfx::Font& mutable_font, GUI::Widget* parent) : GUI::Frame(parent) diff --git a/Applications/FontEditor/GlyphEditorWidget.h b/Applications/FontEditor/GlyphEditorWidget.h index caf4c79447..5476482872 100644 --- a/Applications/FontEditor/GlyphEditorWidget.h +++ b/Applications/FontEditor/GlyphEditorWidget.h @@ -25,7 +25,7 @@ */ #include <AK/Function.h> -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class GlyphEditorWidget final : public GUI::Frame { C_OBJECT(GlyphEditorWidget) diff --git a/Applications/FontEditor/GlyphMapWidget.cpp b/Applications/FontEditor/GlyphMapWidget.cpp index 8cea9009e1..3f64194a5b 100644 --- a/Applications/FontEditor/GlyphMapWidget.cpp +++ b/Applications/FontEditor/GlyphMapWidget.cpp @@ -26,7 +26,7 @@ #include "GlyphMapWidget.h" #include <LibGfx/Palette.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font, GUI::Widget* parent) : GUI::Frame(parent) diff --git a/Applications/FontEditor/GlyphMapWidget.h b/Applications/FontEditor/GlyphMapWidget.h index 5056279fff..4598585b63 100644 --- a/Applications/FontEditor/GlyphMapWidget.h +++ b/Applications/FontEditor/GlyphMapWidget.h @@ -27,7 +27,7 @@ #pragma once #include <AK/Function.h> -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class GlyphMapWidget final : public GUI::Frame { C_OBJECT(GlyphMapWidget) diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp index 1113d5d8f8..7252a22a80 100644 --- a/Applications/FontEditor/main.cpp +++ b/Applications/FontEditor/main.cpp @@ -25,11 +25,11 @@ */ #include "FontEditor.h" -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Applications/Help/ManualModel.h b/Applications/Help/ManualModel.h index e2435e4cbb..3be13de25d 100644 --- a/Applications/Help/ManualModel.h +++ b/Applications/Help/ManualModel.h @@ -28,7 +28,7 @@ #include <AK/NonnullRefPtr.h> #include <AK/String.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class ManualModel final : public GUI::Model { public: diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index a24a1e78f6..c39936f599 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -27,18 +27,18 @@ #include "History.h" #include "ManualModel.h" #include <LibCore/File.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GToolBar.h> -#include <LibGUI/GTreeView.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/ToolBar.h> +#include <LibGUI/TreeView.h> +#include <LibGUI/Window.h> #include <LibHTML/HtmlView.h> #include <LibHTML/Layout/LayoutNode.h> #include <LibHTML/Parser/CSSParser.h> diff --git a/Applications/HexEditor/HexEditor.cpp b/Applications/HexEditor/HexEditor.cpp index 0618790a0e..89fbf6f70a 100644 --- a/Applications/HexEditor/HexEditor.cpp +++ b/Applications/HexEditor/HexEditor.cpp @@ -28,14 +28,14 @@ #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/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/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/Applications/HexEditor/HexEditor.h b/Applications/HexEditor/HexEditor.h index 05186ab577..42adcb105e 100644 --- a/Applications/HexEditor/HexEditor.h +++ b/Applications/HexEditor/HexEditor.h @@ -32,7 +32,7 @@ #include <AK/NonnullRefPtrVector.h> #include <AK/StdLibExtras.h> #include <LibGfx/TextAlignment.h> -#include <LibGUI/GScrollableWidget.h> +#include <LibGUI/ScrollableWidget.h> class HexEditor : public GUI::ScrollableWidget { C_OBJECT(HexEditor) diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp index d139cedc19..16ededb373 100644 --- a/Applications/HexEditor/HexEditorWidget.cpp +++ b/Applications/HexEditor/HexEditorWidget.cpp @@ -28,19 +28,19 @@ #include <AK/Optional.h> #include <AK/StringBuilder.h> #include <LibCore/File.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GFilePicker.h> -#include <LibGUI/GFontDatabase.h> -#include <LibGUI/GInputBox.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GStatusBar.h> -#include <LibGUI/GTextBox.h> -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GToolBar.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/FilePicker.h> +#include <LibGUI/FontDatabase.h> +#include <LibGUI/InputBox.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/StatusBar.h> +#include <LibGUI/TextBox.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/ToolBar.h> #include <stdio.h> HexEditorWidget::HexEditorWidget() diff --git a/Applications/HexEditor/HexEditorWidget.h b/Applications/HexEditor/HexEditorWidget.h index 9b1ee334ca..e46353f0a3 100644 --- a/Applications/HexEditor/HexEditorWidget.h +++ b/Applications/HexEditor/HexEditorWidget.h @@ -29,10 +29,10 @@ #include "HexEditor.h" #include <AK/FileSystemPath.h> #include <AK/Function.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> namespace GUI { class StatusBar; diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp index 47df213a23..adc6f15a6f 100644 --- a/Applications/IRCClient/IRCAppWindow.cpp +++ b/Applications/IRCClient/IRCAppWindow.cpp @@ -28,17 +28,17 @@ #include "IRCChannel.h" #include "IRCWindow.h" #include "IRCWindowListModel.h" -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GInputBox.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GStackWidget.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GToolBar.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/InputBox.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/StackWidget.h> +#include <LibGUI/TableView.h> +#include <LibGUI/ToolBar.h> #include <stdio.h> #include <stdlib.h> diff --git a/Applications/IRCClient/IRCAppWindow.h b/Applications/IRCClient/IRCAppWindow.h index 05af3d598e..7b85e8d838 100644 --- a/Applications/IRCClient/IRCAppWindow.h +++ b/Applications/IRCClient/IRCAppWindow.h @@ -28,8 +28,8 @@ #include "IRCClient.h" #include "IRCWindow.h" -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> namespace GUI { class StackWidget; diff --git a/Applications/IRCClient/IRCChannelMemberListModel.h b/Applications/IRCClient/IRCChannelMemberListModel.h index ae3d06b91e..95acee0ce5 100644 --- a/Applications/IRCClient/IRCChannelMemberListModel.h +++ b/Applications/IRCClient/IRCChannelMemberListModel.h @@ -27,7 +27,7 @@ #pragma once #include <AK/Function.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class IRCChannel; diff --git a/Applications/IRCClient/IRCWindow.cpp b/Applications/IRCClient/IRCWindow.cpp index 0e8c0ea627..835ef1f039 100644 --- a/Applications/IRCClient/IRCWindow.cpp +++ b/Applications/IRCClient/IRCWindow.cpp @@ -28,11 +28,11 @@ #include "IRCChannel.h" #include "IRCChannelMemberListModel.h" #include "IRCClient.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GTextBox.h> -#include <LibGUI/GTextEditor.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/TableView.h> +#include <LibGUI/TextBox.h> +#include <LibGUI/TextEditor.h> #include <LibHTML/HtmlView.h> IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& name, GUI::Widget* parent) diff --git a/Applications/IRCClient/IRCWindow.h b/Applications/IRCClient/IRCWindow.h index 6c280ff3ff..c9e7e38764 100644 --- a/Applications/IRCClient/IRCWindow.h +++ b/Applications/IRCClient/IRCWindow.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class TextEditor; diff --git a/Applications/IRCClient/IRCWindowListModel.h b/Applications/IRCClient/IRCWindowListModel.h index f7f8fcca45..e4d289bcbe 100644 --- a/Applications/IRCClient/IRCWindowListModel.h +++ b/Applications/IRCClient/IRCWindowListModel.h @@ -27,7 +27,7 @@ #pragma once #include <AK/Function.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class IRCClient; class IRCWindow; diff --git a/Applications/IRCClient/main.cpp b/Applications/IRCClient/main.cpp index a2d0f30c85..cbfe8386ef 100644 --- a/Applications/IRCClient/main.cpp +++ b/Applications/IRCClient/main.cpp @@ -26,7 +26,7 @@ #include "IRCAppWindow.h" #include "IRCClient.h" -#include <LibGUI/GApplication.h> +#include <LibGUI/Application.h> #include <stdio.h> int main(int argc, char** argv) 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) diff --git a/Applications/Piano/KeysWidget.cpp b/Applications/Piano/KeysWidget.cpp index aa8c951904..c048c6eb15 100644 --- a/Applications/Piano/KeysWidget.cpp +++ b/Applications/Piano/KeysWidget.cpp @@ -27,7 +27,7 @@ #include "KeysWidget.h" #include "AudioEngine.h" -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> KeysWidget::KeysWidget(GUI::Widget* parent, AudioEngine& audio_engine) : GUI::Frame(parent) diff --git a/Applications/Piano/KeysWidget.h b/Applications/Piano/KeysWidget.h index 0c44487356..2676bffe85 100644 --- a/Applications/Piano/KeysWidget.h +++ b/Applications/Piano/KeysWidget.h @@ -28,7 +28,7 @@ #pragma once #include "Music.h" -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class AudioEngine; diff --git a/Applications/Piano/KnobsWidget.cpp b/Applications/Piano/KnobsWidget.cpp index c6dd0dda90..ecec376fb6 100644 --- a/Applications/Piano/KnobsWidget.cpp +++ b/Applications/Piano/KnobsWidget.cpp @@ -28,9 +28,9 @@ #include "KnobsWidget.h" #include "AudioEngine.h" #include "MainWidget.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GSlider.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Label.h> +#include <LibGUI/Slider.h> KnobsWidget::KnobsWidget(GUI::Widget* parent, AudioEngine& audio_engine, MainWidget& main_widget) : GUI::Frame(parent) diff --git a/Applications/Piano/KnobsWidget.h b/Applications/Piano/KnobsWidget.h index 6adca4368b..8ef3ed7d02 100644 --- a/Applications/Piano/KnobsWidget.h +++ b/Applications/Piano/KnobsWidget.h @@ -27,7 +27,7 @@ #pragma once -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> namespace GUI { class Label; diff --git a/Applications/Piano/MainWidget.cpp b/Applications/Piano/MainWidget.cpp index de3b908741..c1db1e21a3 100644 --- a/Applications/Piano/MainWidget.cpp +++ b/Applications/Piano/MainWidget.cpp @@ -31,7 +31,7 @@ #include "KnobsWidget.h" #include "RollWidget.h" #include "WaveWidget.h" -#include <LibGUI/GBoxLayout.h> +#include <LibGUI/BoxLayout.h> MainWidget::MainWidget(AudioEngine& audio_engine) : m_audio_engine(audio_engine) diff --git a/Applications/Piano/MainWidget.h b/Applications/Piano/MainWidget.h index 4b3ee1c034..d16e649330 100644 --- a/Applications/Piano/MainWidget.h +++ b/Applications/Piano/MainWidget.h @@ -28,7 +28,7 @@ #pragma once #include "Music.h" -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> class AudioEngine; class WaveWidget; diff --git a/Applications/Piano/RollWidget.cpp b/Applications/Piano/RollWidget.cpp index 12e5e9a9db..6eb72573c6 100644 --- a/Applications/Piano/RollWidget.cpp +++ b/Applications/Piano/RollWidget.cpp @@ -27,8 +27,8 @@ #include "RollWidget.h" #include "AudioEngine.h" -#include <LibGUI/GPainter.h> -#include <LibGUI/GScrollBar.h> +#include <LibGUI/Painter.h> +#include <LibGUI/ScrollBar.h> constexpr int note_height = 20; constexpr int roll_height = note_count * note_height; diff --git a/Applications/Piano/RollWidget.h b/Applications/Piano/RollWidget.h index dfbef95300..980ed70b76 100644 --- a/Applications/Piano/RollWidget.h +++ b/Applications/Piano/RollWidget.h @@ -28,7 +28,7 @@ #pragma once #include "Music.h" -#include <LibGUI/GScrollableWidget.h> +#include <LibGUI/ScrollableWidget.h> class AudioEngine; diff --git a/Applications/Piano/WaveWidget.cpp b/Applications/Piano/WaveWidget.cpp index 894e8e8187..483ae2e1c1 100644 --- a/Applications/Piano/WaveWidget.cpp +++ b/Applications/Piano/WaveWidget.cpp @@ -27,7 +27,7 @@ #include "WaveWidget.h" #include "AudioEngine.h" -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> #include <limits> WaveWidget::WaveWidget(GUI::Widget* parent, AudioEngine& audio_engine) diff --git a/Applications/Piano/WaveWidget.h b/Applications/Piano/WaveWidget.h index 403968b7dd..0ead14fed9 100644 --- a/Applications/Piano/WaveWidget.h +++ b/Applications/Piano/WaveWidget.h @@ -27,7 +27,7 @@ #pragma once -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class AudioEngine; diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp index 18b0e3d02e..6778f809d5 100644 --- a/Applications/Piano/main.cpp +++ b/Applications/Piano/main.cpp @@ -30,13 +30,13 @@ #include <LibAudio/ClientConnection.h> #include <LibAudio/WavWriter.h> #include <LibCore/File.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GFilePicker.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/FilePicker.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/Window.h> #include <LibThread/Thread.h> int main(int argc, char** argv) diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp index 40e9a86c3f..96d85c06ef 100644 --- a/Applications/QuickShow/QSWidget.cpp +++ b/Applications/QuickShow/QSWidget.cpp @@ -27,9 +27,9 @@ #include "QSWidget.h" #include <AK/URL.h> #include <LibGfx/Bitmap.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/Painter.h> +#include <LibGUI/Window.h> QSWidget::QSWidget(GUI::Widget* parent) : GUI::Frame(parent) diff --git a/Applications/QuickShow/QSWidget.h b/Applications/QuickShow/QSWidget.h index ba6ca1e90d..7ed6f8689e 100644 --- a/Applications/QuickShow/QSWidget.h +++ b/Applications/QuickShow/QSWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class QSLabel; diff --git a/Applications/QuickShow/main.cpp b/Applications/QuickShow/main.cpp index 6e9b290f05..ce8bbf7771 100644 --- a/Applications/QuickShow/main.cpp +++ b/Applications/QuickShow/main.cpp @@ -25,13 +25,13 @@ */ #include "QSWidget.h" -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Label.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Applications/SoundPlayer/SampleWidget.cpp b/Applications/SoundPlayer/SampleWidget.cpp index 69e4958e99..aab15facba 100644 --- a/Applications/SoundPlayer/SampleWidget.cpp +++ b/Applications/SoundPlayer/SampleWidget.cpp @@ -26,7 +26,7 @@ #include "SampleWidget.h" #include <LibAudio/Buffer.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> #include <LibM/math.h> SampleWidget::SampleWidget(GUI::Widget* parent) diff --git a/Applications/SoundPlayer/SampleWidget.h b/Applications/SoundPlayer/SampleWidget.h index 8070409ec7..2c8a2be8ec 100644 --- a/Applications/SoundPlayer/SampleWidget.h +++ b/Applications/SoundPlayer/SampleWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> namespace Audio { class Buffer; diff --git a/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Applications/SoundPlayer/SoundPlayerWidget.cpp index 1e3820a916..32ac6b1507 100644 --- a/Applications/SoundPlayer/SoundPlayerWidget.cpp +++ b/Applications/SoundPlayer/SoundPlayerWidget.cpp @@ -26,10 +26,10 @@ #include "SoundPlayerWidget.h" #include <AK/StringBuilder.h> -#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 <LibM/math.h> SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtr<Audio::ClientConnection> connection) diff --git a/Applications/SoundPlayer/SoundPlayerWidget.h b/Applications/SoundPlayer/SoundPlayerWidget.h index 8e6ca228d1..ef50e1fc20 100644 --- a/Applications/SoundPlayer/SoundPlayerWidget.h +++ b/Applications/SoundPlayer/SoundPlayerWidget.h @@ -28,11 +28,11 @@ #include "PlaybackManager.h" #include "SampleWidget.h" -#include <LibGUI/GButton.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GSlider.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Button.h> +#include <LibGUI/Label.h> +#include <LibGUI/Slider.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> class SoundPlayerWidget final : public GUI::Widget { C_OBJECT(SoundPlayerWidget) diff --git a/Applications/SoundPlayer/main.cpp b/Applications/SoundPlayer/main.cpp index df7ed3cdf2..a6433e7395 100644 --- a/Applications/SoundPlayer/main.cpp +++ b/Applications/SoundPlayer/main.cpp @@ -27,13 +27,13 @@ #include "SoundPlayerWidget.h" #include <LibAudio/ClientConnection.h> #include <LibGfx/CharacterBitmap.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GFilePicker.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/FilePicker.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Applications/SystemDialog/main.cpp b/Applications/SystemDialog/main.cpp index b5eb8e3391..9efea1c039 100644 --- a/Applications/SystemDialog/main.cpp +++ b/Applications/SystemDialog/main.cpp @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GDesktop.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Desktop.h> +#include <LibGUI/Label.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/Window.h> #include <stdio.h> #include <sys/utsname.h> diff --git a/Applications/SystemMonitor/DevicesModel.h b/Applications/SystemMonitor/DevicesModel.h index 4d25515f83..61f17f705a 100644 --- a/Applications/SystemMonitor/DevicesModel.h +++ b/Applications/SystemMonitor/DevicesModel.h @@ -28,7 +28,7 @@ #include <AK/String.h> #include <AK/Vector.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class DevicesModel final : public GUI::Model { public: diff --git a/Applications/SystemMonitor/GraphWidget.cpp b/Applications/SystemMonitor/GraphWidget.cpp index 2bfb042bd5..235eff37f6 100644 --- a/Applications/SystemMonitor/GraphWidget.cpp +++ b/Applications/SystemMonitor/GraphWidget.cpp @@ -25,7 +25,7 @@ */ #include "GraphWidget.h" -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> GraphWidget::GraphWidget(GUI::Widget* parent) : GUI::Frame(parent) diff --git a/Applications/SystemMonitor/GraphWidget.h b/Applications/SystemMonitor/GraphWidget.h index 6f685e06fd..731d1b0c88 100644 --- a/Applications/SystemMonitor/GraphWidget.h +++ b/Applications/SystemMonitor/GraphWidget.h @@ -25,7 +25,7 @@ */ #include <AK/CircularQueue.h> -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class GraphWidget final : public GUI::Frame { C_OBJECT(GraphWidget) diff --git a/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp index b16dcca337..8731232dee 100644 --- a/Applications/SystemMonitor/MemoryStatsWidget.cpp +++ b/Applications/SystemMonitor/MemoryStatsWidget.cpp @@ -29,9 +29,9 @@ #include <AK/JsonObject.h> #include <LibCore/File.h> #include <LibGfx/StylePainter.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Label.h> +#include <LibGUI/Painter.h> #include <stdio.h> #include <stdlib.h> diff --git a/Applications/SystemMonitor/MemoryStatsWidget.h b/Applications/SystemMonitor/MemoryStatsWidget.h index 2d69506586..8673001e17 100644 --- a/Applications/SystemMonitor/MemoryStatsWidget.h +++ b/Applications/SystemMonitor/MemoryStatsWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class Label; diff --git a/Applications/SystemMonitor/NetworkStatisticsWidget.cpp b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp index d5d72d22b4..6f51834554 100644 --- a/Applications/SystemMonitor/NetworkStatisticsWidget.cpp +++ b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp @@ -25,10 +25,10 @@ */ #include "NetworkStatisticsWidget.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GJsonArrayModel.h> -#include <LibGUI/GTableView.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/JsonArrayModel.h> +#include <LibGUI/TableView.h> NetworkStatisticsWidget::NetworkStatisticsWidget(GUI::Widget* parent) : GUI::LazyWidget(parent) diff --git a/Applications/SystemMonitor/NetworkStatisticsWidget.h b/Applications/SystemMonitor/NetworkStatisticsWidget.h index b98f714f99..5ebd062e33 100644 --- a/Applications/SystemMonitor/NetworkStatisticsWidget.h +++ b/Applications/SystemMonitor/NetworkStatisticsWidget.h @@ -27,7 +27,7 @@ #pragma once #include <LibCore/Timer.h> -#include <LibGUI/GLazyWidget.h> +#include <LibGUI/LazyWidget.h> namespace GUI { class TableView; diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp index 874c502e22..7fd8b0c021 100644 --- a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp +++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp @@ -25,9 +25,9 @@ */ #include "ProcessFileDescriptorMapWidget.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GJsonArrayModel.h> -#include <LibGUI/GTableView.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/JsonArrayModel.h> +#include <LibGUI/TableView.h> ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget(GUI::Widget* parent) : GUI::Widget(parent) diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h index 604e47336a..6f9b803ac8 100644 --- a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h +++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class TableView; diff --git a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index 3ee8b623f6..b8f507e079 100644 --- a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -26,10 +26,10 @@ #include "ProcessMemoryMapWidget.h" #include <LibCore/Timer.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GJsonArrayModel.h> -#include <LibGUI/GSortingProxyModel.h> -#include <LibGUI/GTableView.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/JsonArrayModel.h> +#include <LibGUI/SortingProxyModel.h> +#include <LibGUI/TableView.h> ProcessMemoryMapWidget::ProcessMemoryMapWidget(GUI::Widget* parent) : GUI::Widget(parent) diff --git a/Applications/SystemMonitor/ProcessMemoryMapWidget.h b/Applications/SystemMonitor/ProcessMemoryMapWidget.h index 265eaccb8a..7ee822b673 100644 --- a/Applications/SystemMonitor/ProcessMemoryMapWidget.h +++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace Core { class Timer; diff --git a/Applications/SystemMonitor/ProcessModel.h b/Applications/SystemMonitor/ProcessModel.h index 815fefafa9..9da382822d 100644 --- a/Applications/SystemMonitor/ProcessModel.h +++ b/Applications/SystemMonitor/ProcessModel.h @@ -29,7 +29,7 @@ #include <AK/HashMap.h> #include <AK/String.h> #include <AK/Vector.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> #include <unistd.h> class GraphWidget; diff --git a/Applications/SystemMonitor/ProcessStacksWidget.cpp b/Applications/SystemMonitor/ProcessStacksWidget.cpp index 2e806b3884..7e613d0cea 100644 --- a/Applications/SystemMonitor/ProcessStacksWidget.cpp +++ b/Applications/SystemMonitor/ProcessStacksWidget.cpp @@ -27,7 +27,7 @@ #include "ProcessStacksWidget.h" #include <LibCore/File.h> #include <LibCore/Timer.h> -#include <LibGUI/GBoxLayout.h> +#include <LibGUI/BoxLayout.h> ProcessStacksWidget::ProcessStacksWidget(GUI::Widget* parent) : GUI::Widget(parent) diff --git a/Applications/SystemMonitor/ProcessStacksWidget.h b/Applications/SystemMonitor/ProcessStacksWidget.h index 1c17cc77dd..e0e4c59062 100644 --- a/Applications/SystemMonitor/ProcessStacksWidget.h +++ b/Applications/SystemMonitor/ProcessStacksWidget.h @@ -26,8 +26,8 @@ #pragma once -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/Widget.h> namespace Core { class Timer; diff --git a/Applications/SystemMonitor/ProcessTableView.cpp b/Applications/SystemMonitor/ProcessTableView.cpp index d48a68c066..9e9062b54e 100644 --- a/Applications/SystemMonitor/ProcessTableView.cpp +++ b/Applications/SystemMonitor/ProcessTableView.cpp @@ -26,7 +26,7 @@ #include "ProcessTableView.h" #include "ProcessModel.h" -#include <LibGUI/GSortingProxyModel.h> +#include <LibGUI/SortingProxyModel.h> #include <stdio.h> ProcessTableView::ProcessTableView(GUI::Widget* parent) diff --git a/Applications/SystemMonitor/ProcessTableView.h b/Applications/SystemMonitor/ProcessTableView.h index 3cc00d3b62..a352fbfb85 100644 --- a/Applications/SystemMonitor/ProcessTableView.h +++ b/Applications/SystemMonitor/ProcessTableView.h @@ -27,7 +27,7 @@ #pragma once #include <AK/Function.h> -#include <LibGUI/GTableView.h> +#include <LibGUI/TableView.h> #include <unistd.h> class GraphWidget; diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp index 8f5f515af8..8e6102dde6 100644 --- a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp +++ b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp @@ -25,9 +25,9 @@ */ #include "ProcessUnveiledPathsWidget.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GJsonArrayModel.h> -#include <LibGUI/GTableView.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/JsonArrayModel.h> +#include <LibGUI/TableView.h> ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget(GUI::Widget* parent) : GUI::Widget(parent) diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h index 288c828ba6..4d3af4ac5c 100644 --- a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h +++ b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class TableView; diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp index 34fff03148..406a77ab5b 100644 --- a/Applications/SystemMonitor/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -35,23 +35,23 @@ #include "ProcessTableView.h" #include "ProcessUnveiledPathsWidget.h" #include <LibCore/Timer.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GActionGroup.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GJsonArrayModel.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GLazyWidget.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GSortingProxyModel.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GTabWidget.h> -#include <LibGUI/GToolBar.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/ActionGroup.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/JsonArrayModel.h> +#include <LibGUI/Label.h> +#include <LibGUI/LazyWidget.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Painter.h> +#include <LibGUI/SortingProxyModel.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/TabWidget.h> +#include <LibGUI/ToolBar.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <LibPCIDB/Database.h> #include <signal.h> #include <stdio.h> diff --git a/Applications/Taskbar/TaskbarButton.cpp b/Applications/Taskbar/TaskbarButton.cpp index 67321ae3b4..e5d7c1fbbd 100644 --- a/Applications/Taskbar/TaskbarButton.cpp +++ b/Applications/Taskbar/TaskbarButton.cpp @@ -25,8 +25,8 @@ */ #include "TaskbarButton.h" -#include <LibGUI/GAction.h> -#include <LibGUI/GWindowServerConnection.h> +#include <LibGUI/Action.h> +#include <LibGUI/WindowServerConnection.h> TaskbarButton::TaskbarButton(const WindowIdentifier& identifier, GUI::Widget* parent) : GUI::Button(parent) diff --git a/Applications/Taskbar/TaskbarButton.h b/Applications/Taskbar/TaskbarButton.h index 6b998ebaaf..9f2dc2f13d 100644 --- a/Applications/Taskbar/TaskbarButton.h +++ b/Applications/Taskbar/TaskbarButton.h @@ -27,7 +27,7 @@ #pragma once #include "WindowIdentifier.h" -#include <LibGUI/GButton.h> +#include <LibGUI/Button.h> class TaskbarButton final : public GUI::Button { C_OBJECT(TaskbarButton) diff --git a/Applications/Taskbar/TaskbarWindow.cpp b/Applications/Taskbar/TaskbarWindow.cpp index 59dab89cfe..04037f7760 100644 --- a/Applications/Taskbar/TaskbarWindow.cpp +++ b/Applications/Taskbar/TaskbarWindow.cpp @@ -28,11 +28,11 @@ #include "TaskbarButton.h" #include <AK/SharedBuffer.h> #include <LibCore/ConfigFile.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GDesktop.h> -#include <LibGUI/GFrame.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Desktop.h> +#include <LibGUI/Frame.h> +#include <LibGUI/Window.h> #include <stdio.h> //#define EVENT_DEBUG diff --git a/Applications/Taskbar/TaskbarWindow.h b/Applications/Taskbar/TaskbarWindow.h index aec46cddfb..8b31eeac05 100644 --- a/Applications/Taskbar/TaskbarWindow.h +++ b/Applications/Taskbar/TaskbarWindow.h @@ -25,8 +25,8 @@ */ #include "WindowList.h" -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> class TaskbarWindow final : public GUI::Window { C_OBJECT(TaskbarWindow) diff --git a/Applications/Taskbar/WindowList.cpp b/Applications/Taskbar/WindowList.cpp index 7759903847..e1547a3dd8 100644 --- a/Applications/Taskbar/WindowList.cpp +++ b/Applications/Taskbar/WindowList.cpp @@ -25,7 +25,7 @@ */ #include "WindowList.h" -#include <LibGUI/GWindowServerConnection.h> +#include <LibGUI/WindowServerConnection.h> WindowList& WindowList::the() { diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h index 141a81c48d..90d842c3f4 100644 --- a/Applications/Taskbar/WindowList.h +++ b/Applications/Taskbar/WindowList.h @@ -29,7 +29,7 @@ #include "WindowIdentifier.h" #include <AK/String.h> #include <AK/HashMap.h> -#include <LibGUI/GButton.h> +#include <LibGUI/Button.h> #include <LibGfx/Rect.h> class Window { diff --git a/Applications/Taskbar/main.cpp b/Applications/Taskbar/main.cpp index ffbe5c0413..33b96cb465 100644 --- a/Applications/Taskbar/main.cpp +++ b/Applications/Taskbar/main.cpp @@ -25,7 +25,7 @@ */ #include "TaskbarWindow.h" -#include <LibGUI/GApplication.h> +#include <LibGUI/Application.h> #include <signal.h> #include <stdio.h> #include <sys/wait.h> diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index d55e9532bb..9be1fe9f5d 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -27,18 +27,18 @@ #include <Kernel/KeyCode.h> #include <LibCore/ArgsParser.h> #include <LibCore/UserInfo.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GActionGroup.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GFontDatabase.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GRadioButton.h> -#include <LibGUI/GSlider.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/ActionGroup.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/FontDatabase.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/RadioButton.h> +#include <LibGUI/Slider.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <LibVT/TerminalWidget.h> #include <assert.h> #include <errno.h> diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 47c2b621d9..70b6a8cf78 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -29,18 +29,18 @@ #include <AK/StringBuilder.h> #include <AK/URL.h> #include <LibCore/File.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GFilePicker.h> -#include <LibGUI/GFontDatabase.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GStatusBar.h> -#include <LibGUI/GTextBox.h> -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GToolBar.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/FilePicker.h> +#include <LibGUI/FontDatabase.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/StatusBar.h> +#include <LibGUI/TextBox.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/ToolBar.h> TextEditorWidget::TextEditorWidget() { diff --git a/Applications/TextEditor/TextEditorWidget.h b/Applications/TextEditor/TextEditorWidget.h index 57823c355f..aea7c4fddf 100644 --- a/Applications/TextEditor/TextEditorWidget.h +++ b/Applications/TextEditor/TextEditorWidget.h @@ -28,10 +28,10 @@ #include <AK/FileSystemPath.h> #include <AK/Function.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> namespace GUI { class Button; diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp index c28f185823..f631be2989 100644 --- a/Applications/Welcome/TextWidget.cpp +++ b/Applications/Welcome/TextWidget.cpp @@ -29,7 +29,7 @@ #include <AK/StringBuilder.h> #include <AK/Vector.h> #include <LibGfx/Palette.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> TextWidget::TextWidget(GUI::Widget* parent) : GUI::Frame(parent) diff --git a/Applications/Welcome/TextWidget.h b/Applications/Welcome/TextWidget.h index 4eb5bad2a6..b237c5ee35 100644 --- a/Applications/Welcome/TextWidget.h +++ b/Applications/Welcome/TextWidget.h @@ -29,7 +29,7 @@ #include <AK/String.h> #include <AK/Vector.h> #include <LibGfx/TextAlignment.h> -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class TextWidget : public GUI::Frame { C_OBJECT(TextWidget) diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp index e11e7732c6..59fd06c060 100644 --- a/Applications/Welcome/main.cpp +++ b/Applications/Welcome/main.cpp @@ -26,13 +26,13 @@ #include <AK/String.h> #include <AK/Vector.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GDesktop.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GStackWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Desktop.h> +#include <LibGUI/Label.h> +#include <LibGUI/StackWidget.h> +#include <LibGUI/Window.h> #include <LibGfx/PNGLoader.h> #include "TextWidget.h" diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp index 2176de413c..65f3400a98 100644 --- a/Demos/Fire/Fire.cpp +++ b/Demos/Fire/Fire.cpp @@ -43,11 +43,11 @@ */ #include <LibGfx/Bitmap.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/Label.h> +#include <LibGUI/Painter.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <stdio.h> #include <stdlib.h> #include <time.h> diff --git a/Demos/HelloWorld/main.cpp b/Demos/HelloWorld/main.cpp index 01ca63ba9a..f576d03f3c 100644 --- a/Demos/HelloWorld/main.cpp +++ b/Demos/HelloWorld/main.cpp @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Label.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> int main(int argc, char** argv) { diff --git a/Demos/HelloWorld2/main.cpp b/Demos/HelloWorld2/main.cpp index ba0a9a98ef..8d2921bf26 100644 --- a/Demos/HelloWorld2/main.cpp +++ b/Demos/HelloWorld2/main.cpp @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Label.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include "UI_HelloWorld2.h" int main(int argc, char** argv) diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp index ee8d57b14b..eb16bc3369 100644 --- a/Demos/WidgetGallery/main.cpp +++ b/Demos/WidgetGallery/main.cpp @@ -25,20 +25,20 @@ */ #include <LibCore/Timer.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GCheckBox.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GProgressBar.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/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/CheckBox.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/Label.h> +#include <LibGUI/ProgressBar.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> int main(int argc, char** argv) { diff --git a/DevTools/FormCompiler/main.cpp b/DevTools/FormCompiler/main.cpp index ea9d21c4ab..c94c879134 100644 --- a/DevTools/FormCompiler/main.cpp +++ b/DevTools/FormCompiler/main.cpp @@ -67,7 +67,6 @@ int main(int argc, char** argv) const JsonObject& widget_object = value.as_object(); auto class_name = widget_object.get("class").to_string(); StringBuilder builder; - builder.append('G'); auto parts = class_name.split(':'); builder.append(parts.last()); dbg() << "#include <LibGUI/" << builder.to_string() << ".h>"; diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp index c9372dc669..96782b2778 100644 --- a/DevTools/HackStudio/Editor.cpp +++ b/DevTools/HackStudio/Editor.cpp @@ -30,10 +30,10 @@ #include <AK/FileSystemPath.h> #include <LibCore/DirIterator.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 <LibHTML/DOM/ElementFactory.h> #include <LibHTML/DOM/HTMLHeadElement.h> #include <LibHTML/DOM/Text.h> diff --git a/DevTools/HackStudio/Editor.h b/DevTools/HackStudio/Editor.h index f7d682f555..2824f2fcaf 100644 --- a/DevTools/HackStudio/Editor.h +++ b/DevTools/HackStudio/Editor.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GTextEditor.h> +#include <LibGUI/TextEditor.h> class EditorWrapper; class HtmlView; diff --git a/DevTools/HackStudio/EditorWrapper.cpp b/DevTools/HackStudio/EditorWrapper.cpp index 789454f11d..6bc452ba44 100644 --- a/DevTools/HackStudio/EditorWrapper.cpp +++ b/DevTools/HackStudio/EditorWrapper.cpp @@ -26,10 +26,10 @@ #include "EditorWrapper.h" #include "Editor.h" -#include <LibGUI/GAction.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GInputBox.h> -#include <LibGUI/GLabel.h> +#include <LibGUI/Action.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/InputBox.h> +#include <LibGUI/Label.h> extern RefPtr<EditorWrapper> g_current_editor_wrapper; diff --git a/DevTools/HackStudio/EditorWrapper.h b/DevTools/HackStudio/EditorWrapper.h index 0fa549d0dc..886ac11707 100644 --- a/DevTools/HackStudio/EditorWrapper.h +++ b/DevTools/HackStudio/EditorWrapper.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class Label; diff --git a/DevTools/HackStudio/FindInFilesWidget.cpp b/DevTools/HackStudio/FindInFilesWidget.cpp index 9e6c0cb1d7..9ba9454796 100644 --- a/DevTools/HackStudio/FindInFilesWidget.cpp +++ b/DevTools/HackStudio/FindInFilesWidget.cpp @@ -27,10 +27,10 @@ #include "FindInFilesWidget.h" #include "Project.h" #include <AK/StringBuilder.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GTextBox.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/TableView.h> +#include <LibGUI/TextBox.h> extern GUI::TextEditor& current_editor(); extern void open_file(const String&); diff --git a/DevTools/HackStudio/FindInFilesWidget.h b/DevTools/HackStudio/FindInFilesWidget.h index 5f5d84b919..5a2127d129 100644 --- a/DevTools/HackStudio/FindInFilesWidget.h +++ b/DevTools/HackStudio/FindInFilesWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class Button; diff --git a/DevTools/HackStudio/FormEditorWidget.cpp b/DevTools/HackStudio/FormEditorWidget.cpp index 070f09a169..f4faa9147b 100644 --- a/DevTools/HackStudio/FormEditorWidget.cpp +++ b/DevTools/HackStudio/FormEditorWidget.cpp @@ -28,7 +28,7 @@ #include "CursorTool.h" #include "FormWidget.h" #include "WidgetTreeModel.h" -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> FormEditorWidget::FormEditorWidget(GUI::Widget* parent) : ScrollableWidget(parent) diff --git a/DevTools/HackStudio/FormEditorWidget.h b/DevTools/HackStudio/FormEditorWidget.h index 021905c6a5..b74890eef7 100644 --- a/DevTools/HackStudio/FormEditorWidget.h +++ b/DevTools/HackStudio/FormEditorWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GScrollableWidget.h> +#include <LibGUI/ScrollableWidget.h> class FormWidget; class Tool; diff --git a/DevTools/HackStudio/FormWidget.cpp b/DevTools/HackStudio/FormWidget.cpp index 6350390397..993c1153ae 100644 --- a/DevTools/HackStudio/FormWidget.cpp +++ b/DevTools/HackStudio/FormWidget.cpp @@ -27,7 +27,7 @@ #include "FormWidget.h" #include "FormEditorWidget.h" #include "Tool.h" -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> FormWidget::FormWidget(FormEditorWidget& parent) : GUI::Widget(&parent) diff --git a/DevTools/HackStudio/FormWidget.h b/DevTools/HackStudio/FormWidget.h index d8cb050dfc..c1cee4e34e 100644 --- a/DevTools/HackStudio/FormWidget.h +++ b/DevTools/HackStudio/FormWidget.h @@ -27,7 +27,7 @@ #pragma once #include <AK/Badge.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> class CursorTool; class FormEditorWidget; diff --git a/DevTools/HackStudio/Locator.cpp b/DevTools/HackStudio/Locator.cpp index 787ef4fb44..31dfd8855e 100644 --- a/DevTools/HackStudio/Locator.cpp +++ b/DevTools/HackStudio/Locator.cpp @@ -26,10 +26,10 @@ #include "Locator.h" #include "Project.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GTextBox.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/TableView.h> +#include <LibGUI/TextBox.h> +#include <LibGUI/Window.h> extern RefPtr<Project> g_project; extern void open_file(const String&); diff --git a/DevTools/HackStudio/Locator.h b/DevTools/HackStudio/Locator.h index 5bf04cfc99..bb1773c9b3 100644 --- a/DevTools/HackStudio/Locator.h +++ b/DevTools/HackStudio/Locator.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class ModelIndex; diff --git a/DevTools/HackStudio/ProcessStateWidget.cpp b/DevTools/HackStudio/ProcessStateWidget.cpp index 955e3ed260..4ad6e20882 100644 --- a/DevTools/HackStudio/ProcessStateWidget.cpp +++ b/DevTools/HackStudio/ProcessStateWidget.cpp @@ -27,8 +27,8 @@ #include "ProcessStateWidget.h" #include <LibCore/ProcessStatisticsReader.h> #include <LibCore/Timer.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GLabel.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Label.h> #include <unistd.h> ProcessStateWidget::ProcessStateWidget(GUI::Widget* parent) diff --git a/DevTools/HackStudio/ProcessStateWidget.h b/DevTools/HackStudio/ProcessStateWidget.h index d2fd7fd737..e1e49a170a 100644 --- a/DevTools/HackStudio/ProcessStateWidget.h +++ b/DevTools/HackStudio/ProcessStateWidget.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace Core { class Timer; diff --git a/DevTools/HackStudio/Project.h b/DevTools/HackStudio/Project.h index 63000301d2..0598ff2e5b 100644 --- a/DevTools/HackStudio/Project.h +++ b/DevTools/HackStudio/Project.h @@ -30,8 +30,8 @@ #include <AK/Noncopyable.h> #include <AK/NonnullRefPtrVector.h> #include <AK/OwnPtr.h> -#include <LibGUI/GIcon.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Icon.h> +#include <LibGUI/Model.h> class Project { AK_MAKE_NONCOPYABLE(Project) diff --git a/DevTools/HackStudio/ProjectFile.h b/DevTools/HackStudio/ProjectFile.h index 6ad2052f9c..486895107b 100644 --- a/DevTools/HackStudio/ProjectFile.h +++ b/DevTools/HackStudio/ProjectFile.h @@ -30,7 +30,7 @@ #include <AK/NonnullRefPtr.h> #include <AK/RefCounted.h> #include <AK/String.h> -#include <LibGUI/GTextDocument.h> +#include <LibGUI/TextDocument.h> class ProjectFile : public RefCounted<ProjectFile> { public: diff --git a/DevTools/HackStudio/TerminalWrapper.cpp b/DevTools/HackStudio/TerminalWrapper.cpp index 5cd05860f9..28c220e886 100644 --- a/DevTools/HackStudio/TerminalWrapper.cpp +++ b/DevTools/HackStudio/TerminalWrapper.cpp @@ -28,8 +28,8 @@ #include "ProcessStateWidget.h" #include <AK/String.h> #include <LibCore/ConfigFile.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GMessageBox.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/MessageBox.h> #include <LibVT/TerminalWidget.h> #include <fcntl.h> #include <signal.h> diff --git a/DevTools/HackStudio/TerminalWrapper.h b/DevTools/HackStudio/TerminalWrapper.h index d606da6b1f..96934c8754 100644 --- a/DevTools/HackStudio/TerminalWrapper.h +++ b/DevTools/HackStudio/TerminalWrapper.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> class ProcessStateWidget; class TerminalWidget; diff --git a/DevTools/HackStudio/WidgetTreeModel.cpp b/DevTools/HackStudio/WidgetTreeModel.cpp index 4eb52582fc..3bc34473f1 100644 --- a/DevTools/HackStudio/WidgetTreeModel.cpp +++ b/DevTools/HackStudio/WidgetTreeModel.cpp @@ -26,7 +26,7 @@ #include "WidgetTreeModel.h" #include <AK/StringBuilder.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> #include <stdio.h> WidgetTreeModel::WidgetTreeModel(GUI::Widget& root) diff --git a/DevTools/HackStudio/WidgetTreeModel.h b/DevTools/HackStudio/WidgetTreeModel.h index 28bbeff59e..7af2359363 100644 --- a/DevTools/HackStudio/WidgetTreeModel.h +++ b/DevTools/HackStudio/WidgetTreeModel.h @@ -26,8 +26,8 @@ #pragma once -#include <LibGUI/GModel.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/Model.h> +#include <LibGUI/Painter.h> class WidgetTreeModel final : public GUI::Model { public: diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp index 04200e5a1a..83eba82d03 100644 --- a/DevTools/HackStudio/main.cpp +++ b/DevTools/HackStudio/main.cpp @@ -38,28 +38,28 @@ #include "WidgetTreeModel.h" #include <AK/StringBuilder.h> #include <LibCore/File.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GActionGroup.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GFilePicker.h> -#include <LibGUI/GInputBox.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GStackWidget.h> -#include <LibGUI/GTabWidget.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GTextBox.h> -#include <LibGUI/GTextEditor.h> -#include <LibGUI/GToolBar.h> -#include <LibGUI/GTreeView.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/ActionGroup.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/FilePicker.h> +#include <LibGUI/InputBox.h> +#include <LibGUI/Label.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/StackWidget.h> +#include <LibGUI/TabWidget.h> +#include <LibGUI/TableView.h> +#include <LibGUI/TextBox.h> +#include <LibGUI/TextEditor.h> +#include <LibGUI/ToolBar.h> +#include <LibGUI/TreeView.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <stdio.h> #include <sys/wait.h> #include <unistd.h> diff --git a/DevTools/Inspector/RemoteObjectGraphModel.cpp b/DevTools/Inspector/RemoteObjectGraphModel.cpp index c45095bbfb..34ae2953db 100644 --- a/DevTools/Inspector/RemoteObjectGraphModel.cpp +++ b/DevTools/Inspector/RemoteObjectGraphModel.cpp @@ -29,7 +29,7 @@ #include "RemoteProcess.h" #include <AK/JsonObject.h> #include <AK/JsonValue.h> -#include <LibGUI/GApplication.h> +#include <LibGUI/Application.h> #include <stdio.h> RemoteObjectGraphModel::RemoteObjectGraphModel(RemoteProcess& process) diff --git a/DevTools/Inspector/RemoteObjectGraphModel.h b/DevTools/Inspector/RemoteObjectGraphModel.h index 0bdab10196..007b6861f7 100644 --- a/DevTools/Inspector/RemoteObjectGraphModel.h +++ b/DevTools/Inspector/RemoteObjectGraphModel.h @@ -30,7 +30,7 @@ #include <AK/JsonObject.h> #include <AK/NonnullOwnPtrVector.h> #include <LibCore/LocalSocket.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class RemoteProcess; diff --git a/DevTools/Inspector/RemoteObjectPropertyModel.h b/DevTools/Inspector/RemoteObjectPropertyModel.h index 5e7ecb060f..1aaab5feb2 100644 --- a/DevTools/Inspector/RemoteObjectPropertyModel.h +++ b/DevTools/Inspector/RemoteObjectPropertyModel.h @@ -27,7 +27,7 @@ #pragma once #include <AK/JsonValue.h> -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class RemoteObject; diff --git a/DevTools/Inspector/main.cpp b/DevTools/Inspector/main.cpp index 6b746ebdbd..f93dc1bec0 100644 --- a/DevTools/Inspector/main.cpp +++ b/DevTools/Inspector/main.cpp @@ -28,12 +28,12 @@ #include "RemoteObjectGraphModel.h" #include "RemoteObjectPropertyModel.h" #include "RemoteProcess.h" -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GSplitter.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GTreeView.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Splitter.h> +#include <LibGUI/TableView.h> +#include <LibGUI/TreeView.h> +#include <LibGUI/Window.h> #include <stdio.h> [[noreturn]] static void print_usage_and_exit() diff --git a/DevTools/ProfileViewer/ProfileModel.h b/DevTools/ProfileViewer/ProfileModel.h index 3b3f3ab601..7898ee9279 100644 --- a/DevTools/ProfileViewer/ProfileModel.h +++ b/DevTools/ProfileViewer/ProfileModel.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class Profile; diff --git a/DevTools/ProfileViewer/ProfileTimelineWidget.cpp b/DevTools/ProfileViewer/ProfileTimelineWidget.cpp index 852bd84256..d65e994eab 100644 --- a/DevTools/ProfileViewer/ProfileTimelineWidget.cpp +++ b/DevTools/ProfileViewer/ProfileTimelineWidget.cpp @@ -26,7 +26,7 @@ #include "ProfileTimelineWidget.h" #include "Profile.h" -#include <LibGUI/GPainter.h> +#include <LibGUI/Painter.h> ProfileTimelineWidget::ProfileTimelineWidget(Profile& profile, GUI::Widget* parent) : GUI::Frame(parent) diff --git a/DevTools/ProfileViewer/ProfileTimelineWidget.h b/DevTools/ProfileViewer/ProfileTimelineWidget.h index 3954d0cc6b..238497844c 100644 --- a/DevTools/ProfileViewer/ProfileTimelineWidget.h +++ b/DevTools/ProfileViewer/ProfileTimelineWidget.h @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> class Profile; diff --git a/DevTools/ProfileViewer/main.cpp b/DevTools/ProfileViewer/main.cpp index ead84cdf17..07c2d8a869 100644 --- a/DevTools/ProfileViewer/main.cpp +++ b/DevTools/ProfileViewer/main.cpp @@ -26,13 +26,13 @@ #include "Profile.h" #include "ProfileTimelineWidget.h" -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GTreeView.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/TreeView.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp index 1a37cab479..fad29dfefa 100644 --- a/DevTools/VisualBuilder/VBForm.cpp +++ b/DevTools/VisualBuilder/VBForm.cpp @@ -32,11 +32,11 @@ #include <AK/JsonObject.h> #include <AK/StringBuilder.h> #include <LibCore/File.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMessageBox.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/Action.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/Painter.h> static VBForm* s_current; VBForm* VBForm::current() diff --git a/DevTools/VisualBuilder/VBForm.h b/DevTools/VisualBuilder/VBForm.h index dba01dbe12..0aac6f2acd 100644 --- a/DevTools/VisualBuilder/VBForm.h +++ b/DevTools/VisualBuilder/VBForm.h @@ -28,7 +28,7 @@ #include "VBWidget.h" #include <AK/NonnullRefPtrVector.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> class VBForm : public GUI::Widget { C_OBJECT(VBForm) diff --git a/DevTools/VisualBuilder/VBPropertiesWindow.cpp b/DevTools/VisualBuilder/VBPropertiesWindow.cpp index 7bd2778dcc..e3721528d5 100644 --- a/DevTools/VisualBuilder/VBPropertiesWindow.cpp +++ b/DevTools/VisualBuilder/VBPropertiesWindow.cpp @@ -26,12 +26,12 @@ #include "VBPropertiesWindow.h" #include "VBWidgetPropertyModel.h" -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GComboBox.h> -#include <LibGUI/GModelEditingDelegate.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GTextBox.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/ComboBox.h> +#include <LibGUI/ModelEditingDelegate.h> +#include <LibGUI/TableView.h> +#include <LibGUI/TextBox.h> +#include <LibGUI/Widget.h> class BoolValuesModel final : public GUI::Model { public: diff --git a/DevTools/VisualBuilder/VBPropertiesWindow.h b/DevTools/VisualBuilder/VBPropertiesWindow.h index 4ae1be9acc..c060cbbd8f 100644 --- a/DevTools/VisualBuilder/VBPropertiesWindow.h +++ b/DevTools/VisualBuilder/VBPropertiesWindow.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GWindow.h> +#include <LibGUI/Window.h> namespace GUI { class TableView; diff --git a/DevTools/VisualBuilder/VBProperty.h b/DevTools/VisualBuilder/VBProperty.h index c84660744b..089908328e 100644 --- a/DevTools/VisualBuilder/VBProperty.h +++ b/DevTools/VisualBuilder/VBProperty.h @@ -28,7 +28,7 @@ #include <AK/Function.h> #include <AK/String.h> -#include <LibGUI/GVariant.h> +#include <LibGUI/Variant.h> namespace GUI { class Widget; diff --git a/DevTools/VisualBuilder/VBWidget.cpp b/DevTools/VisualBuilder/VBWidget.cpp index 307f27218c..82006047ec 100644 --- a/DevTools/VisualBuilder/VBWidget.cpp +++ b/DevTools/VisualBuilder/VBWidget.cpp @@ -29,17 +29,17 @@ #include "VBProperty.h" #include "VBWidgetPropertyModel.h" #include "VBWidgetRegistry.h" -#include <LibGUI/GButton.h> -#include <LibGUI/GCheckBox.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GProgressBar.h> -#include <LibGUI/GRadioButton.h> -#include <LibGUI/GScrollBar.h> -#include <LibGUI/GSlider.h> -#include <LibGUI/GSpinBox.h> -#include <LibGUI/GTextEditor.h> +#include <LibGUI/Button.h> +#include <LibGUI/CheckBox.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/Label.h> +#include <LibGUI/Painter.h> +#include <LibGUI/ProgressBar.h> +#include <LibGUI/RadioButton.h> +#include <LibGUI/ScrollBar.h> +#include <LibGUI/Slider.h> +#include <LibGUI/SpinBox.h> +#include <LibGUI/TextEditor.h> VBWidget::VBWidget(VBWidgetType type, VBForm& form, VBWidget* parent) : m_type(type) diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h index 6d593363da..08c5be2597 100644 --- a/DevTools/VisualBuilder/VBWidget.h +++ b/DevTools/VisualBuilder/VBWidget.h @@ -34,7 +34,7 @@ #include <AK/RefCounted.h> #include <AK/Weakable.h> #include <LibGfx/Rect.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> namespace GUI { class Painter; diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.h b/DevTools/VisualBuilder/VBWidgetPropertyModel.h index ec04cee905..480c23ec88 100644 --- a/DevTools/VisualBuilder/VBWidgetPropertyModel.h +++ b/DevTools/VisualBuilder/VBWidgetPropertyModel.h @@ -26,7 +26,7 @@ #pragma once -#include <LibGUI/GModel.h> +#include <LibGUI/Model.h> class VBWidget; class VBProperty; diff --git a/DevTools/VisualBuilder/VBWidgetRegistry.cpp b/DevTools/VisualBuilder/VBWidgetRegistry.cpp index 076c2f7e9f..bf176bbcf1 100644 --- a/DevTools/VisualBuilder/VBWidgetRegistry.cpp +++ b/DevTools/VisualBuilder/VBWidgetRegistry.cpp @@ -26,16 +26,16 @@ #include "VBWidgetRegistry.h" #include "VBProperty.h" -#include <LibGUI/GButton.h> -#include <LibGUI/GCheckBox.h> -#include <LibGUI/GGroupBox.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GProgressBar.h> -#include <LibGUI/GRadioButton.h> -#include <LibGUI/GScrollBar.h> -#include <LibGUI/GSlider.h> -#include <LibGUI/GSpinBox.h> -#include <LibGUI/GTextEditor.h> +#include <LibGUI/Button.h> +#include <LibGUI/CheckBox.h> +#include <LibGUI/GroupBox.h> +#include <LibGUI/Label.h> +#include <LibGUI/ProgressBar.h> +#include <LibGUI/RadioButton.h> +#include <LibGUI/ScrollBar.h> +#include <LibGUI/Slider.h> +#include <LibGUI/SpinBox.h> +#include <LibGUI/TextEditor.h> String to_class_name(VBWidgetType type) { diff --git a/DevTools/VisualBuilder/VBWidgetRegistry.h b/DevTools/VisualBuilder/VBWidgetRegistry.h index 189b5b2e80..bea285bb29 100644 --- a/DevTools/VisualBuilder/VBWidgetRegistry.h +++ b/DevTools/VisualBuilder/VBWidgetRegistry.h @@ -31,7 +31,7 @@ #include <AK/NonnullOwnPtrVector.h> #include <AK/OwnPtr.h> #include <AK/String.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> class VBProperty; class VBWidget; diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp index c514cf84bb..090eca3b81 100644 --- a/DevTools/VisualBuilder/main.cpp +++ b/DevTools/VisualBuilder/main.cpp @@ -28,15 +28,15 @@ #include "VBPropertiesWindow.h" #include "VBWidget.h" #include "VBWidgetPropertyModel.h" -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GTableView.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/TableView.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <fcntl.h> #include <signal.h> #include <stdio.h> diff --git a/Games/Minesweeper/Field.cpp b/Games/Minesweeper/Field.cpp index e458bb2f73..629da5cd81 100644 --- a/Games/Minesweeper/Field.cpp +++ b/Games/Minesweeper/Field.cpp @@ -28,9 +28,9 @@ #include <AK/HashTable.h> #include <AK/Queue.h> #include <LibCore/ConfigFile.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/Button.h> +#include <LibGUI/Label.h> +#include <LibGUI/Painter.h> #include <time.h> #include <unistd.h> diff --git a/Games/Minesweeper/Field.h b/Games/Minesweeper/Field.h index 84b99cf9a2..1dcebcb72d 100644 --- a/Games/Minesweeper/Field.h +++ b/Games/Minesweeper/Field.h @@ -28,7 +28,7 @@ #include <AK/Noncopyable.h> #include <LibCore/Timer.h> -#include <LibGUI/GFrame.h> +#include <LibGUI/Frame.h> namespace GUI { class Button; diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp index e4be764b64..2a35a47987 100644 --- a/Games/Minesweeper/main.cpp +++ b/Games/Minesweeper/main.cpp @@ -26,15 +26,15 @@ #include "Field.h" #include <LibCore/ConfigFile.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GLabel.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Label.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp index ad32e03a73..8cebca5c26 100644 --- a/Games/Snake/SnakeGame.cpp +++ b/Games/Snake/SnakeGame.cpp @@ -25,8 +25,8 @@ */ #include "SnakeGame.h" -#include <LibGUI/GFontDatabase.h> -#include <LibGUI/GPainter.h> +#include <LibGUI/FontDatabase.h> +#include <LibGUI/Painter.h> #include <LibGfx/Bitmap.h> #include <stdlib.h> #include <time.h> diff --git a/Games/Snake/SnakeGame.h b/Games/Snake/SnakeGame.h index 2e60715259..abe08df450 100644 --- a/Games/Snake/SnakeGame.h +++ b/Games/Snake/SnakeGame.h @@ -28,7 +28,7 @@ #include <AK/CircularQueue.h> #include <AK/NonnullRefPtrVector.h> -#include <LibGUI/GWidget.h> +#include <LibGUI/Widget.h> class SnakeGame : public GUI::Widget { C_OBJECT(SnakeGame) diff --git a/Games/Snake/main.cpp b/Games/Snake/main.cpp index dd09ab55f3..ca13e20ff4 100644 --- a/Games/Snake/main.cpp +++ b/Games/Snake/main.cpp @@ -25,14 +25,14 @@ */ #include "SnakeGame.h" -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GBoxLayout.h> -#include <LibGUI/GButton.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/BoxLayout.h> +#include <LibGUI/Button.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> #include <stdio.h> int main(int argc, char** argv) 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 { diff --git a/MenuApplets/Audio/main.cpp b/MenuApplets/Audio/main.cpp index ed0c4071bc..f05ee6a702 100644 --- a/MenuApplets/Audio/main.cpp +++ b/MenuApplets/Audio/main.cpp @@ -25,10 +25,10 @@ */ #include <LibAudio/ClientConnection.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/Painter.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> class AudioWidget final : public GUI::Widget { C_OBJECT(AudioWidget) diff --git a/MenuApplets/CPUGraph/main.cpp b/MenuApplets/CPUGraph/main.cpp index c03cc72592..0fac039375 100644 --- a/MenuApplets/CPUGraph/main.cpp +++ b/MenuApplets/CPUGraph/main.cpp @@ -27,10 +27,10 @@ #include <AK/CircularQueue.h> #include <LibCore/ProcessStatisticsReader.h> #include <LibGfx/Palette.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/Painter.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <stdio.h> class GraphWidget final : public GUI::Widget { diff --git a/MenuApplets/Clock/main.cpp b/MenuApplets/Clock/main.cpp index 5af94b2d25..b9d74f934d 100644 --- a/MenuApplets/Clock/main.cpp +++ b/MenuApplets/Clock/main.cpp @@ -26,10 +26,10 @@ #include <LibCore/Timer.h> #include <LibGfx/Palette.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GPainter.h> -#include <LibGUI/GWidget.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/Application.h> +#include <LibGUI/Painter.h> +#include <LibGUI/Widget.h> +#include <LibGUI/Window.h> #include <stdio.h> #include <time.h> diff --git a/Userland/copy.cpp b/Userland/copy.cpp index 9dd372d759..80cfe945fb 100644 --- a/Userland/copy.cpp +++ b/Userland/copy.cpp @@ -29,8 +29,8 @@ #include <AK/StringBuilder.h> #include <LibCore/ArgsParser.h> #include <LibCore/File.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GClipboard.h> +#include <LibGUI/Application.h> +#include <LibGUI/Clipboard.h> #include <stdio.h> #include <stdlib.h> diff --git a/Userland/html.cpp b/Userland/html.cpp index 6e9c81be8c..5e0594763a 100644 --- a/Userland/html.cpp +++ b/Userland/html.cpp @@ -25,12 +25,12 @@ */ #include <LibCore/File.h> -#include <LibGUI/GAboutDialog.h> -#include <LibGUI/GAction.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GMenu.h> -#include <LibGUI/GMenuBar.h> -#include <LibGUI/GWindow.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Action.h> +#include <LibGUI/Application.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> #include <LibHTML/CSS/StyleResolver.h> #include <LibHTML/DOM/Element.h> #include <LibHTML/Dump.h> diff --git a/Userland/pape.cpp b/Userland/pape.cpp index d9a1b0d886..8136ab0a27 100644 --- a/Userland/pape.cpp +++ b/Userland/pape.cpp @@ -30,8 +30,8 @@ #include <AK/Vector.h> #include <LibCore/ArgsParser.h> #include <LibCore/DirIterator.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GDesktop.h> +#include <LibGUI/Application.h> +#include <LibGUI/Desktop.h> #include <dirent.h> #include <errno.h> #include <fcntl.h> diff --git a/Userland/paste.cpp b/Userland/paste.cpp index 7fbab6c555..8c60168ec1 100644 --- a/Userland/paste.cpp +++ b/Userland/paste.cpp @@ -26,8 +26,8 @@ #include <AK/String.h> #include <LibCore/ArgsParser.h> -#include <LibGUI/GApplication.h> -#include <LibGUI/GClipboard.h> +#include <LibGUI/Application.h> +#include <LibGUI/Clipboard.h> #include <stdio.h> #include <stdlib.h> |