diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-06-26 08:24:11 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 14:43:42 +0200 |
| commit | 882ac6469100d56eaa174daa5d1adc69e4932914 (patch) | |
| tree | de5bc478a8a3df741fdaad9424239e6220f6b04c | |
| parent | 54208033ac54ff966f10b3fdc75f7095828d31b4 (diff) | |
Use NSView pointers instead of void pointers.
Change-Id: If6bc3fa07068ea1991c1740127bbd463b796cc07
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| -rw-r--r-- | src/macextras/qmaccocoaviewcontainer.mm | 2 | ||||
| -rw-r--r-- | 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<SetWindowContentViewFunction>(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); }; |