mirror of
https://github.com/RGBCube/serenity
synced 2025-05-28 18:05:08 +00:00
Ladybird: Define AK_DONT_REPLACE_STD via CMake rather than in every file
This commit is contained in:
parent
269c25e1d2
commit
8fe846eb7f
22 changed files with 2 additions and 46 deletions
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <AK/DeprecatedString.h>
|
#include <AK/DeprecatedString.h>
|
||||||
#include <AK/LexicalPath.h>
|
#include <AK/LexicalPath.h>
|
||||||
#include <AK/Platform.h>
|
#include <AK/Platform.h>
|
||||||
|
|
|
@ -66,6 +66,7 @@ else()
|
||||||
set(SERENITY_SOURCE_DIR "${SERENITY_PROJECT_ROOT}")
|
set(SERENITY_SOURCE_DIR "${SERENITY_PROJECT_ROOT}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_compile_options(-DAK_DONT_REPLACE_STD)
|
||||||
add_compile_options(-Wno-expansion-to-defined)
|
add_compile_options(-Wno-expansion-to-defined)
|
||||||
add_compile_options(-Wno-user-defined-literals)
|
add_compile_options(-Wno-user-defined-literals)
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "ConsoleWidget.h"
|
#include "ConsoleWidget.h"
|
||||||
#include "Utilities.h"
|
#include "Utilities.h"
|
||||||
#include "WebContentView.h"
|
#include "WebContentView.h"
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "EventLoopPluginQt.h"
|
#include "EventLoopPluginQt.h"
|
||||||
#include "TimerQt.h"
|
#include "TimerQt.h"
|
||||||
#include <AK/Function.h>
|
#include <AK/Function.h>
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "FontPluginQt.h"
|
#include "FontPluginQt.h"
|
||||||
#include <AK/DeprecatedString.h>
|
#include <AK/DeprecatedString.h>
|
||||||
#include <AK/String.h>
|
#include <AK/String.h>
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <AK/Error.h>
|
#include <AK/Error.h>
|
||||||
#include <AK/Optional.h>
|
#include <AK/Optional.h>
|
||||||
#include <AK/Span.h>
|
#include <AK/Span.h>
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "ImageCodecPluginLadybird.h"
|
#include "ImageCodecPluginLadybird.h"
|
||||||
#include <LibGfx/Bitmap.h>
|
#include <LibGfx/Bitmap.h>
|
||||||
#include <LibGfx/ImageFormats/ImageDecoder.h>
|
#include <LibGfx/ImageFormats/ImageDecoder.h>
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <LibWebView/AccessibilityTreeModel.h>
|
#include <LibWebView/AccessibilityTreeModel.h>
|
||||||
#include <LibWebView/DOMTreeModel.h>
|
#include <LibWebView/DOMTreeModel.h>
|
||||||
#include <LibWebView/StylePropertiesModel.h>
|
#include <LibWebView/StylePropertiesModel.h>
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
|
|
||||||
class LocationEdit final : public QLineEdit {
|
class LocationEdit final : public QLineEdit {
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "ModelTranslator.h"
|
#include "ModelTranslator.h"
|
||||||
#include "Utilities.h"
|
#include "Utilities.h"
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <LibWeb/Loader/ResourceLoader.h>
|
#include <LibWeb/Loader/ResourceLoader.h>
|
||||||
#include <QtNetwork/QNetworkAccessManager>
|
#include <QtNetwork/QNetworkAccessManager>
|
||||||
#include <QtNetwork/QNetworkReply>
|
#include <QtNetwork/QNetworkReply>
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <AK/DeprecatedString.h>
|
#include <AK/DeprecatedString.h>
|
||||||
#include <LibCore/ArgsParser.h>
|
#include <LibCore/ArgsParser.h>
|
||||||
#include <LibCore/Directory.h>
|
#include <LibCore/Directory.h>
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <AK/DeprecatedString.h>
|
#include <AK/DeprecatedString.h>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "LocationEdit.h"
|
#include "LocationEdit.h"
|
||||||
#include "WebContentView.h"
|
#include "WebContentView.h"
|
||||||
#include <Browser/History.h>
|
#include <Browser/History.h>
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "TimerQt.h"
|
#include "TimerQt.h"
|
||||||
#include <AK/NonnullRefPtr.h>
|
#include <AK/NonnullRefPtr.h>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "Utilities.h"
|
#include "Utilities.h"
|
||||||
#include <AK/LexicalPath.h>
|
#include <AK/LexicalPath.h>
|
||||||
#include <AK/Platform.h>
|
#include <AK/Platform.h>
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "../EventLoopPluginQt.h"
|
#include "../EventLoopPluginQt.h"
|
||||||
#include "../FontPluginQt.h"
|
#include "../FontPluginQt.h"
|
||||||
#include "../ImageCodecPluginLadybird.h"
|
#include "../ImageCodecPluginLadybird.h"
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "WebContentView.h"
|
#include "WebContentView.h"
|
||||||
#include "ConsoleWidget.h"
|
#include "ConsoleWidget.h"
|
||||||
#include "HelperProcess.h"
|
#include "HelperProcess.h"
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include <AK/DeprecatedString.h>
|
#include <AK/DeprecatedString.h>
|
||||||
#include <AK/Function.h>
|
#include <AK/Function.h>
|
||||||
#include <AK/HashMap.h>
|
#include <AK/HashMap.h>
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "../HelperProcess.h"
|
#include "../HelperProcess.h"
|
||||||
#include "../Utilities.h"
|
#include "../Utilities.h"
|
||||||
#include <AK/Platform.h>
|
#include <AK/Platform.h>
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define AK_DONT_REPLACE_STD
|
|
||||||
|
|
||||||
#include "WebSocketImplQt.h"
|
#include "WebSocketImplQt.h"
|
||||||
#include "Utilities.h"
|
#include "Utilities.h"
|
||||||
#include <LibCore/EventLoop.h>
|
#include <LibCore/EventLoop.h>
|
||||||
|
|
|
@ -5,17 +5,12 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* 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/Badge.h>
|
||||||
#include <AK/DeprecatedString.h>
|
#include <AK/DeprecatedString.h>
|
||||||
#include <AK/Function.h>
|
#include <AK/Function.h>
|
||||||
#include <AK/LexicalPath.h>
|
#include <AK/LexicalPath.h>
|
||||||
#include <AK/NonnullOwnPtr.h>
|
#include <AK/NonnullOwnPtr.h>
|
||||||
|
#include <AK/Platform.h>
|
||||||
#include <AK/String.h>
|
#include <AK/String.h>
|
||||||
#include <AK/URL.h>
|
#include <AK/URL.h>
|
||||||
#include <AK/Vector.h>
|
#include <AK/Vector.h>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue