Ladybird/AppKit: Remove system header workarounds for global names

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;

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;

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>

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"

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"

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"

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

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

Ladybird/AppKit/UI/Event.h

@@ -8,7 +8,7 @@
 
 #include <LibWeb/Page/InputEvent.h>
 
-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 namespace Ladybird {
 

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>
 

Ladybird/AppKit/UI/Inspector.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 @class LadybirdWebView;
 @class Tab;

Ladybird/AppKit/UI/InspectorController.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 @class Tab;
 

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>
 

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 {

Ladybird/AppKit/UI/SearchPanel.h

@@ -8,7 +8,7 @@
 
 #include <AK/Optional.h>
 
-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 @interface SearchPanel : NSStackView
 

Ladybird/AppKit/UI/Tab.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 @class LadybirdWebView;
 

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 };

Ladybird/AppKit/UI/TaskManager.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 @class LadybirdWebView;
 

Ladybird/AppKit/UI/TaskManagerController.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#import <System/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 @protocol TaskManagerDelegate <NSObject>
 

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 {