diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-05 21:56:58 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-10 16:06:41 +0000 |
| commit | f835b5aa9cba2665423e6e96a45d97c3c80296a5 (patch) | |
| tree | 32f35432d9046302b799cb55a067195059e40580 /src/plugins/platforms/cocoa/qcocoawindow.h | |
| parent | 1df4b2a3609d977cc8123f1f82e454d0333287d4 (diff) | |
macOS: Get rid of m_qtView member in QCocoaWindow that aliased m_view
The member was mirroring m_view in all cases except for foreign windows.
Instead of a member we now check window()->type() != Qt::ForeignWindow,
which is more explicit, especially for people not normally working on
the macOS platform.
To call methods that are only implemented for our QNSView subclass,
a new qnsview_cast() function has been introduced.
Change-Id: I0a2cfe1a5e4502250c17e1c3ebdce19e9ee5e572
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 11bd6b5cb9..bd7b23bc1b 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -183,7 +183,6 @@ public: void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE; NSView *view() const; - QNSView *qtView() const; NSWindow *nativeWindow() const; void setEmbeddedInForeignView(bool subwindow); @@ -260,7 +259,6 @@ public: // for QNSView void removeMonitor(); NSView *m_view; - QNSView *m_qtView; QCocoaNSWindow *m_nsWindow; QPointer<QCocoaWindow> m_forwardWindow; |