From c8c3d00615f23e19502327888ac6c1e883651dd6 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 23 Oct 2023 16:35:55 -0400 Subject: [PATCH] LibWebView: Rename find_search_engine to find_search_engine_by_name We will also need to search by URL in the Serenity chrome. --- Ladybird/AppKit/Application/ApplicationDelegate.mm | 2 +- Ladybird/Qt/Settings.cpp | 2 +- Userland/Libraries/LibWebView/SearchEngine.cpp | 4 ++-- Userland/Libraries/LibWebView/SearchEngine.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Ladybird/AppKit/Application/ApplicationDelegate.mm b/Ladybird/AppKit/Application/ApplicationDelegate.mm index 6eca9e3df9..c604b52cb1 100644 --- a/Ladybird/AppKit/Application/ApplicationDelegate.mm +++ b/Ladybird/AppKit/Application/ApplicationDelegate.mm @@ -207,7 +207,7 @@ auto* item = (NSMenuItem*)sender; auto title = Ladybird::ns_string_to_string([item title]); - if (auto search_engine = WebView::find_search_engine(title); search_engine.has_value()) + if (auto search_engine = WebView::find_search_engine_by_name(title); search_engine.has_value()) m_search_engine = search_engine.release_value(); else m_search_engine = WebView::default_search_engine(); diff --git a/Ladybird/Qt/Settings.cpp b/Ladybird/Qt/Settings.cpp index fceccb8bfd..b59e6492ec 100644 --- a/Ladybird/Qt/Settings.cpp +++ b/Ladybird/Qt/Settings.cpp @@ -38,7 +38,7 @@ Settings::Settings() auto default_search_engine_name = qstring_from_ak_deprecated_string(default_search_engine.name); auto search_engine_name = m_qsettings->value("search_engine_name", default_search_engine_name).toString(); - auto search_engine = WebView::find_search_engine(MUST(ak_string_from_qstring(search_engine_name))); + auto search_engine = WebView::find_search_engine_by_name(MUST(ak_string_from_qstring(search_engine_name))); if (search_engine.has_value()) m_search_engine = search_engine.release_value(); diff --git a/Userland/Libraries/LibWebView/SearchEngine.cpp b/Userland/Libraries/LibWebView/SearchEngine.cpp index 34ebb0ede4..ca461dbd1a 100644 --- a/Userland/Libraries/LibWebView/SearchEngine.cpp +++ b/Userland/Libraries/LibWebView/SearchEngine.cpp @@ -27,13 +27,13 @@ ReadonlySpan search_engines() SearchEngine const& default_search_engine() { - static auto default_engine = find_search_engine("Google"sv); + static auto default_engine = find_search_engine_by_name("Google"sv); VERIFY(default_engine.has_value()); return *default_engine; } -Optional find_search_engine(StringView name) +Optional find_search_engine_by_name(StringView name) { auto it = AK::find_if(builtin_search_engines.begin(), builtin_search_engines.end(), [&](auto const& engine) { diff --git a/Userland/Libraries/LibWebView/SearchEngine.h b/Userland/Libraries/LibWebView/SearchEngine.h index 0a6ab6a5f0..ff8daaa95e 100644 --- a/Userland/Libraries/LibWebView/SearchEngine.h +++ b/Userland/Libraries/LibWebView/SearchEngine.h @@ -18,6 +18,6 @@ struct SearchEngine { ReadonlySpan search_engines(); SearchEngine const& default_search_engine(); -Optional find_search_engine(StringView name); +Optional find_search_engine_by_name(StringView name); }