summaryrefslogtreecommitdiffstats
path: root/tests/auto/client/seat/tst_seat.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-08-02 09:02:27 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-08-02 14:00:35 +0000
commitc715c9f7db6e1b3a104e317305cc0cae67dcc7c5 (patch)
treec3caaca095c5137631775ffbb38d2c74d50b1215 /tests/auto/client/seat/tst_seat.cpp
parentac44807eddf9ba8d8d7ad81c9d867cad55562521 (diff)
Fix C++20 deprecated capture of *this in [=]
The exec() function is synchronous, so we can just replace [=] with [&]. Manual conflict resolutions: - drop changes to code that was added after 6.5 Change-Id: I1b672b0ef456977fa0b898dff9c88f48765a3e41 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 3122811344cd5480b22523078accb39e2d657886)
Diffstat (limited to 'tests/auto/client/seat/tst_seat.cpp')
-rw-r--r--tests/auto/client/seat/tst_seat.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/client/seat/tst_seat.cpp b/tests/auto/client/seat/tst_seat.cpp
index 9db10d552..34409c2ca 100644
--- a/tests/auto/client/seat/tst_seat.cpp
+++ b/tests/auto/client/seat/tst_seat.cpp
@@ -70,7 +70,7 @@ void tst_seat::setsCursorOnEnter()
window.show();
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *surface = xdgSurface()->m_surface;
pointer()->sendEnter(surface, {0, 0});
pointer()->sendFrame(surface->resource()->client());
@@ -81,13 +81,13 @@ void tst_seat::setsCursorOnEnter()
void tst_seat::usesEnterSerial()
{
- QSignalSpy setCursorSpy(exec([=] { return pointer(); }), &Pointer::setCursor);
+ QSignalSpy setCursorSpy(exec([&] { return pointer(); }), &Pointer::setCursor);
QRasterWindow window;
window.resize(64, 64);
window.show();
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- uint enterSerial = exec([=] {
+ uint enterSerial = exec([&] {
return pointer()->sendEnter(xdgSurface()->m_surface, {0, 0});
});
QCOMPOSITOR_TRY_VERIFY(pointer()->cursorSurface());
@@ -164,7 +164,7 @@ void tst_seat::simpleAxis()
WheelWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *p = pointer();
p->sendEnter(xdgToplevel()->surface(), {32, 32});
p->sendFrame(client());
@@ -196,7 +196,7 @@ void tst_seat::fingerScroll()
WheelWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *p = pointer();
auto *c = client();
p->sendEnter(xdgToplevel()->surface(), {32, 32});
@@ -236,7 +236,7 @@ void tst_seat::fingerScroll()
QTRY_VERIFY(window.m_events.empty());
// Scroll horizontally as well
- exec([=] {
+ exec([&] {
pointer()->sendAxisSource(client(), Pointer::axis_source_finger);
pointer()->sendAxis(client(), Pointer::axis_horizontal_scroll, 10);
pointer()->sendFrame(client());
@@ -251,7 +251,7 @@ void tst_seat::fingerScroll()
}
// Scroll diagonally
- exec([=] {
+ exec([&] {
pointer()->sendAxisSource(client(), Pointer::axis_source_finger);
pointer()->sendAxis(client(), Pointer::axis_horizontal_scroll, 10);
pointer()->sendAxis(client(), Pointer::axis_vertical_scroll, 10);
@@ -275,7 +275,7 @@ void tst_seat::fingerScroll()
QVERIFY(window.m_events.empty());
// Sending axis_stop is mandatory when axis source == finger
- exec([=] {
+ exec([&] {
pointer()->sendAxisStop(client(), Pointer::axis_vertical_scroll);
pointer()->sendFrame(client());
});
@@ -293,7 +293,7 @@ void tst_seat::fingerScrollSlow()
WheelWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *p = pointer();
auto *c = client();
p->sendEnter(xdgToplevel()->surface(), {32, 32});
@@ -323,7 +323,7 @@ void tst_seat::highResolutionScroll()
WheelWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *p = pointer();
auto *c = client();
p->sendEnter(xdgToplevel()->surface(), {32, 32});
@@ -344,7 +344,7 @@ void tst_seat::highResolutionScroll()
QCOMPARE(e.pixelDelta, QPoint(0, 0));
}
- exec([=] {
+ exec([&] {
auto *p = pointer();
auto *c = client();
p->sendAxisSource(c, Pointer::axis_source_wheel);
@@ -369,7 +369,7 @@ void tst_seat::continuousScroll()
WheelWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *p = pointer();
auto *c = client();
p->sendEnter(xdgToplevel()->surface(), {32, 32});
@@ -429,7 +429,7 @@ void tst_seat::singleTap()
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *t = touch();
auto *c = client();
t->sendDown(xdgToplevel()->surface(), {32, 32}, 1);
@@ -460,7 +460,7 @@ void tst_seat::singleTapFloat()
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *t = touch();
auto *c = client();
t->sendDown(xdgToplevel()->surface(), {32.75, 32.25}, 1);
@@ -491,7 +491,7 @@ void tst_seat::multiTouch()
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *t = touch();
auto *c = client();
@@ -563,7 +563,7 @@ void tst_seat::multiTouchUpAndMotionFrame()
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *t = touch();
auto *c = client();
@@ -612,7 +612,7 @@ void tst_seat::tapAndMoveInSameFrame()
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *t = touch();
auto *c = client();
@@ -644,7 +644,7 @@ void tst_seat::cancelTouch()
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
- exec([=] {
+ exec([&] {
auto *t = touch();
auto *c = client();
t->sendDown(xdgToplevel()->surface(), {32, 32}, 1);