diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-07-06 08:39:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-12 20:25:22 +0000 |
| commit | bca4dd57bd858a39db1fa87361d348546cd5e4e5 (patch) | |
| tree | 4c42db23827ddb6f6e803bdca22af186c1b25e22 | |
| parent | d2dfd6522db37ba71ddb673b6e59fee61dcdeb50 (diff) | |
Fix various [=] lambda captures to capture [this] instead
C++20 deprecated the implicit capture of [this] in [=].
Move Q_D()s into the lambdas, where applicable.
Change-Id: I345658b0ab9c4edc070f6fd111fce135dd757b14
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 42f96fe2074bc63cfb8a4ae71a7262d554661da2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/extras/defaults/qabstractcameracontroller.cpp | 3 | ||||
| -rw-r--r-- | src/render/framegraph/qrendersurfaceselector.cpp | 2 | ||||
| -rw-r--r-- | src/render/texture/qtexture.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/extras/defaults/qabstractcameracontroller.cpp b/src/extras/defaults/qabstractcameracontroller.cpp index dafe1fde8..f50b8c987 100644 --- a/src/extras/defaults/qabstractcameracontroller.cpp +++ b/src/extras/defaults/qabstractcameracontroller.cpp @@ -288,7 +288,8 @@ QAbstractCameraController::QAbstractCameraController(QAbstractCameraControllerPr d->init(); QObject::connect(d->m_frameAction, &Qt3DLogic::QFrameAction::triggered, - this, [=] (float dt) { + this, [this] (float dt) { + Q_D(const QAbstractCameraController); InputState state; state.rxAxisValue = d->m_rxAxis->value(); diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index 8e220ac5d..c0d0fb8aa 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -256,7 +256,7 @@ void QRenderSurfaceSelector::setSurface(QObject *surfaceObject) d->m_heightConn = QObject::connect(window, &QWindow::heightChanged, [=] (int) { d->update(); }); - d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [=] (QScreen *screen) { + d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [this] (QScreen *screen) { if (screen && !qFuzzyCompare(surfacePixelRatio(), float(screen->devicePixelRatio()))) setSurfacePixelRatio(float(screen->devicePixelRatio())); }); diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp index 0174af4a3..b91398168 100644 --- a/src/render/texture/qtexture.cpp +++ b/src/render/texture/qtexture.cpp @@ -1514,8 +1514,8 @@ QTextureLoader::QTextureLoader(QNode *parent) // Regenerate the texture functor when properties we support overriding // from QAbstractTexture get changed. - Q_D(QTextureLoader); - auto regenerate = [=] () { + auto regenerate = [this] () { + Q_D(QTextureLoader); if (!notificationsBlocked()) // check the change doesn't come from the backend d->updateGenerator(); }; |