diff options
author | Marc Mutz <marc.mutz@qt.io> | 2023-08-02 09:12:47 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-07 13:24:50 +0000 |
commit | 5005846f97db146010bac76537f83f33072741c2 (patch) | |
tree | ba11b62d10b9f61970fc47ecbef1fbc3145b6229 | |
parent | 3490e90871fe20d8afa33c2a5e3fd7f967f245ef (diff) |
DefaultCompositor: use explcit lambda captures
C++20 deprecates the capture of *this in [=], and using [&] in a
connect() statement is a smell ("are we capturing local variables?"),
so just be explicit about what variables we capture (it's mostly
[this], anyway).
Amends ddef100d9fa7014b21280b1380e6fbcef80277b3.
Change-Id: Ia594ffd5c0b9e82c54aa67c74b0d59684aa92840
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit d979d17b9f5ac724b950d2277cc494db2c5b4335)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | tests/auto/client/shared/mockcompositor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/client/shared/mockcompositor.cpp b/tests/auto/client/shared/mockcompositor.cpp index 2bd3738e5..1dea850bd 100644 --- a/tests/auto/client/shared/mockcompositor.cpp +++ b/tests/auto/client/shared/mockcompositor.cpp @@ -37,8 +37,8 @@ DefaultCompositor::DefaultCompositor(CompositorType t) // TODO: other shells, viewporter, xdgoutput etc - QObject::connect(get<WlCompositor>(), &WlCompositor::surfaceCreated, [&] (Surface *surface){ - QObject::connect(surface, &Surface::bufferCommitted, [=] { + QObject::connect(get<WlCompositor>(), &WlCompositor::surfaceCreated, [this] (Surface *surface){ + QObject::connect(surface, &Surface::bufferCommitted, [this, surface] { if (m_config.autoRelease) { // Pretend we made a copy of the buffer and just release it immediately surface->m_committed.buffer->send_release(); @@ -49,7 +49,7 @@ DefaultCompositor::DefaultCompositor(CompositorType t) }); }); - QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, get<XdgWmBase>(), [&] (XdgToplevel *toplevel) { + QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, get<XdgWmBase>(), [this] (XdgToplevel *toplevel) { if (m_config.autoConfigure) toplevel->sendCompleteConfigure(); }, Qt::DirectConnection); |