Normalize signal/slot signatures 2025HEADdev

This is the result of running util/normalize on the code base. The
following manual edits were needed:

- folded two long connect() lines

Pick-to: 6.10 6.9 6.8 6.5
Change-Id: If3dfd251cacdb1e47b8a98a1fc9462d16fec3e11
Reviewed-by: Mike Krus <[email protected]>

19 files changed, 30 insertions, 28 deletions

diff --git a/src/core/services/qdownloadhelperservice.cpp b/src/core/services/qdownloadhelperservice.cpp
index 51cbdcf4b..330747597 100644
--- a/src/core/services/qdownloadhelperservice.cpp
+++ b/src/core/services/qdownloadhelperservice.cpp
@@ -71,8 +71,8 @@ void QDownloadHelperServicePrivate::init()
     m_downloadWorker = new QDownloadNetworkWorker;
     m_downloadWorker->moveToThread(m_downloadThread);
     // QueuedConnection
-    QObject::connect(m_downloadWorker, SIGNAL(requestDownloaded(const Qt3DCore::QDownloadRequestPtr &)),
-                     q, SLOT(_q_onRequestCompleted(const Qt3DCore::QDownloadRequestPtr &)));
+    QObject::connect(m_downloadWorker, SIGNAL(requestDownloaded(Qt3DCore::QDownloadRequestPtr)),
+                     q, SLOT(_q_onRequestCompleted(Qt3DCore::QDownloadRequestPtr)));
     m_downloadThread->start();
 }
 
diff --git a/src/render/frontend/qcamera.cpp b/src/render/frontend/qcamera.cpp
index 9614ec981..af1ed52f3 100644
--- a/src/render/frontend/qcamera.cpp
+++ b/src/render/frontend/qcamera.cpp
@@ -537,7 +537,8 @@ QCamera::QCamera(Qt3DCore::QNode *parent)
     QObject::connect(d_func()->m_lens, SIGNAL(rightChanged(float)), this, SIGNAL(rightChanged(float)));
     QObject::connect(d_func()->m_lens, SIGNAL(bottomChanged(float)), this, SIGNAL(bottomChanged(float)));
     QObject::connect(d_func()->m_lens, SIGNAL(topChanged(float)), this, SIGNAL(topChanged(float)));
-    QObject::connect(d_func()->m_lens, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &)), this, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &)));
+    QObject::connect(d_func()->m_lens, SIGNAL(projectionMatrixChanged(QMatrix4x4)),
+                     this, SIGNAL(projectionMatrixChanged(QMatrix4x4)));
     QObject::connect(d_func()->m_lens, SIGNAL(exposureChanged(float)), this, SIGNAL(exposureChanged(float)));
     QObject::connect(d_func()->m_lens, &QCameraLens::viewSphere, this, &QCamera::viewSphere);
 
@@ -567,7 +568,8 @@ QCamera::QCamera(QCameraPrivate &dd, Qt3DCore::QNode *parent)
     QObject::connect(d_func()->m_lens, SIGNAL(rightChanged(float)), this, SIGNAL(rightChanged(float)));
     QObject::connect(d_func()->m_lens, SIGNAL(bottomChanged(float)), this, SIGNAL(bottomChanged(float)));
     QObject::connect(d_func()->m_lens, SIGNAL(topChanged(float)), this, SIGNAL(topChanged(float)));
-    QObject::connect(d_func()->m_lens, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &)), this, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &)));
+    QObject::connect(d_func()->m_lens, SIGNAL(projectionMatrixChanged(QMatrix4x4)),
+                     this, SIGNAL(projectionMatrixChanged(QMatrix4x4)));
     QObject::connect(d_func()->m_lens, &QCameraLens::viewSphere, this, &QCamera::viewSphere);
 
     addComponent(d_func()->m_lens);
diff --git a/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp b/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp
index a4babc61f..07529eadf 100644
--- a/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp
+++ b/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp
@@ -112,7 +112,7 @@ private Q_SLOTS:
         {
             // WHEN
             QScopedPointer<Qt3DCore::QEntity> entity(new Qt3DCore::QEntity);
-            QSignalSpy spy(&animationController, SIGNAL(entityChanged(Qt3DCore::QEntity *)));
+            QSignalSpy spy(&animationController, SIGNAL(entityChanged(Qt3DCore::QEntity*)));
             Qt3DCore::QEntity * newValue = entity.data();
             animationController.setEntity(newValue);
 
diff --git a/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp b/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp
index 4417e0de2..47c2c37f7 100644
--- a/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp
+++ b/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp
@@ -42,7 +42,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&blendedClipAnimator, SIGNAL(blendTreeChanged(QAbstractClipBlendNode *)));
+            QSignalSpy spy(&blendedClipAnimator, SIGNAL(blendTreeChanged(QAbstractClipBlendNode*)));
             Qt3DAnimation::QLerpClipBlend newValue;
             blendedClipAnimator.setBlendTree(&newValue);
 
@@ -61,7 +61,7 @@ private Q_SLOTS:
         }
         {
             // WHEN
-            QSignalSpy spy(&blendedClipAnimator, SIGNAL(channelMapperChanged(QChannelMapper *)));
+            QSignalSpy spy(&blendedClipAnimator, SIGNAL(channelMapperChanged(QChannelMapper*)));
             Qt3DAnimation::QChannelMapper newValue;
             blendedClipAnimator.setChannelMapper(&newValue);
 
diff --git a/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp b/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp
index 64294f831..134c2798f 100644
--- a/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp
+++ b/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp
@@ -45,7 +45,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&animator, SIGNAL(clipChanged(Qt3DAnimation::QAbstractAnimationClip *)));
+            QSignalSpy spy(&animator, SIGNAL(clipChanged(Qt3DAnimation::QAbstractAnimationClip*)));
             auto newValue = new Qt3DAnimation::QAnimationClipLoader();
             animator.setClip(newValue);
 
@@ -66,7 +66,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&animator, SIGNAL(channelMapperChanged(Qt3DAnimation::QChannelMapper *)));
+            QSignalSpy spy(&animator, SIGNAL(channelMapperChanged(Qt3DAnimation::QChannelMapper*)));
             auto newValue = new Qt3DAnimation::QChannelMapper();
             animator.setChannelMapper(newValue);
 
@@ -87,7 +87,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&animator, SIGNAL(clockChanged(Qt3DAnimation::QClock *)));
+            QSignalSpy spy(&animator, SIGNAL(clockChanged(Qt3DAnimation::QClock*)));
             auto clock = new Qt3DAnimation::QClock();
             animator.setClock(clock);
 
diff --git a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
index 5ad388a12..2623e1929 100644
--- a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
+++ b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
@@ -39,7 +39,7 @@ private Q_SLOTS:
         {
             // WHEN
             QScopedPointer<Qt3DCore::QTransform> transform(new Qt3DCore::QTransform);
-            QSignalSpy spy(&keyframeAnimation, SIGNAL(targetChanged(Qt3DCore::QTransform *)));
+            QSignalSpy spy(&keyframeAnimation, SIGNAL(targetChanged(Qt3DCore::QTransform*)));
             Qt3DCore::QTransform * newValue = transform.data();
             keyframeAnimation.setTarget(newValue);
 
@@ -58,7 +58,7 @@ private Q_SLOTS:
         }
         {
             // WHEN
-            QSignalSpy spy(&keyframeAnimation, SIGNAL(easingChanged(const QEasingCurve &)));
+            QSignalSpy spy(&keyframeAnimation, SIGNAL(easingChanged(QEasingCurve)));
             const QEasingCurve newValue = QEasingCurve(QEasingCurve::CosineCurve);
             keyframeAnimation.setEasing(newValue);
 
diff --git a/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp b/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp
index db39fdb2d..253b3ba66 100644
--- a/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp
+++ b/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp
@@ -53,7 +53,7 @@ private Q_SLOTS:
             // WHEN
             QScopedPointer<Qt3DRender::QGeometryRenderer> gr(new Qt3DRender::QGeometryRenderer);
             QSignalSpy spy(&morphingAnimation,
-                           SIGNAL(targetChanged(Qt3DRender::QGeometryRenderer *)));
+                           SIGNAL(targetChanged(Qt3DRender::QGeometryRenderer*)));
             Qt3DRender::QGeometryRenderer *newValue = gr.data();
             morphingAnimation.setTarget(newValue);
 
diff --git a/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp b/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp
index a3cb422fc..edcda1070 100644
--- a/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp
+++ b/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp
@@ -32,7 +32,7 @@ private Q_SLOTS:
             // WHEN
             QScopedPointer<Qt3DRender::QGeometryRenderer> gm(new Qt3DRender::QGeometryRenderer);
             QSignalSpy spy(&vertexBlendAnimation,
-                           SIGNAL(targetChanged(Qt3DRender::QGeometryRenderer *)));
+                           SIGNAL(targetChanged(Qt3DRender::QGeometryRenderer*)));
             Qt3DRender::QGeometryRenderer *newValue = gm.data();
             vertexBlendAnimation.setTarget(newValue);
 
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 3c0439396..0b0c7c8a0 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -1616,7 +1616,7 @@ void tst_Nodes::checkPropertyChanges()
 
     {
         // WHEN
-        QSignalSpy spy(&node, SIGNAL(parentChanged(QObject *)));
+        QSignalSpy spy(&node, SIGNAL(parentChanged(QObject*)));
         Qt3DCore::QNode *newValue = &parentNode;
         node.setParent(newValue);
 
diff --git a/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.cpp b/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.cpp
index 73694c4b3..97f86a95d 100644
--- a/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.cpp
+++ b/tests/auto/extras/qforwardrenderer/tst_qforwardrenderer.cpp
@@ -41,7 +41,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&forwardRenderer, SIGNAL(surfaceChanged(QObject *)));
+            QSignalSpy spy(&forwardRenderer, SIGNAL(surfaceChanged(QObject*)));
             QWindow newValue;
             forwardRenderer.setSurface(&newValue);
 
@@ -104,7 +104,7 @@ private Q_SLOTS:
         }
         {
             // WHEN
-            QSignalSpy spy(&forwardRenderer, SIGNAL(cameraChanged(Qt3DCore::QEntity *)));
+            QSignalSpy spy(&forwardRenderer, SIGNAL(cameraChanged(Qt3DCore::QEntity*)));
             Qt3DCore::QEntity newValue;
             forwardRenderer.setCamera(&newValue);
 
diff --git a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp
index 5006efc70..dbd1c307b 100644
--- a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp
+++ b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp
@@ -40,7 +40,7 @@ private Q_SLOTS:
             // WHEN
             Qt3DCore::QEntity entity;
 
-            QSignalSpy spy(&proximityFilter, SIGNAL(entityChanged(Qt3DCore::QEntity *)));
+            QSignalSpy spy(&proximityFilter, SIGNAL(entityChanged(Qt3DCore::QEntity*)));
             Qt3DCore::QEntity *newValue = &entity;
             proximityFilter.setEntity(newValue);
 
diff --git a/tests/auto/render/qraycaster/tst_qraycaster.cpp b/tests/auto/render/qraycaster/tst_qraycaster.cpp
index f4a5e3400..b0bef78b8 100644
--- a/tests/auto/render/qraycaster/tst_qraycaster.cpp
+++ b/tests/auto/render/qraycaster/tst_qraycaster.cpp
@@ -157,7 +157,7 @@ private Q_SLOTS:
     {
         // GIVEN
         QScopedPointer<MyRayCaster> rayCaster(new MyRayCaster());
-        QSignalSpy spy(rayCaster.data(), SIGNAL(hitsChanged(const Hits &)));
+        QSignalSpy spy(rayCaster.data(), SIGNAL(hitsChanged(Hits)));
         Qt3DRender::QRayCaster::Hits hits;
 
         QVERIFY(spy.isValid());
diff --git a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
index 2e93ec237..0f0f2e709 100644
--- a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
+++ b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
@@ -43,7 +43,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&renderPass, SIGNAL(shaderProgramChanged(QShaderProgram *)));
+            QSignalSpy spy(&renderPass, SIGNAL(shaderProgramChanged(QShaderProgram*)));
             Qt3DRender::QShaderProgram newValue;
             renderPass.setShaderProgram(&newValue);
 
diff --git a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp
index 748f2fd19..35a69d3e7 100644
--- a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp
+++ b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp
@@ -66,7 +66,7 @@ private Q_SLOTS:
         }
         {
             // WHEN
-            QSignalSpy spy(&renderSettings, SIGNAL(activeFrameGraphChanged(QFrameGraphNode *)));
+            QSignalSpy spy(&renderSettings, SIGNAL(activeFrameGraphChanged(QFrameGraphNode*)));
 
             Qt3DRender::QViewport newValue;
             renderSettings.setActiveFrameGraph(&newValue);
diff --git a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
index 26309450b..734dc166d 100644
--- a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
+++ b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
@@ -96,7 +96,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&renderSurfaceSelector, SIGNAL(surfaceChanged(QObject *)));
+            QSignalSpy spy(&renderSurfaceSelector, SIGNAL(surfaceChanged(QObject*)));
             QWindow newValue;
             renderSurfaceSelector.setSurface(&newValue);
 
diff --git a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp
index e70382dfa..1e2b18f50 100644
--- a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp
+++ b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp
@@ -63,7 +63,7 @@ private Q_SLOTS:
         }
         {
             // WHEN
-            QSignalSpy spy(&renderTargetOutput, SIGNAL(textureChanged(QAbstractTexture *)));
+            QSignalSpy spy(&renderTargetOutput, SIGNAL(textureChanged(QAbstractTexture*)));
             Qt3DRender::QTexture3D newValue;
             renderTargetOutput.setTexture(&newValue);
 
diff --git a/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp b/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp
index f54ff2344..a62807d8d 100644
--- a/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp
+++ b/tests/auto/render/qscreenraycaster/tst_qscreenraycaster.cpp
@@ -85,7 +85,7 @@ private Q_SLOTS:
         QTest::addColumn<QByteArray>("propertyName");
 
         QTest::newRow("hits")
-                << QByteArray(SIGNAL(hitsChanged(const Hits &)))
+                << QByteArray(SIGNAL(hitsChanged(Hits)))
                 << QByteArrayLiteral("hits");
     }
 };
diff --git a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp
index 2b5295ac4..ef76bab48 100644
--- a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp
+++ b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp
@@ -42,7 +42,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&shaderImage, SIGNAL(textureChanged(Qt3DRender::QAbstractTexture *)));
+            QSignalSpy spy(&shaderImage, SIGNAL(textureChanged(Qt3DRender::QAbstractTexture*)));
             Qt3DRender::QTexture2D newValue;
             shaderImage.setTexture(&newValue);
 
@@ -341,7 +341,7 @@ private Q_SLOTS:
     {
         // GIVEN
         Qt3DRender::QShaderImage shaderImage;
-        QSignalSpy spy(&shaderImage, SIGNAL(textureChanged(Qt3DRender::QAbstractTexture *)));
+        QSignalSpy spy(&shaderImage, SIGNAL(textureChanged(Qt3DRender::QAbstractTexture*)));
 
         {
             // WHEN
diff --git a/tests/manual/dynamicscene-cpp/boxentity.cpp b/tests/manual/dynamicscene-cpp/boxentity.cpp
index 43d5c5a40..52d722fd2 100644
--- a/tests/manual/dynamicscene-cpp/boxentity.cpp
+++ b/tests/manual/dynamicscene-cpp/boxentity.cpp
@@ -14,8 +14,8 @@ BoxEntity::BoxEntity(QNode *parent)
     , m_angle(0.0f)
     , m_radius(1.0f)
 {
-    connect(m_material, SIGNAL(diffuseChanged(const QColor &)),
-            this, SIGNAL(diffuseColorChanged(const QColor &)));
+    connect(m_material, SIGNAL(diffuseChanged(QColor)),
+            this, SIGNAL(diffuseColorChanged(QColor)));
     m_material->setAmbient(Qt::gray);
     m_material->setSpecular(Qt::white);
     m_material->setShininess(150.0f);