diff --git a/UI/Qt/BrowserWindow.cpp b/UI/Qt/BrowserWindow.cpp index fc29eb26da..1e9e74a325 100644 --- a/UI/Qt/BrowserWindow.cpp +++ b/UI/Qt/BrowserWindow.cpp @@ -234,6 +234,7 @@ BrowserWindow::BrowserWindow(Vector const& initial_urls, IsPopupWindow : m_tabs_container(new TabWidget(this)) , m_is_popup_window(is_popup_window) { + auto& application = WebView::Application::the(); auto const& browser_options = WebView::Application::browser_options(); setWindowFlag(Qt::FramelessWindowHint, uses_client_side_decorations()); @@ -302,10 +303,10 @@ BrowserWindow::BrowserWindow(Vector const& initial_urls, IsPopupWindow auto* edit_menu = m_hamburger_menu->addMenu("&Edit"); menuBar()->addMenu(edit_menu); - edit_menu->addAction(create_application_action(*this, Application::the().cut_selection_action(), IncludeActionIcon::No)); - edit_menu->addAction(create_application_action(*this, Application::the().copy_selection_action(), IncludeActionIcon::No)); - edit_menu->addAction(create_application_action(*this, Application::the().paste_action(), IncludeActionIcon::No)); - edit_menu->addAction(create_application_action(*this, Application::the().select_all_action(), IncludeActionIcon::No)); + edit_menu->addAction(create_application_action(*this, application.cut_selection_action(), IncludeActionIcon::No)); + edit_menu->addAction(create_application_action(*this, application.copy_selection_action(), IncludeActionIcon::No)); + edit_menu->addAction(create_application_action(*this, application.paste_action(), IncludeActionIcon::No)); + edit_menu->addAction(create_application_action(*this, application.select_all_action(), IncludeActionIcon::No)); edit_menu->addSeparator(); m_find_in_page_action = new QAction("&Find in Page...", this); @@ -329,7 +330,7 @@ BrowserWindow::BrowserWindow(Vector const& initial_urls, IsPopupWindow QObject::connect(m_find_in_page_action, &QAction::triggered, this, &BrowserWindow::show_find_in_page); edit_menu->addSeparator(); - edit_menu->addAction(create_application_action(*edit_menu, Application::the().open_settings_page_action(), IncludeActionIcon::No)); + edit_menu->addAction(create_application_action(*edit_menu, application.open_settings_page_action(), IncludeActionIcon::No)); auto* view_menu = m_hamburger_menu->addMenu("&View"); menuBar()->addMenu(view_menu); @@ -360,12 +361,12 @@ BrowserWindow::BrowserWindow(Vector const& initial_urls, IsPopupWindow view_menu->addSeparator(); - view_menu->addMenu(create_application_menu(*view_menu, Application::the().zoom_menu())); + view_menu->addMenu(create_application_menu(*view_menu, application.zoom_menu())); view_menu->addSeparator(); - view_menu->addMenu(create_application_menu(*view_menu, Application::the().color_scheme_menu())); - view_menu->addMenu(create_application_menu(*view_menu, Application::the().contrast_menu())); - view_menu->addMenu(create_application_menu(*view_menu, Application::the().motion_menu())); + view_menu->addMenu(create_application_menu(*view_menu, application.color_scheme_menu())); + view_menu->addMenu(create_application_menu(*view_menu, application.contrast_menu())); + view_menu->addMenu(create_application_menu(*view_menu, application.motion_menu())); view_menu->addSeparator(); if (show_menubar_option_available()) { @@ -378,22 +379,22 @@ BrowserWindow::BrowserWindow(Vector const& initial_urls, IsPopupWindow }); } - m_bookmarks_menu = create_application_menu(*this, Application::the().bookmarks_menu()); + m_bookmarks_menu = create_application_menu(*this, application.bookmarks_menu()); m_hamburger_menu->addMenu(m_bookmarks_menu); menuBar()->addMenu(m_bookmarks_menu); - auto* inspect_menu = create_application_menu(*m_hamburger_menu, Application::the().inspect_menu()); + auto* inspect_menu = create_application_menu(*m_hamburger_menu, application.inspect_menu()); m_hamburger_menu->addMenu(inspect_menu); menuBar()->addMenu(inspect_menu); - auto* debug_menu = create_application_menu(*m_hamburger_menu, Application::the().debug_menu()); + auto* debug_menu = create_application_menu(*m_hamburger_menu, application.debug_menu()); m_hamburger_menu->addMenu(debug_menu); menuBar()->addMenu(debug_menu); auto* help_menu = m_hamburger_menu->addMenu("&Help"); menuBar()->addMenu(help_menu); - help_menu->addAction(create_application_action(*help_menu, Application::the().open_about_page_action(), IncludeActionIcon::No)); + help_menu->addAction(create_application_action(*help_menu, application.open_about_page_action(), IncludeActionIcon::No)); m_hamburger_menu->addSeparator(); file_menu->addSeparator();