From df2e029a06f065c82dacc28ec885b4307260b6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= 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 --- src/plugins/platforms/cocoa/qcocoascreen.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoascreen.h') diff --git a/src/plugins/platforms/cocoa/qcocoascreen.h b/src/plugins/platforms/cocoa/qcocoascreen.h index dcf6f1c753..5a5d7fc735 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.h +++ b/src/plugins/platforms/cocoa/qcocoascreen.h @@ -40,12 +40,16 @@ #ifndef QCOCOASCREEN_H #define QCOCOASCREEN_H -#include - #include "qcocoacursor.h" #include +#include +#include + +Q_FORWARD_DECLARE_OBJC_CLASS(NSScreen); +Q_FORWARD_DECLARE_OBJC_CLASS(NSArray); + QT_BEGIN_NAMESPACE class QCocoaIntegration; @@ -136,8 +140,10 @@ QDebug operator<<(QDebug debug, const QCocoaScreen *screen); QT_END_NAMESPACE +#if defined(__OBJC__) @interface NSScreen (QtExtras) @property(readonly) CGDirectDisplayID qt_displayId; @end +#endif #endif // QCOCOASCREEN_H -- cgit v1.2.3