diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-13 16:40:19 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-05 00:03:51 +0200 |
| commit | df2e029a06f065c82dacc28ec885b4307260b6fb (patch) | |
| tree | 7c1c8f334c9036c0b5438c944fce1b205b962293 /src/plugins/platforms/cocoa/qcocoascreen.h | |
| parent | c7d80486dee44c096ba993cbda8f69612441a264 (diff) | |
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>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoascreen.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoascreen.h | 10 |
1 files changed, 8 insertions, 2 deletions
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 <AppKit/AppKit.h> - #include "qcocoacursor.h" #include <qpa/qplatformintegration.h> +#include <CoreGraphics/CoreGraphics.h> +#include <CoreVideo/CoreVideo.h> + +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 |