diff --git a/Libraries/LibGUI/GAction.cpp b/Libraries/LibGUI/GAction.cpp index 8d9d023f87..530f553a87 100644 --- a/Libraries/LibGUI/GAction.cpp +++ b/Libraries/LibGUI/GAction.cpp @@ -3,19 +3,13 @@ #include #include -GAction::GAction(const StringView& text, const StringView& custom_data, Function on_activation_callback, GWidget* widget) +GAction::GAction(const StringView& text, Function 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 on_activation_callback, GWidget* widget) - : GAction(text, String(), move(on_activation_callback), widget) -{ -} - GAction::GAction(const StringView& text, RefPtr&& icon, Function on_activation_callback, GWidget* widget) : on_activation(move(on_activation_callback)) , m_text(text) diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h index 1a80737721..021f4fa4c9 100644 --- a/Libraries/LibGUI/GAction.h +++ b/Libraries/LibGUI/GAction.h @@ -27,10 +27,6 @@ public: { return adopt(*new GAction(text, move(callback), widget)); } - static NonnullRefPtr create(const StringView& text, const StringView& custom_data, Function callback, GWidget* widget = nullptr) - { - return adopt(*new GAction(text, custom_data, move(callback), widget)); - } static NonnullRefPtr create(const StringView& text, RefPtr&& icon, Function 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 on_activation; @@ -80,7 +75,6 @@ private: GAction(const StringView& text, const GShortcut&, Function = nullptr, GWidget* = nullptr); GAction(const StringView& text, const GShortcut&, RefPtr&& icon, Function = nullptr, GWidget* = nullptr); GAction(const StringView& text, RefPtr&& icon, Function = nullptr, GWidget* = nullptr); - GAction(const StringView& text, const StringView& custom_data = StringView(), Function = nullptr, GWidget* = nullptr); template 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 m_icon; GShortcut m_shortcut; bool m_enabled { true };