RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:47:46 +00:00
Code Issues Activity Actions

AK: Add Retained<T>, like RetainPtr, but never null.

Browse source 
Also use some Clang attribute wizardry to get a warning for use-after-move.
This commit is contained in:
Andreas Kling 2019-02-25 12:43:52 +01:00
parent 0b957ed2b1
commit 2cfcbdc735
31 changed files with 214 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

8
LibGUI/GAction.h
View file

@ -3,20 +3,20 @@
#include <AK/AKString.h>
#include <AK/Function.h>
#include <AK/Retainable.h>
#include <AK/RetainPtr.h>
#include <AK/Retained.h>
#include <SharedGraphics/GraphicsBitmap.h>
class GAction : public Retainable<GAction> {
public:
static RetainPtr<GAction> create(const String& text, Function<void(const GAction&)> callback)
static Retained<GAction> create(const String& text, Function<void(const GAction&)> callback)
{
return adopt(*new GAction(text, move(callback)));
}
static RetainPtr<GAction> create(const String& text, const String& custom_data, Function<void(const GAction&)> callback)
static Retained<GAction> create(const String& text, const String& custom_data, Function<void(const GAction&)> callback)
{
return adopt(*new GAction(text, custom_data, move(callback)));
}
static RetainPtr<GAction> create(const String& text, RetainPtr<GraphicsBitmap>&& icon, Function<void(const GAction&)> callback)
static Retained<GAction> create(const String& text, RetainPtr<GraphicsBitmap>&& icon, Function<void(const GAction&)> callback)
{
return adopt(*new GAction(text, move(icon), move(callback)));
}

3
LibGUI/GToolBar.cpp
View file

@ -18,9 +18,8 @@ GToolBar::~GToolBar()
{
}
void GToolBar::add_action(RetainPtr<GAction>&& action)
void GToolBar::add_action(Retained<GAction>&& action)
{
ASSERT(action);
GAction* raw_action_ptr = action.ptr();
auto item = make<Item>();
item->type = Item::Action;

2
LibGUI/GToolBar.h
View file

@ -9,7 +9,7 @@ public:
explicit GToolBar(GWidget* parent);
virtual ~GToolBar() override;
void add_action(RetainPtr<GAction>&&);
void add_action(Retained<GAction>&&);
void add_separator();
private: