diff options
| -rw-r--r-- | Libraries/LibGUI/AbstractTableView.cpp | 3 | ||||
| -rw-r--r-- | Libraries/LibGUI/Action.h | 34 |
2 files changed, 19 insertions, 18 deletions
diff --git a/Libraries/LibGUI/AbstractTableView.cpp b/Libraries/LibGUI/AbstractTableView.cpp index bea23dfe71..cb180241ce 100644 --- a/Libraries/LibGUI/AbstractTableView.cpp +++ b/Libraries/LibGUI/AbstractTableView.cpp @@ -25,12 +25,13 @@ */ #include <AK/StringBuilder.h> -#include <LibGfx/Palette.h> #include <LibGUI/AbstractTableView.h> #include <LibGUI/Action.h> #include <LibGUI/Menu.h> #include <LibGUI/Painter.h> #include <LibGUI/ScrollBar.h> +#include <LibGUI/Window.h> +#include <LibGfx/Palette.h> namespace GUI { diff --git a/Libraries/LibGUI/Action.h b/Libraries/LibGUI/Action.h index ba1688c0e9..2d3f899ece 100644 --- a/Libraries/LibGUI/Action.h +++ b/Libraries/LibGUI/Action.h @@ -34,9 +34,9 @@ #include <AK/String.h> #include <AK/WeakPtr.h> #include <AK/Weakable.h> -#include <LibGfx/Forward.h> +#include <LibCore/Object.h> #include <LibGUI/Shortcut.h> -#include <LibGUI/Window.h> +#include <LibGfx/Forward.h> namespace GUI { @@ -46,21 +46,21 @@ class Button; class MenuItem; namespace CommonActions { -NonnullRefPtr<Action> make_open_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_undo_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_redo_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_cut_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_copy_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_paste_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_delete_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_move_to_front_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_move_to_back_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_fullscreen_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_quit_action(Function<void(Action&)>); -NonnullRefPtr<Action> make_go_back_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_go_forward_action(Function<void(Action&)>, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_go_home_action(Function<void(Action&)> callback, Core::Object* parent = nullptr); -NonnullRefPtr<Action> make_reload_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_open_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_undo_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_redo_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_cut_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_copy_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_paste_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_delete_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_move_to_front_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_move_to_back_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_fullscreen_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_quit_action(Function<void(Action&)>); + NonnullRefPtr<Action> make_go_back_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_go_forward_action(Function<void(Action&)>, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_go_home_action(Function<void(Action&)> callback, Core::Object* parent = nullptr); + NonnullRefPtr<Action> make_reload_action(Function<void(Action&)>, Core::Object* parent = nullptr); }; class Action final : public Core::Object { |