diff options
Diffstat (limited to 'DevTools')
41 files changed, 124 insertions, 125 deletions
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> |