From 88ccaae11e8d4863211e8cf3ea7ef48078d1fbe8 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Wed, 2 Aug 2023 12:01:17 -0600 Subject: [PATCH] Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt. --- ...ginLadybird.cpp => AudioCodecPluginQt.cpp} | 20 +++++++++---------- ...cPluginLadybird.h => AudioCodecPluginQt.h} | 8 ++++---- ...{FontPluginLadybird.cpp => FontPlugin.cpp} | 14 ++++++------- .../{FontPluginLadybird.h => FontPlugin.h} | 6 +++--- ...luginLadybird.cpp => ImageCodecPlugin.cpp} | 6 +++--- ...decPluginLadybird.h => ImageCodecPlugin.h} | 6 +++--- Ladybird/WebContent/CMakeLists.txt | 10 +++++----- Ladybird/WebContent/main.cpp | 16 +++++++-------- ...ybird.cpp => WebSocketClientManagerQt.cpp} | 16 +++++++-------- ...rLadybird.h => WebSocketClientManagerQt.h} | 8 ++++---- ...{WebSocketLadybird.cpp => WebSocketQt.cpp} | 20 +++++++++---------- .../{WebSocketLadybird.h => WebSocketQt.h} | 10 +++++----- .../gn/secondary/Ladybird/WebContent/BUILD.gn | 12 +++++------ 13 files changed, 76 insertions(+), 76 deletions(-) rename Ladybird/{AudioCodecPluginLadybird.cpp => AudioCodecPluginQt.cpp} (68%) rename Ladybird/{AudioCodecPluginLadybird.h => AudioCodecPluginQt.h} (74%) rename Ladybird/{FontPluginLadybird.cpp => FontPlugin.cpp} (92%) rename Ladybird/{FontPluginLadybird.h => FontPlugin.h} (81%) rename Ladybird/{ImageCodecPluginLadybird.cpp => ImageCodecPlugin.cpp} (82%) rename Ladybird/{ImageCodecPluginLadybird.h => ImageCodecPlugin.h} (67%) rename Ladybird/{WebSocketClientManagerLadybird.cpp => WebSocketClientManagerQt.cpp} (52%) rename Ladybird/{WebSocketClientManagerLadybird.h => WebSocketClientManagerQt.h} (68%) rename Ladybird/{WebSocketLadybird.cpp => WebSocketQt.cpp} (80%) rename Ladybird/{WebSocketLadybird.h => WebSocketQt.h} (73%) diff --git a/Ladybird/AudioCodecPluginLadybird.cpp b/Ladybird/AudioCodecPluginQt.cpp similarity index 68% rename from Ladybird/AudioCodecPluginLadybird.cpp rename to Ladybird/AudioCodecPluginQt.cpp index e10a7ea418d..41725eb51fa 100644 --- a/Ladybird/AudioCodecPluginLadybird.cpp +++ b/Ladybird/AudioCodecPluginQt.cpp @@ -4,21 +4,21 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AudioCodecPluginLadybird.h" +#include "AudioCodecPluginQt.h" #include "AudioThread.h" #include namespace Ladybird { -ErrorOr> AudioCodecPluginLadybird::create(NonnullRefPtr loader) +ErrorOr> AudioCodecPluginQt::create(NonnullRefPtr loader) { auto audio_thread = TRY(AudioThread::create(move(loader))); audio_thread->start(); - return adopt_nonnull_own_or_enomem(new (nothrow) AudioCodecPluginLadybird(move(audio_thread))); + return adopt_nonnull_own_or_enomem(new (nothrow) AudioCodecPluginQt(move(audio_thread))); } -AudioCodecPluginLadybird::AudioCodecPluginLadybird(NonnullOwnPtr audio_thread) +AudioCodecPluginQt::AudioCodecPluginQt(NonnullOwnPtr audio_thread) : m_audio_thread(move(audio_thread)) { connect(m_audio_thread, &AudioThread::playback_position_updated, this, [this](auto position) { @@ -27,22 +27,22 @@ AudioCodecPluginLadybird::AudioCodecPluginLadybird(NonnullOwnPtr au }); } -AudioCodecPluginLadybird::~AudioCodecPluginLadybird() +AudioCodecPluginQt::~AudioCodecPluginQt() { m_audio_thread->stop().release_value_but_fixme_should_propagate_errors(); } -void AudioCodecPluginLadybird::resume_playback() +void AudioCodecPluginQt::resume_playback() { m_audio_thread->queue_task({ AudioTask::Type::Play }).release_value_but_fixme_should_propagate_errors(); } -void AudioCodecPluginLadybird::pause_playback() +void AudioCodecPluginQt::pause_playback() { m_audio_thread->queue_task({ AudioTask::Type::Pause }).release_value_but_fixme_should_propagate_errors(); } -void AudioCodecPluginLadybird::set_volume(double volume) +void AudioCodecPluginQt::set_volume(double volume) { AudioTask task { AudioTask::Type::Volume }; @@ -51,7 +51,7 @@ void AudioCodecPluginLadybird::set_volume(double volume) m_audio_thread->queue_task(move(task)).release_value_but_fixme_should_propagate_errors(); } -void AudioCodecPluginLadybird::seek(double position) +void AudioCodecPluginQt::seek(double position) { AudioTask task { AudioTask::Type::Seek }; task.data = position; @@ -59,7 +59,7 @@ void AudioCodecPluginLadybird::seek(double position) m_audio_thread->queue_task(move(task)).release_value_but_fixme_should_propagate_errors(); } -Duration AudioCodecPluginLadybird::duration() +Duration AudioCodecPluginQt::duration() { return m_audio_thread->duration(); } diff --git a/Ladybird/AudioCodecPluginLadybird.h b/Ladybird/AudioCodecPluginQt.h similarity index 74% rename from Ladybird/AudioCodecPluginLadybird.h rename to Ladybird/AudioCodecPluginQt.h index 207f466be70..5ee813ec1b9 100644 --- a/Ladybird/AudioCodecPluginLadybird.h +++ b/Ladybird/AudioCodecPluginQt.h @@ -17,14 +17,14 @@ namespace Ladybird { class AudioThread; -class AudioCodecPluginLadybird final +class AudioCodecPluginQt final : public QObject , public Web::Platform::AudioCodecPlugin { Q_OBJECT public: - static ErrorOr> create(NonnullRefPtr); - virtual ~AudioCodecPluginLadybird() override; + static ErrorOr> create(NonnullRefPtr); + virtual ~AudioCodecPluginQt() override; virtual void resume_playback() override; virtual void pause_playback() override; @@ -34,7 +34,7 @@ public: virtual Duration duration() override; private: - explicit AudioCodecPluginLadybird(NonnullOwnPtr); + explicit AudioCodecPluginQt(NonnullOwnPtr); NonnullOwnPtr m_audio_thread; }; diff --git a/Ladybird/FontPluginLadybird.cpp b/Ladybird/FontPlugin.cpp similarity index 92% rename from Ladybird/FontPluginLadybird.cpp rename to Ladybird/FontPlugin.cpp index 3114b50d11f..6488ae544ca 100644 --- a/Ladybird/FontPluginLadybird.cpp +++ b/Ladybird/FontPlugin.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "FontPluginLadybird.h" +#include "FontPlugin.h" #include #include #include @@ -16,7 +16,7 @@ extern DeprecatedString s_serenity_resource_root; namespace Ladybird { -FontPluginLadybird::FontPluginLadybird(bool is_layout_test_mode) +FontPlugin::FontPlugin(bool is_layout_test_mode) : m_is_layout_test_mode(is_layout_test_mode) { // Load the default SerenityOS fonts... @@ -42,19 +42,19 @@ FontPluginLadybird::FontPluginLadybird(bool is_layout_test_mode) VERIFY(m_default_fixed_width_font); } -FontPluginLadybird::~FontPluginLadybird() = default; +FontPlugin::~FontPlugin() = default; -Gfx::Font& FontPluginLadybird::default_font() +Gfx::Font& FontPlugin::default_font() { return *m_default_font; } -Gfx::Font& FontPluginLadybird::default_fixed_width_font() +Gfx::Font& FontPlugin::default_fixed_width_font() { return *m_default_fixed_width_font; } -void FontPluginLadybird::update_generic_fonts() +void FontPlugin::update_generic_fonts() { // How we choose which system font to use for each CSS font: // 1. Try a list of known-suitable fonts with their names hard-coded below. @@ -109,7 +109,7 @@ void FontPluginLadybird::update_generic_fonts() update_mapping(Web::Platform::GenericFont::UiSerif, serif_fallbacks); } -DeprecatedString FontPluginLadybird::generic_font_name(Web::Platform::GenericFont generic_font) +DeprecatedString FontPlugin::generic_font_name(Web::Platform::GenericFont generic_font) { return m_generic_font_names[static_cast(generic_font)]; } diff --git a/Ladybird/FontPluginLadybird.h b/Ladybird/FontPlugin.h similarity index 81% rename from Ladybird/FontPluginLadybird.h rename to Ladybird/FontPlugin.h index 1f28f7f47a5..cfb09faa11c 100644 --- a/Ladybird/FontPluginLadybird.h +++ b/Ladybird/FontPlugin.h @@ -12,10 +12,10 @@ namespace Ladybird { -class FontPluginLadybird final : public Web::Platform::FontPlugin { +class FontPlugin final : public Web::Platform::FontPlugin { public: - FontPluginLadybird(bool is_layout_test_mode); - virtual ~FontPluginLadybird(); + FontPlugin(bool is_layout_test_mode); + virtual ~FontPlugin(); virtual Gfx::Font& default_font() override; virtual Gfx::Font& default_fixed_width_font() override; diff --git a/Ladybird/ImageCodecPluginLadybird.cpp b/Ladybird/ImageCodecPlugin.cpp similarity index 82% rename from Ladybird/ImageCodecPluginLadybird.cpp rename to Ladybird/ImageCodecPlugin.cpp index 1c1213a14e0..ba6414f504f 100644 --- a/Ladybird/ImageCodecPluginLadybird.cpp +++ b/Ladybird/ImageCodecPlugin.cpp @@ -5,15 +5,15 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "ImageCodecPluginLadybird.h" +#include "ImageCodecPlugin.h" #include #include namespace Ladybird { -ImageCodecPluginLadybird::~ImageCodecPluginLadybird() = default; +ImageCodecPlugin::~ImageCodecPlugin() = default; -Optional ImageCodecPluginLadybird::decode_image(ReadonlyBytes data) +Optional ImageCodecPlugin::decode_image(ReadonlyBytes data) { auto decoder = Gfx::ImageDecoder::try_create_for_raw_bytes(data); diff --git a/Ladybird/ImageCodecPluginLadybird.h b/Ladybird/ImageCodecPlugin.h similarity index 67% rename from Ladybird/ImageCodecPluginLadybird.h rename to Ladybird/ImageCodecPlugin.h index ae2e49ee39b..4637fb6ce6d 100644 --- a/Ladybird/ImageCodecPluginLadybird.h +++ b/Ladybird/ImageCodecPlugin.h @@ -11,10 +11,10 @@ namespace Ladybird { -class ImageCodecPluginLadybird final : public Web::Platform::ImageCodecPlugin { +class ImageCodecPlugin final : public Web::Platform::ImageCodecPlugin { public: - ImageCodecPluginLadybird() = default; - virtual ~ImageCodecPluginLadybird() override; + ImageCodecPlugin() = default; + virtual ~ImageCodecPlugin() override; virtual Optional decode_image(ReadonlyBytes data) override; }; diff --git a/Ladybird/WebContent/CMakeLists.txt b/Ladybird/WebContent/CMakeLists.txt index 017016c4248..e9bf7d4d474 100644 --- a/Ladybird/WebContent/CMakeLists.txt +++ b/Ladybird/WebContent/CMakeLists.txt @@ -6,16 +6,16 @@ set(WEBCONTENT_SOURCES ${WEBCONTENT_SOURCE_DIR}/PageHost.cpp ${WEBCONTENT_SOURCE_DIR}/WebContentConsoleClient.cpp ${WEBCONTENT_SOURCE_DIR}/WebDriverConnection.cpp - ../AudioCodecPluginLadybird.cpp + ../AudioCodecPluginQt.cpp ../AudioThread.cpp ../EventLoopImplementationQt.cpp - ../FontPluginLadybird.cpp + ../FontPlugin.cpp ../HelperProcess.cpp - ../ImageCodecPluginLadybird.cpp + ../ImageCodecPlugin.cpp ../RequestManagerQt.cpp ../Utilities.cpp - ../WebSocketClientManagerLadybird.cpp - ../WebSocketLadybird.cpp + ../WebSocketClientManagerQt.cpp + ../WebSocketQt.cpp ../WebSocketImplQt.cpp main.cpp ) diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index 1be9cd931df..fd7327eda1b 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -4,14 +4,14 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "../AudioCodecPluginLadybird.h" +#include "../AudioCodecPluginQt.h" #include "../EventLoopImplementationQt.h" -#include "../FontPluginLadybird.h" +#include "../FontPlugin.h" #include "../HelperProcess.h" -#include "../ImageCodecPluginLadybird.h" +#include "../ImageCodecPlugin.h" #include "../RequestManagerQt.h" #include "../Utilities.h" -#include "../WebSocketClientManagerLadybird.h" +#include "../WebSocketClientManagerQt.h" #include #include #include @@ -50,13 +50,13 @@ ErrorOr serenity_main(Main::Arguments arguments) platform_init(); Web::Platform::EventLoopPlugin::install(*new Web::Platform::EventLoopPluginSerenity); - Web::Platform::ImageCodecPlugin::install(*new Ladybird::ImageCodecPluginLadybird); + Web::Platform::ImageCodecPlugin::install(*new Ladybird::ImageCodecPlugin); Web::Platform::AudioCodecPlugin::install_creation_hook([](auto loader) { - return Ladybird::AudioCodecPluginLadybird::create(move(loader)); + return Ladybird::AudioCodecPluginQt::create(move(loader)); }); - Web::WebSockets::WebSocketClientManager::initialize(Ladybird::WebSocketClientManagerLadybird::create()); + Web::WebSockets::WebSocketClientManager::initialize(Ladybird::WebSocketClientManagerQt::create()); Web::FrameLoader::set_default_favicon_path(DeprecatedString::formatted("{}/res/icons/16x16/app-browser.png", s_serenity_resource_root)); @@ -84,7 +84,7 @@ ErrorOr serenity_main(Main::Arguments arguments) VERIFY(webcontent_fd_passing_socket >= 0); - Web::Platform::FontPlugin::install(*new Ladybird::FontPluginLadybird(is_layout_test_mode)); + Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode)); Web::FrameLoader::set_error_page_url(DeprecatedString::formatted("file://{}/res/html/error.html", s_serenity_resource_root)); diff --git a/Ladybird/WebSocketClientManagerLadybird.cpp b/Ladybird/WebSocketClientManagerQt.cpp similarity index 52% rename from Ladybird/WebSocketClientManagerLadybird.cpp rename to Ladybird/WebSocketClientManagerQt.cpp index 79edc4e2cd2..da02babcfc2 100644 --- a/Ladybird/WebSocketClientManagerLadybird.cpp +++ b/Ladybird/WebSocketClientManagerQt.cpp @@ -5,21 +5,21 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "WebSocketClientManagerLadybird.h" +#include "WebSocketClientManagerQt.h" #include "WebSocketImplQt.h" -#include "WebSocketLadybird.h" +#include "WebSocketQt.h" namespace Ladybird { -NonnullRefPtr WebSocketClientManagerLadybird::create() +NonnullRefPtr WebSocketClientManagerQt::create() { - return adopt_ref(*new WebSocketClientManagerLadybird()); + return adopt_ref(*new WebSocketClientManagerQt()); } -WebSocketClientManagerLadybird::WebSocketClientManagerLadybird() = default; -WebSocketClientManagerLadybird::~WebSocketClientManagerLadybird() = default; +WebSocketClientManagerQt::WebSocketClientManagerQt() = default; +WebSocketClientManagerQt::~WebSocketClientManagerQt() = default; -RefPtr WebSocketClientManagerLadybird::connect(AK::URL const& url, DeprecatedString const& origin, Vector const& protocols) +RefPtr WebSocketClientManagerQt::connect(AK::URL const& url, DeprecatedString const& origin, Vector const& protocols) { WebSocket::ConnectionInfo connection_info(url); connection_info.set_origin(origin); @@ -28,7 +28,7 @@ RefPtr WebSocketClientManagerLadybird::c auto impl = adopt_ref(*new WebSocketImplQt); auto web_socket = WebSocket::WebSocket::create(move(connection_info), move(impl)); web_socket->start(); - return WebSocketLadybird::create(web_socket); + return WebSocketQt::create(web_socket); } } diff --git a/Ladybird/WebSocketClientManagerLadybird.h b/Ladybird/WebSocketClientManagerQt.h similarity index 68% rename from Ladybird/WebSocketClientManagerLadybird.h rename to Ladybird/WebSocketClientManagerQt.h index a0831d28b0c..54014036be1 100644 --- a/Ladybird/WebSocketClientManagerLadybird.h +++ b/Ladybird/WebSocketClientManagerQt.h @@ -14,15 +14,15 @@ namespace Ladybird { -class WebSocketClientManagerLadybird : public Web::WebSockets::WebSocketClientManager { +class WebSocketClientManagerQt : public Web::WebSockets::WebSocketClientManager { public: - static NonnullRefPtr create(); + static NonnullRefPtr create(); - virtual ~WebSocketClientManagerLadybird() override; + virtual ~WebSocketClientManagerQt() override; virtual RefPtr connect(AK::URL const&, DeprecatedString const& origin, Vector const& protocols) override; private: - WebSocketClientManagerLadybird(); + WebSocketClientManagerQt(); }; } diff --git a/Ladybird/WebSocketLadybird.cpp b/Ladybird/WebSocketQt.cpp similarity index 80% rename from Ladybird/WebSocketLadybird.cpp rename to Ladybird/WebSocketQt.cpp index e11930def67..751a52ae7ea 100644 --- a/Ladybird/WebSocketLadybird.cpp +++ b/Ladybird/WebSocketQt.cpp @@ -5,16 +5,16 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "WebSocketLadybird.h" +#include "WebSocketQt.h" namespace Ladybird { -NonnullRefPtr WebSocketLadybird::create(NonnullRefPtr underlying_socket) +NonnullRefPtr WebSocketQt::create(NonnullRefPtr underlying_socket) { - return adopt_ref(*new WebSocketLadybird(move(underlying_socket))); + return adopt_ref(*new WebSocketQt(move(underlying_socket))); } -WebSocketLadybird::WebSocketLadybird(NonnullRefPtr underlying_socket) +WebSocketQt::WebSocketQt(NonnullRefPtr underlying_socket) : m_websocket(move(underlying_socket)) { m_websocket->on_open = [weak_this = make_weak_ptr()] { @@ -57,9 +57,9 @@ WebSocketLadybird::WebSocketLadybird(NonnullRefPtr underly }; } -WebSocketLadybird::~WebSocketLadybird() = default; +WebSocketQt::~WebSocketQt() = default; -Web::WebSockets::WebSocket::ReadyState WebSocketLadybird::ready_state() +Web::WebSockets::WebSocket::ReadyState WebSocketQt::ready_state() { switch (m_websocket->ready_state()) { case WebSocket::ReadyState::Connecting: @@ -74,22 +74,22 @@ Web::WebSockets::WebSocket::ReadyState WebSocketLadybird::ready_state() VERIFY_NOT_REACHED(); } -DeprecatedString WebSocketLadybird::subprotocol_in_use() +DeprecatedString WebSocketQt::subprotocol_in_use() { return m_websocket->subprotocol_in_use(); } -void WebSocketLadybird::send(ByteBuffer binary_or_text_message, bool is_text) +void WebSocketQt::send(ByteBuffer binary_or_text_message, bool is_text) { m_websocket->send(WebSocket::Message(binary_or_text_message, is_text)); } -void WebSocketLadybird::send(StringView message) +void WebSocketQt::send(StringView message) { m_websocket->send(WebSocket::Message(message)); } -void WebSocketLadybird::close(u16 code, DeprecatedString reason) +void WebSocketQt::close(u16 code, DeprecatedString reason) { m_websocket->close(code, reason); } diff --git a/Ladybird/WebSocketLadybird.h b/Ladybird/WebSocketQt.h similarity index 73% rename from Ladybird/WebSocketLadybird.h rename to Ladybird/WebSocketQt.h index 170d64b3e4a..34cff6c070a 100644 --- a/Ladybird/WebSocketLadybird.h +++ b/Ladybird/WebSocketQt.h @@ -12,13 +12,13 @@ namespace Ladybird { -class WebSocketLadybird +class WebSocketQt : public Web::WebSockets::WebSocketClientSocket - , public Weakable { + , public Weakable { public: - static NonnullRefPtr create(NonnullRefPtr); + static NonnullRefPtr create(NonnullRefPtr); - virtual ~WebSocketLadybird() override; + virtual ~WebSocketQt() override; virtual Web::WebSockets::WebSocket::ReadyState ready_state() override; virtual DeprecatedString subprotocol_in_use() override; @@ -27,7 +27,7 @@ public: virtual void close(u16 code, DeprecatedString reason) override; private: - explicit WebSocketLadybird(NonnullRefPtr); + explicit WebSocketQt(NonnullRefPtr); NonnullRefPtr m_websocket; }; diff --git a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn index a22fb9ac0c3..7441720d515 100644 --- a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn @@ -3,7 +3,7 @@ import("//Ladybird/moc_qt_objects.gni") moc_qt_objects("generate_moc") { sources = [ - "//Ladybird/AudioCodecPluginLadybird.h", + "//Ladybird/AudioCodecPluginQt.h", "//Ladybird/AudioThread.h", "//Ladybird/RequestManagerQt.h", ] @@ -45,17 +45,17 @@ executable("WebContent") { "//Userland/Libraries/LibWebView:WebDriverServerEndpoint", ] sources = [ - "../AudioCodecPluginLadybird.cpp", + "../AudioCodecPluginQt.cpp", "../AudioThread.cpp", "../EventLoopImplementationQt.cpp", - "../FontPluginLadybird.cpp", + "../FontPlugin.cpp", "../HelperProcess.cpp", - "../ImageCodecPluginLadybird.cpp", + "../ImageCodecPlugin.cpp", "../RequestManagerQt.cpp", "../Utilities.cpp", - "../WebSocketClientManagerLadybird.cpp", + "../WebSocketClientManagerQt.cpp", "../WebSocketImplQt.cpp", - "../WebSocketLadybird.cpp", + "../WebSocketQt.cpp", "//Userland/Services/WebContent/ConnectionFromClient.cpp", "//Userland/Services/WebContent/ConsoleGlobalEnvironmentExtensions.cpp", "//Userland/Services/WebContent/PageHost.cpp",