Ladybird/AppKit: Remove system header workarounds for global names

Author: https://github.com/ADKaster Commit: 349a3ceec5 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/676 Reviewed-by: https://github.com/AtkinsSJ ✅ Reviewed-by: https://github.com/trflynn89 ✅
2025-06-10 18:10:56 +09:00 · 2024-07-16 23:54:53 -06:00 · 2024-07-16 23:54:53 -06:00 · 349a3ceec5 · 2024-07-18 23:46:23 +09:00
commit 349a3ceec5
parent 88044f59c6
20 changed files with 16 additions and 83 deletions
--- a/Ladybird/AppKit/Application/Application.h
+++ b/Ladybird/AppKit/Application/Application.h
@ -11,7 +11,7 @@
 #include <LibIPC/Forward.h>
 #include <LibWebView/Forward.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

 namespace Ladybird {
 class WebViewBridge;
--- a/Ladybird/AppKit/Application/ApplicationDelegate.h
+++ b/Ladybird/AppKit/Application/ApplicationDelegate.h
@ -17,7 +17,7 @@
 #include <LibWeb/HTML/ActivateTab.h>
 #include <LibWebView/CookieJar.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@class Tab;
@class TabController;
--- a/Ladybird/AppKit/Application/EventLoopImplementation.mm
+++ b/Ladybird/AppKit/Application/EventLoopImplementation.mm
@ -13,8 +13,8 @@
 #include <LibCore/ThreadEventQueue.h>

 #import <Application/EventLoopImplementation.h>
-#import <System/Cocoa.h>
-#import <System/CoreFoundation.h>
+#import <Cocoa/Cocoa.h>
+#import <CoreFoundation/CoreFoundation.h>

 #include <sys/event.h>
 #include <sys/time.h>
--- a/Ladybird/AppKit/System/Carbon.h
+++ b/Ladybird/AppKit/System/Carbon.h
@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include "Detail/Header.h"
-
-#import <Carbon/Carbon.h>
-
-#include "Detail/Footer.h"
--- a/Ladybird/AppKit/System/Cocoa.h
+++ b/Ladybird/AppKit/System/Cocoa.h
@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include "Detail/Header.h"
-
-#import <Cocoa/Cocoa.h>
-
-#include "Detail/Footer.h"
--- a/Ladybird/AppKit/System/CoreFoundation.h
+++ b/Ladybird/AppKit/System/CoreFoundation.h
@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include "Detail/Header.h"
-
-#import <CoreFoundation/CoreFoundation.h>
-
-#include "Detail/Footer.h"
--- a/Ladybird/AppKit/System/Detail/Footer.h
+++ b/Ladybird/AppKit/System/Detail/Footer.h
@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
- *
- * 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
--- a/Ladybird/AppKit/System/Detail/Header.h
+++ b/Ladybird/AppKit/System/Detail/Header.h
@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
- *
- * 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
--- a/Ladybird/AppKit/UI/Event.h
+++ b/Ladybird/AppKit/UI/Event.h
@ -8,7 +8,7 @@

 #include <LibWeb/Page/InputEvent.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

 namespace Ladybird {

--- a/Ladybird/AppKit/UI/Event.mm
+++ b/Ladybird/AppKit/UI/Event.mm
@ -7,7 +7,7 @@
 #include <AK/TypeCasts.h>
 #include <AK/Utf8View.h>

-#import <System/Carbon.h>
+#import <Carbon/Carbon.h>
 #import <UI/Event.h>
 #import <Utilities/Conversions.h>

--- a/Ladybird/AppKit/UI/Inspector.h
+++ b/Ladybird/AppKit/UI/Inspector.h
@ -6,7 +6,7 @@

 #pragma once

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@class LadybirdWebView;
@class Tab;
--- a/Ladybird/AppKit/UI/InspectorController.h
+++ b/Ladybird/AppKit/UI/InspectorController.h
@ -6,7 +6,7 @@

 #pragma once

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@class Tab;

--- a/Ladybird/AppKit/UI/LadybirdWebView.h
+++ b/Ladybird/AppKit/UI/LadybirdWebView.h
@ -16,7 +16,7 @@
 #include <LibWeb/HTML/AudioPlayState.h>
 #include <LibWebView/Forward.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@protocol LadybirdWebViewObserver <NSObject>

--- a/Ladybird/AppKit/UI/Palette.mm
+++ b/Ladybird/AppKit/UI/Palette.mm
@ -10,7 +10,7 @@
 #include <LibGfx/Palette.h>
 #include <LibGfx/SystemTheme.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 #import <UI/Palette.h>

 namespace Ladybird {
--- a/Ladybird/AppKit/UI/SearchPanel.h
+++ b/Ladybird/AppKit/UI/SearchPanel.h
@ -8,7 +8,7 @@

 #include <AK/Optional.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@interface SearchPanel : NSStackView

--- a/Ladybird/AppKit/UI/Tab.h
+++ b/Ladybird/AppKit/UI/Tab.h
@ -6,7 +6,7 @@

 #pragma once

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@class LadybirdWebView;

--- a/Ladybird/AppKit/UI/TabController.h
+++ b/Ladybird/AppKit/UI/TabController.h
@ -9,7 +9,7 @@
 #include <AK/Forward.h>
 #include <LibURL/URL.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

 struct TabSettings {
    BOOL should_show_line_box_borders { NO };
--- a/Ladybird/AppKit/UI/TaskManager.h
+++ b/Ladybird/AppKit/UI/TaskManager.h
@ -6,7 +6,7 @@

 #pragma once

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@class LadybirdWebView;

--- a/Ladybird/AppKit/UI/TaskManagerController.h
+++ b/Ladybird/AppKit/UI/TaskManagerController.h
@ -6,7 +6,7 @@

 #pragma once

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

@protocol TaskManagerDelegate <NSObject>

--- a/Ladybird/AppKit/Utilities/Conversions.h
+++ b/Ladybird/AppKit/Utilities/Conversions.h
@ -14,7 +14,7 @@
 #include <LibGfx/Rect.h>
 #include <LibGfx/Size.h>

-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>

 namespace Ladybird {