diff options
author | Andreas Kling <kling@serenityos.org> | 2020-02-02 15:07:41 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-02-02 15:15:33 +0100 |
commit | c5bd9d4ed1d80ac91d46146565127b0c185f1b43 (patch) | |
tree | b4ee9ba5999778450f8eb4006df89110617b4a10 /Userland/html.cpp | |
parent | 2d39da5405a4527e91e853ddb1e56a539c96c6c1 (diff) | |
download | serenity-c5bd9d4ed1d80ac91d46146565127b0c185f1b43.zip |
LibGUI: Put all classes in the GUI namespace and remove the leading G
This took me a moment. Welcome to the new world of GUI::Widget! :^)
Diffstat (limited to 'Userland/html.cpp')
-rw-r--r-- | Userland/html.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Userland/html.cpp b/Userland/html.cpp index b32fb2495e..c5cb8a484a 100644 --- a/Userland/html.cpp +++ b/Userland/html.cpp @@ -44,7 +44,7 @@ int main(int argc, char** argv) { - GApplication app(argc, argv); + GUI::Application app(argc, argv); auto f = Core::File::construct(); bool success; @@ -62,7 +62,7 @@ int main(int argc, char** argv) String html = String::copy(f->read_all()); auto document = parse_html_document(html); - auto window = GWindow::construct(); + auto window = GUI::Window::construct(); auto widget = HtmlView::construct(); widget->set_document(document); if (!widget->document()->title().is_null()) @@ -72,17 +72,17 @@ int main(int argc, char** argv) window->set_main_widget(widget); window->show(); - auto menubar = make<GMenuBar>(); + auto menubar = make<GUI::MenuBar>(); - auto app_menu = GMenu::construct("HTML"); - app_menu->add_action(GCommonActions::make_quit_action([&](auto&) { + auto app_menu = GUI::Menu::construct("HTML"); + app_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app.quit(); })); menubar->add_menu(move(app_menu)); - auto help_menu = GMenu::construct("Help"); - help_menu->add_action(GAction::create("About", [&](const GAction&) { - GAboutDialog::show("HTML", GraphicsBitmap::load_from_file("/res/icons/32x32/filetype-html.png"), window); + auto help_menu = GUI::Menu::construct("Help"); + help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) { + GUI::AboutDialog::show("HTML", GraphicsBitmap::load_from_file("/res/icons/32x32/filetype-html.png"), window); })); menubar->add_menu(move(help_menu)); |