From df2e029a06f065c82dacc28ec885b4307260b6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 13 May 2020 16:40:19 +0200
Subject: macOS: Clean up headers

The headers are now C++ clean and can be used outside of Objective-C
code. All includes of Objective-C frameworks have been moved to the
implementation files.

Header guards have been added in the few places they were missing.

All includes are now done via #include, instead of sometimes using
the #import variant.

Change-Id: Ibb0a9c0bcfefbda4347737212e40e300a3184982
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/plugins/platforms/cocoa/qcocoakeymapper.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qcocoakeymapper.h')

diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.h b/src/plugins/platforms/cocoa/qcocoakeymapper.h
index 2624f19978..b4eacf7a76 100644
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.h
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.h
@@ -40,14 +40,13 @@
 #ifndef QCOCOAKEYMAPPER_H
 #define QCOCOAKEYMAPPER_H
 
-#include "qcocoahelpers.h"
-
-#include <AppKit/AppKit.h>
 #include <Carbon/Carbon.h>
 
 #include <QtCore/QList>
 #include <QtGui/QKeyEvent>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 QT_BEGIN_NAMESPACE
 
 /*
-- 
cgit v1.2.3