diff options
author | Tim Blechmann <tim@klingt.org> | 2014-06-01 14:35:04 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-07-02 12:56:06 +0200 |
commit | 4f155b0535c69b895d044bbbbf9535a21dd57994 (patch) | |
tree | eb2424ee26302949ef65aec920554a1467745c4b /src/plugins/platforms/cocoa/qcocoawindow.h | |
parent | 62f1aa7ca758f20a325d3d74702b5cd1b07e97f7 (diff) |
Cocoa: Fix Qt-in-namespace build.
Wrap cocoa classes in namespace macros.
Task-number: QTBUG-39382
Change-Id: Id840e666105afca21760fcb529b5765e0a534120
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index bb5c0c1974..33647a8cbd 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -49,14 +49,15 @@ #include "qcocoaglcontext.h" #include "qnsview.h" +#include "qt_mac_p.h" QT_FORWARD_DECLARE_CLASS(QCocoaWindow) -@class QNSWindowHelper; +@class QT_MANGLE_NAMESPACE(QNSWindowHelper); @protocol QNSWindowProtocol -@property (nonatomic, readonly) QNSWindowHelper *helper; +@property (nonatomic, readonly) QT_MANGLE_NAMESPACE(QNSWindowHelper) *helper; - (void)superSendEvent:(NSEvent *)theEvent; - (void)closeAndRelease; @@ -65,7 +66,7 @@ QT_FORWARD_DECLARE_CLASS(QCocoaWindow) typedef NSWindow<QNSWindowProtocol> QCocoaNSWindow; -@interface QNSWindowHelper : NSObject +@interface QT_MANGLE_NAMESPACE(QNSWindowHelper) : NSObject { QCocoaNSWindow *_window; QCocoaWindow *_platformWindow; @@ -84,7 +85,9 @@ typedef NSWindow<QNSWindowProtocol> QCocoaNSWindow; @end -@interface QNSWindow : NSWindow<QNSWindowProtocol> +QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSWindowHelper); + +@interface QT_MANGLE_NAMESPACE(QNSWindow) : NSWindow<QNSWindowProtocol> { QNSWindowHelper *_helper; } @@ -97,7 +100,9 @@ typedef NSWindow<QNSWindowProtocol> QCocoaNSWindow; @end -@interface QNSPanel : NSPanel<QNSWindowProtocol> +QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSWindow); + +@interface QT_MANGLE_NAMESPACE(QNSPanel) : NSPanel<QNSWindowProtocol> { QNSWindowHelper *_helper; } @@ -110,7 +115,9 @@ typedef NSWindow<QNSWindowProtocol> QCocoaNSWindow; @end -@class QNSWindowDelegate; +QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSPanel); + +@class QT_MANGLE_NAMESPACE(QNSWindowDelegate); QT_BEGIN_NAMESPACE // QCocoaWindow |