From c5d913970ab122cdeaf23aea24e65efa6b425ab0 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 23 Feb 2020 12:07:13 +0100 Subject: [PATCH] LibGUI: Remove parent parameter to GUI::Widget constructor --- Applications/Browser/InspectorWidget.cpp | 3 +- Applications/Browser/InspectorWidget.h | 2 +- Applications/Browser/main.cpp | 2 +- Applications/FontEditor/FontEditor.cpp | 5 ++- Applications/FontEditor/FontEditor.h | 2 +- Applications/HexEditor/HexEditor.cpp | 3 +- Applications/HexEditor/HexEditor.h | 2 +- Applications/HexEditor/HexEditorWidget.cpp | 4 +-- Applications/IRCClient/IRCAppWindow.cpp | 6 ++-- Applications/IRCClient/IRCAppWindow.h | 2 +- Applications/IRCClient/IRCClient.h | 2 +- Applications/IRCClient/IRCQuery.h | 2 +- Applications/IRCClient/IRCWindow.cpp | 5 ++- Applications/IRCClient/IRCWindow.h | 3 +- Applications/QuickShow/QSWidget.cpp | 3 +- Applications/QuickShow/QSWidget.h | 2 +- .../SystemMonitor/NetworkStatisticsWidget.cpp | 3 +- .../SystemMonitor/NetworkStatisticsWidget.h | 2 +- .../ProcessFileDescriptorMapWidget.cpp | 5 ++- .../ProcessFileDescriptorMapWidget.h | 2 +- .../SystemMonitor/ProcessMemoryMapWidget.cpp | 3 +- .../SystemMonitor/ProcessMemoryMapWidget.h | 2 +- .../SystemMonitor/ProcessStacksWidget.cpp | 3 +- .../SystemMonitor/ProcessStacksWidget.h | 3 +- .../SystemMonitor/ProcessTableView.cpp | 3 +- Applications/SystemMonitor/ProcessTableView.h | 2 +- .../ProcessUnveiledPathsWidget.cpp | 5 ++- .../ProcessUnveiledPathsWidget.h | 2 +- Applications/SystemMonitor/main.cpp | 12 +++---- Applications/Welcome/BackgroundWidget.cpp | 3 +- Applications/Welcome/BackgroundWidget.h | 3 +- Applications/Welcome/TextWidget.cpp | 10 ++---- Applications/Welcome/TextWidget.h | 7 ++-- Applications/Welcome/UnuncheckableButton.cpp | 6 +--- Applications/Welcome/UnuncheckableButton.h | 4 ++- DevTools/FormCompiler/main.cpp | 4 +-- DevTools/HackStudio/main.cpp | 3 +- .../ProfileViewer/ProfileTimelineWidget.cpp | 5 ++- .../ProfileViewer/ProfileTimelineWidget.h | 2 +- DevTools/ProfileViewer/main.cpp | 4 +-- DevTools/VisualBuilder/VBForm.cpp | 5 ++- DevTools/VisualBuilder/VBForm.h | 4 ++- DevTools/VisualBuilder/VBPropertiesWindow.cpp | 4 +-- DevTools/VisualBuilder/main.cpp | 20 +++++------ Games/Minesweeper/Field.cpp | 34 +++++++++++-------- Games/Minesweeper/Field.h | 6 ++-- Games/Snake/SnakeGame.cpp | 3 +- Games/Snake/SnakeGame.h | 2 +- Libraries/LibGUI/AbstractButton.cpp | 10 ++---- Libraries/LibGUI/AbstractButton.h | 3 +- Libraries/LibGUI/AbstractTableView.cpp | 3 +- Libraries/LibGUI/AbstractTableView.h | 2 +- Libraries/LibGUI/AbstractView.cpp | 5 ++- Libraries/LibGUI/AbstractView.h | 2 +- Libraries/LibGUI/Button.cpp | 9 ++--- Libraries/LibGUI/Button.h | 3 +- Libraries/LibGUI/CheckBox.cpp | 9 ++--- Libraries/LibGUI/CheckBox.h | 3 +- Libraries/LibGUI/ColumnsView.cpp | 3 +- Libraries/LibGUI/ColumnsView.h | 4 +-- Libraries/LibGUI/ComboBox.cpp | 7 ++-- Libraries/LibGUI/ComboBox.h | 2 +- Libraries/LibGUI/Frame.cpp | 3 +- Libraries/LibGUI/Frame.h | 2 +- Libraries/LibGUI/GroupBox.cpp | 10 ++---- Libraries/LibGUI/GroupBox.h | 3 +- Libraries/LibGUI/ItemView.cpp | 3 +- Libraries/LibGUI/ItemView.h | 2 +- Libraries/LibGUI/Label.cpp | 10 ++---- Libraries/LibGUI/Label.h | 3 +- Libraries/LibGUI/LazyWidget.cpp | 3 +- Libraries/LibGUI/LazyWidget.h | 2 +- Libraries/LibGUI/ListView.cpp | 3 +- Libraries/LibGUI/ListView.h | 3 +- Libraries/LibGUI/ModelEditingDelegate.h | 2 +- Libraries/LibGUI/ProgressBar.cpp | 3 +- Libraries/LibGUI/ProgressBar.h | 2 +- Libraries/LibGUI/RadioButton.cpp | 9 ++--- Libraries/LibGUI/RadioButton.h | 3 +- Libraries/LibGUI/ResizeCorner.cpp | 3 +- Libraries/LibGUI/ResizeCorner.h | 2 +- Libraries/LibGUI/ScrollBar.cpp | 10 ++---- Libraries/LibGUI/ScrollBar.h | 3 +- Libraries/LibGUI/ScrollableWidget.cpp | 9 +++-- Libraries/LibGUI/ScrollableWidget.h | 2 +- Libraries/LibGUI/Slider.cpp | 10 ++---- Libraries/LibGUI/Slider.h | 11 +++--- Libraries/LibGUI/SpinBox.cpp | 3 +- Libraries/LibGUI/SpinBox.h | 2 +- Libraries/LibGUI/Splitter.cpp | 5 ++- Libraries/LibGUI/Splitter.h | 10 +++--- Libraries/LibGUI/StackWidget.cpp | 3 +- Libraries/LibGUI/StackWidget.h | 2 +- Libraries/LibGUI/StatusBar.cpp | 12 ++----- Libraries/LibGUI/StatusBar.h | 3 +- Libraries/LibGUI/TabWidget.cpp | 3 +- Libraries/LibGUI/TabWidget.h | 3 +- Libraries/LibGUI/TableView.cpp | 3 +- Libraries/LibGUI/TableView.h | 2 +- Libraries/LibGUI/TextBox.cpp | 4 +-- Libraries/LibGUI/TextBox.h | 2 +- Libraries/LibGUI/TextEditor.cpp | 10 ++---- Libraries/LibGUI/TextEditor.h | 3 +- Libraries/LibGUI/ToolBar.cpp | 15 +++----- Libraries/LibGUI/ToolBar.h | 3 +- Libraries/LibGUI/TreeView.cpp | 3 +- Libraries/LibGUI/TreeView.h | 2 +- Libraries/LibGUI/Widget.cpp | 6 ++-- Libraries/LibGUI/Widget.h | 10 +++--- Libraries/LibHTML/DOM/HTMLInputElement.cpp | 2 +- MenuApplets/Audio/main.cpp | 1 - MenuApplets/CPUGraph/main.cpp | 1 - MenuApplets/Clock/main.cpp | 1 - MenuApplets/UserName/main.cpp | 1 - 114 files changed, 207 insertions(+), 313 deletions(-) diff --git a/Applications/Browser/InspectorWidget.cpp b/Applications/Browser/InspectorWidget.cpp index 70cd9bc3e93..d2d87b72642 100644 --- a/Applications/Browser/InspectorWidget.cpp +++ b/Applications/Browser/InspectorWidget.cpp @@ -35,8 +35,7 @@ #include #include -InspectorWidget::InspectorWidget(GUI::Widget* parent) - : GUI::Widget(parent) +InspectorWidget::InspectorWidget() { set_layout(make()); auto splitter = add(); diff --git a/Applications/Browser/InspectorWidget.h b/Applications/Browser/InspectorWidget.h index 7296e36f01d..571b3acab1f 100644 --- a/Applications/Browser/InspectorWidget.h +++ b/Applications/Browser/InspectorWidget.h @@ -36,7 +36,7 @@ public: void set_document(Document*); private: - explicit InspectorWidget(GUI::Widget* parent); + InspectorWidget(); RefPtr m_dom_tree_view; RefPtr m_style_table_view; diff --git a/Applications/Browser/main.cpp b/Applications/Browser/main.cpp index d7554eed853..e38824896ce 100644 --- a/Applications/Browser/main.cpp +++ b/Applications/Browser/main.cpp @@ -200,7 +200,7 @@ int main(int argc, char** argv) dom_inspector_window = GUI::Window::construct(); dom_inspector_window->set_rect(100, 100, 300, 500); dom_inspector_window->set_title("DOM inspector"); - auto dom_inspector_widget = InspectorWidget::construct(nullptr); + auto dom_inspector_widget = InspectorWidget::construct(); dom_inspector_window->set_main_widget(dom_inspector_widget); } auto* inspector_widget = static_cast(dom_inspector_window->main_widget()); diff --git a/Applications/FontEditor/FontEditor.cpp b/Applications/FontEditor/FontEditor.cpp index 1dfa4f2c0a9..06775daabe5 100644 --- a/Applications/FontEditor/FontEditor.cpp +++ b/Applications/FontEditor/FontEditor.cpp @@ -39,9 +39,8 @@ #include #include -FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edited_font, GUI::Widget* parent) - : GUI::Widget(parent) - , m_edited_font(move(edited_font)) +FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edited_font) + : m_edited_font(move(edited_font)) { set_fill_with_background_color(true); diff --git a/Applications/FontEditor/FontEditor.h b/Applications/FontEditor/FontEditor.h index 002d8969c1f..f6e9bf87fcd 100644 --- a/Applications/FontEditor/FontEditor.h +++ b/Applications/FontEditor/FontEditor.h @@ -40,7 +40,7 @@ public: virtual ~FontEditorWidget() override; private: - FontEditorWidget(const String& path, RefPtr&&, GUI::Widget* parent = nullptr); + FontEditorWidget(const String& path, RefPtr&&); RefPtr m_edited_font; GlyphMapWidget* m_glyph_map_widget { nullptr }; diff --git a/Applications/HexEditor/HexEditor.cpp b/Applications/HexEditor/HexEditor.cpp index 6914cb1760a..269d73cb266 100644 --- a/Applications/HexEditor/HexEditor.cpp +++ b/Applications/HexEditor/HexEditor.cpp @@ -41,8 +41,7 @@ #include #include -HexEditor::HexEditor(GUI::Widget* parent) - : ScrollableWidget(parent) +HexEditor::HexEditor() { set_scrollbars_enabled(true); set_font(GFontDatabase::the().get_by_name("Csilla Thin")); diff --git a/Applications/HexEditor/HexEditor.h b/Applications/HexEditor/HexEditor.h index 25469cfc0ad..d01e40abf38 100644 --- a/Applications/HexEditor/HexEditor.h +++ b/Applications/HexEditor/HexEditor.h @@ -67,7 +67,7 @@ public: Function on_change; protected: - HexEditor(GUI::Widget* parent); + HexEditor(); virtual void paint_event(GUI::PaintEvent&) override; virtual void mousedown_event(GUI::MouseEvent&) override; diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp index 0f77a32b768..17ac674b090 100644 --- a/Applications/HexEditor/HexEditorWidget.cpp +++ b/Applications/HexEditor/HexEditorWidget.cpp @@ -49,7 +49,7 @@ HexEditorWidget::HexEditorWidget() set_layout(make()); layout()->set_spacing(0); - m_editor = HexEditor::construct(this); + m_editor = add(); m_editor->on_status_change = [this](int position, HexEditor::EditMode edit_mode, int selection_start, int selection_end) { m_statusbar->set_text(0, String::format("Offset: %8X", position)); @@ -66,7 +66,7 @@ HexEditorWidget::HexEditorWidget() update_title(); }; - m_statusbar = GUI::StatusBar::construct(5, this); + m_statusbar = add(5); m_new_action = GUI::Action::create("New", { Mod_Ctrl, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GUI::Action&) { if (m_document_dirty) { diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp index 0662fb06700..0993d3ab9a1 100644 --- a/Applications/IRCClient/IRCAppWindow.cpp +++ b/Applications/IRCClient/IRCAppWindow.cpp @@ -78,7 +78,7 @@ void IRCAppWindow::update_title() void IRCAppWindow::setup_client() { m_client->aid_create_window = [this](void* owner, IRCWindow::Type type, const String& name) { - return &create_window(owner, type, name); + return create_window(owner, type, name); }; m_client->aid_get_active_window = [this] { return static_cast(m_container->active_widget()); @@ -237,7 +237,7 @@ void IRCAppWindow::update_part_action() m_part_action->set_enabled(is_open_channel); } -IRCWindow& IRCAppWindow::create_window(void* owner, IRCWindow::Type type, const String& name) +NonnullRefPtr IRCAppWindow::create_window(void* owner, IRCWindow::Type type, const String& name) { - return *new IRCWindow(m_client, owner, type, name, m_container); + return m_container->add(m_client, owner, type, name); } diff --git a/Applications/IRCClient/IRCAppWindow.h b/Applications/IRCClient/IRCAppWindow.h index 1acb1886bd4..72c73dd11da 100644 --- a/Applications/IRCClient/IRCAppWindow.h +++ b/Applications/IRCClient/IRCAppWindow.h @@ -50,7 +50,7 @@ private: void update_title(); void update_part_action(); - IRCWindow& create_window(void* owner, IRCWindow::Type, const String& name); + NonnullRefPtr create_window(void* owner, IRCWindow::Type, const String& name); NonnullRefPtr m_client; RefPtr m_container; RefPtr m_window_list; diff --git a/Applications/IRCClient/IRCClient.h b/Applications/IRCClient/IRCClient.h index 71dc41cea44..99f48342c39 100644 --- a/Applications/IRCClient/IRCClient.h +++ b/Applications/IRCClient/IRCClient.h @@ -70,7 +70,7 @@ public: Function on_nickname_changed; Function on_part_from_channel; - Function aid_create_window; + Function(void*, IRCWindow::Type, const String&)> aid_create_window; Function aid_get_active_window; Function aid_update_window_list; diff --git a/Applications/IRCClient/IRCQuery.h b/Applications/IRCClient/IRCQuery.h index f783f5294d2..26625e490a3 100644 --- a/Applications/IRCClient/IRCQuery.h +++ b/Applications/IRCClient/IRCQuery.h @@ -59,7 +59,7 @@ private: IRCClient& m_client; String m_name; - IRCWindow* m_window { nullptr }; + RefPtr m_window; NonnullRefPtr m_log; }; diff --git a/Applications/IRCClient/IRCWindow.cpp b/Applications/IRCClient/IRCWindow.cpp index 83ba78148a1..e151bea4afe 100644 --- a/Applications/IRCClient/IRCWindow.cpp +++ b/Applications/IRCClient/IRCWindow.cpp @@ -35,9 +35,8 @@ #include #include -IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& name, GUI::Widget* parent) - : GUI::Widget(parent) - , m_client(client) +IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& name) + : m_client(client) , m_owner(owner) , m_type(type) , m_name(name) diff --git a/Applications/IRCClient/IRCWindow.h b/Applications/IRCClient/IRCWindow.h index 31e4c7f3cb1..319184dd85d 100644 --- a/Applications/IRCClient/IRCWindow.h +++ b/Applications/IRCClient/IRCWindow.h @@ -43,7 +43,6 @@ public: Query, }; - IRCWindow(IRCClient&, void* owner, Type, const String& name, GUI::Widget* parent); virtual ~IRCWindow() override; String name() const { return m_name; } @@ -67,6 +66,8 @@ public: const IRCQuery& query() const { return *(const IRCQuery*)m_owner; } private: + IRCWindow(IRCClient&, void* owner, Type, const String& name); + IRCClient& m_client; void* m_owner { nullptr }; Type m_type; diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp index 9adc2766e1e..ca8e206e779 100644 --- a/Applications/QuickShow/QSWidget.cpp +++ b/Applications/QuickShow/QSWidget.cpp @@ -32,8 +32,7 @@ #include #include -QSWidget::QSWidget(GUI::Widget* parent) - : GUI::Frame(parent) +QSWidget::QSWidget() { set_fill_with_background_color(true); set_background_color(Color::Black); diff --git a/Applications/QuickShow/QSWidget.h b/Applications/QuickShow/QSWidget.h index 7ed6f8689e5..46bf310fcc4 100644 --- a/Applications/QuickShow/QSWidget.h +++ b/Applications/QuickShow/QSWidget.h @@ -44,7 +44,7 @@ public: Function on_scale_change; private: - explicit QSWidget(GUI::Widget* parent = nullptr); + QSWidget(); virtual void paint_event(GUI::PaintEvent&) override; virtual void resize_event(GUI::ResizeEvent&) override; virtual void mousedown_event(GUI::MouseEvent&) override; diff --git a/Applications/SystemMonitor/NetworkStatisticsWidget.cpp b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp index 591d10a5b51..039758bb6d2 100644 --- a/Applications/SystemMonitor/NetworkStatisticsWidget.cpp +++ b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp @@ -30,8 +30,7 @@ #include #include -NetworkStatisticsWidget::NetworkStatisticsWidget(GUI::Widget* parent) - : GUI::LazyWidget(parent) +NetworkStatisticsWidget::NetworkStatisticsWidget() { on_first_show = [this](auto&) { set_layout(make()); diff --git a/Applications/SystemMonitor/NetworkStatisticsWidget.h b/Applications/SystemMonitor/NetworkStatisticsWidget.h index f7bf1df99ad..554bd255f06 100644 --- a/Applications/SystemMonitor/NetworkStatisticsWidget.h +++ b/Applications/SystemMonitor/NetworkStatisticsWidget.h @@ -35,7 +35,7 @@ public: virtual ~NetworkStatisticsWidget() override; private: - explicit NetworkStatisticsWidget(GUI::Widget* parent = nullptr); + NetworkStatisticsWidget(); void update_models(); RefPtr m_adapter_table_view; diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp index 7fd8b0c021a..133f4a7d868 100644 --- a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp +++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp @@ -29,12 +29,11 @@ #include #include -ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget(GUI::Widget* parent) - : GUI::Widget(parent) +ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget() { set_layout(make()); layout()->set_margins({ 4, 4, 4, 4 }); - m_table_view = GUI::TableView::construct(this); + m_table_view = add(); m_table_view->set_size_columns_to_fit_content(true); Vector pid_fds_fields; diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h index 2937fa4b0a8..a03bf7d1cff 100644 --- a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h +++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h @@ -36,7 +36,7 @@ public: void set_pid(pid_t); private: - explicit ProcessFileDescriptorMapWidget(GUI::Widget* parent); + ProcessFileDescriptorMapWidget(); RefPtr m_table_view; pid_t m_pid { -1 }; diff --git a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index 9f5e5c33460..5f957e5cebb 100644 --- a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -31,8 +31,7 @@ #include #include -ProcessMemoryMapWidget::ProcessMemoryMapWidget(GUI::Widget* parent) - : GUI::Widget(parent) +ProcessMemoryMapWidget::ProcessMemoryMapWidget() { set_layout(make()); layout()->set_margins({ 4, 4, 4, 4 }); diff --git a/Applications/SystemMonitor/ProcessMemoryMapWidget.h b/Applications/SystemMonitor/ProcessMemoryMapWidget.h index d8094f69f7b..71a554fe510 100644 --- a/Applications/SystemMonitor/ProcessMemoryMapWidget.h +++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.h @@ -38,7 +38,7 @@ public: void refresh(); private: - explicit ProcessMemoryMapWidget(GUI::Widget* parent); + ProcessMemoryMapWidget(); RefPtr m_table_view; RefPtr m_json_model; pid_t m_pid { -1 }; diff --git a/Applications/SystemMonitor/ProcessStacksWidget.cpp b/Applications/SystemMonitor/ProcessStacksWidget.cpp index fdbcae184c5..f096878a0b3 100644 --- a/Applications/SystemMonitor/ProcessStacksWidget.cpp +++ b/Applications/SystemMonitor/ProcessStacksWidget.cpp @@ -30,8 +30,7 @@ #include #include -ProcessStacksWidget::ProcessStacksWidget(GUI::Widget* parent) - : GUI::Widget(parent) +ProcessStacksWidget::ProcessStacksWidget() { set_layout(make()); layout()->set_margins({ 4, 4, 4, 4 }); diff --git a/Applications/SystemMonitor/ProcessStacksWidget.h b/Applications/SystemMonitor/ProcessStacksWidget.h index 1dc3c4bbaf5..a9a76b304a0 100644 --- a/Applications/SystemMonitor/ProcessStacksWidget.h +++ b/Applications/SystemMonitor/ProcessStacksWidget.h @@ -32,13 +32,14 @@ class ProcessStacksWidget final : public GUI::Widget { C_OBJECT(ProcessStacksWidget) public: - explicit ProcessStacksWidget(GUI::Widget* parent); virtual ~ProcessStacksWidget() override; void set_pid(pid_t); void refresh(); private: + ProcessStacksWidget(); + pid_t m_pid { -1 }; RefPtr m_stacks_editor; RefPtr m_timer; diff --git a/Applications/SystemMonitor/ProcessTableView.cpp b/Applications/SystemMonitor/ProcessTableView.cpp index 9e9062b54e5..f8cf68955bd 100644 --- a/Applications/SystemMonitor/ProcessTableView.cpp +++ b/Applications/SystemMonitor/ProcessTableView.cpp @@ -29,8 +29,7 @@ #include #include -ProcessTableView::ProcessTableView(GUI::Widget* parent) - : TableView(parent) +ProcessTableView::ProcessTableView() { set_size_columns_to_fit_content(true); set_model(GUI::SortingProxyModel::create(ProcessModel::create())); diff --git a/Applications/SystemMonitor/ProcessTableView.h b/Applications/SystemMonitor/ProcessTableView.h index a352fbfb85d..0fe294c98ef 100644 --- a/Applications/SystemMonitor/ProcessTableView.h +++ b/Applications/SystemMonitor/ProcessTableView.h @@ -45,5 +45,5 @@ public: Function on_process_selected; private: - explicit ProcessTableView(GUI::Widget* parent = nullptr); + ProcessTableView(); }; diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp index 8e6102dde62..d10222bc08f 100644 --- a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp +++ b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp @@ -29,12 +29,11 @@ #include #include -ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget(GUI::Widget* parent) - : GUI::Widget(parent) +ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget() { set_layout(make()); layout()->set_margins({ 4, 4, 4, 4 }); - m_table_view = GUI::TableView::construct(this); + m_table_view = add(); m_table_view->set_size_columns_to_fit_content(true); Vector pid_unveil_fields; diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h index bbc75361944..99eb84055a9 100644 --- a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h +++ b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h @@ -36,7 +36,7 @@ public: void set_pid(pid_t); private: - explicit ProcessUnveiledPathsWidget(GUI::Widget* parent); + ProcessUnveiledPathsWidget(); RefPtr m_table_view; pid_t m_pid { -1 }; diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp index 3b85ef0e103..12d1803588d 100644 --- a/Applications/SystemMonitor/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -123,7 +123,7 @@ int main(int argc, char** argv) auto tabwidget = keeper->add(); - auto process_container_splitter = GUI::VerticalSplitter::construct(nullptr); + auto process_container_splitter = GUI::VerticalSplitter::construct(); tabwidget->add_widget("Processes", process_container_splitter); auto process_table_container = process_container_splitter->add(); @@ -136,7 +136,7 @@ int main(int argc, char** argv) tabwidget->add_widget("Devices", build_devices_tab()); - auto network_stats_widget = NetworkStatisticsWidget::construct(nullptr); + auto network_stats_widget = NetworkStatisticsWidget::construct(); tabwidget->add_widget("Network", network_stats_widget); process_table_container->set_layout(make()); @@ -232,16 +232,16 @@ int main(int argc, char** argv) auto process_tab_widget = process_container_splitter->add(); - auto memory_map_widget = ProcessMemoryMapWidget::construct(nullptr); + auto memory_map_widget = ProcessMemoryMapWidget::construct(); process_tab_widget->add_widget("Memory map", memory_map_widget); - auto open_files_widget = ProcessFileDescriptorMapWidget::construct(nullptr); + auto open_files_widget = ProcessFileDescriptorMapWidget::construct(); process_tab_widget->add_widget("Open files", open_files_widget); - auto unveiled_paths_widget = ProcessUnveiledPathsWidget::construct(nullptr); + auto unveiled_paths_widget = ProcessUnveiledPathsWidget::construct(); process_tab_widget->add_widget("Unveiled paths", unveiled_paths_widget); - auto stacks_widget = ProcessStacksWidget::construct(nullptr); + auto stacks_widget = ProcessStacksWidget::construct(); process_tab_widget->add_widget("Stacks", stacks_widget); process_table_view->on_process_selected = [&](pid_t pid) { diff --git a/Applications/Welcome/BackgroundWidget.cpp b/Applications/Welcome/BackgroundWidget.cpp index 9e7963a70c7..c64f2fc93b1 100644 --- a/Applications/Welcome/BackgroundWidget.cpp +++ b/Applications/Welcome/BackgroundWidget.cpp @@ -29,8 +29,7 @@ #include #include -BackgroundWidget::BackgroundWidget(GUI::Widget* parent) - : GUI::Frame(parent) +BackgroundWidget::BackgroundWidget() { } diff --git a/Applications/Welcome/BackgroundWidget.h b/Applications/Welcome/BackgroundWidget.h index bc8bbf69708..fea3871edc9 100644 --- a/Applications/Welcome/BackgroundWidget.h +++ b/Applications/Welcome/BackgroundWidget.h @@ -31,10 +31,11 @@ class BackgroundWidget : public GUI::Frame { C_OBJECT(BackgroundWidget) public: - explicit BackgroundWidget(GUI::Widget* parent = nullptr); virtual ~BackgroundWidget() override; private: + BackgroundWidget(); + virtual void paint_event(GUI::PaintEvent&) override; virtual void resize_event(GUI::ResizeEvent&) override; }; diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp index 42fc4897200..8d4bad08d01 100644 --- a/Applications/Welcome/TextWidget.cpp +++ b/Applications/Welcome/TextWidget.cpp @@ -33,14 +33,8 @@ #include #include -TextWidget::TextWidget(GUI::Widget* parent) - : GUI::Frame(parent) -{ -} - -TextWidget::TextWidget(const StringView& text, GUI::Widget* parent) - : GUI::Frame(parent) - , m_text(text) +TextWidget::TextWidget(const StringView& text) + : m_text(text) { } diff --git a/Applications/Welcome/TextWidget.h b/Applications/Welcome/TextWidget.h index f4c71e8cd5d..c4353096ff4 100644 --- a/Applications/Welcome/TextWidget.h +++ b/Applications/Welcome/TextWidget.h @@ -32,10 +32,9 @@ #include class TextWidget : public GUI::Frame { - C_OBJECT(TextWidget) + C_OBJECT(TextWidget); + public: - explicit TextWidget(GUI::Widget* parent = nullptr); - TextWidget(const StringView& text, GUI::Widget* parent = nullptr); virtual ~TextWidget() override; String text() const { return m_text; } @@ -53,6 +52,8 @@ public: void wrap_and_set_height(); private: + explicit TextWidget(const StringView& text = {}); + virtual void paint_event(GUI::PaintEvent&) override; virtual void resize_event(GUI::ResizeEvent&) override; diff --git a/Applications/Welcome/UnuncheckableButton.cpp b/Applications/Welcome/UnuncheckableButton.cpp index 41a09f89c5b..29194fff81e 100644 --- a/Applications/Welcome/UnuncheckableButton.cpp +++ b/Applications/Welcome/UnuncheckableButton.cpp @@ -25,12 +25,8 @@ */ #include "UnuncheckableButton.h" -#include -#include -#include -UnuncheckableButton::UnuncheckableButton(GUI::Widget* parent) - : GUI::Button(parent) +UnuncheckableButton::UnuncheckableButton() { } diff --git a/Applications/Welcome/UnuncheckableButton.h b/Applications/Welcome/UnuncheckableButton.h index 5a57bd510cd..b91a41ef9cd 100644 --- a/Applications/Welcome/UnuncheckableButton.h +++ b/Applications/Welcome/UnuncheckableButton.h @@ -31,8 +31,10 @@ class UnuncheckableButton : public GUI::Button { C_OBJECT(UnuncheckableButton) public: - explicit UnuncheckableButton(GUI::Widget* parent = nullptr); virtual ~UnuncheckableButton() override; virtual bool is_uncheckable() const override { return false; } + +private: + UnuncheckableButton(); }; diff --git a/DevTools/FormCompiler/main.cpp b/DevTools/FormCompiler/main.cpp index c94c8791345..0823dbe46c2 100644 --- a/DevTools/FormCompiler/main.cpp +++ b/DevTools/FormCompiler/main.cpp @@ -90,7 +90,7 @@ int main(int argc, char** argv) dbg() << "UI_" << name << "::UI_" << name << "()"; dbg() << "{"; - dbg() << " main_widget = GUI::Widget::construct(nullptr);"; + dbg() << " main_widget = GUI::Widget::construct();"; dbg() << " main_widget->set_fill_with_background_color(true);"; widgets.as_array().for_each([&](auto& value) { @@ -98,7 +98,7 @@ int main(int argc, char** argv) const JsonObject& widget_object = value.as_object(); auto name = widget_object.get("name").to_string(); auto class_name = widget_object.get("class").to_string(); - dbg() << " " << name << " = " << class_name << "::construct(main_widget);"; + dbg() << " " << name << " = main_widget->add<" << class_name << ">();"; widget_object.for_each_member([&](auto& property_name, const JsonValue& property_value) { if (property_name == "class") diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp index 2159812549a..cd6c5893ce1 100644 --- a/DevTools/HackStudio/main.cpp +++ b/DevTools/HackStudio/main.cpp @@ -286,7 +286,8 @@ int main(int argc, char** argv) auto icon_path = String::format("/res/icons/widgets/G%s.png", reg.class_name().characters()); auto action = GUI::Action::create(reg.class_name(), Gfx::Bitmap::load_from_file(icon_path), [®](auto&) { g_form_editor_widget->set_tool(make(*g_form_editor_widget, reg)); - auto widget = reg.construct(&g_form_editor_widget->form_widget()); + auto widget = reg.construct(); + g_form_editor_widget->form_widget().add_child(widget); widget->set_relative_rect(30, 30, 30, 30); g_form_editor_widget->model().update(); }); diff --git a/DevTools/ProfileViewer/ProfileTimelineWidget.cpp b/DevTools/ProfileViewer/ProfileTimelineWidget.cpp index e927033c1ef..c2d9df7ddab 100644 --- a/DevTools/ProfileViewer/ProfileTimelineWidget.cpp +++ b/DevTools/ProfileViewer/ProfileTimelineWidget.cpp @@ -28,9 +28,8 @@ #include "Profile.h" #include -ProfileTimelineWidget::ProfileTimelineWidget(Profile& profile, GUI::Widget* parent) - : GUI::Frame(parent) - , m_profile(profile) +ProfileTimelineWidget::ProfileTimelineWidget(Profile& profile) + : m_profile(profile) { set_background_color(Color::White); set_fill_with_background_color(true); diff --git a/DevTools/ProfileViewer/ProfileTimelineWidget.h b/DevTools/ProfileViewer/ProfileTimelineWidget.h index 238497844c7..f1e50c9fb9e 100644 --- a/DevTools/ProfileViewer/ProfileTimelineWidget.h +++ b/DevTools/ProfileViewer/ProfileTimelineWidget.h @@ -39,7 +39,7 @@ private: virtual void mousemove_event(GUI::MouseEvent&) override; virtual void mouseup_event(GUI::MouseEvent&) override; - ProfileTimelineWidget(Profile&, GUI::Widget* parent); + explicit ProfileTimelineWidget(Profile&); u64 timestamp_at_x(int x) const; diff --git a/DevTools/ProfileViewer/main.cpp b/DevTools/ProfileViewer/main.cpp index 92d0b4e6883..d7f6f46f000 100644 --- a/DevTools/ProfileViewer/main.cpp +++ b/DevTools/ProfileViewer/main.cpp @@ -62,9 +62,9 @@ int main(int argc, char** argv) main_widget->set_fill_with_background_color(true); main_widget->set_layout(make()); - auto timeline_widget = ProfileTimelineWidget::construct(*profile, main_widget); + auto timeline_widget = main_widget->add(*profile); - auto tree_view = GUI::TreeView::construct(main_widget); + auto tree_view = main_widget->add(); tree_view->set_headers_visible(true); tree_view->set_size_columns_to_fit_content(true); tree_view->set_model(profile->model()); diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp index fad29dfefad..ba105eec84f 100644 --- a/DevTools/VisualBuilder/VBForm.cpp +++ b/DevTools/VisualBuilder/VBForm.cpp @@ -44,9 +44,8 @@ VBForm* VBForm::current() return s_current; } -VBForm::VBForm(const String& name, GUI::Widget* parent) - : GUI::Widget(parent) - , m_name(name) +VBForm::VBForm(const String& name) + : m_name(name) { s_current = this; set_fill_with_background_color(true); diff --git a/DevTools/VisualBuilder/VBForm.h b/DevTools/VisualBuilder/VBForm.h index 0aac6f2acdc..7aef3c024aa 100644 --- a/DevTools/VisualBuilder/VBForm.h +++ b/DevTools/VisualBuilder/VBForm.h @@ -33,8 +33,8 @@ class VBForm : public GUI::Widget { C_OBJECT(VBForm) friend class VBWidget; + public: - explicit VBForm(const String& name, GUI::Widget* parent = nullptr); virtual ~VBForm() override; static VBForm* current(); @@ -66,6 +66,8 @@ protected: virtual void keydown_event(GUI::KeyEvent&) override; private: + explicit VBForm(const String& name); + void grabber_mousedown_event(GUI::MouseEvent&, Direction grabber); void set_single_selected_widget(VBWidget*); void add_to_selection(VBWidget&); diff --git a/DevTools/VisualBuilder/VBPropertiesWindow.cpp b/DevTools/VisualBuilder/VBPropertiesWindow.cpp index e3721528d5f..a5150fb4df7 100644 --- a/DevTools/VisualBuilder/VBPropertiesWindow.cpp +++ b/DevTools/VisualBuilder/VBPropertiesWindow.cpp @@ -59,7 +59,7 @@ public: virtual RefPtr create_widget() override { - auto combo = GUI::ComboBox::construct(nullptr); + auto combo = GUI::ComboBox::construct(); combo->set_only_allow_values_from_model(true); combo->set_model(adopt(*new BoolValuesModel)); combo->on_return_pressed = [this] { commit(); }; @@ -87,7 +87,7 @@ VBPropertiesWindow::VBPropertiesWindow() widget->layout()->set_margins({ 2, 2, 2, 2 }); set_main_widget(widget); - m_table_view = GUI::TableView::construct(widget); + m_table_view = widget->add(); m_table_view->set_headers_visible(false); m_table_view->set_editable(true); diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp index 098e03c5e4c..b06ca890adc 100644 --- a/DevTools/VisualBuilder/main.cpp +++ b/DevTools/VisualBuilder/main.cpp @@ -112,7 +112,7 @@ RefPtr make_toolbox_window() widget->layout()->set_spacing(0); window->set_main_widget(widget); - auto label_button = GUI::Button::construct(widget); + auto label_button = widget->add(); label_button->set_button_style(Gfx::ButtonStyle::CoolBar); label_button->set_tooltip("GLabel"); label_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/label.png")); @@ -121,7 +121,7 @@ RefPtr make_toolbox_window() form->insert_widget(VBWidgetType::GLabel); }; - auto button_button = GUI::Button::construct(widget); + auto button_button = widget->add(); button_button->set_button_style(Gfx::ButtonStyle::CoolBar); button_button->set_tooltip("GButton"); button_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/button.png")); @@ -129,7 +129,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GButton); }; - auto spinbox_button = GUI::Button::construct(widget); + auto spinbox_button = widget->add(); spinbox_button->set_button_style(Gfx::ButtonStyle::CoolBar); spinbox_button->set_tooltip("GSpinBox"); spinbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/spinbox.png")); @@ -137,7 +137,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GSpinBox); }; - auto editor_button = GUI::Button::construct(widget); + auto editor_button = widget->add(); editor_button->set_button_style(Gfx::ButtonStyle::CoolBar); editor_button->set_tooltip("GTextEditor"); editor_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/textbox.png")); @@ -145,7 +145,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GTextEditor); }; - auto progress_bar_button = GUI::Button::construct(widget); + auto progress_bar_button = widget->add(); progress_bar_button->set_button_style(Gfx::ButtonStyle::CoolBar); progress_bar_button->set_tooltip("GProgressBar"); progress_bar_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/progressbar.png")); @@ -153,7 +153,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GProgressBar); }; - auto slider_button = GUI::Button::construct(widget); + auto slider_button = widget->add(); slider_button->set_button_style(Gfx::ButtonStyle::CoolBar); slider_button->set_tooltip("GSlider"); slider_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/slider.png")); @@ -161,7 +161,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GSlider); }; - auto checkbox_button = GUI::Button::construct(widget); + auto checkbox_button = widget->add(); checkbox_button->set_button_style(Gfx::ButtonStyle::CoolBar); checkbox_button->set_tooltip("GCheckBox"); checkbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/checkbox.png")); @@ -169,7 +169,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GCheckBox); }; - auto radiobutton_button = GUI::Button::construct(widget); + auto radiobutton_button = widget->add(); radiobutton_button->set_button_style(Gfx::ButtonStyle::CoolBar); radiobutton_button->set_tooltip("GRadioButton"); radiobutton_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/filled-radio-circle.png")); @@ -177,7 +177,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GRadioButton); }; - auto scrollbar_button = GUI::Button::construct(widget); + auto scrollbar_button = widget->add(); scrollbar_button->set_button_style(Gfx::ButtonStyle::CoolBar); scrollbar_button->set_tooltip("GScrollBar"); scrollbar_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/scrollbar.png")); @@ -185,7 +185,7 @@ RefPtr make_toolbox_window() if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GScrollBar); }; - auto groupbox_button = GUI::Button::construct(widget); + auto groupbox_button = widget->add(); groupbox_button->set_button_style(Gfx::ButtonStyle::CoolBar); groupbox_button->set_tooltip("GGroupBox"); groupbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/groupbox.png")); diff --git a/Games/Minesweeper/Field.cpp b/Games/Minesweeper/Field.cpp index 17250264cab..90cef6454ac 100644 --- a/Games/Minesweeper/Field.cpp +++ b/Games/Minesweeper/Field.cpp @@ -36,12 +36,9 @@ #include class SquareButton final : public GUI::Button { -public: - SquareButton(GUI::Widget* parent) - : GUI::Button(parent) - { - } + C_OBJECT(SquareButton); +public: Function on_right_click; Function on_middle_click; @@ -57,16 +54,15 @@ public: } GUI::Button::mousedown_event(event); } + +private: + SquareButton() {} }; class SquareLabel final : public GUI::Label { -public: - SquareLabel(Square& square, GUI::Widget* parent) - : GUI::Label(parent) - , m_square(square) - { - } + C_OBJECT(SquareLabel); +public: Function on_chord_click; virtual void mousedown_event(GUI::MouseEvent& event) override @@ -115,6 +111,12 @@ public: GUI::Label::mouseup_event(event); } +private: + explicit SquareLabel(Square& square) + : m_square(square) + { + } + Square& m_square; bool m_chord { false }; }; @@ -243,7 +245,7 @@ void Field::reset() square.is_considering = false; square.is_swept = false; if (!square.label) { - square.label = new SquareLabel(square, this); + square.label = add(square); square.label->set_background_color(Color::from_rgb(0xff4040)); } square.label->set_fill_with_background_color(false); @@ -251,7 +253,7 @@ void Field::reset() square.label->set_visible(false); square.label->set_icon(square.has_mine ? m_mine_bitmap : nullptr); if (!square.button) { - square.button = new SquareButton(this); + square.button = add(); square.button->on_click = [this, &square](GUI::Button&) { on_square_clicked(square); }; @@ -513,10 +515,12 @@ void Field::set_single_chording(bool enabled) config->write_bool_entry("Minesweeper", "SingleChording", m_single_chording); } +Square::Square() +{ +} + Square::~Square() { - delete label; - delete button; } template diff --git a/Games/Minesweeper/Field.h b/Games/Minesweeper/Field.h index b56813d4601..97a84f015db 100644 --- a/Games/Minesweeper/Field.h +++ b/Games/Minesweeper/Field.h @@ -37,7 +37,7 @@ class SquareLabel; class Square { AK_MAKE_NONCOPYABLE(Square) public: - Square() {} + Square(); ~Square(); Field* field { nullptr }; @@ -48,8 +48,8 @@ public: int row { 0 }; int column { 0 }; int number { 0 }; - SquareButton* button { nullptr }; - SquareLabel* label { nullptr }; + RefPtr button; + RefPtr label; template void for_each_neighbor(Callback); diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp index a560d895d68..39ba9caa440 100644 --- a/Games/Snake/SnakeGame.cpp +++ b/Games/Snake/SnakeGame.cpp @@ -32,8 +32,7 @@ #include #include -SnakeGame::SnakeGame(GUI::Widget* parent) - : GUI::Widget(parent) +SnakeGame::SnakeGame() { set_font(GFontDatabase::the().get_by_name("Liza Regular")); m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/paprika.png")); diff --git a/Games/Snake/SnakeGame.h b/Games/Snake/SnakeGame.h index abe08df4506..6ecb5fa0998 100644 --- a/Games/Snake/SnakeGame.h +++ b/Games/Snake/SnakeGame.h @@ -38,7 +38,7 @@ public: void reset(); private: - explicit SnakeGame(GUI::Widget* parent = nullptr); + SnakeGame(); virtual void paint_event(GUI::PaintEvent&) override; virtual void keydown_event(GUI::KeyEvent&) override; virtual void timer_event(Core::TimerEvent&) override; diff --git a/Libraries/LibGUI/AbstractButton.cpp b/Libraries/LibGUI/AbstractButton.cpp index 27f3ed998c7..2c02b7d9fe2 100644 --- a/Libraries/LibGUI/AbstractButton.cpp +++ b/Libraries/LibGUI/AbstractButton.cpp @@ -31,14 +31,8 @@ namespace GUI { -AbstractButton::AbstractButton(Widget* parent) - : AbstractButton({}, parent) -{ -} - -AbstractButton::AbstractButton(const StringView& text, Widget* parent) - : Widget(parent) - , m_text(text) +AbstractButton::AbstractButton(const StringView& text) + : m_text(text) { m_auto_repeat_timer = add(); m_auto_repeat_timer->on_timeout = [this] { diff --git a/Libraries/LibGUI/AbstractButton.h b/Libraries/LibGUI/AbstractButton.h index 4e504fd9e83..09780b6f8db 100644 --- a/Libraries/LibGUI/AbstractButton.h +++ b/Libraries/LibGUI/AbstractButton.h @@ -60,8 +60,7 @@ public: void set_auto_repeat_interval(int interval) { m_auto_repeat_interval = interval; } protected: - explicit AbstractButton(Widget* parent = nullptr); - AbstractButton(const StringView&, Widget* parent = nullptr); + explicit AbstractButton(const StringView& = {}); virtual void mousedown_event(MouseEvent&) override; virtual void mousemove_event(MouseEvent&) override; diff --git a/Libraries/LibGUI/AbstractTableView.cpp b/Libraries/LibGUI/AbstractTableView.cpp index 13a6e5bba51..d6cc4684657 100644 --- a/Libraries/LibGUI/AbstractTableView.cpp +++ b/Libraries/LibGUI/AbstractTableView.cpp @@ -39,8 +39,7 @@ namespace GUI { static const int minimum_column_width = 2; -AbstractTableView::AbstractTableView(Widget* parent) - : AbstractView(parent) +AbstractTableView::AbstractTableView() { set_should_hide_unnecessary_scrollbars(true); } diff --git a/Libraries/LibGUI/AbstractTableView.h b/Libraries/LibGUI/AbstractTableView.h index 19b6bcb16f3..41b0e905a89 100644 --- a/Libraries/LibGUI/AbstractTableView.h +++ b/Libraries/LibGUI/AbstractTableView.h @@ -72,7 +72,7 @@ public: protected: virtual ~AbstractTableView() override; - explicit AbstractTableView(Widget* parent = nullptr); + AbstractTableView(); virtual void did_update_model() override; virtual void mouseup_event(MouseEvent&) override; diff --git a/Libraries/LibGUI/AbstractView.cpp b/Libraries/LibGUI/AbstractView.cpp index c8411142b04..e9ac3dbc690 100644 --- a/Libraries/LibGUI/AbstractView.cpp +++ b/Libraries/LibGUI/AbstractView.cpp @@ -37,9 +37,8 @@ namespace GUI { -AbstractView::AbstractView(Widget* parent) - : ScrollableWidget(parent) - , m_selection(*this) +AbstractView::AbstractView() + : m_selection(*this) { } diff --git a/Libraries/LibGUI/AbstractView.h b/Libraries/LibGUI/AbstractView.h index 86564bc2893..e8e339f86f0 100644 --- a/Libraries/LibGUI/AbstractView.h +++ b/Libraries/LibGUI/AbstractView.h @@ -73,7 +73,7 @@ public: NonnullRefPtr font_for_index(const ModelIndex&) const; protected: - explicit AbstractView(Widget* parent = nullptr); + AbstractView(); virtual ~AbstractView() override; virtual void mousedown_event(MouseEvent&) override; diff --git a/Libraries/LibGUI/Button.cpp b/Libraries/LibGUI/Button.cpp index 5ec77339c77..59c2ecc6642 100644 --- a/Libraries/LibGUI/Button.cpp +++ b/Libraries/LibGUI/Button.cpp @@ -36,13 +36,8 @@ namespace GUI { -Button::Button(Widget* parent) - : AbstractButton(parent) -{ -} - -Button::Button(const StringView& text, Widget* parent) - : AbstractButton(text, parent) +Button::Button(const StringView& text) + : AbstractButton(text) { } diff --git a/Libraries/LibGUI/Button.h b/Libraries/LibGUI/Button.h index 225c8afc94e..4ad0f2190ed 100644 --- a/Libraries/LibGUI/Button.h +++ b/Libraries/LibGUI/Button.h @@ -62,8 +62,7 @@ public: void set_focusable(bool b) { m_focusable = b; } protected: - Button(const StringView& text, Widget* parent = nullptr); - explicit Button(Widget* parent = nullptr); + explicit Button(const StringView& text = {}); virtual void paint_event(PaintEvent&) override; private: diff --git a/Libraries/LibGUI/CheckBox.cpp b/Libraries/LibGUI/CheckBox.cpp index 34e87ac7d9a..57a4df3a5ff 100644 --- a/Libraries/LibGUI/CheckBox.cpp +++ b/Libraries/LibGUI/CheckBox.cpp @@ -52,13 +52,8 @@ static const int s_checked_bitmap_height = 9; static const int s_box_width = 13; static const int s_box_height = 13; -CheckBox::CheckBox(Widget* parent) - : AbstractButton(parent) -{ -} - -CheckBox::CheckBox(const StringView& text, Widget* parent) - : AbstractButton(text, parent) +CheckBox::CheckBox(const StringView& text) + : AbstractButton(text) { } diff --git a/Libraries/LibGUI/CheckBox.h b/Libraries/LibGUI/CheckBox.h index bee9ccad497..23367dfc965 100644 --- a/Libraries/LibGUI/CheckBox.h +++ b/Libraries/LibGUI/CheckBox.h @@ -38,8 +38,7 @@ public: virtual void click() override; private: - CheckBox(const StringView&, Widget* parent = nullptr); - explicit CheckBox(Widget* parent = nullptr); + explicit CheckBox(const StringView& = {}); // These don't make sense for a check box, so hide them. using AbstractButton::auto_repeat_interval; diff --git a/Libraries/LibGUI/ColumnsView.cpp b/Libraries/LibGUI/ColumnsView.cpp index 296b345c97d..e71d86c608b 100644 --- a/Libraries/LibGUI/ColumnsView.cpp +++ b/Libraries/LibGUI/ColumnsView.cpp @@ -47,8 +47,7 @@ static const char* s_arrow_bitmap_data = { static const int s_arrow_bitmap_width = 9; static const int s_arrow_bitmap_height = 9; -ColumnsView::ColumnsView(Widget* parent) - : AbstractView(parent) +ColumnsView::ColumnsView() { set_fill_with_background_color(true); set_background_role(ColorRole::Base); diff --git a/Libraries/LibGUI/ColumnsView.h b/Libraries/LibGUI/ColumnsView.h index 34245fc7bce..e92f31336ef 100644 --- a/Libraries/LibGUI/ColumnsView.h +++ b/Libraries/LibGUI/ColumnsView.h @@ -40,8 +40,8 @@ public: virtual ModelIndex index_at_event_position(const Gfx::Point&) const override; private: - ColumnsView(Widget* parent = nullptr); - virtual ~ColumnsView(); + ColumnsView(); + virtual ~ColumnsView() override; void push_column(ModelIndex& parent_index); void update_column_sizes(); diff --git a/Libraries/LibGUI/ComboBox.cpp b/Libraries/LibGUI/ComboBox.cpp index 90bc2ed7438..617a67dd4d1 100644 --- a/Libraries/LibGUI/ComboBox.cpp +++ b/Libraries/LibGUI/ComboBox.cpp @@ -35,8 +35,7 @@ namespace GUI { -ComboBox::ComboBox(Widget* parent) - : Widget(parent) +ComboBox::ComboBox() { m_editor = add(); m_editor->on_change = [this] { @@ -57,11 +56,11 @@ ComboBox::ComboBox(Widget* parent) open(); }; - m_list_window = Window::construct(this); + m_list_window = add(); // FIXME: This is obviously not a tooltip window, but it's the closest thing to what we want atm. m_list_window->set_window_type(WindowType::Tooltip); - m_list_view = ListView::construct(nullptr); + m_list_view = ListView::construct(); m_list_view->horizontal_scrollbar().set_visible(false); m_list_window->set_main_widget(m_list_view); diff --git a/Libraries/LibGUI/ComboBox.h b/Libraries/LibGUI/ComboBox.h index 51ebbd2e4c7..f766a052d81 100644 --- a/Libraries/LibGUI/ComboBox.h +++ b/Libraries/LibGUI/ComboBox.h @@ -56,7 +56,7 @@ public: Function on_return_pressed; protected: - explicit ComboBox(Widget* parent = nullptr); + ComboBox(); virtual void resize_event(ResizeEvent&) override; private: diff --git a/Libraries/LibGUI/Frame.cpp b/Libraries/LibGUI/Frame.cpp index 18fd5eefeb9..e2cb7c23d02 100644 --- a/Libraries/LibGUI/Frame.cpp +++ b/Libraries/LibGUI/Frame.cpp @@ -31,8 +31,7 @@ namespace GUI { -Frame::Frame(Widget* parent) - : Widget(parent) +Frame::Frame() { set_frame_thickness(2); set_frame_shape(Gfx::FrameShape::Container); diff --git a/Libraries/LibGUI/Frame.h b/Libraries/LibGUI/Frame.h index 1d78703c732..e31bf130520 100644 --- a/Libraries/LibGUI/Frame.h +++ b/Libraries/LibGUI/Frame.h @@ -49,7 +49,7 @@ public: Gfx::Rect frame_inner_rect() const { return frame_inner_rect_for_size(size()); } protected: - explicit Frame(Widget* parent = nullptr); + Frame(); void paint_event(PaintEvent&) override; private: diff --git a/Libraries/LibGUI/GroupBox.cpp b/Libraries/LibGUI/GroupBox.cpp index db9cb6480d2..f74db7f20bc 100644 --- a/Libraries/LibGUI/GroupBox.cpp +++ b/Libraries/LibGUI/GroupBox.cpp @@ -32,14 +32,8 @@ namespace GUI { -GroupBox::GroupBox(Widget* parent) - : GroupBox({}, parent) -{ -} - -GroupBox::GroupBox(const StringView& title, Widget* parent) - : Widget(parent) - , m_title(title) +GroupBox::GroupBox(const StringView& title) + : m_title(title) { } diff --git a/Libraries/LibGUI/GroupBox.h b/Libraries/LibGUI/GroupBox.h index 1e1c6164fee..1e56fb91f6b 100644 --- a/Libraries/LibGUI/GroupBox.h +++ b/Libraries/LibGUI/GroupBox.h @@ -39,8 +39,7 @@ public: void set_title(const StringView&); protected: - explicit GroupBox(Widget* parent = nullptr); - GroupBox(const StringView& title, Widget* parent = nullptr); + explicit GroupBox(const StringView& title = {}); virtual void paint_event(PaintEvent&) override; diff --git a/Libraries/LibGUI/ItemView.cpp b/Libraries/LibGUI/ItemView.cpp index 3c4a394e73d..73672fbb3ad 100644 --- a/Libraries/LibGUI/ItemView.cpp +++ b/Libraries/LibGUI/ItemView.cpp @@ -37,8 +37,7 @@ namespace GUI { -ItemView::ItemView(Widget* parent) - : AbstractView(parent) +ItemView::ItemView() { set_background_role(ColorRole::Base); set_foreground_role(ColorRole::BaseText); diff --git a/Libraries/LibGUI/ItemView.h b/Libraries/LibGUI/ItemView.h index 625b7e1b3fc..a960df73fbe 100644 --- a/Libraries/LibGUI/ItemView.h +++ b/Libraries/LibGUI/ItemView.h @@ -48,7 +48,7 @@ public: virtual ModelIndex index_at_event_position(const Gfx::Point&) const override; private: - explicit ItemView(Widget* parent = nullptr); + ItemView(); virtual void did_update_model() override; virtual void paint_event(PaintEvent&) override; diff --git a/Libraries/LibGUI/Label.cpp b/Libraries/LibGUI/Label.cpp index 09a4dc87be3..aaab033106e 100644 --- a/Libraries/LibGUI/Label.cpp +++ b/Libraries/LibGUI/Label.cpp @@ -32,14 +32,8 @@ namespace GUI { -Label::Label(Widget* parent) - : Label({}, parent) -{ -} - -Label::Label(const StringView& text, Widget* parent) - : Frame(parent) - , m_text(text) +Label::Label(const StringView& text) + : m_text(text) { set_frame_thickness(0); set_frame_shadow(Gfx::FrameShadow::Plain); diff --git a/Libraries/LibGUI/Label.h b/Libraries/LibGUI/Label.h index d686fad13c8..d0541eccfa7 100644 --- a/Libraries/LibGUI/Label.h +++ b/Libraries/LibGUI/Label.h @@ -52,8 +52,7 @@ public: void size_to_fit(); protected: - explicit Label(Widget* parent = nullptr); - Label(const StringView& text, Widget* parent = nullptr); + explicit Label(const StringView& text = {}); virtual void paint_event(PaintEvent&) override; diff --git a/Libraries/LibGUI/LazyWidget.cpp b/Libraries/LibGUI/LazyWidget.cpp index 9de6f79d1b4..3e1a9c49519 100644 --- a/Libraries/LibGUI/LazyWidget.cpp +++ b/Libraries/LibGUI/LazyWidget.cpp @@ -28,8 +28,7 @@ namespace GUI { -LazyWidget::LazyWidget(Widget* parent) - : Widget(parent) +LazyWidget::LazyWidget() { } diff --git a/Libraries/LibGUI/LazyWidget.h b/Libraries/LibGUI/LazyWidget.h index 887a53ede07..8b7717fb961 100644 --- a/Libraries/LibGUI/LazyWidget.h +++ b/Libraries/LibGUI/LazyWidget.h @@ -38,7 +38,7 @@ public: Function on_first_show; protected: - explicit LazyWidget(Widget* parent = nullptr); + LazyWidget(); private: virtual void show_event(ShowEvent&) override; diff --git a/Libraries/LibGUI/ListView.cpp b/Libraries/LibGUI/ListView.cpp index d87339e27d4..ec1ca55dc44 100644 --- a/Libraries/LibGUI/ListView.cpp +++ b/Libraries/LibGUI/ListView.cpp @@ -33,8 +33,7 @@ namespace GUI { -ListView::ListView(Widget* parent) - : AbstractView(parent) +ListView::ListView() { set_background_role(ColorRole::Base); set_foreground_role(ColorRole::BaseText); diff --git a/Libraries/LibGUI/ListView.h b/Libraries/LibGUI/ListView.h index 070cc1bf045..0564a873dfb 100644 --- a/Libraries/LibGUI/ListView.h +++ b/Libraries/LibGUI/ListView.h @@ -33,7 +33,6 @@ namespace GUI { class ListView : public AbstractView { C_OBJECT(ListView) public: - explicit ListView(Widget* parent = nullptr); virtual ~ListView() override; int item_height() const { return 16; } @@ -54,6 +53,8 @@ public: void set_model_column(int column) { m_model_column = column; } private: + ListView(); + virtual void did_update_model() override; virtual void paint_event(PaintEvent&) override; virtual void doubleclick_event(MouseEvent&) override; diff --git a/Libraries/LibGUI/ModelEditingDelegate.h b/Libraries/LibGUI/ModelEditingDelegate.h index 5b8efeed201..0815075f6f9 100644 --- a/Libraries/LibGUI/ModelEditingDelegate.h +++ b/Libraries/LibGUI/ModelEditingDelegate.h @@ -77,7 +77,7 @@ public: virtual RefPtr create_widget() override { - auto textbox = TextBox::construct(nullptr); + auto textbox = TextBox::construct(); textbox->on_return_pressed = [this] { commit(); }; diff --git a/Libraries/LibGUI/ProgressBar.cpp b/Libraries/LibGUI/ProgressBar.cpp index 4fee5a63c6f..a193f61b486 100644 --- a/Libraries/LibGUI/ProgressBar.cpp +++ b/Libraries/LibGUI/ProgressBar.cpp @@ -32,8 +32,7 @@ namespace GUI { -ProgressBar::ProgressBar(Widget* parent) - : Frame(parent) +ProgressBar::ProgressBar() { } diff --git a/Libraries/LibGUI/ProgressBar.h b/Libraries/LibGUI/ProgressBar.h index 02bafeb06ea..9ba6f212975 100644 --- a/Libraries/LibGUI/ProgressBar.h +++ b/Libraries/LibGUI/ProgressBar.h @@ -56,7 +56,7 @@ public: void set_format(Format format) { m_format = format; } protected: - explicit ProgressBar(Widget* parent = nullptr); + ProgressBar(); virtual void paint_event(PaintEvent&) override; diff --git a/Libraries/LibGUI/RadioButton.cpp b/Libraries/LibGUI/RadioButton.cpp index e633a909b5c..8d00f8105fa 100644 --- a/Libraries/LibGUI/RadioButton.cpp +++ b/Libraries/LibGUI/RadioButton.cpp @@ -33,13 +33,8 @@ namespace GUI { -RadioButton::RadioButton(Widget* parent) - : RadioButton({}, parent) -{ -} - -RadioButton::RadioButton(const StringView& text, Widget* parent) - : AbstractButton(text, parent) +RadioButton::RadioButton(const StringView& text) + : AbstractButton(text) { } diff --git a/Libraries/LibGUI/RadioButton.h b/Libraries/LibGUI/RadioButton.h index cb03930ceaa..77c77ec4261 100644 --- a/Libraries/LibGUI/RadioButton.h +++ b/Libraries/LibGUI/RadioButton.h @@ -38,8 +38,7 @@ public: virtual void click() override; protected: - explicit RadioButton(Widget* parent = nullptr); - explicit RadioButton(const StringView& text, Widget* parent = nullptr); + explicit RadioButton(const StringView& text = {}); virtual void paint_event(PaintEvent&) override; private: diff --git a/Libraries/LibGUI/ResizeCorner.cpp b/Libraries/LibGUI/ResizeCorner.cpp index e17989a06fa..4aa3ca2939c 100644 --- a/Libraries/LibGUI/ResizeCorner.cpp +++ b/Libraries/LibGUI/ResizeCorner.cpp @@ -75,8 +75,7 @@ static Gfx::CharacterBitmap* s_resize_corner_highlights_bitmap; static const int s_resize_corner_bitmap_width = 16; static const int s_resize_corner_bitmap_height = 16; -ResizeCorner::ResizeCorner(Widget* parent) - : Widget(parent) +ResizeCorner::ResizeCorner() { set_background_role(ColorRole::Button); set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed); diff --git a/Libraries/LibGUI/ResizeCorner.h b/Libraries/LibGUI/ResizeCorner.h index a91379de5a8..c2ebbd9ce3b 100644 --- a/Libraries/LibGUI/ResizeCorner.h +++ b/Libraries/LibGUI/ResizeCorner.h @@ -34,7 +34,7 @@ public: virtual ~ResizeCorner() override; protected: - explicit ResizeCorner(Widget* parent = nullptr); + ResizeCorner(); virtual void paint_event(PaintEvent&) override; virtual void mousedown_event(MouseEvent&) override; diff --git a/Libraries/LibGUI/ScrollBar.cpp b/Libraries/LibGUI/ScrollBar.cpp index 73bdc42c162..0f217ce1ae9 100644 --- a/Libraries/LibGUI/ScrollBar.cpp +++ b/Libraries/LibGUI/ScrollBar.cpp @@ -86,14 +86,8 @@ static Gfx::CharacterBitmap* s_down_arrow_bitmap; static Gfx::CharacterBitmap* s_left_arrow_bitmap; static Gfx::CharacterBitmap* s_right_arrow_bitmap; -ScrollBar::ScrollBar(Widget* parent) - : ScrollBar(Orientation::Vertical, parent) -{ -} - -ScrollBar::ScrollBar(Orientation orientation, Widget* parent) - : Widget(parent) - , m_orientation(orientation) +ScrollBar::ScrollBar(Orientation orientation) + : m_orientation(orientation) { m_automatic_scrolling_timer = add(); if (!s_up_arrow_bitmap) diff --git a/Libraries/LibGUI/ScrollBar.h b/Libraries/LibGUI/ScrollBar.h index 556dbff0f24..dd943e6a0ee 100644 --- a/Libraries/LibGUI/ScrollBar.h +++ b/Libraries/LibGUI/ScrollBar.h @@ -65,8 +65,7 @@ public: }; private: - explicit ScrollBar(Widget* parent = nullptr); - explicit ScrollBar(Orientation, Widget* parent = nullptr); + explicit ScrollBar(Gfx::Orientation = Gfx::Orientation::Vertical); virtual void paint_event(PaintEvent&) override; virtual void mousedown_event(MouseEvent&) override; diff --git a/Libraries/LibGUI/ScrollableWidget.cpp b/Libraries/LibGUI/ScrollableWidget.cpp index d5fe7de93a8..42fc5ebf25e 100644 --- a/Libraries/LibGUI/ScrollableWidget.cpp +++ b/Libraries/LibGUI/ScrollableWidget.cpp @@ -29,17 +29,16 @@ namespace GUI { -ScrollableWidget::ScrollableWidget(Widget* parent) - : Frame(parent) +ScrollableWidget::ScrollableWidget() { - m_vertical_scrollbar = ScrollBar::construct(Orientation::Vertical, this); + m_vertical_scrollbar = add(Orientation::Vertical); m_vertical_scrollbar->set_step(4); m_vertical_scrollbar->on_change = [this](int) { did_scroll(); update(); }; - m_horizontal_scrollbar = ScrollBar::construct(Orientation::Horizontal, this); + m_horizontal_scrollbar = add(Orientation::Horizontal); m_horizontal_scrollbar->set_step(4); m_horizontal_scrollbar->set_big_step(30); m_horizontal_scrollbar->on_change = [this](int) { @@ -47,7 +46,7 @@ ScrollableWidget::ScrollableWidget(Widget* parent) update(); }; - m_corner_widget = Widget::construct(this); + m_corner_widget = add(); m_corner_widget->set_fill_with_background_color(true); } diff --git a/Libraries/LibGUI/ScrollableWidget.h b/Libraries/LibGUI/ScrollableWidget.h index 923fc6ed68a..a83739d126a 100644 --- a/Libraries/LibGUI/ScrollableWidget.h +++ b/Libraries/LibGUI/ScrollableWidget.h @@ -71,7 +71,7 @@ public: Gfx::Point to_widget_position(const Gfx::Point& content_position) const; protected: - explicit ScrollableWidget(Widget* parent = nullptr); + ScrollableWidget(); virtual void custom_layout() override; virtual void resize_event(ResizeEvent&) override; virtual void mousewheel_event(MouseEvent&) override; diff --git a/Libraries/LibGUI/Slider.cpp b/Libraries/LibGUI/Slider.cpp index 540806846f6..6fcafa766c4 100644 --- a/Libraries/LibGUI/Slider.cpp +++ b/Libraries/LibGUI/Slider.cpp @@ -33,14 +33,8 @@ namespace GUI { -Slider::Slider(Widget* parent) - : Slider(Orientation::Horizontal, parent) -{ -} - -Slider::Slider(Orientation orientation, Widget* parent) - : Widget(parent) - , m_orientation(orientation) +Slider::Slider(Orientation orientation) + : m_orientation(orientation) { } diff --git a/Libraries/LibGUI/Slider.h b/Libraries/LibGUI/Slider.h index 74f217bdcfc..597f3d1e65c 100644 --- a/Libraries/LibGUI/Slider.h +++ b/Libraries/LibGUI/Slider.h @@ -74,8 +74,7 @@ public: Function on_value_changed; protected: - explicit Slider(Widget* = nullptr); - explicit Slider(Orientation, Widget* = nullptr); + explicit Slider(Orientation = Orientation::Vertical); virtual void paint_event(PaintEvent&) override; virtual void mousedown_event(MouseEvent&) override; @@ -106,8 +105,8 @@ public: virtual ~VerticalSlider() override {} private: - explicit VerticalSlider(Widget* parent = nullptr) - : Slider(Orientation::Vertical, parent) + VerticalSlider() + : Slider(Orientation::Vertical) { } }; @@ -118,8 +117,8 @@ public: virtual ~HorizontalSlider() override {} private: - explicit HorizontalSlider(Widget* parent = nullptr) - : Slider(Orientation::Horizontal, parent) + HorizontalSlider() + : Slider(Orientation::Horizontal) { } }; diff --git a/Libraries/LibGUI/SpinBox.cpp b/Libraries/LibGUI/SpinBox.cpp index 26b71612f9e..718b1d7aa9d 100644 --- a/Libraries/LibGUI/SpinBox.cpp +++ b/Libraries/LibGUI/SpinBox.cpp @@ -30,8 +30,7 @@ namespace GUI { -SpinBox::SpinBox(Widget* parent) - : Widget(parent) +SpinBox::SpinBox() { m_editor = add(); m_editor->set_text("0"); diff --git a/Libraries/LibGUI/SpinBox.h b/Libraries/LibGUI/SpinBox.h index e86d87948ce..f47b64b168f 100644 --- a/Libraries/LibGUI/SpinBox.h +++ b/Libraries/LibGUI/SpinBox.h @@ -47,7 +47,7 @@ public: Function on_change; protected: - explicit SpinBox(Widget* parent = nullptr); + SpinBox(); virtual void resize_event(ResizeEvent&) override; diff --git a/Libraries/LibGUI/Splitter.cpp b/Libraries/LibGUI/Splitter.cpp index 6d8b935d650..671c5407765 100644 --- a/Libraries/LibGUI/Splitter.cpp +++ b/Libraries/LibGUI/Splitter.cpp @@ -32,9 +32,8 @@ namespace GUI { -Splitter::Splitter(Orientation orientation, Widget* parent) - : Frame(parent) - , m_orientation(orientation) +Splitter::Splitter(Orientation orientation) + : m_orientation(orientation) { set_background_role(ColorRole::Button); set_layout(make(orientation)); diff --git a/Libraries/LibGUI/Splitter.h b/Libraries/LibGUI/Splitter.h index 4d05f47526f..25de077667a 100644 --- a/Libraries/LibGUI/Splitter.h +++ b/Libraries/LibGUI/Splitter.h @@ -36,7 +36,7 @@ public: virtual ~Splitter() override; protected: - Splitter(Gfx::Orientation, Widget* parent = nullptr); + explicit Splitter(Gfx::Orientation); virtual void paint_event(PaintEvent&) override; virtual void resize_event(ResizeEvent&) override; @@ -68,8 +68,8 @@ public: virtual ~VerticalSplitter() override {} private: - explicit VerticalSplitter(Widget* parent = nullptr) - : Splitter(Gfx::Orientation::Vertical, parent) + VerticalSplitter() + : Splitter(Gfx::Orientation::Vertical) { } }; @@ -80,8 +80,8 @@ public: virtual ~HorizontalSplitter() override {} private: - explicit HorizontalSplitter(Widget* parent = nullptr) - : Splitter(Gfx::Orientation::Horizontal, parent) + HorizontalSplitter() + : Splitter(Gfx::Orientation::Horizontal) { } }; diff --git a/Libraries/LibGUI/StackWidget.cpp b/Libraries/LibGUI/StackWidget.cpp index 2b33f187df6..f3ac39070e1 100644 --- a/Libraries/LibGUI/StackWidget.cpp +++ b/Libraries/LibGUI/StackWidget.cpp @@ -29,8 +29,7 @@ namespace GUI { -StackWidget::StackWidget(Widget* parent) - : Widget(parent) +StackWidget::StackWidget() { } diff --git a/Libraries/LibGUI/StackWidget.h b/Libraries/LibGUI/StackWidget.h index d8057c2a18d..0d1d66b31f0 100644 --- a/Libraries/LibGUI/StackWidget.h +++ b/Libraries/LibGUI/StackWidget.h @@ -42,7 +42,7 @@ public: Function on_active_widget_change; protected: - explicit StackWidget(Widget* parent = nullptr); + StackWidget(); virtual void child_event(Core::ChildEvent&) override; virtual void resize_event(ResizeEvent&) override; diff --git a/Libraries/LibGUI/StatusBar.cpp b/Libraries/LibGUI/StatusBar.cpp index 8f9d41820a5..9019816abb9 100644 --- a/Libraries/LibGUI/StatusBar.cpp +++ b/Libraries/LibGUI/StatusBar.cpp @@ -34,13 +34,7 @@ namespace GUI { -StatusBar::StatusBar(Widget* parent) - : StatusBar(1, parent) -{ -} - -StatusBar::StatusBar(int label_count, Widget* parent) - : Widget(parent) +StatusBar::StatusBar(int label_count) { set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); set_preferred_size(0, 20); @@ -54,7 +48,7 @@ StatusBar::StatusBar(int label_count, Widget* parent) for (auto i = 0; i < label_count; i++) m_labels.append(create_label()); - m_corner = ResizeCorner::construct(this); + m_corner = add(); } StatusBar::~StatusBar() @@ -63,7 +57,7 @@ StatusBar::~StatusBar() NonnullRefPtr