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

GAction: Remove "custom_data" and the related convenience constructors.

Browse source 
This mechanism was never actually used, just something I imagined would be
useful while I was first creating the class.
This commit is contained in:
Andreas Kling 2019-07-09 21:28:52 +02:00
parent fe69b326e9
commit 2ae0333f5d
2 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibGUI/GAction.cpp
View file

@ -3,19 +3,13 @@
#include <LibGUI/GButton.h>
#include <LibGUI/GMenuItem.h>
GAction::GAction(const StringView& text, const StringView& custom_data, Function<void(GAction&)> on_activation_callback, GWidget* widget)
GAction::GAction(const StringView& text, Function<void(GAction&)> on_activation_callback, GWidget* widget)
: on_activation(move(on_activation_callback))
, m_text(text)
, m_custom_data(custom_data)
, m_widget(widget ? widget->make_weak_ptr() : nullptr)
{
}
GAction::GAction(const StringView& text, Function<void(GAction&)> on_activation_callback, GWidget* widget)
: GAction(text, String(), move(on_activation_callback), widget)
{
}
GAction::GAction(const StringView& text, RefPtr<GraphicsBitmap>&& icon, Function<void(GAction&)> on_activation_callback, GWidget* widget)
: on_activation(move(on_activation_callback))
, m_text(text)

7
Libraries/LibGUI/GAction.h
View file

@ -27,10 +27,6 @@ public:
{
return adopt(*new GAction(text, move(callback), widget));
}
static NonnullRefPtr<GAction> create(const StringView& text, const StringView& custom_data, Function<void(GAction&)> callback, GWidget* widget = nullptr)
{
return adopt(*new GAction(text, custom_data, move(callback), widget));
}
static NonnullRefPtr<GAction> create(const StringView& text, RefPtr<GraphicsBitmap>&& icon, Function<void(GAction&)> callback, GWidget* widget = nullptr)
{
return adopt(*new GAction(text, move(icon), move(callback), widget));
@ -50,7 +46,6 @@ public:
String text() const { return m_text; }
GShortcut shortcut() const { return m_shortcut; }
String custom_data() const { return m_custom_data; }
const GraphicsBitmap* icon() const { return m_icon.ptr(); }
Function<void(GAction&)> on_activation;
@ -80,7 +75,6 @@ private:
GAction(const StringView& text, const GShortcut&, Function<void(GAction&)> = nullptr, GWidget* = nullptr);
GAction(const StringView& text, const GShortcut&, RefPtr<GraphicsBitmap>&& icon, Function<void(GAction&)> = nullptr, GWidget* = nullptr);
GAction(const StringView& text, RefPtr<GraphicsBitmap>&& icon, Function<void(GAction&)> = nullptr, GWidget* = nullptr);
GAction(const StringView& text, const StringView& custom_data = StringView(), Function<void(GAction&)> = nullptr, GWidget* = nullptr);
template<typename Callback>
void for_each_toolbar_button(Callback);
@ -88,7 +82,6 @@ private:
void for_each_menu_item(Callback);
String m_text;
String m_custom_data;
RefPtr<GraphicsBitmap> m_icon;
GShortcut m_shortcut;
bool m_enabled { true };