diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1299da92503..0976743de0e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -11,6 +11,6 @@ /Userland/Libraries/LibWeb/WebAssembly @alimpfard /Userland/Libraries/LibWeb/WebDriver @trflynn89 /Userland/Libraries/LibXML @alimpfard -/Userland/Services/RequestServer @alimpfard -/Userland/Services/WebDriver @trflynn89 +/Services/RequestServer @alimpfard +/Services/WebDriver @trflynn89 /Userland/Utilities/wasm.cpp @alimpfard diff --git a/CMakeLists.txt b/CMakeLists.txt index 01ef8f42d86..ac76b5dec14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ endif() include(CTest) # for BUILD_TESTING option, default ON if (ENABLE_GUI_TARGETS) - add_subdirectory(Userland/Services) + add_subdirectory(Services) add_subdirectory(Ladybird) endif() diff --git a/Documentation/EditorConfiguration/QtCreatorConfiguration.md b/Documentation/EditorConfiguration/QtCreatorConfiguration.md index 365d6508eee..9b5088c774d 100644 --- a/Documentation/EditorConfiguration/QtCreatorConfiguration.md +++ b/Documentation/EditorConfiguration/QtCreatorConfiguration.md @@ -24,11 +24,11 @@ First, make sure you have a working toolchain and can build and run Ladybird. Go ./ Userland/ Userland/Libraries/ - Userland/Services/ + Services/ Build/release/ Build/release/Userland/ Build/release/Userland/Libraries/ - Build/release/Userland/Services/ + Build/release/Services/ AK/ ``` diff --git a/Documentation/EditorConfiguration/VSCodeConfiguration.md b/Documentation/EditorConfiguration/VSCodeConfiguration.md index 77786e31024..32259e6a8c5 100644 --- a/Documentation/EditorConfiguration/VSCodeConfiguration.md +++ b/Documentation/EditorConfiguration/VSCodeConfiguration.md @@ -61,10 +61,10 @@ following ``c_cpp_properties.json`` to circumvent some errors. Even with the con "${workspaceFolder}/Build/release/", "${workspaceFolder}/Build/release/Userland", "${workspaceFolder}/Build/release/Userland/Libraries", - "${workspaceFolder}/Build/release/Userland/Services", + "${workspaceFolder}/Build/release/Services", "${workspaceFolder}/Userland", "${workspaceFolder}/Userland/Libraries", - "${workspaceFolder}/Userland/Services" + "${workspaceFolder}/Services" ], "defines": [ "DEBUG" @@ -84,10 +84,10 @@ following ``c_cpp_properties.json`` to circumvent some errors. Even with the con "${workspaceFolder}/Build/release/", "${workspaceFolder}/Build/release/Userland", "${workspaceFolder}/Build/release/Userland/Libraries", - "${workspaceFolder}/Build/release/Userland/Services", + "${workspaceFolder}/Build/release/Services", "${workspaceFolder}/Userland", "${workspaceFolder}/Userland/Libraries", - "${workspaceFolder}/Userland/Services" + "${workspaceFolder}/Services" ], "limitSymbolsToIncludedHeaders": true, "databaseFilename": "${workspaceFolder}/Build/release/" @@ -290,7 +290,7 @@ The following three example tasks should suffice in most situations, and allow y #### Mac If you want to run the debugger, first place the content below in `.vscode/launch.json` in the root of the project. -```json +```json { "version": "0.2.0", "configurations": [ @@ -310,7 +310,7 @@ then run Ladybird with the debug preset and with the `--debug-process WebContent CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ BUILD_PRESET=Debug ./Meta/ladybird.sh run ladybird --debug-process WebContent ``` -Running Ladybird in this way will pause execution until a debugger is attached. You can then run the debugger by going to the **Run and Debug** menu and selecting the **Attach to WebContent** configuration. +Running Ladybird in this way will pause execution until a debugger is attached. You can then run the debugger by going to the **Run and Debug** menu and selecting the **Attach to WebContent** configuration. #### Linux For Linux, the `launch.json` will instead be the file below. diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index a2a45d6aea7..c4eb7f4dd97 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -95,7 +95,7 @@ target_link_libraries(${LADYBIRD_TARGET} PRIVATE ${LADYBIRD_LIBS}) target_include_directories(${LADYBIRD_TARGET} ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR}/Userland/) -target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR}/Userland/Services/) +target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR}/Services/) function(set_helper_process_properties) set(targets ${ARGV}) diff --git a/Ladybird/cmake/EnableLagom.cmake b/Ladybird/cmake/EnableLagom.cmake index d99046038da..fab308207ef 100644 --- a/Ladybird/cmake/EnableLagom.cmake +++ b/Ladybird/cmake/EnableLagom.cmake @@ -7,10 +7,10 @@ set(LAGOM_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/Lagom") # FIXME: Setting target_include_directories on Lagom libraries might make this unnecessary? include_directories(${LADYBIRD_SOURCE_DIR}) -include_directories(${LADYBIRD_SOURCE_DIR}/Userland/Services) +include_directories(${LADYBIRD_SOURCE_DIR}/Services) include_directories(${LADYBIRD_SOURCE_DIR}/Userland/Libraries) include_directories(${LAGOM_BINARY_DIR}) -include_directories(${LAGOM_BINARY_DIR}/Userland/Services) +include_directories(${LAGOM_BINARY_DIR}/Services) include_directories(${LAGOM_BINARY_DIR}/Userland/Libraries) add_subdirectory("${LAGOM_SOURCE_DIR}" "${LAGOM_BINARY_DIR}") diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 056ce05b37e..17798267999 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -177,11 +177,11 @@ configure_file(../../AK/Debug.h.in AK/Debug.h @ONLY) include_directories(../../) include_directories(../../Userland/) include_directories(../../Userland/Libraries/) -include_directories(../../Userland/Services) +include_directories(../../Services) include_directories(${CMAKE_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland/Libraries) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland/Services) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/Services) # install rules, think about moving to its own helper cmake file include(CMakePackageConfigHelpers) @@ -234,7 +234,7 @@ function(lagom_lib target_name fs_name) target_include_directories(${target_name} INTERFACE $ $ - $ + $ ) endif() add_lagom_library_install_rules(${target_name} ALIAS_NAME ${library}) @@ -425,12 +425,12 @@ if (HAIKU) target_link_libraries(LibCore PRIVATE network) endif() -compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/RequestClient.ipc Userland/Services/RequestServer/RequestClientEndpoint.h) -compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/RequestServer.ipc Userland/Services/RequestServer/RequestServerEndpoint.h) -compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebContentServer.ipc Userland/Services/WebContent/WebContentServerEndpoint.h) -compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebContentClient.ipc Userland/Services/WebContent/WebContentClientEndpoint.h) -compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebDriverClient.ipc Userland/Services/WebContent/WebDriverClientEndpoint.h) -compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebDriverServer.ipc Userland/Services/WebContent/WebDriverServerEndpoint.h) +compile_ipc(${SERENITY_PROJECT_ROOT}/Services/RequestServer/RequestClient.ipc Services/RequestServer/RequestClientEndpoint.h) +compile_ipc(${SERENITY_PROJECT_ROOT}/Services/RequestServer/RequestServer.ipc Services/RequestServer/RequestServerEndpoint.h) +compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebContentServer.ipc Services/WebContent/WebContentServerEndpoint.h) +compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebContentClient.ipc Services/WebContent/WebContentClientEndpoint.h) +compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebDriverClient.ipc Services/WebContent/WebDriverClientEndpoint.h) +compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebDriverServer.ipc Services/WebContent/WebDriverServerEndpoint.h) foreach(lib IN LISTS lagom_standard_libraries) add_serenity_subdirectory("Userland/Libraries/Lib${lib}") diff --git a/Userland/Services/CMakeLists.txt b/Services/CMakeLists.txt similarity index 100% rename from Userland/Services/CMakeLists.txt rename to Services/CMakeLists.txt diff --git a/Userland/Services/ImageDecoder/CMakeLists.txt b/Services/ImageDecoder/CMakeLists.txt similarity index 96% rename from Userland/Services/ImageDecoder/CMakeLists.txt rename to Services/ImageDecoder/CMakeLists.txt index 6cbbd416761..6675323798c 100644 --- a/Userland/Services/ImageDecoder/CMakeLists.txt +++ b/Services/ImageDecoder/CMakeLists.txt @@ -20,7 +20,7 @@ endif() add_executable(ImageDecoder main.cpp) target_include_directories(imagedecoderservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..) -target_include_directories(imagedecoderservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/) +target_include_directories(imagedecoderservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/) target_link_libraries(ImageDecoder PRIVATE imagedecoderservice LibCore LibMain) target_link_libraries(imagedecoderservice PRIVATE LibCore LibGfx LibIPC LibImageDecoderClient LibMain LibThreading) diff --git a/Userland/Services/ImageDecoder/ConnectionFromClient.cpp b/Services/ImageDecoder/ConnectionFromClient.cpp similarity index 100% rename from Userland/Services/ImageDecoder/ConnectionFromClient.cpp rename to Services/ImageDecoder/ConnectionFromClient.cpp diff --git a/Userland/Services/ImageDecoder/ConnectionFromClient.h b/Services/ImageDecoder/ConnectionFromClient.h similarity index 100% rename from Userland/Services/ImageDecoder/ConnectionFromClient.h rename to Services/ImageDecoder/ConnectionFromClient.h diff --git a/Userland/Services/ImageDecoder/Forward.h b/Services/ImageDecoder/Forward.h similarity index 100% rename from Userland/Services/ImageDecoder/Forward.h rename to Services/ImageDecoder/Forward.h diff --git a/Userland/Services/ImageDecoder/ImageDecoderClient.ipc b/Services/ImageDecoder/ImageDecoderClient.ipc similarity index 100% rename from Userland/Services/ImageDecoder/ImageDecoderClient.ipc rename to Services/ImageDecoder/ImageDecoderClient.ipc diff --git a/Userland/Services/ImageDecoder/ImageDecoderServer.ipc b/Services/ImageDecoder/ImageDecoderServer.ipc similarity index 100% rename from Userland/Services/ImageDecoder/ImageDecoderServer.ipc rename to Services/ImageDecoder/ImageDecoderServer.ipc diff --git a/Userland/Services/ImageDecoder/main.cpp b/Services/ImageDecoder/main.cpp similarity index 100% rename from Userland/Services/ImageDecoder/main.cpp rename to Services/ImageDecoder/main.cpp diff --git a/Userland/Services/RequestServer/CMakeLists.txt b/Services/RequestServer/CMakeLists.txt similarity index 97% rename from Userland/Services/RequestServer/CMakeLists.txt rename to Services/RequestServer/CMakeLists.txt index 4147370a861..64419abb9a9 100644 --- a/Userland/Services/RequestServer/CMakeLists.txt +++ b/Services/RequestServer/CMakeLists.txt @@ -23,7 +23,7 @@ find_package(CURL REQUIRED) add_executable(RequestServer main.cpp) target_include_directories(requestserverservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..) -target_include_directories(requestserverservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/) +target_include_directories(requestserverservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/) target_link_libraries(RequestServer PRIVATE requestserverservice) target_link_libraries(requestserverservice PUBLIC LibCore LibMain LibCrypto LibFileSystem LibIPC LibMain LibTLS LibWebView LibWebSocket LibURL LibTextCodec LibThreading CURL::libcurl) diff --git a/Userland/Services/RequestServer/CacheLevel.h b/Services/RequestServer/CacheLevel.h similarity index 100% rename from Userland/Services/RequestServer/CacheLevel.h rename to Services/RequestServer/CacheLevel.h diff --git a/Userland/Services/RequestServer/ConnectionFromClient.cpp b/Services/RequestServer/ConnectionFromClient.cpp similarity index 100% rename from Userland/Services/RequestServer/ConnectionFromClient.cpp rename to Services/RequestServer/ConnectionFromClient.cpp diff --git a/Userland/Services/RequestServer/ConnectionFromClient.h b/Services/RequestServer/ConnectionFromClient.h similarity index 100% rename from Userland/Services/RequestServer/ConnectionFromClient.h rename to Services/RequestServer/ConnectionFromClient.h diff --git a/Userland/Services/RequestServer/Forward.h b/Services/RequestServer/Forward.h similarity index 100% rename from Userland/Services/RequestServer/Forward.h rename to Services/RequestServer/Forward.h diff --git a/Userland/Services/RequestServer/Request.cpp b/Services/RequestServer/Request.cpp similarity index 100% rename from Userland/Services/RequestServer/Request.cpp rename to Services/RequestServer/Request.cpp diff --git a/Userland/Services/RequestServer/Request.h b/Services/RequestServer/Request.h similarity index 100% rename from Userland/Services/RequestServer/Request.h rename to Services/RequestServer/Request.h diff --git a/Userland/Services/RequestServer/RequestClient.ipc b/Services/RequestServer/RequestClient.ipc similarity index 100% rename from Userland/Services/RequestServer/RequestClient.ipc rename to Services/RequestServer/RequestClient.ipc diff --git a/Userland/Services/RequestServer/RequestServer.ipc b/Services/RequestServer/RequestServer.ipc similarity index 100% rename from Userland/Services/RequestServer/RequestServer.ipc rename to Services/RequestServer/RequestServer.ipc diff --git a/Userland/Services/RequestServer/main.cpp b/Services/RequestServer/main.cpp similarity index 100% rename from Userland/Services/RequestServer/main.cpp rename to Services/RequestServer/main.cpp diff --git a/Userland/Services/WebContent/BackingStoreManager.cpp b/Services/WebContent/BackingStoreManager.cpp similarity index 100% rename from Userland/Services/WebContent/BackingStoreManager.cpp rename to Services/WebContent/BackingStoreManager.cpp diff --git a/Userland/Services/WebContent/BackingStoreManager.h b/Services/WebContent/BackingStoreManager.h similarity index 100% rename from Userland/Services/WebContent/BackingStoreManager.h rename to Services/WebContent/BackingStoreManager.h diff --git a/Userland/Services/WebContent/CMakeLists.txt b/Services/WebContent/CMakeLists.txt similarity index 96% rename from Userland/Services/WebContent/CMakeLists.txt rename to Services/WebContent/CMakeLists.txt index d21ddf0133e..7a2462e41e6 100644 --- a/Userland/Services/WebContent/CMakeLists.txt +++ b/Services/WebContent/CMakeLists.txt @@ -30,7 +30,7 @@ else() endif() target_include_directories(webcontentservice PUBLIC $) -target_include_directories(webcontentservice PUBLIC $) +target_include_directories(webcontentservice PUBLIC $) target_include_directories(webcontentservice PUBLIC $) target_link_libraries(webcontentservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibMedia LibWeb LibWebSocket LibRequests LibWebView LibImageDecoderClient) @@ -72,7 +72,7 @@ target_sources(webcontentservice PUBLIC FILE_SET ladybird TYPE HEADERS ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.h ) target_sources(webcontentservice PUBLIC FILE_SET server TYPE HEADERS - BASE_DIRS ${LADYBIRD_SOURCE_DIR}/Userland/Services + BASE_DIRS ${LADYBIRD_SOURCE_DIR}/Services FILES ConnectionFromClient.h ConsoleGlobalEnvironmentExtensions.h Forward.h diff --git a/Userland/Services/WebContent/ConnectionFromClient.cpp b/Services/WebContent/ConnectionFromClient.cpp similarity index 100% rename from Userland/Services/WebContent/ConnectionFromClient.cpp rename to Services/WebContent/ConnectionFromClient.cpp diff --git a/Userland/Services/WebContent/ConnectionFromClient.h b/Services/WebContent/ConnectionFromClient.h similarity index 100% rename from Userland/Services/WebContent/ConnectionFromClient.h rename to Services/WebContent/ConnectionFromClient.h diff --git a/Userland/Services/WebContent/ConsoleGlobalEnvironmentExtensions.cpp b/Services/WebContent/ConsoleGlobalEnvironmentExtensions.cpp similarity index 100% rename from Userland/Services/WebContent/ConsoleGlobalEnvironmentExtensions.cpp rename to Services/WebContent/ConsoleGlobalEnvironmentExtensions.cpp diff --git a/Userland/Services/WebContent/ConsoleGlobalEnvironmentExtensions.h b/Services/WebContent/ConsoleGlobalEnvironmentExtensions.h similarity index 100% rename from Userland/Services/WebContent/ConsoleGlobalEnvironmentExtensions.h rename to Services/WebContent/ConsoleGlobalEnvironmentExtensions.h diff --git a/Userland/Services/WebContent/Forward.h b/Services/WebContent/Forward.h similarity index 100% rename from Userland/Services/WebContent/Forward.h rename to Services/WebContent/Forward.h diff --git a/Userland/Services/WebContent/ImageCodecPluginSerenity.cpp b/Services/WebContent/ImageCodecPluginSerenity.cpp similarity index 100% rename from Userland/Services/WebContent/ImageCodecPluginSerenity.cpp rename to Services/WebContent/ImageCodecPluginSerenity.cpp diff --git a/Userland/Services/WebContent/ImageCodecPluginSerenity.h b/Services/WebContent/ImageCodecPluginSerenity.h similarity index 100% rename from Userland/Services/WebContent/ImageCodecPluginSerenity.h rename to Services/WebContent/ImageCodecPluginSerenity.h diff --git a/Userland/Services/WebContent/PageClient.cpp b/Services/WebContent/PageClient.cpp similarity index 100% rename from Userland/Services/WebContent/PageClient.cpp rename to Services/WebContent/PageClient.cpp diff --git a/Userland/Services/WebContent/PageClient.h b/Services/WebContent/PageClient.h similarity index 100% rename from Userland/Services/WebContent/PageClient.h rename to Services/WebContent/PageClient.h diff --git a/Userland/Services/WebContent/PageHost.cpp b/Services/WebContent/PageHost.cpp similarity index 100% rename from Userland/Services/WebContent/PageHost.cpp rename to Services/WebContent/PageHost.cpp diff --git a/Userland/Services/WebContent/PageHost.h b/Services/WebContent/PageHost.h similarity index 100% rename from Userland/Services/WebContent/PageHost.h rename to Services/WebContent/PageHost.h diff --git a/Userland/Services/WebContent/WebContentClient.ipc b/Services/WebContent/WebContentClient.ipc similarity index 100% rename from Userland/Services/WebContent/WebContentClient.ipc rename to Services/WebContent/WebContentClient.ipc diff --git a/Userland/Services/WebContent/WebContentConsoleClient.cpp b/Services/WebContent/WebContentConsoleClient.cpp similarity index 100% rename from Userland/Services/WebContent/WebContentConsoleClient.cpp rename to Services/WebContent/WebContentConsoleClient.cpp diff --git a/Userland/Services/WebContent/WebContentConsoleClient.h b/Services/WebContent/WebContentConsoleClient.h similarity index 100% rename from Userland/Services/WebContent/WebContentConsoleClient.h rename to Services/WebContent/WebContentConsoleClient.h diff --git a/Userland/Services/WebContent/WebContentServer.ipc b/Services/WebContent/WebContentServer.ipc similarity index 100% rename from Userland/Services/WebContent/WebContentServer.ipc rename to Services/WebContent/WebContentServer.ipc diff --git a/Userland/Services/WebContent/WebDriverClient.ipc b/Services/WebContent/WebDriverClient.ipc similarity index 100% rename from Userland/Services/WebContent/WebDriverClient.ipc rename to Services/WebContent/WebDriverClient.ipc diff --git a/Userland/Services/WebContent/WebDriverConnection.cpp b/Services/WebContent/WebDriverConnection.cpp similarity index 100% rename from Userland/Services/WebContent/WebDriverConnection.cpp rename to Services/WebContent/WebDriverConnection.cpp diff --git a/Userland/Services/WebContent/WebDriverConnection.h b/Services/WebContent/WebDriverConnection.h similarity index 100% rename from Userland/Services/WebContent/WebDriverConnection.h rename to Services/WebContent/WebDriverConnection.h diff --git a/Userland/Services/WebContent/WebDriverServer.ipc b/Services/WebContent/WebDriverServer.ipc similarity index 100% rename from Userland/Services/WebContent/WebDriverServer.ipc rename to Services/WebContent/WebDriverServer.ipc diff --git a/Userland/Services/WebContent/main.cpp b/Services/WebContent/main.cpp similarity index 100% rename from Userland/Services/WebContent/main.cpp rename to Services/WebContent/main.cpp diff --git a/Userland/Services/WebDriver/CMakeLists.txt b/Services/WebDriver/CMakeLists.txt similarity index 96% rename from Userland/Services/WebDriver/CMakeLists.txt rename to Services/WebDriver/CMakeLists.txt index 849c81c06e7..7eddbc1cb97 100644 --- a/Userland/Services/WebDriver/CMakeLists.txt +++ b/Services/WebDriver/CMakeLists.txt @@ -11,6 +11,6 @@ add_executable(WebDriver ${SOURCES}) target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../..) target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..) target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland) -target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services) +target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Services) target_link_libraries(WebDriver PRIVATE LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibWeb LibWebSocket LibWebView) diff --git a/Userland/Services/WebDriver/Client.cpp b/Services/WebDriver/Client.cpp similarity index 100% rename from Userland/Services/WebDriver/Client.cpp rename to Services/WebDriver/Client.cpp diff --git a/Userland/Services/WebDriver/Client.h b/Services/WebDriver/Client.h similarity index 100% rename from Userland/Services/WebDriver/Client.h rename to Services/WebDriver/Client.h diff --git a/Userland/Services/WebDriver/Session.cpp b/Services/WebDriver/Session.cpp similarity index 100% rename from Userland/Services/WebDriver/Session.cpp rename to Services/WebDriver/Session.cpp diff --git a/Userland/Services/WebDriver/Session.h b/Services/WebDriver/Session.h similarity index 100% rename from Userland/Services/WebDriver/Session.h rename to Services/WebDriver/Session.h diff --git a/Userland/Services/WebDriver/WebContentConnection.cpp b/Services/WebDriver/WebContentConnection.cpp similarity index 100% rename from Userland/Services/WebDriver/WebContentConnection.cpp rename to Services/WebDriver/WebContentConnection.cpp diff --git a/Userland/Services/WebDriver/WebContentConnection.h b/Services/WebDriver/WebContentConnection.h similarity index 100% rename from Userland/Services/WebDriver/WebContentConnection.h rename to Services/WebDriver/WebContentConnection.h diff --git a/Userland/Services/WebDriver/main.cpp b/Services/WebDriver/main.cpp similarity index 100% rename from Userland/Services/WebDriver/main.cpp rename to Services/WebDriver/main.cpp diff --git a/Userland/Services/WebWorker/CMakeLists.txt b/Services/WebWorker/CMakeLists.txt similarity index 98% rename from Userland/Services/WebWorker/CMakeLists.txt rename to Services/WebWorker/CMakeLists.txt index 9c9bc40504d..51cc6590cb7 100644 --- a/Userland/Services/WebWorker/CMakeLists.txt +++ b/Services/WebWorker/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(webworkerservice STATIC ${WEBWORKER_SOURCES}) set_target_properties(webworkerservice PROPERTIES AUTOMOC OFF AUTORCC OFF AUTOUIC OFF) target_include_directories(webworkerservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..) -target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/) +target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/) target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/) target_link_libraries(webworkerservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibRequests LibWeb LibWebView LibUnicode LibImageDecoderClient LibMain LibURL) diff --git a/Userland/Services/WebWorker/ConnectionFromClient.cpp b/Services/WebWorker/ConnectionFromClient.cpp similarity index 100% rename from Userland/Services/WebWorker/ConnectionFromClient.cpp rename to Services/WebWorker/ConnectionFromClient.cpp diff --git a/Userland/Services/WebWorker/ConnectionFromClient.h b/Services/WebWorker/ConnectionFromClient.h similarity index 100% rename from Userland/Services/WebWorker/ConnectionFromClient.h rename to Services/WebWorker/ConnectionFromClient.h diff --git a/Userland/Services/WebWorker/DedicatedWorkerHost.cpp b/Services/WebWorker/DedicatedWorkerHost.cpp similarity index 100% rename from Userland/Services/WebWorker/DedicatedWorkerHost.cpp rename to Services/WebWorker/DedicatedWorkerHost.cpp diff --git a/Userland/Services/WebWorker/DedicatedWorkerHost.h b/Services/WebWorker/DedicatedWorkerHost.h similarity index 100% rename from Userland/Services/WebWorker/DedicatedWorkerHost.h rename to Services/WebWorker/DedicatedWorkerHost.h diff --git a/Userland/Services/WebWorker/Forward.h b/Services/WebWorker/Forward.h similarity index 100% rename from Userland/Services/WebWorker/Forward.h rename to Services/WebWorker/Forward.h diff --git a/Userland/Services/WebWorker/PageHost.cpp b/Services/WebWorker/PageHost.cpp similarity index 100% rename from Userland/Services/WebWorker/PageHost.cpp rename to Services/WebWorker/PageHost.cpp diff --git a/Userland/Services/WebWorker/PageHost.h b/Services/WebWorker/PageHost.h similarity index 100% rename from Userland/Services/WebWorker/PageHost.h rename to Services/WebWorker/PageHost.h diff --git a/Userland/Services/WebWorker/main.cpp b/Services/WebWorker/main.cpp similarity index 100% rename from Userland/Services/WebWorker/main.cpp rename to Services/WebWorker/main.cpp diff --git a/Userland/Libraries/LibImageDecoderClient/CMakeLists.txt b/Userland/Libraries/LibImageDecoderClient/CMakeLists.txt index b9af1b2b131..90ab12338c2 100644 --- a/Userland/Libraries/LibImageDecoderClient/CMakeLists.txt +++ b/Userland/Libraries/LibImageDecoderClient/CMakeLists.txt @@ -3,13 +3,13 @@ set(SOURCES ) if (NOT SERENITYOS) - compile_ipc(../../Services/ImageDecoder/ImageDecoderClient.ipc ../../Services/ImageDecoder/ImageDecoderClientEndpoint.h) - compile_ipc(../../Services/ImageDecoder/ImageDecoderServer.ipc ../../Services/ImageDecoder/ImageDecoderServerEndpoint.h) + compile_ipc(../../../Services/ImageDecoder/ImageDecoderClient.ipc ../../../Services/ImageDecoder/ImageDecoderClientEndpoint.h) + compile_ipc(../../../Services/ImageDecoder/ImageDecoderServer.ipc ../../../Services/ImageDecoder/ImageDecoderServerEndpoint.h) endif() set(GENERATED_SOURCES - ../../Services/ImageDecoder/ImageDecoderClientEndpoint.h - ../../Services/ImageDecoder/ImageDecoderServerEndpoint.h + ../../../Services/ImageDecoder/ImageDecoderClientEndpoint.h + ../../../Services/ImageDecoder/ImageDecoderServerEndpoint.h ) serenity_lib(LibImageDecoderClient imagedecoderclient) diff --git a/Userland/Libraries/LibRequests/CMakeLists.txt b/Userland/Libraries/LibRequests/CMakeLists.txt index 65f71ca4230..d0169d2014d 100644 --- a/Userland/Libraries/LibRequests/CMakeLists.txt +++ b/Userland/Libraries/LibRequests/CMakeLists.txt @@ -6,8 +6,8 @@ set(SOURCES ) set(GENERATED_SOURCES - ../../Services/RequestServer/RequestClientEndpoint.h - ../../Services/RequestServer/RequestServerEndpoint.h + ../../../Services/RequestServer/RequestClientEndpoint.h + ../../../Services/RequestServer/RequestServerEndpoint.h ) serenity_lib(LibRequests requests) diff --git a/Userland/Libraries/LibWebView/CMakeLists.txt b/Userland/Libraries/LibWebView/CMakeLists.txt index 9c68e489287..d87237b9c05 100644 --- a/Userland/Libraries/LibWebView/CMakeLists.txt +++ b/Userland/Libraries/LibWebView/CMakeLists.txt @@ -34,12 +34,12 @@ compile_ipc(UIProcessClient.ipc UIProcessClientEndpoint.h) set(GENERATED_SOURCES ${GENERATED_SOURCES} - ../../Services/RequestServer/RequestClientEndpoint.h - ../../Services/RequestServer/RequestServerEndpoint.h - ../../Services/WebContent/WebContentClientEndpoint.h - ../../Services/WebContent/WebContentServerEndpoint.h - ../../Services/WebContent/WebDriverClientEndpoint.h - ../../Services/WebContent/WebDriverServerEndpoint.h + ../../../Services/RequestServer/RequestClientEndpoint.h + ../../../Services/RequestServer/RequestServerEndpoint.h + ../../../Services/WebContent/WebContentClientEndpoint.h + ../../../Services/WebContent/WebContentServerEndpoint.h + ../../../Services/WebContent/WebDriverClientEndpoint.h + ../../../Services/WebContent/WebDriverServerEndpoint.h NativeStyleSheetSource.cpp UIProcessClientEndpoint.h UIProcessServerEndpoint.h