From b0fc8b67d64089587552effbe3b994cdb5967ce5 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Tue, 20 Aug 2024 19:48:41 +0100
Subject: [PATCH] Ladybird/Qt: Rename convert functions to reflect their new
 types

This is a follow up to GH-1111 to reflect the new signatures that these
functions have.
---
 Ladybird/Qt/WebContentView.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Ladybird/Qt/WebContentView.cpp b/Ladybird/Qt/WebContentView.cpp
index 5b97c1d8ba4..2d947293491 100644
--- a/Ladybird/Qt/WebContentView.cpp
+++ b/Ladybird/Qt/WebContentView.cpp
@@ -146,7 +146,7 @@ WebContentView::WebContentView(QWidget* window, RefPtr<WebView::WebContentClient
 
 WebContentView::~WebContentView() = default;
 
-static Web::UIEvents::MouseButton get_button_from_qt_event(Qt::MouseButton button)
+static Web::UIEvents::MouseButton get_button_from_qt_mouse_button(Qt::MouseButton button)
 {
     if (button == Qt::MouseButton::LeftButton)
         return Web::UIEvents::MouseButton::Primary;
@@ -161,7 +161,7 @@ static Web::UIEvents::MouseButton get_button_from_qt_event(Qt::MouseButton butto
     return Web::UIEvents::MouseButton::None;
 }
 
-static Web::UIEvents::MouseButton get_buttons_from_qt_event(Qt::MouseButtons buttons)
+static Web::UIEvents::MouseButton get_buttons_from_qt_mouse_buttons(Qt::MouseButtons buttons)
 {
     auto result = Web::UIEvents::MouseButton::None;
     if (buttons.testFlag(Qt::MouseButton::LeftButton))
@@ -177,7 +177,7 @@ static Web::UIEvents::MouseButton get_buttons_from_qt_event(Qt::MouseButtons but
     return result;
 }
 
-static Web::UIEvents::KeyModifier get_modifiers_from_qt_mouse_event(Qt::KeyboardModifiers modifiers)
+static Web::UIEvents::KeyModifier get_modifiers_from_qt_keyboard_modifiers(Qt::KeyboardModifiers modifiers)
 {
     auto result = Web::UIEvents::KeyModifier::Mod_None;
     if (modifiers.testFlag(Qt::AltModifier))
@@ -189,7 +189,7 @@ static Web::UIEvents::KeyModifier get_modifiers_from_qt_mouse_event(Qt::Keyboard
     return result;
 }
 
-static Web::UIEvents::KeyModifier get_modifiers_from_qt_keyboard_event(QKeyEvent const& event)
+static Web::UIEvents::KeyModifier get_modifiers_from_qt_key_event(QKeyEvent const& event)
 {
     auto modifiers = Web::UIEvents::KeyModifier::Mod_None;
     if (event.modifiers().testFlag(Qt::AltModifier))
@@ -207,7 +207,7 @@ static Web::UIEvents::KeyModifier get_modifiers_from_qt_keyboard_event(QKeyEvent
     return modifiers;
 }
 
-static Web::UIEvents::KeyCode get_keycode_from_qt_keyboard_event(QKeyEvent const& event)
+static Web::UIEvents::KeyCode get_keycode_from_qt_key_event(QKeyEvent const& event)
 {
     struct Mapping {
         constexpr Mapping(Qt::Key q, Web::UIEvents::KeyCode s)
@@ -761,9 +761,9 @@ void WebContentView::enqueue_native_event(Web::MouseEvent::Type type, QSinglePoi
     Web::DevicePixelPoint position = { event.position().x() * m_device_pixel_ratio, event.position().y() * m_device_pixel_ratio };
     auto screen_position = Gfx::IntPoint { event.globalPosition().x() * m_device_pixel_ratio, event.globalPosition().y() * m_device_pixel_ratio };
 
-    auto button = get_button_from_qt_event(event.button());
-    auto buttons = get_buttons_from_qt_event(event.buttons());
-    auto modifiers = get_modifiers_from_qt_mouse_event(event.modifiers());
+    auto button = get_button_from_qt_mouse_button(event.button());
+    auto buttons = get_buttons_from_qt_mouse_buttons(event.buttons());
+    auto modifiers = get_modifiers_from_qt_keyboard_modifiers(event.modifiers());
 
     if (button == 0 && (type == Web::MouseEvent::Type::MouseDown || type == Web::MouseEvent::Type::MouseUp)) {
         // We could not convert Qt buttons to something that LibWeb can recognize - don't even bother propagating this
@@ -813,9 +813,9 @@ void WebContentView::enqueue_native_event(Web::DragEvent::Type type, QDropEvent
     auto global_position = mapToGlobal(event.position());
     auto screen_position = Gfx::IntPoint { global_position.x() * m_device_pixel_ratio, global_position.y() * m_device_pixel_ratio };
 
-    auto button = get_button_from_qt_event(Qt::LeftButton);
-    auto buttons = get_buttons_from_qt_event(event.buttons());
-    auto modifiers = get_modifiers_from_qt_mouse_event(event.modifiers());
+    auto button = get_button_from_qt_mouse_button(Qt::LeftButton);
+    auto buttons = get_buttons_from_qt_mouse_buttons(event.buttons());
+    auto modifiers = get_modifiers_from_qt_keyboard_modifiers(event.modifiers());
 
     Vector<Web::HTML::SelectedFile> files;
     OwnPtr<DragData> chrome_data;
@@ -858,8 +858,8 @@ struct KeyData : Web::ChromeInputData {
 
 void WebContentView::enqueue_native_event(Web::KeyEvent::Type type, QKeyEvent const& event)
 {
-    auto keycode = get_keycode_from_qt_keyboard_event(event);
-    auto modifiers = get_modifiers_from_qt_keyboard_event(event);
+    auto keycode = get_keycode_from_qt_key_event(event);
+    auto modifiers = get_modifiers_from_qt_key_event(event);
 
     auto text = event.text();
     auto code_point = text.isEmpty() ? 0u : event.text()[0].unicode();