From 349a3ceec5b3792dd4b51cbce58041783434b116 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Tue, 16 Jul 2024 23:54:53 -0600 Subject: [PATCH] Ladybird/AppKit: Remove system header workarounds for global names --- Ladybird/AppKit/Application/Application.h | 2 +- Ladybird/AppKit/Application/ApplicationDelegate.h | 2 +- .../AppKit/Application/EventLoopImplementation.mm | 4 ++-- Ladybird/AppKit/System/Carbon.h | 13 ------------- Ladybird/AppKit/System/Cocoa.h | 13 ------------- Ladybird/AppKit/System/CoreFoundation.h | 13 ------------- Ladybird/AppKit/System/Detail/Footer.h | 14 -------------- Ladybird/AppKit/System/Detail/Header.h | 14 -------------- Ladybird/AppKit/UI/Event.h | 2 +- Ladybird/AppKit/UI/Event.mm | 2 +- Ladybird/AppKit/UI/Inspector.h | 2 +- Ladybird/AppKit/UI/InspectorController.h | 2 +- Ladybird/AppKit/UI/LadybirdWebView.h | 2 +- Ladybird/AppKit/UI/Palette.mm | 2 +- Ladybird/AppKit/UI/SearchPanel.h | 2 +- Ladybird/AppKit/UI/Tab.h | 2 +- Ladybird/AppKit/UI/TabController.h | 2 +- Ladybird/AppKit/UI/TaskManager.h | 2 +- Ladybird/AppKit/UI/TaskManagerController.h | 2 +- Ladybird/AppKit/Utilities/Conversions.h | 2 +- 20 files changed, 16 insertions(+), 83 deletions(-) delete mode 100644 Ladybird/AppKit/System/Carbon.h delete mode 100644 Ladybird/AppKit/System/Cocoa.h delete mode 100644 Ladybird/AppKit/System/CoreFoundation.h delete mode 100644 Ladybird/AppKit/System/Detail/Footer.h delete mode 100644 Ladybird/AppKit/System/Detail/Header.h diff --git a/Ladybird/AppKit/Application/Application.h b/Ladybird/AppKit/Application/Application.h index edd2112184d..1ce7a446653 100644 --- a/Ladybird/AppKit/Application/Application.h +++ b/Ladybird/AppKit/Application/Application.h @@ -11,7 +11,7 @@ #include #include -#import +#import namespace Ladybird { class WebViewBridge; diff --git a/Ladybird/AppKit/Application/ApplicationDelegate.h b/Ladybird/AppKit/Application/ApplicationDelegate.h index 871bdd5ef61..961ed65a017 100644 --- a/Ladybird/AppKit/Application/ApplicationDelegate.h +++ b/Ladybird/AppKit/Application/ApplicationDelegate.h @@ -17,7 +17,7 @@ #include #include -#import +#import @class Tab; @class TabController; diff --git a/Ladybird/AppKit/Application/EventLoopImplementation.mm b/Ladybird/AppKit/Application/EventLoopImplementation.mm index 10ac24b1c29..53dd5c36cee 100644 --- a/Ladybird/AppKit/Application/EventLoopImplementation.mm +++ b/Ladybird/AppKit/Application/EventLoopImplementation.mm @@ -13,8 +13,8 @@ #include #import -#import -#import +#import +#import #include #include diff --git a/Ladybird/AppKit/System/Carbon.h b/Ladybird/AppKit/System/Carbon.h deleted file mode 100644 index 5ed116ab7b3..00000000000 --- a/Ladybird/AppKit/System/Carbon.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include "Detail/Header.h" - -#import - -#include "Detail/Footer.h" diff --git a/Ladybird/AppKit/System/Cocoa.h b/Ladybird/AppKit/System/Cocoa.h deleted file mode 100644 index 5830be83cfb..00000000000 --- a/Ladybird/AppKit/System/Cocoa.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include "Detail/Header.h" - -#import - -#include "Detail/Footer.h" diff --git a/Ladybird/AppKit/System/CoreFoundation.h b/Ladybird/AppKit/System/CoreFoundation.h deleted file mode 100644 index d3affe91af4..00000000000 --- a/Ladybird/AppKit/System/CoreFoundation.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include "Detail/Header.h" - -#import - -#include "Detail/Footer.h" diff --git a/Ladybird/AppKit/System/Detail/Footer.h b/Ladybird/AppKit/System/Detail/Footer.h deleted file mode 100644 index e13d175366e..00000000000 --- a/Ladybird/AppKit/System/Detail/Footer.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#if !defined(MACOS_UGLY_WORKAROUND) -# error Footer.h was included before Header.h. -#endif - -#undef Duration -#undef FixedPoint - -#undef MACOS_UGLY_WORKAROUND diff --git a/Ladybird/AppKit/System/Detail/Header.h b/Ladybird/AppKit/System/Detail/Header.h deleted file mode 100644 index 8401e8a7244..00000000000 --- a/Ladybird/AppKit/System/Detail/Header.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#if defined(MACOS_UGLY_WORKAROUND) -# error Header.h was included again before Footer.h. -#endif - -#define Duration DurationMacOS -#define FixedPoint FixedPointMacOS - -#define MACOS_UGLY_WORKAROUND diff --git a/Ladybird/AppKit/UI/Event.h b/Ladybird/AppKit/UI/Event.h index 4650c6e769b..64689b13157 100644 --- a/Ladybird/AppKit/UI/Event.h +++ b/Ladybird/AppKit/UI/Event.h @@ -8,7 +8,7 @@ #include -#import +#import namespace Ladybird { diff --git a/Ladybird/AppKit/UI/Event.mm b/Ladybird/AppKit/UI/Event.mm index 730760e1b54..5422d33a9be 100644 --- a/Ladybird/AppKit/UI/Event.mm +++ b/Ladybird/AppKit/UI/Event.mm @@ -7,7 +7,7 @@ #include #include -#import +#import #import #import diff --git a/Ladybird/AppKit/UI/Inspector.h b/Ladybird/AppKit/UI/Inspector.h index 895835d86c2..391700ac2f3 100644 --- a/Ladybird/AppKit/UI/Inspector.h +++ b/Ladybird/AppKit/UI/Inspector.h @@ -6,7 +6,7 @@ #pragma once -#import +#import @class LadybirdWebView; @class Tab; diff --git a/Ladybird/AppKit/UI/InspectorController.h b/Ladybird/AppKit/UI/InspectorController.h index 099e05974de..ef35cf254e4 100644 --- a/Ladybird/AppKit/UI/InspectorController.h +++ b/Ladybird/AppKit/UI/InspectorController.h @@ -6,7 +6,7 @@ #pragma once -#import +#import @class Tab; diff --git a/Ladybird/AppKit/UI/LadybirdWebView.h b/Ladybird/AppKit/UI/LadybirdWebView.h index 6800e2ea167..3b2e17a81e3 100644 --- a/Ladybird/AppKit/UI/LadybirdWebView.h +++ b/Ladybird/AppKit/UI/LadybirdWebView.h @@ -16,7 +16,7 @@ #include #include -#import +#import @protocol LadybirdWebViewObserver diff --git a/Ladybird/AppKit/UI/Palette.mm b/Ladybird/AppKit/UI/Palette.mm index 94602b78595..12ebe66760d 100644 --- a/Ladybird/AppKit/UI/Palette.mm +++ b/Ladybird/AppKit/UI/Palette.mm @@ -10,7 +10,7 @@ #include #include -#import +#import #import namespace Ladybird { diff --git a/Ladybird/AppKit/UI/SearchPanel.h b/Ladybird/AppKit/UI/SearchPanel.h index 28bf0c798aa..fdf1dd227ff 100644 --- a/Ladybird/AppKit/UI/SearchPanel.h +++ b/Ladybird/AppKit/UI/SearchPanel.h @@ -8,7 +8,7 @@ #include -#import +#import @interface SearchPanel : NSStackView diff --git a/Ladybird/AppKit/UI/Tab.h b/Ladybird/AppKit/UI/Tab.h index 67322bd0949..92d4bd629aa 100644 --- a/Ladybird/AppKit/UI/Tab.h +++ b/Ladybird/AppKit/UI/Tab.h @@ -6,7 +6,7 @@ #pragma once -#import +#import @class LadybirdWebView; diff --git a/Ladybird/AppKit/UI/TabController.h b/Ladybird/AppKit/UI/TabController.h index 9e3927e0937..ee810c0ae68 100644 --- a/Ladybird/AppKit/UI/TabController.h +++ b/Ladybird/AppKit/UI/TabController.h @@ -9,7 +9,7 @@ #include #include -#import +#import struct TabSettings { BOOL should_show_line_box_borders { NO }; diff --git a/Ladybird/AppKit/UI/TaskManager.h b/Ladybird/AppKit/UI/TaskManager.h index 5ab2a267c2b..b14006007dc 100644 --- a/Ladybird/AppKit/UI/TaskManager.h +++ b/Ladybird/AppKit/UI/TaskManager.h @@ -6,7 +6,7 @@ #pragma once -#import +#import @class LadybirdWebView; diff --git a/Ladybird/AppKit/UI/TaskManagerController.h b/Ladybird/AppKit/UI/TaskManagerController.h index 7ea8ddc00ba..52d8dab247f 100644 --- a/Ladybird/AppKit/UI/TaskManagerController.h +++ b/Ladybird/AppKit/UI/TaskManagerController.h @@ -6,7 +6,7 @@ #pragma once -#import +#import @protocol TaskManagerDelegate diff --git a/Ladybird/AppKit/Utilities/Conversions.h b/Ladybird/AppKit/Utilities/Conversions.h index 0823d539316..0f74bce0565 100644 --- a/Ladybird/AppKit/Utilities/Conversions.h +++ b/Ladybird/AppKit/Utilities/Conversions.h @@ -14,7 +14,7 @@ #include #include -#import +#import namespace Ladybird {