diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp index 9ebda060c9..e84fd06368 100644 --- a/Applications/ChanViewer/main.cpp +++ b/Applications/ChanViewer/main.cpp @@ -22,7 +22,7 @@ int main(int argc, char** argv) widget->set_fill_with_background_color(true); widget->set_layout(make(Orientation::Vertical)); - auto* board_combo = new GComboBox(widget); + auto board_combo = GComboBox::construct(widget); board_combo->set_only_allow_values_from_model(true); board_combo->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); board_combo->set_preferred_size(0, 20); diff --git a/Applications/FontEditor/FontEditor.cpp b/Applications/FontEditor/FontEditor.cpp index 0e22471127..09f7de7e4d 100644 --- a/Applications/FontEditor/FontEditor.cpp +++ b/Applications/FontEditor/FontEditor.cpp @@ -23,10 +23,10 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edited_fon else m_path = path; - m_glyph_map_widget = new GlyphMapWidget(*m_edited_font, this); + m_glyph_map_widget = GlyphMapWidget::construct(*m_edited_font, this); m_glyph_map_widget->move_to({ 90, 5 }); - m_glyph_editor_widget = new GlyphEditorWidget(*m_edited_font, this); + m_glyph_editor_widget = GlyphEditorWidget::construct(*m_edited_font, this); m_glyph_editor_widget->move_to({ 5, 5 }); m_ui = make(); diff --git a/Applications/FontEditor/GlyphEditorWidget.h b/Applications/FontEditor/GlyphEditorWidget.h index 31b83ed3e5..c4c1b8a288 100644 --- a/Applications/FontEditor/GlyphEditorWidget.h +++ b/Applications/FontEditor/GlyphEditorWidget.h @@ -2,8 +2,8 @@ #include class GlyphEditorWidget final : public GFrame { + C_OBJECT(GlyphEditorWidget) public: - GlyphEditorWidget(Font&, GWidget* parent); virtual ~GlyphEditorWidget() override; u8 glyph() const { return m_glyph; } @@ -18,6 +18,7 @@ public: Function on_glyph_altered; private: + GlyphEditorWidget(Font&, GWidget* parent); virtual void paint_event(GPaintEvent&) override; virtual void mousedown_event(GMouseEvent&) override; virtual void mousemove_event(GMouseEvent&) override; diff --git a/Applications/FontEditor/GlyphMapWidget.h b/Applications/FontEditor/GlyphMapWidget.h index 944aca6542..7c233c4103 100644 --- a/Applications/FontEditor/GlyphMapWidget.h +++ b/Applications/FontEditor/GlyphMapWidget.h @@ -4,8 +4,8 @@ #include class GlyphMapWidget final : public GFrame { + C_OBJECT(GlyphMapWidget) public: - GlyphMapWidget(Font&, GWidget* parent); virtual ~GlyphMapWidget() override; u8 selected_glyph() const { return m_selected_glyph; } @@ -25,6 +25,7 @@ public: Function on_glyph_selected; private: + GlyphMapWidget(Font&, GWidget* parent); virtual void paint_event(GPaintEvent&) override; virtual void mousedown_event(GMouseEvent&) override; diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp index d7a81ceda4..45285216ae 100644 --- a/Applications/IRCClient/IRCAppWindow.cpp +++ b/Applications/IRCClient/IRCAppWindow.cpp @@ -189,7 +189,7 @@ void IRCAppWindow::setup_widgets() set_active_window(m_client.window_at(index.row())); }; - m_container = new GStackWidget(horizontal_container); + m_container = GStackWidget::construct(horizontal_container); m_container->on_active_widget_change = [this](auto*) { update_part_action(); }; diff --git a/Applications/IRCClient/IRCAppWindow.h b/Applications/IRCClient/IRCAppWindow.h index b3cb5013b8..a058152b84 100644 --- a/Applications/IRCClient/IRCAppWindow.h +++ b/Applications/IRCClient/IRCAppWindow.h @@ -27,7 +27,7 @@ private: IRCWindow& create_window(void* owner, IRCWindow::Type, const String& name); IRCClient m_client; - GStackWidget* m_container { nullptr }; + ObjectPtr m_container; ObjectPtr m_window_list; RefPtr m_join_action; RefPtr m_part_action; diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp index 14a8c812d6..aa5aef86d0 100644 --- a/Applications/Welcome/main.cpp +++ b/Applications/Welcome/main.cpp @@ -107,7 +107,7 @@ int main(int argc, char** argv) menu->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill); menu->set_preferred_size(200, 0); - auto* stack = new GStackWidget(main_section); + auto stack = GStackWidget::construct(main_section); stack->set_size_policy(SizePolicy::Fill, SizePolicy::Fill); for (auto& page : pages) { diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp index 99a4329f34..3e7c9af88f 100755 --- a/Demos/WidgetGallery/main.cpp +++ b/Demos/WidgetGallery/main.cpp @@ -55,9 +55,9 @@ int main(int argc, char** argv) auto label2 = GLabel::construct("GLabel 2", main_widget); label2->set_enabled(false); - auto textbox1 = new GTextBox(main_widget); + auto textbox1 = GTextBox::construct(main_widget); textbox1->set_text("GTextBox 1"); - auto textbox2 = new GTextBox(main_widget); + auto textbox2 = GTextBox::construct(main_widget); textbox2->set_text("GTextBox 2"); textbox2->set_enabled(false); diff --git a/DevTools/VisualBuilder/VBPropertiesWindow.cpp b/DevTools/VisualBuilder/VBPropertiesWindow.cpp index 78fceb2ced..76622fd4d8 100644 --- a/DevTools/VisualBuilder/VBPropertiesWindow.cpp +++ b/DevTools/VisualBuilder/VBPropertiesWindow.cpp @@ -33,7 +33,7 @@ public: virtual ObjectPtr create_widget() override { - auto* combo = new GComboBox(nullptr); + auto combo = GComboBox::construct(nullptr); combo->set_only_allow_values_from_model(true); combo->set_model(adopt(*new BoolValuesModel)); combo->on_return_pressed = [this] { commit(); }; diff --git a/Libraries/LibGUI/GComboBox.h b/Libraries/LibGUI/GComboBox.h index 5ac31a636f..7a3a3bf579 100644 --- a/Libraries/LibGUI/GComboBox.h +++ b/Libraries/LibGUI/GComboBox.h @@ -9,7 +9,6 @@ class GTextEditor; class GComboBox : public GWidget { C_OBJECT(GComboBox) public: - explicit GComboBox(GWidget* parent = nullptr); virtual ~GComboBox() override; String text() const; @@ -33,6 +32,7 @@ public: Function on_return_pressed; protected: + explicit GComboBox(GWidget* parent = nullptr); virtual void resize_event(GResizeEvent&) override; private: diff --git a/Libraries/LibGUI/GStackWidget.h b/Libraries/LibGUI/GStackWidget.h index 7474dc012c..c2597c83ae 100644 --- a/Libraries/LibGUI/GStackWidget.h +++ b/Libraries/LibGUI/GStackWidget.h @@ -5,7 +5,6 @@ class GStackWidget : public GWidget { C_OBJECT(GStackWidget) public: - explicit GStackWidget(GWidget* parent); virtual ~GStackWidget() override; GWidget* active_widget() { return m_active_widget.ptr(); } @@ -15,6 +14,7 @@ public: Function on_active_widget_change; protected: + explicit GStackWidget(GWidget* parent); virtual void child_event(CChildEvent&) override; virtual void resize_event(GResizeEvent&) override;