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/qnsview.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/qnsview.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.h b/src/plugins/platforms/cocoa/qnsview.h index 0a18afe3a6..2c7bb00df2 100644 --- a/src/plugins/platforms/cocoa/qnsview.h +++ b/src/plugins/platforms/cocoa/qnsview.h @@ -40,9 +40,6 @@ #ifndef QNSVIEW_H #define QNSVIEW_H -#include <AppKit/AppKit.h> -#include <MetalKit/MetalKit.h> - #include <QtCore/private/qcore_mac_p.h> QT_BEGIN_NAMESPACE @@ -51,14 +48,13 @@ class QCocoaGLContext; class QPointF; QT_END_NAMESPACE -@interface QT_MANGLE_NAMESPACE(QNSView) : NSView +QT_DECLARE_NAMESPACED_OBJC_INTERFACE(QNSView, NSView @property (nonatomic, retain) NSCursor *cursor; - (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow; - (void)convertFromScreen:(NSPoint)mouseLocation toWindowPoint:(QPointF *)qtWindowPoint andScreenPoint:(QPointF *)qtScreenPoint; -@end - -QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView); +) +#if defined(__OBJC__) @interface QNSView (MouseAPI) - (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent; - (void)resetMouseButtons; @@ -76,5 +72,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView); @interface QNSView (QtExtras) @property (nonatomic, readonly) QCocoaWindow *platformWindow; @end +#endif // __OBJC__ + #endif //QNSVIEW_H |