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

Mark QWaylandWindow::wlSurface as const

Browse Source 
Change-Id: I416fee67bb35a88f55ac6d24d203e607f1ea1f32
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
David Redondo 2023-12-06 14:51:53 +01:00
parent e992607d50
commit 992aa7e561
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -933,7 +933,7 @@ QPointF QWaylandWindow::mapFromWlSurface(const QPointF &surfacePosition) const
return QPointF(surfacePosition.x() - margins.left(), surfacePosition.y() - margins.top()); return QPointF(surfacePosition.x() - margins.left(), surfacePosition.y() - margins.top());
} }
wl_surface *QWaylandWindow::wlSurface() wl_surface *QWaylandWindow::wlSurface() const
{ {
QReadLocker locker(&mSurfaceLock); QReadLocker locker(&mSurfaceLock);
return mSurface ? mSurface->object() : nullptr; return mSurface ? mSurface->object() : nullptr;

4
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -129,10 +129,10 @@ public:
QPointF mapFromWlSurface(const QPointF &surfacePosition) const; QPointF mapFromWlSurface(const QPointF &surfacePosition) const;
QWaylandSurface *waylandSurface() const { return mSurface.data(); } QWaylandSurface *waylandSurface() const { return mSurface.data(); }
::wl_surface *wlSurface(); ::wl_surface *wlSurface() const;
::wl_surface *surface() const override ::wl_surface *surface() const override
{ {
return const_cast<QWaylandWindow *>(this)->wlSurface(); return wlSurface();
} }
static QWaylandWindow *fromWlSurface(::wl_surface *surface); static QWaylandWindow *fromWlSurface(::wl_surface *surface);