Переглянути джерело

Ladybird: Define AK_DONT_REPLACE_STD via CMake rather than in every file

Timothy Flynn 2 роки тому
батько
коміт
8fe846eb7f

+ 0 - 2
Ladybird/AndroidPlatform.cpp

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#define AK_DONT_REPLACE_STD
-
 #include <AK/DeprecatedString.h>
 #include <AK/LexicalPath.h>
 #include <AK/Platform.h>

+ 1 - 0
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)
 

+ 0 - 2
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"

+ 0 - 2
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 <AK/Function.h>

+ 0 - 2
Ladybird/FontPluginQt.cpp

@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#define AK_DONT_REPLACE_STD
-
 #include "FontPluginQt.h"
 #include <AK/DeprecatedString.h>
 #include <AK/String.h>

+ 0 - 2
Ladybird/HelperProcess.h

@@ -6,8 +6,6 @@
 
 #pragma once
 
-#define AK_DONT_REPLACE_STD
-
 #include <AK/Error.h>
 #include <AK/Optional.h>
 #include <AK/Span.h>

+ 0 - 2
Ladybird/ImageCodecPluginLadybird.cpp

@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#define AK_DONT_REPLACE_STD
-
 #include "ImageCodecPluginLadybird.h"
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageFormats/ImageDecoder.h>

+ 0 - 2
Ladybird/InspectorWidget.cpp

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#define AK_DONT_REPLACE_STD
-
 #include <LibWebView/AccessibilityTreeModel.h>
 #include <LibWebView/DOMTreeModel.h>
 #include <LibWebView/StylePropertiesModel.h>

+ 0 - 2
Ladybird/LocationEdit.h

@@ -6,8 +6,6 @@
 
 #pragma once
 
-#define AK_DONT_REPLACE_STD
-
 #include <QLineEdit>
 
 class LocationEdit final : public QLineEdit {

+ 0 - 2
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 <QIcon>

+ 0 - 2
Ladybird/RequestManagerQt.h

@@ -6,8 +6,6 @@
 
 #pragma once
 
-#define AK_DONT_REPLACE_STD
-
 #include <LibWeb/Loader/ResourceLoader.h>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>

+ 0 - 2
Ladybird/SQLServer/main.cpp

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#define AK_DONT_REPLACE_STD
-
 #include <AK/DeprecatedString.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/Directory.h>

+ 0 - 2
Ladybird/Settings.h

@@ -6,8 +6,6 @@
 
 #pragma once
 
-#define AK_DONT_REPLACE_STD
-
 #include <AK/DeprecatedString.h>
 #include <QSettings>
 

+ 0 - 2
Ladybird/Tab.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#define AK_DONT_REPLACE_STD
-
 #include "LocationEdit.h"
 #include "WebContentView.h"
 #include <Browser/History.h>

+ 0 - 2
Ladybird/TimerQt.cpp

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#define AK_DONT_REPLACE_STD
-
 #include "TimerQt.h"
 #include <AK/NonnullRefPtr.h>
 #include <QTimer>

+ 0 - 2
Ladybird/Utilities.cpp

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#define AK_DONT_REPLACE_STD
-
 #include "Utilities.h"
 #include <AK/LexicalPath.h>
 #include <AK/Platform.h>

+ 0 - 2
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"

+ 0 - 2
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"

+ 0 - 2
Ladybird/WebContentView.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#define AK_DONT_REPLACE_STD
-
 #include <AK/DeprecatedString.h>
 #include <AK/Function.h>
 #include <AK/HashMap.h>

+ 0 - 2
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 <AK/Platform.h>

+ 0 - 2
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 <LibCore/EventLoop.h>

+ 1 - 6
Userland/Utilities/headless-browser.cpp

@@ -5,17 +5,12 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <AK/Platform.h>
-
-#if !defined(AK_OS_SERENITY)
-#    define AK_DONT_REPLACE_STD
-#endif
-
 #include <AK/Badge.h>
 #include <AK/DeprecatedString.h>
 #include <AK/Function.h>
 #include <AK/LexicalPath.h>
 #include <AK/NonnullOwnPtr.h>
+#include <AK/Platform.h>
 #include <AK/String.h>
 #include <AK/URL.h>
 #include <AK/Vector.h>