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>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.mm b/src/plugins/platforms/cocoa/qcocoainputcontext.mm
index ae060d5e2d..9e3d747cd7 100644
--- a/src/plugins/platforms/cocoa/qcocoainputcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoainputcontext.mm
@@ -41,6 +41,7 @@
 #include "qcocoainputcontext.h"
 #include "qcocoanativeinterface.h"
 #include "qcocoawindow.h"
+#include "qcocoahelpers.h"
 
 #include <Carbon/Carbon.h>
 
@@ -102,7 +103,8 @@ void QCocoaInputContext::reset()
     if (!mWindow)
         return;
 
-    QNSView *view = static_cast<QCocoaWindow *>(mWindow->handle())->qtView();
+    QCocoaWindow *window = static_cast<QCocoaWindow *>(mWindow->handle());
+    QNSView *view = qnsview_cast(window->view());
     if (!view)
         return;