1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup and null ptr check

Browse Source 
Don't crash if we ask for the surface before the window is created.
Also clean up NULL/0/nullptr and a c-style cast.

Change-Id: I2a5a66ee76a3a12c8ca32847dbe30cc640e924c2
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Paul Olav Tvete 2016-09-15 12:31:45 +02:00
parent df32477ff0
commit be090d4d41
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
View File

@ -76,7 +76,7 @@ void *QWaylandNativeInterface::nativeResourceForIntegration(const QByteArray &re
if (lowerCaseResource == "egldisplay" && m_integration->clientBufferIntegration()) if (lowerCaseResource == "egldisplay" && m_integration->clientBufferIntegration())
return m_integration->clientBufferIntegration()->nativeResource(QWaylandClientBufferIntegration::EglDisplay); return m_integration->clientBufferIntegration()->nativeResource(QWaylandClientBufferIntegration::EglDisplay);
return 0; return nullptr;
} }
void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
@ -88,21 +88,22 @@ void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourc
if (lowerCaseResource == "compositor") if (lowerCaseResource == "compositor")
return const_cast<wl_compositor *>(m_integration->display()->wl_compositor()); return const_cast<wl_compositor *>(m_integration->display()->wl_compositor());
if (lowerCaseResource == "surface") { if (lowerCaseResource == "surface") {
return ((QWaylandWindow *) window->handle())->object(); QWaylandWindow *w = static_cast<QWaylandWindow*>(window->handle());
return w ? w->object() : nullptr;
} }
if (lowerCaseResource == "wl_shell_surface") { if (lowerCaseResource == "wl_shell_surface") {
QWaylandWindow *w = (QWaylandWindow *) window->handle(); QWaylandWindow *w = static_cast<QWaylandWindow*>(window->handle());
if (!w) if (!w)
return NULL; return nullptr;
QWaylandWlShellSurface *s = qobject_cast<QWaylandWlShellSurface *>(w->shellSurface()); QWaylandWlShellSurface *s = qobject_cast<QWaylandWlShellSurface *>(w->shellSurface());
if (!s) if (!s)
return NULL; return nullptr;
return s->object(); return s->object();
} }
if (lowerCaseResource == "egldisplay" && m_integration->clientBufferIntegration()) if (lowerCaseResource == "egldisplay" && m_integration->clientBufferIntegration())
return m_integration->clientBufferIntegration()->nativeResource(QWaylandClientBufferIntegration::EglDisplay); return m_integration->clientBufferIntegration()->nativeResource(QWaylandClientBufferIntegration::EglDisplay);
return NULL; return nullptr;
} }
void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourceString, QScreen *screen) void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourceString, QScreen *screen)
@ -112,7 +113,7 @@ void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourc
if (lowerCaseResource == "output") if (lowerCaseResource == "output")
return ((QWaylandScreen *) screen->handle())->output(); return ((QWaylandScreen *) screen->handle())->output();
return NULL; return nullptr;
} }
void *QWaylandNativeInterface::nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) void *QWaylandNativeInterface::nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context)
@ -130,7 +131,7 @@ void *QWaylandNativeInterface::nativeResourceForContext(const QByteArray &resour
return m_integration->clientBufferIntegration()->nativeResourceForContext(QWaylandClientBufferIntegration::EglDisplay, context->handle()); return m_integration->clientBufferIntegration()->nativeResourceForContext(QWaylandClientBufferIntegration::EglDisplay, context->handle());
#endif #endif
return 0; return nullptr;
} }
QVariantMap QWaylandNativeInterface::windowProperties(QPlatformWindow *window) const QVariantMap QWaylandNativeInterface::windowProperties(QPlatformWindow *window) const
@ -171,7 +172,7 @@ QFunctionPointer QWaylandNativeInterface::platformFunction(const QByteArray &res
} else if (resource == QWaylandWindowFunctions::isSyncIdentifier()) { } else if (resource == QWaylandWindowFunctions::isSyncIdentifier()) {
return QFunctionPointer(isSync); return QFunctionPointer(isSync);
} }
return 0; return nullptr;
} }