From ca93c22ae2706c35828f913976f35e828157bb01 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 4 Jul 2020 16:52:01 +0200 Subject: LibGUI: Turn GUI::Application::the() into a pointer During app teardown, the Application object may be destroyed before something else, and so having Application::the() return a reference was obscuring the truth about its lifetime. This patch makes the API more honest by returning a pointer. While this makes call sites look a bit more sketchy, do note that the global Application pointer only becomes null during app teardown. --- Applications/HexEditor/HexEditorWidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Applications/HexEditor') diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp index f5c920af9e..eabb7cea67 100644 --- a/Applications/HexEditor/HexEditorWidget.cpp +++ b/Applications/HexEditor/HexEditorWidget.cpp @@ -142,7 +142,7 @@ HexEditorWidget::HexEditorWidget() app_menu.add_action(GUI::CommonActions::make_quit_action([this](auto&) { if (!request_close()) return; - GUI::Application::the().quit(0); + GUI::Application::the()->quit(); })); m_goto_decimal_offset_action = GUI::Action::create("Go To Offset (Decimal)...", { Mod_Ctrl | Mod_Shift, Key_G }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"), [this](const GUI::Action&) { @@ -199,7 +199,7 @@ HexEditorWidget::HexEditorWidget() GUI::AboutDialog::show("Hex Editor", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-hexeditor.png"), window()); })); - GUI::Application::the().set_menubar(move(menubar)); + GUI::Application::the()->set_menubar(move(menubar)); m_editor->set_focus(true); } -- cgit v1.2.3