fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ladybird/AppKit: Remove system header workarounds for global names

Browse Source
This commit is contained in:
Andrew Kaster
2024-07-16 23:54:53 -06:00
committed by Sam Atkins
parent 88044f59c6
commit 349a3ceec5
20 changed files with 16 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ladybird/AppKit/Application/Application.h
View File

@@ -11,7 +11,7 @@
#include <LibIPC/Forward.h> #include <LibIPC/Forward.h>
#include <LibWebView/Forward.h> #include <LibWebView/Forward.h>
#import <System/Cocoa.h> #import <Cocoa/Cocoa.h>
namespace Ladybird { namespace Ladybird {
class WebViewBridge; class WebViewBridge;

2
Ladybird/AppKit/Application/ApplicationDelegate.h
View File

@@ -17,7 +17,7 @@
#include <LibWeb/HTML/ActivateTab.h> #include <LibWeb/HTML/ActivateTab.h>
#include <LibWebView/CookieJar.h> #include <LibWebView/CookieJar.h>
#import <System/Cocoa.h> #import <Cocoa/Cocoa.h>
@class Tab; @class Tab;
@class TabController; @class TabController;

4
Ladybird/AppKit/Application/EventLoopImplementation.mm
View File

@@ -13,8 +13,8 @@
#include <LibCore/ThreadEventQueue.h> #include <LibCore/ThreadEventQueue.h>
#import <Application/EventLoopImplementation.h> #import <Application/EventLoopImplementation.h>
#import <System/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <System/CoreFoundation.h> #import <CoreFoundation/CoreFoundation.h>
#include <sys/event.h> #include <sys/event.h>
#include <sys/time.h> #include <sys/time.h>

13
Ladybird/AppKit/System/Carbon.h
View File

@@ -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"

13
Ladybird/AppKit/System/Cocoa.h
View File

@@ -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"

13
Ladybird/AppKit/System/CoreFoundation.h
View File

@@ -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"

14
Ladybird/AppKit/System/Detail/Footer.h
View File

@@ -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

14
Ladybird/AppKit/System/Detail/Header.h
View File

@@ -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

2
Ladybird/AppKit/UI/Event.h
View File

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

2
Ladybird/AppKit/UI/Event.mm
View File

@@ -7,7 +7,7 @@
#include <AK/TypeCasts.h> #include <AK/TypeCasts.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#import <System/Carbon.h> #import <Carbon/Carbon.h>
#import <UI/Event.h> #import <UI/Event.h>
#import <Utilities/Conversions.h> #import <Utilities/Conversions.h>

2
Ladybird/AppKit/UI/Inspector.h
View File

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

2
Ladybird/AppKit/UI/InspectorController.h
View File

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

2
Ladybird/AppKit/UI/LadybirdWebView.h
View File

@@ -16,7 +16,7 @@
#include <LibWeb/HTML/AudioPlayState.h> #include <LibWeb/HTML/AudioPlayState.h>
#include <LibWebView/Forward.h> #include <LibWebView/Forward.h>
#import <System/Cocoa.h> #import <Cocoa/Cocoa.h>
@protocol LadybirdWebViewObserver <NSObject> @protocol LadybirdWebViewObserver <NSObject>

2
Ladybird/AppKit/UI/Palette.mm
View File

@@ -10,7 +10,7 @@
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
#include <LibGfx/SystemTheme.h> #include <LibGfx/SystemTheme.h>
#import <System/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <UI/Palette.h> #import <UI/Palette.h>
namespace Ladybird { namespace Ladybird {

2
Ladybird/AppKit/UI/SearchPanel.h
View File

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

2
Ladybird/AppKit/UI/Tab.h
View File

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

2
Ladybird/AppKit/UI/TabController.h
View File

@@ -9,7 +9,7 @@
#include <AK/Forward.h> #include <AK/Forward.h>
#include <LibURL/URL.h> #include <LibURL/URL.h>
#import <System/Cocoa.h> #import <Cocoa/Cocoa.h>
struct TabSettings { struct TabSettings {
BOOL should_show_line_box_borders { NO }; BOOL should_show_line_box_borders { NO };

2
Ladybird/AppKit/UI/TaskManager.h
View File

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

2
Ladybird/AppKit/UI/TaskManagerController.h
View File

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

2
Ladybird/AppKit/Utilities/Conversions.h
View File

@@ -14,7 +14,7 @@
#include <LibGfx/Rect.h> #include <LibGfx/Rect.h>
#include <LibGfx/Size.h> #include <LibGfx/Size.h>
#import <System/Cocoa.h> #import <Cocoa/Cocoa.h>
namespace Ladybird { namespace Ladybird {