From 7faf878e0adbd37bd8b52867e57997628006f60b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 11 Jul 2019 15:55:54 +0200 Subject: [PATCH] GToolBar: Make add_action() take a GAction& instead of NonnullRefPtr&&. There's very little reason to take NonnullRefPtr&& in arguments really. You can avoid ref-count churn in the cases where ownership is transferred from the caller to the callee, but that's a pretty unusual situation and not worth optimizing for at this stage. --- Libraries/LibGUI/GToolBar.cpp | 9 ++++----- Libraries/LibGUI/GToolBar.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Libraries/LibGUI/GToolBar.cpp b/Libraries/LibGUI/GToolBar.cpp index 761953e828..75b88bc97a 100644 --- a/Libraries/LibGUI/GToolBar.cpp +++ b/Libraries/LibGUI/GToolBar.cpp @@ -18,12 +18,11 @@ GToolBar::~GToolBar() { } -void GToolBar::add_action(NonnullRefPtr&& action) +void GToolBar::add_action(GAction& action) { - GAction* raw_action_ptr = action.ptr(); auto item = make(); item->type = Item::Action; - item->action = move(action); + item->action = action; auto* button = new GButton(this); button->set_action(*item->action); @@ -32,8 +31,8 @@ void GToolBar::add_action(NonnullRefPtr&& action) button->set_icon(item->action->icon()); else button->set_text(item->action->text()); - button->on_click = [raw_action_ptr](const GButton&) { - raw_action_ptr->activate(); + button->on_click = [&action](const GButton&) { + action.activate(); }; button->set_button_style(ButtonStyle::CoolBar); diff --git a/Libraries/LibGUI/GToolBar.h b/Libraries/LibGUI/GToolBar.h index 375734e586..bff3f9a49e 100644 --- a/Libraries/LibGUI/GToolBar.h +++ b/Libraries/LibGUI/GToolBar.h @@ -9,7 +9,7 @@ public: explicit GToolBar(GWidget* parent); virtual ~GToolBar() override; - void add_action(NonnullRefPtr&&); + void add_action(GAction&); void add_separator(); bool has_frame() const { return m_has_frame; }