From 882ac6469100d56eaa174daa5d1adc69e4932914 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 26 Jun 2013 08:24:11 -0400 Subject: Use NSView pointers instead of void pointers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If6bc3fa07068ea1991c1740127bbd463b796cc07 Reviewed-by: Tor Arne Vestbø --- src/macextras/qmaccocoaviewcontainer.mm | 2 +- src/macextras/qmacnativewidget.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/macextras/qmaccocoaviewcontainer.mm b/src/macextras/qmaccocoaviewcontainer.mm index dd685d4..8b9acc1 100644 --- a/src/macextras/qmaccocoaviewcontainer.mm +++ b/src/macextras/qmaccocoaviewcontainer.mm @@ -157,7 +157,7 @@ void QMacCocoaViewContainer::setCocoaView(NSView *view) // Set the new view as the content view for the window. extern QPlatformNativeInterface::NativeResourceForIntegrationFunction resolvePlatformFunction(const QByteArray &functionName); - typedef void (*SetWindowContentViewFunction)(QPlatformWindow *window, void *nsview); + typedef void (*SetWindowContentViewFunction)(QPlatformWindow *window, NSView *nsview); reinterpret_cast(resolvePlatformFunction("setwindowcontentview"))(platformWindow, view); [oldView release]; diff --git a/src/macextras/qmacnativewidget.h b/src/macextras/qmacnativewidget.h index f2550e8..994a9d8 100644 --- a/src/macextras/qmacnativewidget.h +++ b/src/macextras/qmacnativewidget.h @@ -67,7 +67,7 @@ public: QSize sizeHint() const; protected: - void init(void *parentView); + void init(NSView *parentView); bool event(QEvent *ev); }; -- cgit v1.2.3