Przeglądaj źródła

LibGUI: Convert GComboBox to ObjectPtr

Andreas Kling 5 lat temu
rodzic
commit
e4e92980a1

+ 2 - 2
Applications/DisplayProperties/DisplayProperties.cpp

@@ -103,7 +103,7 @@ void DisplayPropertiesWidget::create_frame()
 
     m_wallpaper_preview = GLabel::construct(background_splitter);
 
-    auto* wallpaper_list = new GListView(background_content);
+    auto wallpaper_list = GListView::construct(background_content);
     wallpaper_list->set_background_color(Color::White);
     wallpaper_list->set_model(*ItemListModel<AK::String>::create(m_wallpapers));
     wallpaper_list->horizontal_scrollbar().set_visible(false);
@@ -124,7 +124,7 @@ void DisplayPropertiesWidget::create_frame()
     settings_content->set_layout(make<GBoxLayout>(Orientation::Vertical));
     settings_content->layout()->set_margins({ 4, 4, 4, 4 });
 
-    auto* resolution_list = new GListView(settings_content);
+    auto resolution_list = GListView::construct(settings_content);
     resolution_list->set_background_color(Color::White);
     resolution_list->set_model(*ItemListModel<Size>::create(m_resolutions));
     resolution_list->horizontal_scrollbar().set_visible(false);

+ 1 - 1
Libraries/LibGUI/GComboBox.cpp

@@ -33,7 +33,7 @@ GComboBox::GComboBox(GWidget* parent)
     m_list_window->set_window_type(GWindowType::Tooltip);
     m_list_window->set_should_destroy_on_close(false);
 
-    m_list_view = new GListView(nullptr);
+    m_list_view = GListView::construct(nullptr);
     m_list_view->horizontal_scrollbar().set_visible(false);
     m_list_window->set_main_widget(m_list_view);
 

+ 1 - 1
Libraries/LibGUI/GComboBox.h

@@ -39,6 +39,6 @@ private:
     ObjectPtr<GTextEditor> m_editor;
     GButton* m_open_button { nullptr };
     GWindow* m_list_window { nullptr };
-    GListView* m_list_view { nullptr };
+    ObjectPtr<GListView> m_list_view;
     bool m_only_allow_values_from_model { false };
 };