diff options
author | Marc Mutz <[email protected]> | 2025-06-03 23:24:35 +0200 |
---|---|---|
committer | Marc Mutz <[email protected]> | 2025-06-04 14:59:25 +0200 |
commit | c823eccce97cd2eefd927aff8ef4c6838eb11f84 (patch) | |
tree | 3cb5983d5e881962b9b2bdca10fe573eadde0059 | |
parent | 081436188784d728f5b46b6cf2259429069c2688 (diff) |
This is the result of running util/normalize on the code base. The
following manual edits were needed:
- folded a long connect() line in texture-sharing manual test
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: Iaf425d057c1b59bacd09847469a4409d73739a09
Reviewed-by: Liang Qi <[email protected]>
-rw-r--r-- | src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp | 2 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 6 | ||||
-rw-r--r-- | tests/manual/texture-sharing/cpp-client/main.cpp | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp b/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp index d9ae2c2fb..01424b5db 100644 --- a/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp +++ b/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp @@ -339,7 +339,7 @@ void QWaylandAdwaitaDecoration::loadConfiguration() QDBusConnection::sessionBus().connect(QString(), "/org/freedesktop/portal/desktop"_L1, "org.freedesktop.portal.Settings"_L1, "SettingChanged"_L1, this, - SLOT(settingChanged(QString, QString, QDBusVariant))); + SLOT(settingChanged(QString,QString,QDBusVariant))); // Load SVG icons for (auto mapIt = buttonMap.constBegin(); mapIt != buttonMap.constEnd(); mapIt++) { diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 43e54e37e..b95691d42 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -510,7 +510,7 @@ void tst_WaylandCompositor::mapSurfaceHiDpi() QCOMPARE(damage, QRect(QPoint(), surfaceSize)); verifyComittedState(); }); - QSignalSpy damagedSpy(waylandSurface, SIGNAL(damaged(const QRegion &))); + QSignalSpy damagedSpy(waylandSurface, SIGNAL(damaged(QRegion))); QObject::connect(waylandSurface, &QWaylandSurface::hasContentChanged, this, verifyComittedState); @@ -533,7 +533,7 @@ void tst_WaylandCompositor::mapSurfaceHiDpi() QCOMPARE(offset, attachOffset); verifyComittedState(); }); - QSignalSpy offsetSpy(waylandSurface, SIGNAL(offsetForNextFrame(const QPoint &))); + QSignalSpy offsetSpy(waylandSurface, SIGNAL(offsetForNextFrame(QPoint))); // No state should be applied before the commit QCOMPARE(waylandSurface->bufferSize(), QSize()); @@ -610,7 +610,7 @@ void tst_WaylandCompositor::frameCallback() view->setSurface(waylandSurface); view->setOutput(compositor.defaultOutput()); - QSignalSpy damagedSpy(waylandSurface, SIGNAL(damaged(const QRegion &))); + QSignalSpy damagedSpy(waylandSurface, SIGNAL(damaged(QRegion))); for (int i = 0; i < 10; ++i) { QSize size(i * 8 + 2, i * 8 + 2); diff --git a/tests/manual/texture-sharing/cpp-client/main.cpp b/tests/manual/texture-sharing/cpp-client/main.cpp index d389ffbd5..9869283b2 100644 --- a/tests/manual/texture-sharing/cpp-client/main.cpp +++ b/tests/manual/texture-sharing/cpp-client/main.cpp @@ -29,7 +29,8 @@ public: : m_extension(nullptr) { m_extension = new TextureSharingExtension; - connect(m_extension, SIGNAL(bufferReceived(QtWaylandClient::QWaylandServerBuffer*, const QString&)), this, SLOT(receiveBuffer(QtWaylandClient::QWaylandServerBuffer*, const QString&))); + connect(m_extension, SIGNAL(bufferReceived(QtWaylandClient::QWaylandServerBuffer*,QString)), + this, SLOT(receiveBuffer(QtWaylandClient::QWaylandServerBuffer*,QString))); connect(m_extension, &TextureSharingExtension::activeChanged, this, &TestWindow::handleExtensionActive); } |