From 8fe846eb7fd0619b5f9a91d25ece7f93f0fc4eb5 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 24 Apr 2023 07:16:37 -0400 Subject: [PATCH] Ladybird: Define AK_DONT_REPLACE_STD via CMake rather than in every file --- Ladybird/AndroidPlatform.cpp | 2 -- Ladybird/CMakeLists.txt | 1 + Ladybird/ConsoleWidget.cpp | 2 -- Ladybird/EventLoopPluginQt.cpp | 2 -- Ladybird/FontPluginQt.cpp | 2 -- Ladybird/HelperProcess.h | 2 -- Ladybird/ImageCodecPluginLadybird.cpp | 2 -- Ladybird/InspectorWidget.cpp | 2 -- Ladybird/LocationEdit.h | 2 -- Ladybird/ModelTranslator.cpp | 2 -- Ladybird/RequestManagerQt.h | 2 -- Ladybird/SQLServer/main.cpp | 2 -- Ladybird/Settings.h | 2 -- Ladybird/Tab.h | 2 -- Ladybird/TimerQt.cpp | 2 -- Ladybird/Utilities.cpp | 2 -- Ladybird/WebContent/main.cpp | 2 -- Ladybird/WebContentView.cpp | 2 -- Ladybird/WebContentView.h | 2 -- Ladybird/WebDriver/main.cpp | 2 -- Ladybird/WebSocketImplQt.cpp | 2 -- Userland/Utilities/headless-browser.cpp | 7 +------ 22 files changed, 2 insertions(+), 46 deletions(-) diff --git a/Ladybird/AndroidPlatform.cpp b/Ladybird/AndroidPlatform.cpp index 73815ce2cc4..436e51766e7 100644 --- a/Ladybird/AndroidPlatform.cpp +++ b/Ladybird/AndroidPlatform.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include #include #include diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index 53495a953e6..30f4ec6eeb9 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -66,6 +66,7 @@ else() set(SERENITY_SOURCE_DIR "${SERENITY_PROJECT_ROOT}") endif() +add_compile_options(-DAK_DONT_REPLACE_STD) add_compile_options(-Wno-expansion-to-defined) add_compile_options(-Wno-user-defined-literals) diff --git a/Ladybird/ConsoleWidget.cpp b/Ladybird/ConsoleWidget.cpp index 761768ff262..00eb559b94a 100644 --- a/Ladybird/ConsoleWidget.cpp +++ b/Ladybird/ConsoleWidget.cpp @@ -7,8 +7,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "ConsoleWidget.h" #include "Utilities.h" #include "WebContentView.h" diff --git a/Ladybird/EventLoopPluginQt.cpp b/Ladybird/EventLoopPluginQt.cpp index 766447cf08c..fe5b28de700 100644 --- a/Ladybird/EventLoopPluginQt.cpp +++ b/Ladybird/EventLoopPluginQt.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "EventLoopPluginQt.h" #include "TimerQt.h" #include diff --git a/Ladybird/FontPluginQt.cpp b/Ladybird/FontPluginQt.cpp index 78fd7125693..c98440f7734 100644 --- a/Ladybird/FontPluginQt.cpp +++ b/Ladybird/FontPluginQt.cpp @@ -5,8 +5,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "FontPluginQt.h" #include #include diff --git a/Ladybird/HelperProcess.h b/Ladybird/HelperProcess.h index 5003e97c48e..6a42701ec23 100644 --- a/Ladybird/HelperProcess.h +++ b/Ladybird/HelperProcess.h @@ -6,8 +6,6 @@ #pragma once -#define AK_DONT_REPLACE_STD - #include #include #include diff --git a/Ladybird/ImageCodecPluginLadybird.cpp b/Ladybird/ImageCodecPluginLadybird.cpp index 40faf29f55e..0172d2d384b 100644 --- a/Ladybird/ImageCodecPluginLadybird.cpp +++ b/Ladybird/ImageCodecPluginLadybird.cpp @@ -5,8 +5,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "ImageCodecPluginLadybird.h" #include #include diff --git a/Ladybird/InspectorWidget.cpp b/Ladybird/InspectorWidget.cpp index 7052e011538..a0894c40387 100644 --- a/Ladybird/InspectorWidget.cpp +++ b/Ladybird/InspectorWidget.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include #include #include diff --git a/Ladybird/LocationEdit.h b/Ladybird/LocationEdit.h index 20ed6771f19..f2607e0fc1b 100644 --- a/Ladybird/LocationEdit.h +++ b/Ladybird/LocationEdit.h @@ -6,8 +6,6 @@ #pragma once -#define AK_DONT_REPLACE_STD - #include class LocationEdit final : public QLineEdit { diff --git a/Ladybird/ModelTranslator.cpp b/Ladybird/ModelTranslator.cpp index 31d61954deb..3d0f663c5e4 100644 --- a/Ladybird/ModelTranslator.cpp +++ b/Ladybird/ModelTranslator.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "ModelTranslator.h" #include "Utilities.h" #include diff --git a/Ladybird/RequestManagerQt.h b/Ladybird/RequestManagerQt.h index 4c3d99ea905..eb7e13bb2ba 100644 --- a/Ladybird/RequestManagerQt.h +++ b/Ladybird/RequestManagerQt.h @@ -6,8 +6,6 @@ #pragma once -#define AK_DONT_REPLACE_STD - #include #include #include diff --git a/Ladybird/SQLServer/main.cpp b/Ladybird/SQLServer/main.cpp index 70789c2f848..26c3ee25d23 100644 --- a/Ladybird/SQLServer/main.cpp +++ b/Ladybird/SQLServer/main.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include #include #include diff --git a/Ladybird/Settings.h b/Ladybird/Settings.h index 9069ba09aa3..5dea619bb0f 100644 --- a/Ladybird/Settings.h +++ b/Ladybird/Settings.h @@ -6,8 +6,6 @@ #pragma once -#define AK_DONT_REPLACE_STD - #include #include diff --git a/Ladybird/Tab.h b/Ladybird/Tab.h index 2ab47470eac..5a0a45906d8 100644 --- a/Ladybird/Tab.h +++ b/Ladybird/Tab.h @@ -7,8 +7,6 @@ #pragma once -#define AK_DONT_REPLACE_STD - #include "LocationEdit.h" #include "WebContentView.h" #include diff --git a/Ladybird/TimerQt.cpp b/Ladybird/TimerQt.cpp index 3692a635e22..39d6520dd2f 100644 --- a/Ladybird/TimerQt.cpp +++ b/Ladybird/TimerQt.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "TimerQt.h" #include #include diff --git a/Ladybird/Utilities.cpp b/Ladybird/Utilities.cpp index 5fb1598d27a..dbc9e9a48d8 100644 --- a/Ladybird/Utilities.cpp +++ b/Ladybird/Utilities.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "Utilities.h" #include #include diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index ae8c4247979..0cb098aa3ee 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "../EventLoopPluginQt.h" #include "../FontPluginQt.h" #include "../ImageCodecPluginLadybird.h" diff --git a/Ladybird/WebContentView.cpp b/Ladybird/WebContentView.cpp index f2938e0111e..14ce3974f7c 100644 --- a/Ladybird/WebContentView.cpp +++ b/Ladybird/WebContentView.cpp @@ -5,8 +5,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "WebContentView.h" #include "ConsoleWidget.h" #include "HelperProcess.h" diff --git a/Ladybird/WebContentView.h b/Ladybird/WebContentView.h index 3c4be3a4aa7..9b24cfe5180 100644 --- a/Ladybird/WebContentView.h +++ b/Ladybird/WebContentView.h @@ -7,8 +7,6 @@ #pragma once -#define AK_DONT_REPLACE_STD - #include #include #include diff --git a/Ladybird/WebDriver/main.cpp b/Ladybird/WebDriver/main.cpp index f501597a726..5734753ba60 100644 --- a/Ladybird/WebDriver/main.cpp +++ b/Ladybird/WebDriver/main.cpp @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "../HelperProcess.h" #include "../Utilities.h" #include diff --git a/Ladybird/WebSocketImplQt.cpp b/Ladybird/WebSocketImplQt.cpp index 81a30ee78a0..afa76aefa92 100644 --- a/Ladybird/WebSocketImplQt.cpp +++ b/Ladybird/WebSocketImplQt.cpp @@ -7,8 +7,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#define AK_DONT_REPLACE_STD - #include "WebSocketImplQt.h" #include "Utilities.h" #include diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp index 8c6420aca6e..c63fdfdb8b1 100644 --- a/Userland/Utilities/headless-browser.cpp +++ b/Userland/Utilities/headless-browser.cpp @@ -5,17 +5,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include - -#if !defined(AK_OS_SERENITY) -# define AK_DONT_REPLACE_STD -#endif - #include #include #include #include #include +#include #include #include #include