RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:07:35 +00:00
Code Issues Activity Actions

LibGUI: Make GUI::Application a Core::Object

Browse source 
Having this on the stack makes whole-program teardown iffy. Turning it
into a Core::Object allows anyone who needs it to extends its lifetime.
This commit is contained in:
Andreas Kling 2020-07-04 14:05:19 +02:00
parent 0d577ab781
commit 1dd1595043
51 changed files with 140 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

8
DevTools/HackStudio/main.cpp
View file

@ -160,7 +160,7 @@ int main(int argc, char** argv)
return 1;
}
GUI::Application app(argc, argv);
auto app = GUI::Application::construct(argc, argv);
if (pledge("stdio tty accept rpath cpath wpath shared_buffer proc exec fattr thread", nullptr) < 0) {
perror("pledge");
@ -525,7 +525,7 @@ int main(int argc, char** argv)
app_menu.add_action(save_action);
app_menu.add_separator();
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
app.quit();
app->quit();
}));
auto& project_menu = menubar->add_menu("Project");
@ -664,7 +664,7 @@ int main(int argc, char** argv)
GUI::AboutDialog::show("HackStudio", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-hack-studio.png"), g_window);
}));
app.set_menubar(move(menubar));
app->set_menubar(move(menubar));
g_window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-hack-studio.png"));
@ -691,7 +691,7 @@ int main(int argc, char** argv)
open_file(g_project->default_file());
update_actions();
return app.exec();
return app->exec();
}
void build(TerminalWrapper& wrapper)

4
DevTools/Inspector/main.cpp
View file

@ -71,7 +71,7 @@ int main(int argc, char** argv)
pid_t pid = pid_opt.value();
GUI::Application app(argc, argv);
auto app = GUI::Application::construct(argc, argv);
auto window = GUI::Window::construct();
window->set_title("Inspector");
@ -114,5 +114,5 @@ int main(int argc, char** argv)
return 1;
}
return app.exec();
return app->exec();
}

8
DevTools/Profiler/main.cpp
View file

@ -58,7 +58,7 @@ int main(int argc, char** argv)
args_parser.add_option(pid, "PID to profile", "pid", 'p', "PID");
args_parser.parse(argc, argv, false);
GUI::Application app(argc, argv);
auto app = GUI::Application::construct(argc, argv);
const char* path = nullptr;
if (argc != 2) {
@ -101,7 +101,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Profiler");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app.quit(); }));
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& view_menu = menubar->add_menu("View");
auto invert_action = GUI::Action::create_checkable("Invert tree", { Mod_Ctrl, Key_I }, [&](auto& action) {
@ -118,10 +118,10 @@ int main(int argc, char** argv)
percent_action->set_checked(false);
view_menu.add_action(percent_action);
app.set_menubar(move(menubar));
app->set_menubar(move(menubar));
window->show();
return app.exec();
return app->exec();
}
bool prompt_to_stop_profiling()

6
DevTools/VisualBuilder/main.cpp
View file

@ -47,7 +47,7 @@ static RefPtr<GUI::Window> make_toolbox_window();
int main(int argc, char** argv)
{
GUI::Application app(argc, argv);
auto app = GUI::Application::construct(argc, argv);
auto propbox = VBPropertiesWindow::construct();
@ -83,7 +83,7 @@ int main(int argc, char** argv)
GUI::AboutDialog::show("Visual Builder", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-visual-builder.png"), window);
}));
app.set_menubar(move(menubar));
app->set_menubar(move(menubar));
auto toolbox = make_toolbox_window();
toolbox->show();
@ -94,7 +94,7 @@ int main(int argc, char** argv)
form1->load_from_file(argv[1]);
}
return app.exec();
return app->exec();
}
RefPtr<GUI::Window> make_toolbox_window()