فهرست منبع

LibGUI: Convert GToolBar to ObjectPtr

Andreas Kling 5 سال پیش
والد
کامیت
f4531c976c

+ 2 - 2
Applications/FileManager/main.cpp

@@ -48,8 +48,8 @@ int main(int argc, char** argv)
     widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
     widget->layout()->set_spacing(0);
 
-    auto* main_toolbar = new GToolBar(widget);
-    auto* location_toolbar = new GToolBar(widget);
+    auto main_toolbar = GToolBar::construct(widget);
+    auto location_toolbar = GToolBar::construct(widget);
     location_toolbar->layout()->set_margins({ 6, 3, 6, 3 });
     location_toolbar->set_preferred_size(0, 25);
 

+ 1 - 1
Applications/IRCClient/IRCAppWindow.cpp

@@ -160,7 +160,7 @@ void IRCAppWindow::setup_widgets()
     widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
     widget->layout()->set_spacing(0);
 
-    auto* toolbar = new GToolBar(widget);
+    auto toolbar = GToolBar::construct(widget);
     toolbar->set_has_frame(false);
     toolbar->add_action(*m_change_nick_action);
     toolbar->add_separator();

+ 1 - 1
Applications/SystemMonitor/main.cpp

@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     process_table_container->layout()->set_margins({ 4, 0, 4, 4 });
     process_table_container->layout()->set_spacing(0);
 
-    auto* toolbar = new GToolBar(process_table_container);
+    auto toolbar = GToolBar::construct(process_table_container);
     toolbar->set_has_frame(false);
     auto* process_table_view = new ProcessTableView(*cpu_graph, process_table_container);
     auto* memory_stats_widget = new MemoryStatsWidget(*memory_graph, graphs_container);

+ 1 - 1
Applications/TextEditor/TextEditorWidget.cpp

@@ -21,7 +21,7 @@ TextEditorWidget::TextEditorWidget()
     set_layout(make<GBoxLayout>(Orientation::Vertical));
     layout()->set_spacing(0);
 
-    auto* toolbar = new GToolBar(this);
+    auto toolbar = GToolBar::construct(this);
     m_editor = GTextEditor::construct(GTextEditor::MultiLine, this);
     m_editor->set_ruler_visible(true);
     m_editor->set_automatic_indentation_enabled(true);

+ 1 - 1
Libraries/LibGUI/GFilePicker.cpp

@@ -67,7 +67,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
     upper_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
     upper_container->set_preferred_size(0, 26);
 
-    auto* toolbar = new GToolBar(upper_container);
+    auto toolbar = GToolBar::construct(upper_container);
     toolbar->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
     toolbar->set_preferred_size(85, 0);
     toolbar->set_has_frame(false);

+ 4 - 2
Libraries/LibGUI/GToolBar.h

@@ -8,7 +8,6 @@ class GAction;
 class GToolBar : public GWidget {
     C_OBJECT(GToolBar)
 public:
-    explicit GToolBar(GWidget* parent);
     virtual ~GToolBar() override;
 
     void add_action(GAction&);
@@ -17,9 +16,12 @@ public:
     bool has_frame() const { return m_has_frame; }
     void set_has_frame(bool has_frame) { m_has_frame = has_frame; }
 
-private:
+protected:
+    explicit GToolBar(GWidget* parent);
+
     virtual void paint_event(GPaintEvent&) override;
 
+private:
     struct Item {
         enum Type {
             Invalid,