diff --git a/.github/workflows/lagom-template.yml b/.github/workflows/lagom-template.yml index 5505bca77d9..a274561ab18 100644 --- a/.github/workflows/lagom-template.yml +++ b/.github/workflows/lagom-template.yml @@ -191,7 +191,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: libweb-test-artifacts-${{ inputs.os_name }} - path: ${{ github.workspace }}/Build/Ladybird/test-dumps + path: ${{ github.workspace }}/Build/UI/test-dumps retention-days: 7 if-no-files-found: ignore diff --git a/.github/workflows/nightly-android.yml b/.github/workflows/nightly-android.yml index 4643f01f22e..e1c752a9199 100644 --- a/.github/workflows/nightly-android.yml +++ b/.github/workflows/nightly-android.yml @@ -91,7 +91,7 @@ jobs: # === BUILD === - name: Build and Test - working-directory: ${{ github.workspace }}/Ladybird/Android + working-directory: ${{ github.workspace }}/UI/Android run: ./gradlew connectedAndroidTest env: GRADLE_OPTS: '-Xmx3072m' diff --git a/CMakeLists.txt b/CMakeLists.txt index ac76b5dec14..95fb560356b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ if (VCPKG_TARGET_ANDROID) # If we are building for Android, we must load vcpkg_android.cmake before the project() declaration. # This ensures that the CMAKE_TOOLCHAIN_FILE is set correctly. # (we cannot set CMAKE_TOOLCHAIN_FILE from Gradle, unfortunately, so this is the only place we can do it.) - include("Ladybird/Android/vcpkg_android.cmake") + include("UI/Android/vcpkg_android.cmake") endif() # Pass additional information to vcpkg toolchain files if we are using vcpkg. @@ -28,7 +28,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(LADYBIRD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") list(APPEND CMAKE_MODULE_PATH "${LADYBIRD_SOURCE_DIR}/Meta/CMake") -include(Ladybird/cmake/EnableLagom.cmake) +include(UI/cmake/EnableLagom.cmake) include(use_linker) include(lagom_options NO_POLICY_SCOPE) include(lagom_compile_options) @@ -90,7 +90,7 @@ include(CTest) # for BUILD_TESTING option, default ON if (ENABLE_GUI_TARGETS) add_subdirectory(Services) - add_subdirectory(Ladybird) + add_subdirectory(UI) endif() add_custom_target(lint-shell-scripts diff --git a/Documentation/BuildInstructionsLadybird.md b/Documentation/BuildInstructionsLadybird.md index fd0d4ef38ce..5356848f2f8 100644 --- a/Documentation/BuildInstructionsLadybird.md +++ b/Documentation/BuildInstructionsLadybird.md @@ -188,7 +188,7 @@ pkgman install cmake cmd:python3 ninja openal_devel qt6_base_devel qt6_multimedi ### Android: On a Unix-like platform, install the prerequisites for that platform and then see the [Android Studio guide](EditorConfiguration/AndroidStudioConfiguration.md). -Or, download a version of Gradle >= 8.0.0, and run the ``gradlew`` program in ``Ladybird/Android`` +Or, download a version of Gradle >= 8.0.0, and run the ``gradlew`` program in ``UI/Android`` ## Build steps @@ -281,7 +281,7 @@ The script Meta/ladybird.sh and the default preset in CMakePresets.json both def `Build/release`. For distribution purposes, or when building multiple configurations, it may be useful to create a custom CMake build directory. -The install rules in Ladybird/cmake/InstallRules.cmake define which binaries and libraries will be +The install rules in UI/cmake/InstallRules.cmake define which binaries and libraries will be installed into the configured CMAKE_PREFIX_PATH or path passed to ``cmake --install``. Note that when using a custom build directory rather than Meta/ladybird.sh, the user may need to provide diff --git a/Documentation/EditorConfiguration/AndroidStudioConfiguration.md b/Documentation/EditorConfiguration/AndroidStudioConfiguration.md index 940be72c0ba..b04165ac677 100644 --- a/Documentation/EditorConfiguration/AndroidStudioConfiguration.md +++ b/Documentation/EditorConfiguration/AndroidStudioConfiguration.md @@ -12,11 +12,11 @@ Ensure that your system has the following tools available: ## Opening the project -After opening the ``ladybird`` directory in Android Studio (NOT the Ladybird/Android directory!) +After opening the ``ladybird`` directory in Android Studio (NOT the UI/Android directory!) there should be a pop-up in the bottom left indicating that an Android Gradle project was detected -in ``Ladybird/Android``. +in ``UI/Android``. -In the top left of the screen in the Project view, navigate to ``Ladybird/Android``. Or, click the +In the top left of the screen in the Project view, navigate to ``UI/Android``. Or, click the highlighted text in the notification for that path. Open the ``settings.gradle.kts`` file. At the top of the file should be a banner that says ``Code Insight unavailable (related Gradle project not linked).`` Click the ``Link Gradle project`` text on the right side of the banner. After the IDE diff --git a/Documentation/Testing.md b/Documentation/Testing.md index 9e1a5df77a6..15721fe34e8 100644 --- a/Documentation/Testing.md +++ b/Documentation/Testing.md @@ -12,9 +12,9 @@ Tests of internal C++ code go in their own `TestFoo.cpp` file in `Tests/LibWeb`. > To reproduce a CI failure, see the section on [Running with Sanitizers](#running-with-sanitizers). The easiest way to run tests is to use the `ladybird.sh` script. The LibWeb tests are registered with CMake as a test in -`Ladybird/CMakeLists.txt`. Using the built-in test filtering, you can run all tests with `Meta/ladybird.sh test` or run +`UI/CMakeLists.txt`. Using the built-in test filtering, you can run all tests with `Meta/ladybird.sh test` or run just the LibWeb tests with `Meta/ladybird.sh test LibWeb`. The second way is to invoke the headless browser test runner -directly. See the invocation in `Ladybird/CMakeLists.txt` for the expected command line arguments. +directly. See the invocation in `UI/CMakeLists.txt` for the expected command line arguments. A third way is to invoke `ctest` directly. The simplest method is to use the `default` preset from ``CMakePresets.json``: diff --git a/Ladybird/Android/src/main/assets/.gitkeep b/Ladybird/Android/src/main/assets/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Meta/Lagom/ReadMe.md b/Meta/Lagom/ReadMe.md index 32d85495829..7f5aafc085e 100644 --- a/Meta/Lagom/ReadMe.md +++ b/Meta/Lagom/ReadMe.md @@ -13,7 +13,7 @@ Lagom is used by the Serenity project in the following ways: - [Build tools](./Tools) required to build Serenity itself using Serenity's own C++ libraries are in Lagom. - [Unit tests](../../Documentation/Testing.md) in CI are built using the Lagom build for host systems to ensure portability. - [Continuous fuzzing](#fuzzing-on-oss-fuzz) is done with the help of OSS-fuzz using the Lagom build. -- [The Ladybird browser](../../Ladybird/README.md) uses Lagom to provide LibWeb and LibJS for non-Serenity systems. +- [The Ladybird browser](../../README.md) uses Lagom to provide LibWeb and LibJS for non-Serenity systems. - [ECMA 262 spec tests](https://ladybirdbrowser.github.io/libjs-website/test262) for LibJS are run per-commit and tracked on [LibJS website](https://ladybirdbrowser.github.io/libjs-website/). - [Wasm spec tests](https://ladybirdbrowser.github.io/libjs-website/wasm) for LibWasm are run per-commit and tracked on [LibJS website](https://ladybirdbrowser.github.io/libjs-website/). diff --git a/Meta/check-style.py b/Meta/check-style.py index b157ed15505..02d82218135 100755 --- a/Meta/check-style.py +++ b/Meta/check-style.py @@ -27,10 +27,6 @@ LICENSE_HEADER_CHECK_EXCLUDES = { # We check that "#pragma once" is present PRAGMA_ONCE_STRING = '#pragma once' -PRAGMA_ONCE_CHECK_EXCLUDES = { - 'Ladybird/AppKit/System/Detail/Header.h', - 'Ladybird/AppKit/System/Detail/Footer.h', -} # We make sure that there's a blank line before and after pragma once GOOD_PRAGMA_ONCE_PATTERN = re.compile('(^|\\S\n\n)#pragma once(\n\n\\S.|$)') @@ -105,10 +101,7 @@ def run(): if not GOOD_LICENSE_HEADER_PATTERN.search(file_content): errors_license.append(filename) if filename.endswith('.h'): - if is_in_prefix_list(filename, PRAGMA_ONCE_CHECK_EXCLUDES): - # File was excluded - pass - elif GOOD_PRAGMA_ONCE_PATTERN.search(file_content): + if GOOD_PRAGMA_ONCE_PATTERN.search(file_content): # Excellent, the formatting is correct. pass elif PRAGMA_ONCE_STRING in file_content: diff --git a/Services/ImageDecoder/CMakeLists.txt b/Services/ImageDecoder/CMakeLists.txt index 6675323798c..b315b30ac1b 100644 --- a/Services/ImageDecoder/CMakeLists.txt +++ b/Services/ImageDecoder/CMakeLists.txt @@ -8,9 +8,9 @@ set(SOURCES if (ANDROID) add_library(imagedecoderservice SHARED - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/ImageDecoderService.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/ImageDecoderService.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp ${SOURCES} ) else() diff --git a/Services/RequestServer/CMakeLists.txt b/Services/RequestServer/CMakeLists.txt index 64419abb9a9..d3ff5dedf53 100644 --- a/Services/RequestServer/CMakeLists.txt +++ b/Services/RequestServer/CMakeLists.txt @@ -8,9 +8,9 @@ set(SOURCES if (ANDROID) add_library(requestserverservice SHARED - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/RequestServerService.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/RequestServerService.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp ${SOURCES} ) else() diff --git a/Services/WebContent/CMakeLists.txt b/Services/WebContent/CMakeLists.txt index f1c86f91bbf..a4cd5bf056f 100644 --- a/Services/WebContent/CMakeLists.txt +++ b/Services/WebContent/CMakeLists.txt @@ -2,10 +2,10 @@ include(fontconfig) include(pulseaudio) set(SOURCES - ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/HelperProcess.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp + ${LADYBIRD_SOURCE_DIR}/UI/FontPlugin.cpp + ${LADYBIRD_SOURCE_DIR}/UI/HelperProcess.cpp + ${LADYBIRD_SOURCE_DIR}/UI/ImageCodecPlugin.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp ConnectionFromClient.cpp ConsoleGlobalEnvironmentExtensions.cpp BackingStoreManager.cpp @@ -17,10 +17,10 @@ set(SOURCES if (ANDROID) add_library(webcontentservice SHARED - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/WebContentService.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/JNIHelpers.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/WebContentService.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/WebContentServiceJNI.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/JNIHelpers.cpp ${SOURCES} ) target_link_libraries(webcontentservice PRIVATE android) @@ -41,9 +41,9 @@ endif() if (ENABLE_QT) qt_add_executable(WebContent - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQt.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/StringUtils.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQt.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQtEventTarget.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/StringUtils.cpp main.cpp ) target_link_libraries(WebContent PRIVATE Qt::Core) @@ -53,8 +53,8 @@ if (ENABLE_QT) find_package(Qt6 REQUIRED COMPONENTS Multimedia) target_sources(WebContent PRIVATE - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/AudioCodecPluginQt.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/AudioThread.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/AudioCodecPluginQt.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/AudioThread.cpp ) target_link_libraries(WebContent PRIVATE Qt::Multimedia) @@ -68,8 +68,8 @@ target_link_libraries(WebContent PRIVATE webcontentservice LibURL) target_sources(webcontentservice PUBLIC FILE_SET ladybird TYPE HEADERS BASE_DIRS ${LADYBIRD_SOURCE_DIR} - FILES ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.h - ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.h + FILES ${LADYBIRD_SOURCE_DIR}/UI/FontPlugin.h + ${LADYBIRD_SOURCE_DIR}/UI/ImageCodecPlugin.h ) target_sources(webcontentservice PUBLIC FILE_SET server TYPE HEADERS BASE_DIRS ${LADYBIRD_SOURCE_DIR}/Services diff --git a/Services/WebContent/main.cpp b/Services/WebContent/main.cpp index 340c343b1d5..bc60b241c13 100644 --- a/Services/WebContent/main.cpp +++ b/Services/WebContent/main.cpp @@ -5,9 +5,6 @@ */ #include -#include -#include -#include #include #include #include @@ -29,16 +26,19 @@ #include #include #include +#include +#include +#include #include #include #include #if defined(HAVE_QT) -# include # include +# include # if defined(HAVE_QT_MULTIMEDIA) -# include +# include # endif #endif diff --git a/Services/WebDriver/CMakeLists.txt b/Services/WebDriver/CMakeLists.txt index 7d10ea464d7..698730776e7 100644 --- a/Services/WebDriver/CMakeLists.txt +++ b/Services/WebDriver/CMakeLists.txt @@ -1,5 +1,5 @@ set(SOURCES - ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp Client.cpp Session.cpp WebContentConnection.cpp diff --git a/Services/WebDriver/main.cpp b/Services/WebDriver/main.cpp index fa57ee6d182..e2a028bc8ab 100644 --- a/Services/WebDriver/main.cpp +++ b/Services/WebDriver/main.cpp @@ -5,7 +5,6 @@ */ #include -#include #include #include #include @@ -15,6 +14,7 @@ #include #include #include +#include #include static Vector certificates; diff --git a/Services/WebWorker/CMakeLists.txt b/Services/WebWorker/CMakeLists.txt index 0a23533576e..a06e859e4c7 100644 --- a/Services/WebWorker/CMakeLists.txt +++ b/Services/WebWorker/CMakeLists.txt @@ -1,9 +1,9 @@ include(fontconfig) set(WEBWORKER_SOURCES - ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/HelperProcess.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp + ${LADYBIRD_SOURCE_DIR}/UI/FontPlugin.cpp + ${LADYBIRD_SOURCE_DIR}/UI/HelperProcess.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp ConnectionFromClient.cpp DedicatedWorkerHost.cpp PageHost.cpp @@ -26,9 +26,9 @@ endif() if (ENABLE_QT) qt_add_executable(WebWorker - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQt.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp - ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/StringUtils.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQt.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQtEventTarget.cpp + ${LADYBIRD_SOURCE_DIR}/UI/Qt/StringUtils.cpp main.cpp ) target_link_libraries(WebWorker PRIVATE Qt::Core) diff --git a/Services/WebWorker/main.cpp b/Services/WebWorker/main.cpp index d24c3f577c0..2433674dde9 100644 --- a/Services/WebWorker/main.cpp +++ b/Services/WebWorker/main.cpp @@ -4,9 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include -#include #include #include #include @@ -22,11 +19,14 @@ #include #include #include +#include +#include +#include #include #if defined(HAVE_QT) -# include # include +# include #endif static ErrorOr initialize_resource_loader(JS::Heap&, int request_server_socket); diff --git a/Ladybird/.gitignore b/UI/.gitignore similarity index 100% rename from Ladybird/.gitignore rename to UI/.gitignore diff --git a/Ladybird/Android/BuildLagomTools.sh b/UI/Android/BuildLagomTools.sh similarity index 100% rename from Ladybird/Android/BuildLagomTools.sh rename to UI/Android/BuildLagomTools.sh diff --git a/Ladybird/Android/CMakeLists.txt b/UI/Android/CMakeLists.txt similarity index 100% rename from Ladybird/Android/CMakeLists.txt rename to UI/Android/CMakeLists.txt diff --git a/Ladybird/Android/build.gradle.kts b/UI/Android/build.gradle.kts similarity index 100% rename from Ladybird/Android/build.gradle.kts rename to UI/Android/build.gradle.kts diff --git a/Ladybird/Android/gradle.properties b/UI/Android/gradle.properties similarity index 100% rename from Ladybird/Android/gradle.properties rename to UI/Android/gradle.properties diff --git a/Ladybird/Android/gradle/wrapper/gradle-wrapper.jar b/UI/Android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from Ladybird/Android/gradle/wrapper/gradle-wrapper.jar rename to UI/Android/gradle/wrapper/gradle-wrapper.jar diff --git a/Ladybird/Android/gradle/wrapper/gradle-wrapper.properties b/UI/Android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from Ladybird/Android/gradle/wrapper/gradle-wrapper.properties rename to UI/Android/gradle/wrapper/gradle-wrapper.properties diff --git a/Ladybird/Android/gradlew b/UI/Android/gradlew similarity index 100% rename from Ladybird/Android/gradlew rename to UI/Android/gradlew diff --git a/Ladybird/Android/proguard-rules.pro b/UI/Android/proguard-rules.pro similarity index 100% rename from Ladybird/Android/proguard-rules.pro rename to UI/Android/proguard-rules.pro diff --git a/Ladybird/Android/settings.gradle.kts b/UI/Android/settings.gradle.kts similarity index 100% rename from Ladybird/Android/settings.gradle.kts rename to UI/Android/settings.gradle.kts diff --git a/Ladybird/Android/src/androidTest/java/org/serenityos/ladybird/SmokeTest.kt b/UI/Android/src/androidTest/java/org/serenityos/ladybird/SmokeTest.kt similarity index 100% rename from Ladybird/Android/src/androidTest/java/org/serenityos/ladybird/SmokeTest.kt rename to UI/Android/src/androidTest/java/org/serenityos/ladybird/SmokeTest.kt diff --git a/Ladybird/Android/src/main/AndroidManifest.xml b/UI/Android/src/main/AndroidManifest.xml similarity index 100% rename from Ladybird/Android/src/main/AndroidManifest.xml rename to UI/Android/src/main/AndroidManifest.xml diff --git a/Ladybird/Android/src/main/cpp/ALooperEventLoopImplementation.cpp b/UI/Android/src/main/cpp/ALooperEventLoopImplementation.cpp similarity index 100% rename from Ladybird/Android/src/main/cpp/ALooperEventLoopImplementation.cpp rename to UI/Android/src/main/cpp/ALooperEventLoopImplementation.cpp diff --git a/Ladybird/Android/src/main/cpp/ALooperEventLoopImplementation.h b/UI/Android/src/main/cpp/ALooperEventLoopImplementation.h similarity index 100% rename from Ladybird/Android/src/main/cpp/ALooperEventLoopImplementation.h rename to UI/Android/src/main/cpp/ALooperEventLoopImplementation.h diff --git a/Ladybird/Android/src/main/cpp/ImageDecoderService.cpp b/UI/Android/src/main/cpp/ImageDecoderService.cpp similarity index 100% rename from Ladybird/Android/src/main/cpp/ImageDecoderService.cpp rename to UI/Android/src/main/cpp/ImageDecoderService.cpp diff --git a/Ladybird/Android/src/main/cpp/JNIHelpers.cpp b/UI/Android/src/main/cpp/JNIHelpers.cpp similarity index 100% rename from Ladybird/Android/src/main/cpp/JNIHelpers.cpp rename to UI/Android/src/main/cpp/JNIHelpers.cpp diff --git a/Ladybird/Android/src/main/cpp/JNIHelpers.h b/UI/Android/src/main/cpp/JNIHelpers.h similarity index 100% rename from Ladybird/Android/src/main/cpp/JNIHelpers.h rename to UI/Android/src/main/cpp/JNIHelpers.h diff --git a/Ladybird/Android/src/main/cpp/LadybirdActivity.cpp b/UI/Android/src/main/cpp/LadybirdActivity.cpp similarity index 99% rename from Ladybird/Android/src/main/cpp/LadybirdActivity.cpp rename to UI/Android/src/main/cpp/LadybirdActivity.cpp index 82225ae929f..62690ef503b 100644 --- a/Ladybird/Android/src/main/cpp/LadybirdActivity.cpp +++ b/UI/Android/src/main/cpp/LadybirdActivity.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -20,6 +19,7 @@ #include #include #include +#include #include static ErrorOr extract_tar_archive(String archive_file, ByteString output_directory); diff --git a/Ladybird/Android/src/main/cpp/LadybirdServiceBase.h b/UI/Android/src/main/cpp/LadybirdServiceBase.h similarity index 100% rename from Ladybird/Android/src/main/cpp/LadybirdServiceBase.h rename to UI/Android/src/main/cpp/LadybirdServiceBase.h diff --git a/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp b/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp similarity index 98% rename from Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp rename to UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp index dee876890b1..00b423c5901 100644 --- a/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp +++ b/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp @@ -7,8 +7,8 @@ #include "LadybirdServiceBase.h" #include #include -#include #include +#include #include JavaVM* global_vm; diff --git a/Ladybird/Android/src/main/cpp/RequestServerService.cpp b/UI/Android/src/main/cpp/RequestServerService.cpp similarity index 98% rename from Ladybird/Android/src/main/cpp/RequestServerService.cpp rename to UI/Android/src/main/cpp/RequestServerService.cpp index 7e0ab7f2aed..895323ef353 100644 --- a/Ladybird/Android/src/main/cpp/RequestServerService.cpp +++ b/UI/Android/src/main/cpp/RequestServerService.cpp @@ -8,7 +8,6 @@ #include "LadybirdServiceBase.h" #include #include -#include #include #include #include @@ -19,6 +18,7 @@ #include #include #include +#include // FIXME: Share b/w RequestServer and WebSocket static ErrorOr find_certificates(StringView serenity_resource_root) diff --git a/Ladybird/Android/src/main/cpp/TimerExecutorService.cpp b/UI/Android/src/main/cpp/TimerExecutorService.cpp similarity index 100% rename from Ladybird/Android/src/main/cpp/TimerExecutorService.cpp rename to UI/Android/src/main/cpp/TimerExecutorService.cpp diff --git a/Ladybird/Android/src/main/cpp/WebContentService.cpp b/UI/Android/src/main/cpp/WebContentService.cpp similarity index 97% rename from Ladybird/Android/src/main/cpp/WebContentService.cpp rename to UI/Android/src/main/cpp/WebContentService.cpp index d15ee31defe..b1aafad72ca 100644 --- a/Ladybird/Android/src/main/cpp/WebContentService.cpp +++ b/UI/Android/src/main/cpp/WebContentService.cpp @@ -7,10 +7,6 @@ #include "WebContentService.h" #include "LadybirdServiceBase.h" #include -#include -#include -#include -#include #include #include #include @@ -29,6 +25,10 @@ #include #include #include +#include +#include +#include +#include #include #include diff --git a/Ladybird/Android/src/main/cpp/WebContentService.h b/UI/Android/src/main/cpp/WebContentService.h similarity index 100% rename from Ladybird/Android/src/main/cpp/WebContentService.h rename to UI/Android/src/main/cpp/WebContentService.h diff --git a/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp b/UI/Android/src/main/cpp/WebContentServiceJNI.cpp similarity index 100% rename from Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp rename to UI/Android/src/main/cpp/WebContentServiceJNI.cpp diff --git a/Ladybird/Android/src/main/cpp/WebViewImplementationNative.cpp b/UI/Android/src/main/cpp/WebViewImplementationNative.cpp similarity index 100% rename from Ladybird/Android/src/main/cpp/WebViewImplementationNative.cpp rename to UI/Android/src/main/cpp/WebViewImplementationNative.cpp diff --git a/Ladybird/Android/src/main/cpp/WebViewImplementationNative.h b/UI/Android/src/main/cpp/WebViewImplementationNative.h similarity index 100% rename from Ladybird/Android/src/main/cpp/WebViewImplementationNative.h rename to UI/Android/src/main/cpp/WebViewImplementationNative.h diff --git a/Ladybird/Android/src/main/cpp/WebViewImplementationNativeJNI.cpp b/UI/Android/src/main/cpp/WebViewImplementationNativeJNI.cpp similarity index 100% rename from Ladybird/Android/src/main/cpp/WebViewImplementationNativeJNI.cpp rename to UI/Android/src/main/cpp/WebViewImplementationNativeJNI.cpp diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/ImageDecoderService.kt b/UI/Android/src/main/java/org/serenityos/ladybird/ImageDecoderService.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/ImageDecoderService.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/ImageDecoderService.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/LadybirdActivity.kt b/UI/Android/src/main/java/org/serenityos/ladybird/LadybirdActivity.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/LadybirdActivity.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/LadybirdActivity.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceBase.kt b/UI/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceBase.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceBase.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceBase.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceConnection.kt b/UI/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceConnection.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceConnection.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/LadybirdServiceConnection.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/RequestServerService.kt b/UI/Android/src/main/java/org/serenityos/ladybird/RequestServerService.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/RequestServerService.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/RequestServerService.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/TimerExecutorService.kt b/UI/Android/src/main/java/org/serenityos/ladybird/TimerExecutorService.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/TimerExecutorService.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/TimerExecutorService.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/TransferAssets.java b/UI/Android/src/main/java/org/serenityos/ladybird/TransferAssets.java similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/TransferAssets.java rename to UI/Android/src/main/java/org/serenityos/ladybird/TransferAssets.java diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/WebContentService.kt b/UI/Android/src/main/java/org/serenityos/ladybird/WebContentService.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/WebContentService.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/WebContentService.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/WebView.kt b/UI/Android/src/main/java/org/serenityos/ladybird/WebView.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/WebView.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/WebView.kt diff --git a/Ladybird/Android/src/main/java/org/serenityos/ladybird/WebViewImplementation.kt b/UI/Android/src/main/java/org/serenityos/ladybird/WebViewImplementation.kt similarity index 100% rename from Ladybird/Android/src/main/java/org/serenityos/ladybird/WebViewImplementation.kt rename to UI/Android/src/main/java/org/serenityos/ladybird/WebViewImplementation.kt diff --git a/Ladybird/Android/src/main/res/drawable/ic_launcher_background.xml b/UI/Android/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from Ladybird/Android/src/main/res/drawable/ic_launcher_background.xml rename to UI/Android/src/main/res/drawable/ic_launcher_background.xml diff --git a/Ladybird/Android/src/main/res/drawable/ic_launcher_foreground.xml b/UI/Android/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from Ladybird/Android/src/main/res/drawable/ic_launcher_foreground.xml rename to UI/Android/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/Ladybird/Android/src/main/res/layout/activity_main.xml b/UI/Android/src/main/res/layout/activity_main.xml similarity index 100% rename from Ladybird/Android/src/main/res/layout/activity_main.xml rename to UI/Android/src/main/res/layout/activity_main.xml diff --git a/Ladybird/Android/src/main/res/mipmap-anydpi/ic_launcher.xml b/UI/Android/src/main/res/mipmap-anydpi/ic_launcher.xml similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-anydpi/ic_launcher.xml rename to UI/Android/src/main/res/mipmap-anydpi/ic_launcher.xml diff --git a/Ladybird/Android/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/UI/Android/src/main/res/mipmap-anydpi/ic_launcher_round.xml similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to UI/Android/src/main/res/mipmap-anydpi/ic_launcher_round.xml diff --git a/Ladybird/Android/src/main/res/mipmap-hdpi/ic_launcher.webp b/UI/Android/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-hdpi/ic_launcher.webp rename to UI/Android/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/Ladybird/Android/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/UI/Android/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to UI/Android/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/Ladybird/Android/src/main/res/mipmap-mdpi/ic_launcher.webp b/UI/Android/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-mdpi/ic_launcher.webp rename to UI/Android/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/Ladybird/Android/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/UI/Android/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to UI/Android/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/Ladybird/Android/src/main/res/mipmap-xhdpi/ic_launcher.webp b/UI/Android/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to UI/Android/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/Ladybird/Android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/UI/Android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to UI/Android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/Ladybird/Android/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/UI/Android/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to UI/Android/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/Ladybird/Android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/UI/Android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to UI/Android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/Ladybird/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/UI/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to UI/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/Ladybird/Android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/UI/Android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from Ladybird/Android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to UI/Android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/Ladybird/Android/src/main/res/values-night/themes.xml b/UI/Android/src/main/res/values-night/themes.xml similarity index 100% rename from Ladybird/Android/src/main/res/values-night/themes.xml rename to UI/Android/src/main/res/values-night/themes.xml diff --git a/Ladybird/Android/src/main/res/values/colors.xml b/UI/Android/src/main/res/values/colors.xml similarity index 100% rename from Ladybird/Android/src/main/res/values/colors.xml rename to UI/Android/src/main/res/values/colors.xml diff --git a/Ladybird/Android/src/main/res/values/strings.xml b/UI/Android/src/main/res/values/strings.xml similarity index 100% rename from Ladybird/Android/src/main/res/values/strings.xml rename to UI/Android/src/main/res/values/strings.xml diff --git a/Ladybird/Android/src/main/res/values/themes.xml b/UI/Android/src/main/res/values/themes.xml similarity index 100% rename from Ladybird/Android/src/main/res/values/themes.xml rename to UI/Android/src/main/res/values/themes.xml diff --git a/Ladybird/Android/src/main/res/xml/backup_rules.xml b/UI/Android/src/main/res/xml/backup_rules.xml similarity index 100% rename from Ladybird/Android/src/main/res/xml/backup_rules.xml rename to UI/Android/src/main/res/xml/backup_rules.xml diff --git a/Ladybird/Android/src/main/res/xml/data_extraction_rules.xml b/UI/Android/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from Ladybird/Android/src/main/res/xml/data_extraction_rules.xml rename to UI/Android/src/main/res/xml/data_extraction_rules.xml diff --git a/Ladybird/Android/vcpkg_android.cmake b/UI/Android/vcpkg_android.cmake similarity index 100% rename from Ladybird/Android/vcpkg_android.cmake rename to UI/Android/vcpkg_android.cmake diff --git a/Ladybird/AppKit/Application/Application.h b/UI/AppKit/Application/Application.h similarity index 100% rename from Ladybird/AppKit/Application/Application.h rename to UI/AppKit/Application/Application.h diff --git a/Ladybird/AppKit/Application/Application.mm b/UI/AppKit/Application/Application.mm similarity index 97% rename from Ladybird/AppKit/Application/Application.mm rename to UI/AppKit/Application/Application.mm index ddae9b15834..109d748dfa7 100644 --- a/Ladybird/AppKit/Application/Application.mm +++ b/UI/AppKit/Application/Application.mm @@ -4,15 +4,15 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include +#include #include #include #include #include #include #include -#include +#include +#include #include #import diff --git a/Ladybird/AppKit/Application/ApplicationDelegate.h b/UI/AppKit/Application/ApplicationDelegate.h similarity index 100% rename from Ladybird/AppKit/Application/ApplicationDelegate.h rename to UI/AppKit/Application/ApplicationDelegate.h diff --git a/Ladybird/AppKit/Application/ApplicationDelegate.mm b/UI/AppKit/Application/ApplicationDelegate.mm similarity index 99% rename from Ladybird/AppKit/Application/ApplicationDelegate.mm rename to UI/AppKit/Application/ApplicationDelegate.mm index e01cfa988bf..63920b3ba8e 100644 --- a/Ladybird/AppKit/Application/ApplicationDelegate.mm +++ b/UI/AppKit/Application/ApplicationDelegate.mm @@ -9,10 +9,10 @@ #include #import +#import +#import +#import #import -#import -#import -#import #if defined(LADYBIRD_USE_SWIFT) // FIXME: Report this codegen error to Apple @@ -20,7 +20,7 @@ # import # undef StyleMask #else -# import +# import #endif #import diff --git a/Ladybird/AppKit/Application/EventLoopImplementation.h b/UI/AppKit/Application/EventLoopImplementation.h similarity index 100% rename from Ladybird/AppKit/Application/EventLoopImplementation.h rename to UI/AppKit/Application/EventLoopImplementation.h diff --git a/Ladybird/AppKit/Application/EventLoopImplementation.mm b/UI/AppKit/Application/EventLoopImplementation.mm similarity index 100% rename from Ladybird/AppKit/Application/EventLoopImplementation.mm rename to UI/AppKit/Application/EventLoopImplementation.mm diff --git a/Ladybird/AppKit/CMakeLists.txt b/UI/AppKit/CMakeLists.txt similarity index 73% rename from Ladybird/AppKit/CMakeLists.txt rename to UI/AppKit/CMakeLists.txt index 481f0576a36..e9e727f3b5d 100644 --- a/Ladybird/AppKit/CMakeLists.txt +++ b/UI/AppKit/CMakeLists.txt @@ -3,16 +3,16 @@ add_library(ladybird_impl STATIC Application/Application.mm Application/ApplicationDelegate.mm Application/EventLoopImplementation.mm - UI/Event.mm - UI/Inspector.mm - UI/InspectorController.mm - UI/LadybirdWebView.mm - UI/LadybirdWebViewBridge.cpp - UI/LadybirdWebViewWindow.mm - UI/Palette.mm - UI/SearchPanel.mm - UI/Tab.mm - UI/TabController.mm + Interface/Event.mm + Interface/Inspector.mm + Interface/InspectorController.mm + Interface/LadybirdWebView.mm + Interface/LadybirdWebViewBridge.cpp + Interface/LadybirdWebViewWindow.mm + Interface/Palette.mm + Interface/SearchPanel.mm + Interface/Tab.mm + Interface/TabController.mm Utilities/Conversions.mm ) target_include_directories(ladybird_impl PUBLIC $) @@ -25,8 +25,8 @@ target_compile_features(ladybird_impl PUBLIC cxx_std_23) if (ENABLE_SWIFT) target_sources(ladybird_impl PRIVATE - UI/TaskManager.swift - UI/TaskManagerController.swift + Interface/TaskManager.swift + Interface/TaskManagerController.swift ) target_compile_definitions(ladybird_impl PUBLIC LADYBIRD_USE_SWIFT) set_target_properties(ladybird_impl PROPERTIES Swift_MODULE_NAME "SwiftLadybird") @@ -37,8 +37,8 @@ if (ENABLE_SWIFT) ) else() target_sources(ladybird_impl PRIVATE - UI/TaskManager.mm - UI/TaskManagerController.mm + Interface/TaskManager.mm + Interface/TaskManagerController.mm ) endif() diff --git a/Ladybird/AppKit/UI/Event.h b/UI/AppKit/Interface/Event.h similarity index 100% rename from Ladybird/AppKit/UI/Event.h rename to UI/AppKit/Interface/Event.h diff --git a/Ladybird/AppKit/UI/Event.mm b/UI/AppKit/Interface/Event.mm similarity index 99% rename from Ladybird/AppKit/UI/Event.mm rename to UI/AppKit/Interface/Event.mm index 5de876ced54..1f5dfc7368b 100644 --- a/Ladybird/AppKit/UI/Event.mm +++ b/UI/AppKit/Interface/Event.mm @@ -11,7 +11,7 @@ #include #import -#import +#import #import namespace Ladybird { diff --git a/Ladybird/AppKit/UI/Inspector.h b/UI/AppKit/Interface/Inspector.h similarity index 86% rename from Ladybird/AppKit/UI/Inspector.h rename to UI/AppKit/Interface/Inspector.h index 35b314234fa..43fadc55dc0 100644 --- a/Ladybird/AppKit/UI/Inspector.h +++ b/UI/AppKit/Interface/Inspector.h @@ -7,7 +7,7 @@ #pragma once #import -#import +#import @class LadybirdWebView; @class Tab; diff --git a/Ladybird/AppKit/UI/Inspector.mm b/UI/AppKit/Interface/Inspector.mm similarity index 99% rename from Ladybird/AppKit/UI/Inspector.mm rename to UI/AppKit/Interface/Inspector.mm index 782e7c31a07..6a560786f1b 100644 --- a/Ladybird/AppKit/UI/Inspector.mm +++ b/UI/AppKit/Interface/Inspector.mm @@ -9,10 +9,10 @@ #include #include -#import -#import -#import -#import +#import +#import +#import +#import #import #if !__has_feature(objc_arc) diff --git a/Ladybird/AppKit/UI/InspectorController.h b/UI/AppKit/Interface/InspectorController.h similarity index 100% rename from Ladybird/AppKit/UI/InspectorController.h rename to UI/AppKit/Interface/InspectorController.h diff --git a/Ladybird/AppKit/UI/InspectorController.mm b/UI/AppKit/Interface/InspectorController.mm similarity index 89% rename from Ladybird/AppKit/UI/InspectorController.mm rename to UI/AppKit/Interface/InspectorController.mm index 7937bf37354..f0bb82c6ae4 100644 --- a/Ladybird/AppKit/UI/InspectorController.mm +++ b/UI/AppKit/Interface/InspectorController.mm @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#import -#import -#import -#import +#import +#import +#import +#import #if !__has_feature(objc_arc) # error "This project requires ARC" diff --git a/Ladybird/AppKit/UI/LadybirdWebView.h b/UI/AppKit/Interface/LadybirdWebView.h similarity index 100% rename from Ladybird/AppKit/UI/LadybirdWebView.h rename to UI/AppKit/Interface/LadybirdWebView.h diff --git a/Ladybird/AppKit/UI/LadybirdWebView.mm b/UI/AppKit/Interface/LadybirdWebView.mm similarity index 99% rename from Ladybird/AppKit/UI/LadybirdWebView.mm rename to UI/AppKit/Interface/LadybirdWebView.mm index b98e1e60da2..107f85f61cb 100644 --- a/Ladybird/AppKit/UI/LadybirdWebView.mm +++ b/UI/AppKit/Interface/LadybirdWebView.mm @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -14,12 +15,11 @@ #include #include #include -#include #import #import -#import -#import +#import +#import #import #import diff --git a/Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp b/UI/AppKit/Interface/LadybirdWebViewBridge.cpp similarity index 98% rename from Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp rename to UI/AppKit/Interface/LadybirdWebViewBridge.cpp index 3b37619d45d..9a786c72ff7 100644 --- a/Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp +++ b/UI/AppKit/Interface/LadybirdWebViewBridge.cpp @@ -4,17 +4,17 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include +#include #include #include #include #include #include #include -#include +#include +#include -#import +#import namespace Ladybird { diff --git a/Ladybird/AppKit/UI/LadybirdWebViewBridge.h b/UI/AppKit/Interface/LadybirdWebViewBridge.h similarity index 100% rename from Ladybird/AppKit/UI/LadybirdWebViewBridge.h rename to UI/AppKit/Interface/LadybirdWebViewBridge.h diff --git a/Ladybird/AppKit/UI/LadybirdWebViewWindow.h b/UI/AppKit/Interface/LadybirdWebViewWindow.h similarity index 100% rename from Ladybird/AppKit/UI/LadybirdWebViewWindow.h rename to UI/AppKit/Interface/LadybirdWebViewWindow.h diff --git a/Ladybird/AppKit/UI/LadybirdWebViewWindow.mm b/UI/AppKit/Interface/LadybirdWebViewWindow.mm similarity index 93% rename from Ladybird/AppKit/UI/LadybirdWebViewWindow.mm rename to UI/AppKit/Interface/LadybirdWebViewWindow.mm index 9d838307996..b6dedb9c517 100644 --- a/Ladybird/AppKit/UI/LadybirdWebViewWindow.mm +++ b/UI/AppKit/Interface/LadybirdWebViewWindow.mm @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#import -#import +#import +#import #if !__has_feature(objc_arc) # error "This project requires ARC" diff --git a/Ladybird/AppKit/UI/Palette.h b/UI/AppKit/Interface/Palette.h similarity index 100% rename from Ladybird/AppKit/UI/Palette.h rename to UI/AppKit/Interface/Palette.h diff --git a/Ladybird/AppKit/UI/Palette.mm b/UI/AppKit/Interface/Palette.mm similarity index 96% rename from Ladybird/AppKit/UI/Palette.mm rename to UI/AppKit/Interface/Palette.mm index 14ee1ed9501..ac516feaded 100644 --- a/Ladybird/AppKit/UI/Palette.mm +++ b/UI/AppKit/Interface/Palette.mm @@ -5,13 +5,13 @@ */ #include -#include #include #include #include +#include #import -#import +#import #import namespace Ladybird { diff --git a/Ladybird/AppKit/UI/SearchPanel.h b/UI/AppKit/Interface/SearchPanel.h similarity index 100% rename from Ladybird/AppKit/UI/SearchPanel.h rename to UI/AppKit/Interface/SearchPanel.h diff --git a/Ladybird/AppKit/UI/SearchPanel.mm b/UI/AppKit/Interface/SearchPanel.mm similarity index 97% rename from Ladybird/AppKit/UI/SearchPanel.mm rename to UI/AppKit/Interface/SearchPanel.mm index bbe46eae3a0..24ca4e8a550 100644 --- a/Ladybird/AppKit/UI/SearchPanel.mm +++ b/UI/AppKit/Interface/SearchPanel.mm @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include -#import -#import -#import +#import +#import +#import #import #if !__has_feature(objc_arc) diff --git a/Ladybird/AppKit/UI/Tab.h b/UI/AppKit/Interface/Tab.h similarity index 89% rename from Ladybird/AppKit/UI/Tab.h rename to UI/AppKit/Interface/Tab.h index 772318ab701..99728c91997 100644 --- a/Ladybird/AppKit/UI/Tab.h +++ b/UI/AppKit/Interface/Tab.h @@ -9,7 +9,7 @@ #include #import -#import +#import @class LadybirdWebView; diff --git a/Ladybird/AppKit/UI/Tab.mm b/UI/AppKit/Interface/Tab.mm similarity index 98% rename from Ladybird/AppKit/UI/Tab.mm rename to UI/AppKit/Interface/Tab.mm index 51cdaabded6..bb3b4d163b6 100644 --- a/Ladybird/AppKit/UI/Tab.mm +++ b/UI/AppKit/Interface/Tab.mm @@ -6,20 +6,20 @@ #include #include -#include #include #include #include #include #include +#include #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #import #if !__has_feature(objc_arc) diff --git a/Ladybird/AppKit/UI/TabController.h b/UI/AppKit/Interface/TabController.h similarity index 100% rename from Ladybird/AppKit/UI/TabController.h rename to UI/AppKit/Interface/TabController.h diff --git a/Ladybird/AppKit/UI/TabController.mm b/UI/AppKit/Interface/TabController.mm similarity index 99% rename from Ladybird/AppKit/UI/TabController.mm rename to UI/AppKit/Interface/TabController.mm index 9463988fe26..2cdf06c6ae2 100644 --- a/Ladybird/AppKit/UI/TabController.mm +++ b/UI/AppKit/Interface/TabController.mm @@ -11,9 +11,9 @@ #include #import -#import -#import -#import +#import +#import +#import #import #if !__has_feature(objc_arc) diff --git a/Ladybird/AppKit/UI/TaskManager.h b/UI/AppKit/Interface/TaskManager.h similarity index 82% rename from Ladybird/AppKit/UI/TaskManager.h rename to UI/AppKit/Interface/TaskManager.h index 5ed8ecf08eb..1a7d0a0a273 100644 --- a/Ladybird/AppKit/UI/TaskManager.h +++ b/UI/AppKit/Interface/TaskManager.h @@ -7,7 +7,7 @@ #pragma once #import -#import +#import @class LadybirdWebView; diff --git a/Ladybird/AppKit/UI/TaskManager.mm b/UI/AppKit/Interface/TaskManager.mm similarity index 95% rename from Ladybird/AppKit/UI/TaskManager.mm rename to UI/AppKit/Interface/TaskManager.mm index f7f8926b844..9fd55645005 100644 --- a/Ladybird/AppKit/UI/TaskManager.mm +++ b/UI/AppKit/Interface/TaskManager.mm @@ -8,8 +8,8 @@ #include #include -#import -#import +#import +#import #if !__has_feature(objc_arc) # error "This project requires ARC" diff --git a/Ladybird/AppKit/UI/TaskManager.swift b/UI/AppKit/Interface/TaskManager.swift similarity index 100% rename from Ladybird/AppKit/UI/TaskManager.swift rename to UI/AppKit/Interface/TaskManager.swift diff --git a/Ladybird/AppKit/UI/TaskManagerController.h b/UI/AppKit/Interface/TaskManagerController.h similarity index 100% rename from Ladybird/AppKit/UI/TaskManagerController.h rename to UI/AppKit/Interface/TaskManagerController.h diff --git a/Ladybird/AppKit/UI/TaskManagerController.mm b/UI/AppKit/Interface/TaskManagerController.mm similarity index 91% rename from Ladybird/AppKit/UI/TaskManagerController.mm rename to UI/AppKit/Interface/TaskManagerController.mm index abdf705e130..0763a333a1b 100644 --- a/Ladybird/AppKit/UI/TaskManagerController.mm +++ b/UI/AppKit/Interface/TaskManagerController.mm @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#import -#import -#import +#import +#import +#import #if !__has_feature(objc_arc) # error "This project requires ARC" diff --git a/Ladybird/AppKit/UI/TaskManagerController.swift b/UI/AppKit/Interface/TaskManagerController.swift similarity index 100% rename from Ladybird/AppKit/UI/TaskManagerController.swift rename to UI/AppKit/Interface/TaskManagerController.swift diff --git a/Ladybird/AppKit/Utilities/Conversions.h b/UI/AppKit/Utilities/Conversions.h similarity index 100% rename from Ladybird/AppKit/Utilities/Conversions.h rename to UI/AppKit/Utilities/Conversions.h diff --git a/Ladybird/AppKit/Utilities/Conversions.mm b/UI/AppKit/Utilities/Conversions.mm similarity index 100% rename from Ladybird/AppKit/Utilities/Conversions.mm rename to UI/AppKit/Utilities/Conversions.mm diff --git a/Ladybird/AppKit/main.mm b/UI/AppKit/main.mm similarity index 95% rename from Ladybird/AppKit/main.mm rename to UI/AppKit/main.mm index e6fc7231640..819cef60048 100644 --- a/Ladybird/AppKit/main.mm +++ b/UI/AppKit/main.mm @@ -5,9 +5,6 @@ */ #include -#include -#include -#include #include #include #include @@ -15,12 +12,15 @@ #include #include #include +#include +#include +#include #import #import #import -#import -#import +#import +#import #if !__has_feature(objc_arc) # error "This project requires ARC" diff --git a/Ladybird/AppKit/module.modulemap b/UI/AppKit/module.modulemap similarity index 76% rename from Ladybird/AppKit/module.modulemap rename to UI/AppKit/module.modulemap index 9bf83b050cb..845cdef7b60 100644 --- a/Ladybird/AppKit/module.modulemap +++ b/UI/AppKit/module.modulemap @@ -3,12 +3,12 @@ module Ladybird [system] { requires objc_arc explicit module WebView { - header "UI/LadybirdWebView.h" + header "Interface/LadybirdWebView.h" export * } explicit module WebViewWindow { - header "UI/LadybirdWebViewWindow.h" + header "Interface/LadybirdWebViewWindow.h" export * } diff --git a/Ladybird/CMakeLists.txt b/UI/CMakeLists.txt similarity index 96% rename from Ladybird/CMakeLists.txt rename to UI/CMakeLists.txt index a63bcd14194..d6d5073797e 100644 --- a/Ladybird/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -15,7 +15,7 @@ function(create_ladybird_bundle target_name) MACOSX_BUNDLE_GUI_IDENTIFIER org.ladybird.Ladybird MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} - MACOSX_BUNDLE_INFO_PLIST "${LADYBIRD_SOURCE_DIR}/Ladybird/Info.plist" + MACOSX_BUNDLE_INFO_PLIST "${LADYBIRD_SOURCE_DIR}/UI/Info.plist" MACOSX_BUNDLE TRUE WIN32_EXECUTABLE TRUE XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER org.ladybird.Ladybird @@ -25,7 +25,7 @@ function(create_ladybird_bundle target_name) set(bundle_dir "$") add_custom_command(TARGET ${target_name} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E make_directory "${bundle_dir}/Contents/Resources" - COMMAND "iconutil" --convert icns "${LADYBIRD_SOURCE_DIR}/Ladybird/Icons/macos/app_icon.iconset" --output "${bundle_dir}/Contents/Resources/app_icon.icns" + COMMAND "iconutil" --convert icns "${LADYBIRD_SOURCE_DIR}/UI/Icons/macos/app_icon.iconset" --output "${bundle_dir}/Contents/Resources/app_icon.icns" ) # Note: This symlink is removed in the install commands diff --git a/Ladybird/DefaultSettings.h b/UI/DefaultSettings.h similarity index 100% rename from Ladybird/DefaultSettings.h rename to UI/DefaultSettings.h diff --git a/Ladybird/FontPlugin.cpp b/UI/FontPlugin.cpp similarity index 99% rename from Ladybird/FontPlugin.cpp rename to UI/FontPlugin.cpp index c854fee143e..61821f8c57b 100644 --- a/Ladybird/FontPlugin.cpp +++ b/UI/FontPlugin.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "FontPlugin.h" #include #include #include @@ -13,6 +12,7 @@ #include #include #include +#include #ifdef USE_FONTCONFIG # include diff --git a/Ladybird/FontPlugin.h b/UI/FontPlugin.h similarity index 100% rename from Ladybird/FontPlugin.h rename to UI/FontPlugin.h diff --git a/Ladybird/Headless/Application.cpp b/UI/Headless/Application.cpp similarity index 95% rename from Ladybird/Headless/Application.cpp rename to UI/Headless/Application.cpp index d3e66a97917..55803eccada 100644 --- a/Ladybird/Headless/Application.cpp +++ b/UI/Headless/Application.cpp @@ -4,14 +4,14 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include namespace Ladybird { diff --git a/Ladybird/Headless/Application.h b/UI/Headless/Application.h similarity index 100% rename from Ladybird/Headless/Application.h rename to UI/Headless/Application.h diff --git a/Ladybird/Headless/CMakeLists.txt b/UI/Headless/CMakeLists.txt similarity index 100% rename from Ladybird/Headless/CMakeLists.txt rename to UI/Headless/CMakeLists.txt diff --git a/Ladybird/Headless/Fixture.cpp b/UI/Headless/Fixture.cpp similarity index 97% rename from Ladybird/Headless/Fixture.cpp rename to UI/Headless/Fixture.cpp index 73e760ad915..5caef844c22 100644 --- a/Ladybird/Headless/Fixture.cpp +++ b/UI/Headless/Fixture.cpp @@ -5,10 +5,10 @@ */ #include -#include -#include #include #include +#include +#include namespace Ladybird { diff --git a/Ladybird/Headless/Fixture.h b/UI/Headless/Fixture.h similarity index 100% rename from Ladybird/Headless/Fixture.h rename to UI/Headless/Fixture.h diff --git a/Ladybird/Headless/HeadlessWebView.cpp b/UI/Headless/HeadlessWebView.cpp similarity index 97% rename from Ladybird/Headless/HeadlessWebView.cpp rename to UI/Headless/HeadlessWebView.cpp index 04f05a1c7a4..72a5ef9a0f8 100644 --- a/Ladybird/Headless/HeadlessWebView.cpp +++ b/UI/Headless/HeadlessWebView.cpp @@ -4,13 +4,13 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include namespace Ladybird { diff --git a/Ladybird/Headless/HeadlessWebView.h b/UI/Headless/HeadlessWebView.h similarity index 98% rename from Ladybird/Headless/HeadlessWebView.h rename to UI/Headless/HeadlessWebView.h index c12d799231c..ed013690c52 100644 --- a/Ladybird/Headless/HeadlessWebView.h +++ b/UI/Headless/HeadlessWebView.h @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -16,6 +15,7 @@ #include #include #include +#include namespace Ladybird { diff --git a/Ladybird/Headless/Test.cpp b/UI/Headless/Test.cpp similarity index 99% rename from Ladybird/Headless/Test.cpp rename to UI/Headless/Test.cpp index bc1e145dfe3..7bc3e1edde3 100644 --- a/Ladybird/Headless/Test.cpp +++ b/UI/Headless/Test.cpp @@ -10,9 +10,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -26,6 +23,9 @@ #include #include #include +#include +#include +#include namespace Ladybird { diff --git a/Ladybird/Headless/Test.h b/UI/Headless/Test.h similarity index 100% rename from Ladybird/Headless/Test.h rename to UI/Headless/Test.h diff --git a/Ladybird/Headless/main.cpp b/UI/Headless/main.cpp similarity index 96% rename from Ladybird/Headless/main.cpp rename to UI/Headless/main.cpp index 6af23627f96..823bad74ca6 100644 --- a/Ladybird/Headless/main.cpp +++ b/UI/Headless/main.cpp @@ -11,10 +11,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include @@ -25,6 +21,10 @@ #include #include #include +#include +#include +#include +#include static ErrorOr> load_page_for_screenshot_and_exit(Core::EventLoop& event_loop, Ladybird::HeadlessWebView& view, URL::URL const& url, int screenshot_timeout) { diff --git a/Ladybird/HelperProcess.cpp b/UI/HelperProcess.cpp similarity index 99% rename from Ladybird/HelperProcess.cpp rename to UI/HelperProcess.cpp index cee43c3685d..493784243a4 100644 --- a/Ladybird/HelperProcess.cpp +++ b/UI/HelperProcess.cpp @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "HelperProcess.h" -#include "Utilities.h" #include #include #include +#include +#include template static ErrorOr> launch_server_process( diff --git a/Ladybird/HelperProcess.h b/UI/HelperProcess.h similarity index 100% rename from Ladybird/HelperProcess.h rename to UI/HelperProcess.h diff --git a/Ladybird/Icons/back.tvg b/UI/Icons/back.tvg similarity index 100% rename from Ladybird/Icons/back.tvg rename to UI/Icons/back.tvg diff --git a/Ladybird/Icons/close.tvg b/UI/Icons/close.tvg similarity index 100% rename from Ladybird/Icons/close.tvg rename to UI/Icons/close.tvg diff --git a/Ladybird/Icons/down.tvg b/UI/Icons/down.tvg similarity index 100% rename from Ladybird/Icons/down.tvg rename to UI/Icons/down.tvg diff --git a/Ladybird/Icons/forward.tvg b/UI/Icons/forward.tvg similarity index 100% rename from Ladybird/Icons/forward.tvg rename to UI/Icons/forward.tvg diff --git a/Ladybird/Icons/hamburger.tvg b/UI/Icons/hamburger.tvg similarity index 100% rename from Ladybird/Icons/hamburger.tvg rename to UI/Icons/hamburger.tvg diff --git a/Ladybird/Icons/ladybird.png b/UI/Icons/ladybird.png similarity index 100% rename from Ladybird/Icons/ladybird.png rename to UI/Icons/ladybird.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_128x128.png b/UI/Icons/macos/app_icon.iconset/icon_128x128.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_128x128.png rename to UI/Icons/macos/app_icon.iconset/icon_128x128.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_128x128@2x.png b/UI/Icons/macos/app_icon.iconset/icon_128x128@2x.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_128x128@2x.png rename to UI/Icons/macos/app_icon.iconset/icon_128x128@2x.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_16x16.png b/UI/Icons/macos/app_icon.iconset/icon_16x16.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_16x16.png rename to UI/Icons/macos/app_icon.iconset/icon_16x16.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_16x16@2x.png b/UI/Icons/macos/app_icon.iconset/icon_16x16@2x.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_16x16@2x.png rename to UI/Icons/macos/app_icon.iconset/icon_16x16@2x.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_256x256.png b/UI/Icons/macos/app_icon.iconset/icon_256x256.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_256x256.png rename to UI/Icons/macos/app_icon.iconset/icon_256x256.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_256x256@2x.png b/UI/Icons/macos/app_icon.iconset/icon_256x256@2x.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_256x256@2x.png rename to UI/Icons/macos/app_icon.iconset/icon_256x256@2x.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_32x32.png b/UI/Icons/macos/app_icon.iconset/icon_32x32.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_32x32.png rename to UI/Icons/macos/app_icon.iconset/icon_32x32.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_32x32@2x.png b/UI/Icons/macos/app_icon.iconset/icon_32x32@2x.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_32x32@2x.png rename to UI/Icons/macos/app_icon.iconset/icon_32x32@2x.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_512x512.png b/UI/Icons/macos/app_icon.iconset/icon_512x512.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_512x512.png rename to UI/Icons/macos/app_icon.iconset/icon_512x512.png diff --git a/Ladybird/Icons/macos/app_icon.iconset/icon_512x512@2x.png b/UI/Icons/macos/app_icon.iconset/icon_512x512@2x.png similarity index 100% rename from Ladybird/Icons/macos/app_icon.iconset/icon_512x512@2x.png rename to UI/Icons/macos/app_icon.iconset/icon_512x512@2x.png diff --git a/Ladybird/Icons/new_tab.tvg b/UI/Icons/new_tab.tvg similarity index 100% rename from Ladybird/Icons/new_tab.tvg rename to UI/Icons/new_tab.tvg diff --git a/Ladybird/Icons/reload.tvg b/UI/Icons/reload.tvg similarity index 100% rename from Ladybird/Icons/reload.tvg rename to UI/Icons/reload.tvg diff --git a/Ladybird/Icons/up.tvg b/UI/Icons/up.tvg similarity index 100% rename from Ladybird/Icons/up.tvg rename to UI/Icons/up.tvg diff --git a/Ladybird/ImageCodecPlugin.cpp b/UI/ImageCodecPlugin.cpp similarity index 97% rename from Ladybird/ImageCodecPlugin.cpp rename to UI/ImageCodecPlugin.cpp index 7320cd894e1..d4629e8e718 100644 --- a/Ladybird/ImageCodecPlugin.cpp +++ b/UI/ImageCodecPlugin.cpp @@ -5,11 +5,11 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "ImageCodecPlugin.h" -#include "Utilities.h" #include #include #include +#include +#include namespace Ladybird { diff --git a/Ladybird/ImageCodecPlugin.h b/UI/ImageCodecPlugin.h similarity index 100% rename from Ladybird/ImageCodecPlugin.h rename to UI/ImageCodecPlugin.h diff --git a/Ladybird/Info.plist b/UI/Info.plist similarity index 100% rename from Ladybird/Info.plist rename to UI/Info.plist diff --git a/Ladybird/MachPortServer.cpp b/UI/MachPortServer.cpp similarity index 99% rename from Ladybird/MachPortServer.cpp rename to UI/MachPortServer.cpp index 329eeafa0b7..6a7a8491792 100644 --- a/Ladybird/MachPortServer.cpp +++ b/UI/MachPortServer.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "MachPortServer.h" #include #include #include +#include namespace Ladybird { diff --git a/Ladybird/MachPortServer.h b/UI/MachPortServer.h similarity index 100% rename from Ladybird/MachPortServer.h rename to UI/MachPortServer.h diff --git a/Ladybird/Qt/Application.cpp b/UI/Qt/Application.cpp similarity index 94% rename from Ladybird/Qt/Application.cpp rename to UI/Qt/Application.cpp index 351491a4777..2e9fcf48924 100644 --- a/Ladybird/Qt/Application.cpp +++ b/UI/Qt/Application.cpp @@ -4,14 +4,15 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include + #include #include diff --git a/Ladybird/Qt/Application.h b/UI/Qt/Application.h similarity index 97% rename from Ladybird/Qt/Application.h rename to UI/Qt/Application.h index e5dfcac2b73..bb6877c0da5 100644 --- a/Ladybird/Qt/Application.h +++ b/UI/Qt/Application.h @@ -8,11 +8,12 @@ #include #include -#include #include #include #include #include +#include + #include namespace Ladybird { diff --git a/Ladybird/Qt/AudioCodecPluginQt.cpp b/UI/Qt/AudioCodecPluginQt.cpp similarity index 96% rename from Ladybird/Qt/AudioCodecPluginQt.cpp rename to UI/Qt/AudioCodecPluginQt.cpp index eb95a570cb7..ca3d4b678c1 100644 --- a/Ladybird/Qt/AudioCodecPluginQt.cpp +++ b/UI/Qt/AudioCodecPluginQt.cpp @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AudioCodecPluginQt.h" -#include "AudioThread.h" #include +#include +#include namespace Ladybird { diff --git a/Ladybird/Qt/AudioCodecPluginQt.h b/UI/Qt/AudioCodecPluginQt.h similarity index 99% rename from Ladybird/Qt/AudioCodecPluginQt.h rename to UI/Qt/AudioCodecPluginQt.h index 352ab839dab..e2b9e8e354b 100644 --- a/Ladybird/Qt/AudioCodecPluginQt.h +++ b/UI/Qt/AudioCodecPluginQt.h @@ -11,6 +11,7 @@ #include #include #include + #include namespace Ladybird { diff --git a/Ladybird/Qt/AudioThread.cpp b/UI/Qt/AudioThread.cpp similarity index 99% rename from Ladybird/Qt/AudioThread.cpp rename to UI/Qt/AudioThread.cpp index 66a5a74e107..5188fc3c1a0 100644 --- a/Ladybird/Qt/AudioThread.cpp +++ b/UI/Qt/AudioThread.cpp @@ -5,8 +5,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AudioThread.h" #include +#include namespace Ladybird { diff --git a/Ladybird/Qt/AudioThread.h b/UI/Qt/AudioThread.h similarity index 99% rename from Ladybird/Qt/AudioThread.h rename to UI/Qt/AudioThread.h index 9388b98783b..e11a840d1f4 100644 --- a/Ladybird/Qt/AudioThread.h +++ b/UI/Qt/AudioThread.h @@ -15,6 +15,7 @@ #include #include #include + #include #include #include diff --git a/Ladybird/Qt/AutoComplete.cpp b/UI/Qt/AutoComplete.cpp similarity index 98% rename from Ladybird/Qt/AutoComplete.cpp rename to UI/Qt/AutoComplete.cpp index 0f4f3975e4d..7c88271d768 100644 --- a/Ladybird/Qt/AutoComplete.cpp +++ b/UI/Qt/AutoComplete.cpp @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AutoComplete.h" -#include "Settings.h" #include #include #include #include +#include +#include namespace Ladybird { diff --git a/Ladybird/Qt/AutoComplete.h b/UI/Qt/AutoComplete.h similarity index 98% rename from Ladybird/Qt/AutoComplete.h rename to UI/Qt/AutoComplete.h index 65ca9a86f0f..580cba59342 100644 --- a/Ladybird/Qt/AutoComplete.h +++ b/UI/Qt/AutoComplete.h @@ -6,9 +6,10 @@ #pragma once -#include "StringUtils.h" #include #include +#include + #include #include #include diff --git a/Ladybird/Qt/BrowserWindow.cpp b/UI/Qt/BrowserWindow.cpp similarity index 99% rename from Ladybird/Qt/BrowserWindow.cpp rename to UI/Qt/BrowserWindow.cpp index 326039b1af8..0d1d3d7a25d 100644 --- a/Ladybird/Qt/BrowserWindow.cpp +++ b/UI/Qt/BrowserWindow.cpp @@ -8,17 +8,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "BrowserWindow.h" -#include "Application.h" -#include "Icon.h" -#include "Settings.h" -#include "SettingsDialog.h" -#include "StringUtils.h" -#include "TaskManagerWindow.h" -#include "WebContentView.h" #include -#include -#include #include #include #include @@ -26,6 +16,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/BrowserWindow.h b/UI/Qt/BrowserWindow.h similarity index 99% rename from Ladybird/Qt/BrowserWindow.h rename to UI/Qt/BrowserWindow.h index b45ddf3cfca..30b418b9961 100644 --- a/Ladybird/Qt/BrowserWindow.h +++ b/UI/Qt/BrowserWindow.h @@ -7,12 +7,13 @@ #pragma once -#include "Tab.h" -#include #include #include #include #include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/CMakeLists.txt b/UI/Qt/CMakeLists.txt similarity index 100% rename from Ladybird/Qt/CMakeLists.txt rename to UI/Qt/CMakeLists.txt diff --git a/Ladybird/Qt/EventLoopImplementationQt.cpp b/UI/Qt/EventLoopImplementationQt.cpp similarity index 99% rename from Ladybird/Qt/EventLoopImplementationQt.cpp rename to UI/Qt/EventLoopImplementationQt.cpp index 9d48a29e9d3..0b3c767f849 100644 --- a/Ladybird/Qt/EventLoopImplementationQt.cpp +++ b/UI/Qt/EventLoopImplementationQt.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "EventLoopImplementationQt.h" -#include "EventLoopImplementationQtEventTarget.h" #include #include #include @@ -14,6 +12,9 @@ #include #include #include +#include +#include + #include #include diff --git a/Ladybird/Qt/EventLoopImplementationQt.h b/UI/Qt/EventLoopImplementationQt.h similarity index 99% rename from Ladybird/Qt/EventLoopImplementationQt.h rename to UI/Qt/EventLoopImplementationQt.h index dd1cd5b6551..de9d0c0acef 100644 --- a/Ladybird/Qt/EventLoopImplementationQt.h +++ b/UI/Qt/EventLoopImplementationQt.h @@ -11,6 +11,7 @@ #include #include #include + #include #include #include diff --git a/Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp b/UI/Qt/EventLoopImplementationQtEventTarget.cpp similarity index 83% rename from Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp rename to UI/Qt/EventLoopImplementationQtEventTarget.cpp index 5c8eb25a8cd..258abc4a57f 100644 --- a/Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp +++ b/UI/Qt/EventLoopImplementationQtEventTarget.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "EventLoopImplementationQtEventTarget.h" +#include namespace Ladybird { diff --git a/Ladybird/Qt/EventLoopImplementationQtEventTarget.h b/UI/Qt/EventLoopImplementationQtEventTarget.h similarity index 87% rename from Ladybird/Qt/EventLoopImplementationQtEventTarget.h rename to UI/Qt/EventLoopImplementationQtEventTarget.h index bf15fc23435..e9a723282a5 100644 --- a/Ladybird/Qt/EventLoopImplementationQtEventTarget.h +++ b/UI/Qt/EventLoopImplementationQtEventTarget.h @@ -6,9 +6,9 @@ #pragma once -#include +#include -#include "EventLoopImplementationQt.h" +#include namespace Ladybird { diff --git a/Ladybird/Qt/FindInPageWidget.cpp b/UI/Qt/FindInPageWidget.cpp similarity index 97% rename from Ladybird/Qt/FindInPageWidget.cpp rename to UI/Qt/FindInPageWidget.cpp index 0c38f2babc6..4fe0f58700b 100644 --- a/Ladybird/Qt/FindInPageWidget.cpp +++ b/UI/Qt/FindInPageWidget.cpp @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "FindInPageWidget.h" -#include "Icon.h" -#include "StringUtils.h" -#include +#include +#include +#include +#include + #include namespace Ladybird { diff --git a/Ladybird/Qt/FindInPageWidget.h b/UI/Qt/FindInPageWidget.h similarity index 97% rename from Ladybird/Qt/FindInPageWidget.h rename to UI/Qt/FindInPageWidget.h index e3eee76c3f2..9018a196399 100644 --- a/Ladybird/Qt/FindInPageWidget.h +++ b/UI/Qt/FindInPageWidget.h @@ -6,8 +6,9 @@ #pragma once -#include "WebContentView.h" #include +#include + #include #include #include diff --git a/Ladybird/Qt/Icon.cpp b/UI/Qt/Icon.cpp similarity index 94% rename from Ladybird/Qt/Icon.cpp rename to UI/Qt/Icon.cpp index ffd61bf9146..c78cbe06a9e 100644 --- a/Ladybird/Qt/Icon.cpp +++ b/UI/Qt/Icon.cpp @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "Icon.h" -#include "StringUtils.h" -#include "TVGIconEngine.h" #include +#include +#include +#include + #include namespace Ladybird { diff --git a/Ladybird/Qt/Icon.h b/UI/Qt/Icon.h similarity index 99% rename from Ladybird/Qt/Icon.h rename to UI/Qt/Icon.h index 406bde5595c..d9765e17d6e 100644 --- a/Ladybird/Qt/Icon.h +++ b/UI/Qt/Icon.h @@ -7,6 +7,7 @@ #pragma once #include + #include namespace Ladybird { diff --git a/Ladybird/Qt/InspectorWidget.cpp b/UI/Qt/InspectorWidget.cpp similarity index 99% rename from Ladybird/Qt/InspectorWidget.cpp rename to UI/Qt/InspectorWidget.cpp index ad61f73f055..bad70798384 100644 --- a/Ladybird/Qt/InspectorWidget.cpp +++ b/UI/Qt/InspectorWidget.cpp @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "InspectorWidget.h" -#include #include #include #include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/InspectorWidget.h b/UI/Qt/InspectorWidget.h similarity index 97% rename from Ladybird/Qt/InspectorWidget.h rename to UI/Qt/InspectorWidget.h index 784b7df524b..89478080e85 100644 --- a/Ladybird/Qt/InspectorWidget.h +++ b/UI/Qt/InspectorWidget.h @@ -6,9 +6,10 @@ #pragma once -#include "WebContentView.h" #include #include +#include + #include class QAction; diff --git a/Ladybird/Qt/LocationEdit.cpp b/UI/Qt/LocationEdit.cpp similarity index 97% rename from Ladybird/Qt/LocationEdit.cpp rename to UI/Qt/LocationEdit.cpp index fcfd49cb841..2a02051f54c 100644 --- a/Ladybird/Qt/LocationEdit.cpp +++ b/UI/Qt/LocationEdit.cpp @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "LocationEdit.h" -#include "Settings.h" -#include "StringUtils.h" #include #include +#include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/LocationEdit.h b/UI/Qt/LocationEdit.h similarity index 96% rename from Ladybird/Qt/LocationEdit.h rename to UI/Qt/LocationEdit.h index bb1b604dd21..c99b28564a6 100644 --- a/Ladybird/Qt/LocationEdit.h +++ b/UI/Qt/LocationEdit.h @@ -6,8 +6,9 @@ #pragma once -#include "AutoComplete.h" #include +#include + #include namespace Ladybird { diff --git a/Ladybird/Qt/Settings.cpp b/UI/Qt/Settings.cpp similarity index 98% rename from Ladybird/Qt/Settings.cpp rename to UI/Qt/Settings.cpp index ad331d73035..7403d502744 100644 --- a/Ladybird/Qt/Settings.cpp +++ b/UI/Qt/Settings.cpp @@ -6,10 +6,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "Settings.h" -#include "StringUtils.h" #include -#include +#include +#include +#include namespace Ladybird { diff --git a/Ladybird/Qt/Settings.h b/UI/Qt/Settings.h similarity index 99% rename from Ladybird/Qt/Settings.h rename to UI/Qt/Settings.h index 6697eb00313..38f73dd6293 100644 --- a/Ladybird/Qt/Settings.h +++ b/UI/Qt/Settings.h @@ -11,6 +11,7 @@ #include #include #include + #include #include #include diff --git a/Ladybird/Qt/SettingsDialog.cpp b/UI/Qt/SettingsDialog.cpp similarity index 98% rename from Ladybird/Qt/SettingsDialog.cpp rename to UI/Qt/SettingsDialog.cpp index bf89c34417d..67f6109073b 100644 --- a/Ladybird/Qt/SettingsDialog.cpp +++ b/UI/Qt/SettingsDialog.cpp @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "SettingsDialog.h" -#include "Settings.h" -#include "StringUtils.h" #include #include #include +#include +#include +#include + #include #include diff --git a/Ladybird/Qt/SettingsDialog.h b/UI/Qt/SettingsDialog.h similarity index 100% rename from Ladybird/Qt/SettingsDialog.h rename to UI/Qt/SettingsDialog.h diff --git a/Ladybird/Qt/StringUtils.cpp b/UI/Qt/StringUtils.cpp similarity index 96% rename from Ladybird/Qt/StringUtils.cpp rename to UI/Qt/StringUtils.cpp index 4f7652ca899..0da9216b505 100644 --- a/Ladybird/Qt/StringUtils.cpp +++ b/UI/Qt/StringUtils.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "StringUtils.h" +#include AK::ByteString ak_byte_string_from_qstring(QString const& qstring) { diff --git a/Ladybird/Qt/StringUtils.h b/UI/Qt/StringUtils.h similarity index 99% rename from Ladybird/Qt/StringUtils.h rename to UI/Qt/StringUtils.h index 9fa12b870b3..7fa6c112f65 100644 --- a/Ladybird/Qt/StringUtils.h +++ b/UI/Qt/StringUtils.h @@ -11,6 +11,7 @@ #include #include #include + #include #include diff --git a/Ladybird/Qt/TVGIconEngine.cpp b/UI/Qt/TVGIconEngine.cpp similarity index 97% rename from Ladybird/Qt/TVGIconEngine.cpp rename to UI/Qt/TVGIconEngine.cpp index d3978940f53..50b15342596 100644 --- a/Ladybird/Qt/TVGIconEngine.cpp +++ b/UI/Qt/TVGIconEngine.cpp @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "TVGIconEngine.h" -#include "StringUtils.h" #include #include #include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/TVGIconEngine.h b/UI/Qt/TVGIconEngine.h similarity index 99% rename from Ladybird/Qt/TVGIconEngine.h rename to UI/Qt/TVGIconEngine.h index eecb5230ca2..c02939c0c0f 100644 --- a/Ladybird/Qt/TVGIconEngine.h +++ b/UI/Qt/TVGIconEngine.h @@ -10,6 +10,7 @@ #include #include #include + #include namespace Ladybird { diff --git a/Ladybird/Qt/Tab.cpp b/UI/Qt/Tab.cpp similarity index 99% rename from Ladybird/Qt/Tab.cpp rename to UI/Qt/Tab.cpp index 176bf426fa4..979ad0aef41 100644 --- a/Ladybird/Qt/Tab.cpp +++ b/UI/Qt/Tab.cpp @@ -6,11 +6,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "BrowserWindow.h" -#include "Icon.h" -#include "InspectorWidget.h" -#include "Settings.h" -#include "StringUtils.h" #include #include #include @@ -18,6 +13,12 @@ #include #include #include +#include +#include +#include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/Tab.h b/UI/Qt/Tab.h similarity index 97% rename from Ladybird/Qt/Tab.h rename to UI/Qt/Tab.h index 2881b90c62d..ecfaabffd6c 100644 --- a/Ladybird/Qt/Tab.h +++ b/UI/Qt/Tab.h @@ -7,10 +7,11 @@ #pragma once -#include "LocationEdit.h" -#include "WebContentView.h" -#include #include +#include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/TabBar.cpp b/UI/Qt/TabBar.cpp similarity index 99% rename from Ladybird/Qt/TabBar.cpp rename to UI/Qt/TabBar.cpp index b7560a3f0e0..744327bfb8e 100644 --- a/Ladybird/Qt/TabBar.cpp +++ b/UI/Qt/TabBar.cpp @@ -6,10 +6,11 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "Tab.h" #include #include -#include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/TabBar.h b/UI/Qt/TabBar.h similarity index 100% rename from Ladybird/Qt/TabBar.h rename to UI/Qt/TabBar.h diff --git a/Ladybird/Qt/TaskManagerWindow.cpp b/UI/Qt/TaskManagerWindow.cpp similarity index 96% rename from Ladybird/Qt/TaskManagerWindow.cpp rename to UI/Qt/TaskManagerWindow.cpp index 5ce0e9eb1d4..c4cee5f5d7a 100644 --- a/Ladybird/Qt/TaskManagerWindow.cpp +++ b/UI/Qt/TaskManagerWindow.cpp @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "TaskManagerWindow.h" #include +#include + #include namespace Ladybird { diff --git a/Ladybird/Qt/TaskManagerWindow.h b/UI/Qt/TaskManagerWindow.h similarity index 93% rename from Ladybird/Qt/TaskManagerWindow.h rename to UI/Qt/TaskManagerWindow.h index efe7863e360..8084aaa9fdc 100644 --- a/Ladybird/Qt/TaskManagerWindow.h +++ b/UI/Qt/TaskManagerWindow.h @@ -6,7 +6,8 @@ #pragma once -#include "WebContentView.h" +#include + #include #include diff --git a/Ladybird/Qt/WebContentView.cpp b/UI/Qt/WebContentView.cpp similarity index 99% rename from Ladybird/Qt/WebContentView.cpp rename to UI/Qt/WebContentView.cpp index 03e5d220073..47a77e38a5b 100644 --- a/Ladybird/Qt/WebContentView.cpp +++ b/UI/Qt/WebContentView.cpp @@ -5,17 +5,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "WebContentView.h" -#include "Application.h" -#include "StringUtils.h" #include #include #include #include #include #include -#include -#include #include #include #include @@ -30,6 +25,12 @@ #include #include #include +#include +#include +#include +#include +#include + #include #include #include diff --git a/Ladybird/Qt/WebContentView.h b/UI/Qt/WebContentView.h similarity index 99% rename from Ladybird/Qt/WebContentView.h rename to UI/Qt/WebContentView.h index 229247b26e1..0d20a368830 100644 --- a/Ladybird/Qt/WebContentView.h +++ b/UI/Qt/WebContentView.h @@ -21,6 +21,7 @@ #include #include #include + #include #include #include diff --git a/Ladybird/Qt/ladybird.qrc b/UI/Qt/ladybird.qrc similarity index 100% rename from Ladybird/Qt/ladybird.qrc rename to UI/Qt/ladybird.qrc diff --git a/Ladybird/Qt/main.cpp b/UI/Qt/main.cpp similarity index 94% rename from Ladybird/Qt/main.cpp rename to UI/Qt/main.cpp index d66ac125676..1fc82956f66 100644 --- a/Ladybird/Qt/main.cpp +++ b/UI/Qt/main.cpp @@ -4,13 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "Application.h" -#include "BrowserWindow.h" -#include "EventLoopImplementationQt.h" -#include "Settings.h" -#include "WebContentView.h" -#include -#include #include #include #include @@ -21,9 +14,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include #if defined(AK_OS_MACOS) -# include +# include #endif namespace Ladybird { diff --git a/Ladybird/Utilities.cpp b/UI/Utilities.cpp similarity index 99% rename from Ladybird/Utilities.cpp rename to UI/Utilities.cpp index ae3c1565235..a41f60e0145 100644 --- a/Ladybird/Utilities.cpp +++ b/UI/Utilities.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "Utilities.h" #include #include #include @@ -14,6 +13,7 @@ #include #include #include +#include #define TOKENCAT(x, y) x##y #define STRINGIFY(x) TOKENCAT(x, sv) diff --git a/Ladybird/Utilities.h b/UI/Utilities.h similarity index 100% rename from Ladybird/Utilities.h rename to UI/Utilities.h diff --git a/Ladybird/cmake/AndroidExtras.cmake b/UI/cmake/AndroidExtras.cmake similarity index 92% rename from Ladybird/cmake/AndroidExtras.cmake rename to UI/cmake/AndroidExtras.cmake index c15229609e5..5109e92cbad 100644 --- a/Ladybird/cmake/AndroidExtras.cmake +++ b/UI/cmake/AndroidExtras.cmake @@ -28,6 +28,6 @@ add_custom_target(copy-certs "asset-bundle/res/ladybird/cacert.pem" ) add_dependencies(archive-assets copy-certs) -add_custom_target(copy-assets COMMAND ${CMAKE_COMMAND} -E copy_if_different ladybird-assets.tar "${CMAKE_SOURCE_DIR}/Ladybird/Android/src/main/assets/") +add_custom_target(copy-assets COMMAND ${CMAKE_COMMAND} -E copy_if_different ladybird-assets.tar "${CMAKE_SOURCE_DIR}/UI/Android/src/main/assets/") add_dependencies(copy-assets archive-assets) add_dependencies(ladybird copy-assets) diff --git a/Ladybird/cmake/EnableLagom.cmake b/UI/cmake/EnableLagom.cmake similarity index 100% rename from Ladybird/cmake/EnableLagom.cmake rename to UI/cmake/EnableLagom.cmake diff --git a/Ladybird/cmake/InstallRules.cmake b/UI/cmake/InstallRules.cmake similarity index 100% rename from Ladybird/cmake/InstallRules.cmake rename to UI/cmake/InstallRules.cmake diff --git a/Ladybird/cmake/LadybirdInstallConfig.cmake b/UI/cmake/LadybirdInstallConfig.cmake similarity index 100% rename from Ladybird/cmake/LadybirdInstallConfig.cmake rename to UI/cmake/LadybirdInstallConfig.cmake diff --git a/Ladybird/cmake/ResourceFiles.cmake b/UI/cmake/ResourceFiles.cmake similarity index 100% rename from Ladybird/cmake/ResourceFiles.cmake rename to UI/cmake/ResourceFiles.cmake diff --git a/Ladybird/default.nix b/UI/default.nix similarity index 100% rename from Ladybird/default.nix rename to UI/default.nix