Particles: Use pointer-based connect() and disconnect()

Change-Id: I363922d6f1eacd82e6f6b0588a35a830b9d3e351
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

5 files changed, 35 insertions, 31 deletions

diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index 0c938e0ffc..0e663923ec 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -1052,8 +1052,8 @@ void QQuickImageParticle::createEngine()
         delete m_spriteEngine;
     if (m_sprites.size()) {
         m_spriteEngine = new QQuickSpriteEngine(m_sprites, this);
-        connect(m_spriteEngine, SIGNAL(stateChanged(int)),
-                this, SLOT(spriteAdvance(int)), Qt::DirectConnection);
+        connect(m_spriteEngine, &QQuickStochasticEngine::stateChanged,
+                this, &QQuickImageParticle::spriteAdvance, Qt::DirectConnection);
         m_explicitAnimation = true;
     } else {
         m_spriteEngine = nullptr;
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index 749feb1015..5e743137aa 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -207,10 +207,10 @@ QQuickParticleEmitter::QQuickParticleEmitter(QQuickItem *parent) :
 
 {
     //TODO: Reset velocity/acc back to null vector? Or allow null pointer?
-    connect(this, SIGNAL(particlesPerSecondChanged(qreal)),
-            this, SIGNAL(particleCountChanged()));
-    connect(this, SIGNAL(particleDurationChanged(int)),
-            this, SIGNAL(particleCountChanged()));
+    connect(this, &QQuickParticleEmitter::particlesPerSecondChanged,
+            this, &QQuickParticleEmitter::particleCountChanged);
+    connect(this, &QQuickParticleEmitter::particleDurationChanged,
+            this, &QQuickParticleEmitter::particleCountChanged);
 }
 
 QQuickParticleEmitter::~QQuickParticleEmitter()
@@ -281,15 +281,15 @@ void QQuickParticleEmitter::setMaxParticleCount(int arg)
 {
     if (m_maxParticleCount != arg) {
         if (arg < 0 && m_maxParticleCount >= 0){
-            connect(this, SIGNAL(particlesPerSecondChanged(qreal)),
-                    this, SIGNAL(particleCountChanged()));
-            connect(this, SIGNAL(particleDurationChanged(int)),
-                    this, SIGNAL(particleCountChanged()));
-        }else if (arg >= 0 && m_maxParticleCount < 0){
-            disconnect(this, SIGNAL(particlesPerSecondChanged(qreal)),
-                    this, SIGNAL(particleCountChanged()));
-            disconnect(this, SIGNAL(particleDurationChanged(int)),
-                    this, SIGNAL(particleCountChanged()));
+            connect(this, &QQuickParticleEmitter::particlesPerSecondChanged,
+                    this, &QQuickParticleEmitter::particleCountChanged);
+            connect(this, &QQuickParticleEmitter::particleDurationChanged,
+                    this, &QQuickParticleEmitter::particleCountChanged);
+        } else if (arg >= 0 && m_maxParticleCount < 0){
+            disconnect(this, &QQuickParticleEmitter::particlesPerSecondChanged,
+                       this, &QQuickParticleEmitter::particleCountChanged);
+            disconnect(this, &QQuickParticleEmitter::particleDurationChanged,
+                       this, &QQuickParticleEmitter::velocityFromMovementChanged);
         }
         m_overwrite = arg < 0;
         m_maxParticleCount = arg;
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp
index fa4e160207..ee5942d7fd 100644
--- a/src/particles/qquickparticlepainter.cpp
+++ b/src/particles/qquickparticlepainter.cpp
@@ -44,12 +44,16 @@ QQuickParticlePainter::QQuickParticlePainter(QQuickItem *parent)
 void QQuickParticlePainter::itemChange(ItemChange change, const ItemChangeData &data)
 {
     if (change == QQuickItem::ItemSceneChange) {
-        if (m_window)
-            disconnect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated()));
+        if (m_window) {
+            disconnect(m_window, &QQuickWindow::sceneGraphInvalidated,
+                       this, &QQuickParticlePainter::sceneGraphInvalidated);
+        }
         m_window = data.window;
         m_windowChanged = true;
-        if (m_window)
-            connect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated()), Qt::DirectConnection);
+        if (m_window) {
+            connect(m_window, &QQuickWindow::sceneGraphInvalidated,
+                    this, &QQuickParticlePainter::sceneGraphInvalidated, Qt::DirectConnection);
+        }
     }
     QQuickItem::itemChange(change, data);
 }
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 40a4f76ace..5d7ef12ed6 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -589,10 +589,10 @@ void QQuickParticleSystem::registerParticleEmitter(QQuickParticleEmitter* e)
 
 void QQuickParticleSystem::finishRegisteringParticleEmitter(QQuickParticleEmitter* e)
 {
-    connect(e, SIGNAL(particleCountChanged()),
-            this, SLOT(emittersChanged()));
-    connect(e, SIGNAL(groupChanged(QString)),
-            this, SLOT(emittersChanged()));
+    connect(e, &QQuickParticleEmitter::particleCountChanged,
+            this, &QQuickParticleSystem::emittersChanged);
+    connect(e, &QQuickParticleEmitter::groupChanged,
+            this, &QQuickParticleSystem::emittersChanged);
     if (m_componentComplete)
         emitterAdded(e);
     e->reset();//Start, so that starttime factors appropriately
@@ -931,8 +931,8 @@ void QQuickParticleSystem::createEngine()
         stateEngine->setCount(particleCount);
         stateEngine->m_states = states;
 
-        connect(stateEngine, SIGNAL(stateChanged(int)),
-                this, SLOT(particleStateChange(int)));
+        connect(stateEngine, &QQuickStochasticEngine::stateChanged,
+                this, &QQuickParticleSystem::particleStateChange);
 
     } else {
         if (stateEngine)
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index cb0eeb0608..b1c754ca54 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -33,12 +33,12 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
   , m_defaultEmissionExtruder(new QQuickParticleExtruder(this))
 {
     //TODO: If followed increased their size
-    connect(this, SIGNAL(followChanged(QString)),
-            this, SLOT(recalcParticlesPerSecond()));
-    connect(this, SIGNAL(particleDurationChanged(int)),
-            this, SLOT(recalcParticlesPerSecond()));
-    connect(this, SIGNAL(particlesPerParticlePerSecondChanged(int)),
-            this, SLOT(recalcParticlesPerSecond()));
+    connect(this, &QQuickTrailEmitter::followChanged,
+            this, &QQuickTrailEmitter::recalcParticlesPerSecond);
+    connect(this, &QQuickTrailEmitter::particleDurationChanged,
+            this, &QQuickTrailEmitter::recalcParticlesPerSecond);
+    connect(this, &QQuickTrailEmitter::particlesPerParticlePerSecondChanged,
+            this, &QQuickTrailEmitter::recalcParticlesPerSecond);
 }
 
 /*!