From ead0a2c78a38e6e4e36d4f8554ee96fa5a20825b Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Tue, 8 Jul 2025 12:14:08 +0200 Subject: [PATCH] Everywhere: Rename serenity_main to ladybird_main No functional changes. --- Documentation/Patterns.md | 12 ++++++------ Libraries/LibMain/Main.cpp | 2 +- Libraries/LibMain/Main.h | 2 +- Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp | 2 +- .../CodeGenerators/LibWeb/BindingsGenerator/main.cpp | 2 +- .../CodeGenerators/LibWeb/GenerateAriaRoles.cpp | 2 +- .../CodeGenerators/LibWeb/GenerateCSSDescriptors.cpp | 2 +- .../Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp | 2 +- .../CodeGenerators/LibWeb/GenerateCSSKeyword.cpp | 2 +- .../LibWeb/GenerateCSSMathFunctions.cpp | 2 +- .../LibWeb/GenerateCSSMediaFeatureID.cpp | 2 +- .../CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp | 2 +- .../CodeGenerators/LibWeb/GenerateCSSPseudoClass.cpp | 2 +- .../LibWeb/GenerateCSSPseudoElement.cpp | 2 +- .../LibWeb/GenerateCSSStyleProperties.cpp | 2 +- .../LibWeb/GenerateCSSTransformFunctions.cpp | 2 +- .../LibWeb/GenerateNamedCharacterReferences.cpp | 2 +- .../LibWeb/GenerateWindowOrWorkerInterfaces.cpp | 2 +- Meta/Lagom/Tools/IPCMagicLinter/main.cpp | 2 +- Services/ImageDecoder/main.cpp | 2 +- Services/RequestServer/main.cpp | 2 +- Services/WebContent/main.cpp | 2 +- Services/WebDriver/main.cpp | 2 +- Services/WebWorker/main.cpp | 2 +- Tests/LibWeb/test-web/main.cpp | 2 +- UI/AppKit/main.mm | 2 +- UI/Qt/main.cpp | 2 +- Utilities/abench.cpp | 4 ++-- Utilities/animation.cpp | 2 +- Utilities/dns.cpp | 2 +- Utilities/image.cpp | 2 +- Utilities/js.cpp | 2 +- Utilities/wasm.cpp | 2 +- Utilities/xml.cpp | 2 +- 34 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Documentation/Patterns.md b/Documentation/Patterns.md index a2c5b0d2eb1..44f6ed2aeb9 100644 --- a/Documentation/Patterns.md +++ b/Documentation/Patterns.md @@ -110,10 +110,10 @@ private: } ``` -## The `serenity_main(..)` program entry point +## The `ladybird_main(..)` program entry point Ladybird has moved to a pattern where executables do not expose a normal C -main function. A `serenity_main(..)` is exposed instead. The main reasoning +main function. A `ladybird_main(..)` is exposed instead. The main reasoning is that the `Main::Arguments` struct can provide arguments in a more idiomatic way that fits with the Ladybird's internal API surface area. The ErrorOr likewise allows the program to propagate errors seamlessly with the `TRY(...)` macro, @@ -121,7 +121,7 @@ avoiding a significant amount of clunky C style error handling. These executables are then linked with the `LibMain` library, which will link in the normal C `int main(int, char**)` function which will call into the programs -`serenity_main(..)` on program startup. +`ladybird_main(..)` on program startup. The creation of the pattern was documented in the following video: [OS hacking: A better main() for SerenityOS C++ programs](https://www.youtube.com/watch?v=5PciKJW1rUc) @@ -137,14 +137,14 @@ int main(int argc, char** argv) } ``` -Instead, `serenity_main(..)` is defined like this: +Instead, `ladybird_main(..)` is defined like this: ```cpp #include -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { - return 0; + return 0; } ``` diff --git a/Libraries/LibMain/Main.cpp b/Libraries/LibMain/Main.cpp index 270b88e7e7b..a9cc45ebcb7 100644 --- a/Libraries/LibMain/Main.cpp +++ b/Libraries/LibMain/Main.cpp @@ -36,7 +36,7 @@ int main(int argc, char** argv) for (int i = 0; i < argc; ++i) arguments.unchecked_append({ argv[i], strlen(argv[i]) }); - auto result = serenity_main({ + auto result = ladybird_main({ .argc = argc, .argv = argv, .strings = arguments.span(), diff --git a/Libraries/LibMain/Main.h b/Libraries/LibMain/Main.h index 16b8843cd48..9c024ed1500 100644 --- a/Libraries/LibMain/Main.h +++ b/Libraries/LibMain/Main.h @@ -24,4 +24,4 @@ void set_return_code_for_errors(int); } -ErrorOr serenity_main(Main::Arguments); +ErrorOr ladybird_main(Main::Arguments); diff --git a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp index 91769636f1a..3081454bd78 100644 --- a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp @@ -910,7 +910,7 @@ void build(StringBuilder& builder, Vector const& endpoints) } // end anonymous namespace -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView ipc_file; StringView output_file = "-"sv; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp index 804e1c43f00..d535f3b8a1c 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp @@ -17,7 +17,7 @@ #include #include -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { Core::ArgsParser args_parser; StringView path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp index 8ef61c7f799..a6f17f80717 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp @@ -374,7 +374,7 @@ NameFromSource @name@::name_from_source() const } // end anonymous namespace -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSDescriptors.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSDescriptors.cpp index e6c84f531f8..07ec7c5c509 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSDescriptors.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSDescriptors.cpp @@ -20,7 +20,7 @@ static bool is_legacy_alias(JsonObject const& descriptor) return descriptor.has_string("legacy-alias-for"sv); } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp index 70acfde8a0b..2b634b5be0e 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp @@ -13,7 +13,7 @@ ErrorOr generate_header_file(JsonObject& enums_data, Core::File& file); ErrorOr generate_implementation_file(JsonObject& enums_data, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSKeyword.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSKeyword.cpp index 14e9a7fe284..b4c342e903f 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSKeyword.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSKeyword.cpp @@ -14,7 +14,7 @@ ErrorOr generate_header_file(JsonArray& keyword_data, Core::File& file); ErrorOr generate_implementation_file(JsonArray& keyword_data, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp index e6002ed0d57..a835dc1f6ed 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp @@ -382,7 +382,7 @@ RefPtr Parser::parse_math_function(Function const& functi } // end anonymous namespace -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp index d8372b830ff..a5acea85105 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp @@ -13,7 +13,7 @@ ErrorOr generate_header_file(JsonObject& media_feature_data, Core::File& file); ErrorOr generate_implementation_file(JsonObject& media_feature_data, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp index e34e97bf441..030fdef78ce 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp @@ -55,7 +55,7 @@ static bool is_legacy_alias(JsonObject const& property) return property.has_string("legacy-alias-for"sv); } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoClass.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoClass.cpp index 8382e8ac26b..aed4abe6adc 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoClass.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoClass.cpp @@ -12,7 +12,7 @@ ErrorOr generate_header_file(JsonObject& pseudo_classes_data, Core::File& file); ErrorOr generate_implementation_file(JsonObject& pseudo_classes_data, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoElement.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoElement.cpp index a98018ec549..1e4a9cd424b 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoElement.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPseudoElement.cpp @@ -12,7 +12,7 @@ ErrorOr generate_header_file(JsonObject& pseudo_elements_data, Core::File& file); ErrorOr generate_implementation_file(JsonObject& pseudo_elements_data, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSStyleProperties.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSStyleProperties.cpp index 952a3aaf57b..aac6117fc7d 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSStyleProperties.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSStyleProperties.cpp @@ -14,7 +14,7 @@ ErrorOr generate_header_file(JsonObject& properties, Core::File& file); ErrorOr generate_implementation_file(JsonObject& properties, Core::File& file); ErrorOr generate_idl_file(JsonObject& properties, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp index 9ca747cbc7d..569b7de1108 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSTransformFunctions.cpp @@ -14,7 +14,7 @@ ErrorOr generate_header_file(JsonObject& transforms_data, Core::File& file); ErrorOr generate_implementation_file(JsonObject& transforms_data, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp index 6157a24ea9b..b9fa96dc704 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp @@ -15,7 +15,7 @@ ErrorOr generate_header_file(Core::File& file); ErrorOr generate_implementation_file(JsonObject& named_character_reference_data, Core::File& file); -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView generated_header_path; StringView generated_implementation_path; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp index 3c6925d9c73..b5f396e4e58 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp @@ -331,7 +331,7 @@ void add_@global_object_snake_name@_exposed_interfaces(JS::Object& global) return {}; } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { Core::ArgsParser args_parser; diff --git a/Meta/Lagom/Tools/IPCMagicLinter/main.cpp b/Meta/Lagom/Tools/IPCMagicLinter/main.cpp index 19e0666e386..94f1051f55f 100644 --- a/Meta/Lagom/Tools/IPCMagicLinter/main.cpp +++ b/Meta/Lagom/Tools/IPCMagicLinter/main.cpp @@ -15,7 +15,7 @@ static constexpr auto EXIT_COLLISION = 0x1; static constexpr auto EXIT_ERROR = 0x2; -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { if (arguments.argc < 3) { warnln("Usage: {} path/to/some.ipc path/to/other.ipc [more ipc files ...]", arguments.strings[0]); diff --git a/Services/ImageDecoder/main.cpp b/Services/ImageDecoder/main.cpp index 72cdeeb6dac..cf54248ff6e 100644 --- a/Services/ImageDecoder/main.cpp +++ b/Services/ImageDecoder/main.cpp @@ -17,7 +17,7 @@ # include #endif -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { AK::set_rich_debug_enabled(true); diff --git a/Services/RequestServer/main.cpp b/Services/RequestServer/main.cpp index 9ea7ab9d9c4..ae2f16dffc9 100644 --- a/Services/RequestServer/main.cpp +++ b/Services/RequestServer/main.cpp @@ -26,7 +26,7 @@ extern ByteString g_default_certificate_path; } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { AK::set_rich_debug_enabled(true); diff --git a/Services/WebContent/main.cpp b/Services/WebContent/main.cpp index cbc6117f55e..e75df80b887 100644 --- a/Services/WebContent/main.cpp +++ b/Services/WebContent/main.cpp @@ -69,7 +69,7 @@ extern bool g_http_cache_enabled; } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { AK::set_rich_debug_enabled(true); diff --git a/Services/WebDriver/main.cpp b/Services/WebDriver/main.cpp index 3eafb6e2800..15f4e2b29be 100644 --- a/Services/WebDriver/main.cpp +++ b/Services/WebDriver/main.cpp @@ -66,7 +66,7 @@ static Vector create_arguments(ByteString const& socket_path, bool h return arguments; } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { AK::set_rich_debug_enabled(true); diff --git a/Services/WebWorker/main.cpp b/Services/WebWorker/main.cpp index 150c0c7a9a3..63d20dcb2ee 100644 --- a/Services/WebWorker/main.cpp +++ b/Services/WebWorker/main.cpp @@ -37,7 +37,7 @@ static ErrorOr agent_type_from_string(StringView type) return Error::from_string_literal("Invalid worker type, must be one of: 'dedicated', 'shared', or 'service'"); } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { AK::set_rich_debug_enabled(true); diff --git a/Tests/LibWeb/test-web/main.cpp b/Tests/LibWeb/test-web/main.cpp index 629d03ff29f..3bfeb1bcff7 100644 --- a/Tests/LibWeb/test-web/main.cpp +++ b/Tests/LibWeb/test-web/main.cpp @@ -714,7 +714,7 @@ static ErrorOr run_tests(Core::AnonymousBuffer const& theme, Web::DevicePix } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { #if defined(LADYBIRD_BINARY_PATH) auto app = TRY(TestWeb::Application::create(arguments, LADYBIRD_BINARY_PATH)); diff --git a/UI/AppKit/main.mm b/UI/AppKit/main.mm index f524f01ffb7..f7ebd38a97c 100644 --- a/UI/AppKit/main.mm +++ b/UI/AppKit/main.mm @@ -35,7 +35,7 @@ static void open_urls_from_client(Vector const& urls, WebView::NewWind } } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { AK::set_rich_debug_enabled(true); diff --git a/UI/Qt/main.cpp b/UI/Qt/main.cpp index 5c09dd128e2..d8899907373 100644 --- a/UI/Qt/main.cpp +++ b/UI/Qt/main.cpp @@ -39,7 +39,7 @@ bool is_using_dark_system_theme(QWidget& widget) } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { AK::set_rich_debug_enabled(true); diff --git a/Utilities/abench.cpp b/Utilities/abench.cpp index 1b41dc08977..58f13b5e9c5 100644 --- a/Utilities/abench.cpp +++ b/Utilities/abench.cpp @@ -16,7 +16,7 @@ // The Kernel has problems with large anonymous buffers, so let's limit sample reads ourselves. static constexpr size_t MAX_CHUNK_SIZE = 1 * MiB / 2; -ErrorOr serenity_main(Main::Arguments args) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView path {}; int sample_count = -1; @@ -25,7 +25,7 @@ ErrorOr serenity_main(Main::Arguments args) args_parser.set_general_help("Benchmark audio loading"); args_parser.add_positional_argument(path, "Path to audio file", "path"); args_parser.add_option(sample_count, "How many samples to load at maximum", "sample-count", 's', "samples"); - args_parser.parse(args); + args_parser.parse(arguments); auto maybe_loader = Audio::Loader::create(path); if (maybe_loader.is_error()) { diff --git a/Utilities/animation.cpp b/Utilities/animation.cpp index 71394d80609..a339d509e87 100644 --- a/Utilities/animation.cpp +++ b/Utilities/animation.cpp @@ -32,7 +32,7 @@ static ErrorOr parse_options(Main::Arguments arguments) return options; } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { Options options = TRY(parse_options(arguments)); diff --git a/Utilities/dns.cpp b/Utilities/dns.cpp index 76ffc54d12b..110589e7352 100644 --- a/Utilities/dns.cpp +++ b/Utilities/dns.cpp @@ -11,7 +11,7 @@ #include #include -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { struct Request { Vector> types; diff --git a/Utilities/image.cpp b/Utilities/image.cpp index ef5f5a02651..b0b3fe5c4a2 100644 --- a/Utilities/image.cpp +++ b/Utilities/image.cpp @@ -242,7 +242,7 @@ static ErrorOr parse_options(Main::Arguments arguments) return options; } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { Options options = TRY(parse_options(arguments)); diff --git a/Utilities/js.cpp b/Utilities/js.cpp index fead35e33a8..5752fbfe7ec 100644 --- a/Utilities/js.cpp +++ b/Utilities/js.cpp @@ -785,7 +785,7 @@ static ErrorOr run_repl(bool gc_on_every_allocation, bool syntax_highlight) #endif -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { bool gc_on_every_allocation = false; bool disable_syntax_highlight = false; diff --git a/Utilities/wasm.cpp b/Utilities/wasm.cpp index 38eb6a31170..34c735d587a 100644 --- a/Utilities/wasm.cpp +++ b/Utilities/wasm.cpp @@ -515,7 +515,7 @@ static void print_link_error(Wasm::LinkError const& error) warnln("Missing import '{}'", missing); } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView filename; bool print = false; diff --git a/Utilities/xml.cpp b/Utilities/xml.cpp index c71bc056a39..ec3b764ffce 100644 --- a/Utilities/xml.cpp +++ b/Utilities/xml.cpp @@ -498,7 +498,7 @@ static void do_run_tests(XML::Document& document) } } -ErrorOr serenity_main(Main::Arguments arguments) +ErrorOr ladybird_main(Main::Arguments arguments) { StringView filename; bool run_tests { false };