summaryrefslogtreecommitdiff
path: root/Applications/TextEditor
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-07-04 16:52:01 +0200
committerAndreas Kling <kling@serenityos.org>2020-07-04 16:54:55 +0200
commitca93c22ae2706c35828f913976f35e828157bb01 (patch)
tree6daa1e52973d55636634ceb69fc0fe15b6bd50f4 /Applications/TextEditor
parentf7577585a6794228659e5e7b496cddfd8a94b54d (diff)
downloadserenity-ca93c22ae2706c35828f913976f35e828157bb01.zip
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.
Diffstat (limited to 'Applications/TextEditor')
-rw-r--r--Applications/TextEditor/TextEditorWidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp
index 39b339de3c..307e280d6e 100644
--- a/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Applications/TextEditor/TextEditorWidget.cpp
@@ -368,7 +368,7 @@ TextEditorWidget::TextEditorWidget()
app_menu.add_action(GUI::CommonActions::make_quit_action([this](auto&) {
if (!request_close())
return;
- GUI::Application::the().quit(0);
+ GUI::Application::the()->quit();
}));
auto& edit_menu = menubar->add_menu("Edit");
@@ -455,7 +455,7 @@ TextEditorWidget::TextEditorWidget()
GUI::AboutDialog::show("Text Editor", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-texteditor.png"), window());
}));
- GUI::Application::the().set_menubar(move(menubar));
+ GUI::Application::the()->set_menubar(move(menubar));
toolbar.add_action(*m_new_action);
toolbar.add_action(*m_open_action);