aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-05-16 15:25:23 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-06-03 00:39:02 +0200
commitfedc75b518854ecf5ac2360cfc735f2b213d4a1f (patch)
tree111902895f54da38ff8eb9dbba5c2e0a049f9091 /src/particles
parent338f96c6e84b0b45c4a6b80a15478d911dfe264a (diff)
Remove the template arguments from some qMakePair calls
They're unnecessary and will break if QPair becomes std::pair. Change-Id: Ie52acf14fa8cbc36f74ef2ca0ebcbc1a0dbaf5db Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/particles')
-rw-r--r--src/particles/qquickimageparticle.cpp2
-rw-r--r--src/particles/qquickparticlepainter.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index d33db8de76..cc76418be1 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -1373,7 +1373,7 @@ void QQuickImageParticle::finishBuildParticleNodes(QSGNode** node)
m_nodes.insert(groupId, node);
m_idxStarts.insert(groupId, m_lastIdxStart);
- m_startsIdx.append(qMakePair<int,int>(m_lastIdxStart, groupId));
+ m_startsIdx.append(qMakePair(m_lastIdxStart, groupId));
m_lastIdxStart += count;
//Create Particle Geometry
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp
index 78e11fafcf..dfd637b415 100644
--- a/src/particles/qquickparticlepainter.cpp
+++ b/src/particles/qquickparticlepainter.cpp
@@ -145,14 +145,14 @@ void QQuickParticlePainter::load(QQuickParticleData* d)
initialize(d->groupId, d->index);
if (m_pleaseReset)
return;
- m_pendingCommits << qMakePair<int, int>(d->groupId, d->index);
+ m_pendingCommits << qMakePair(d->groupId, d->index);
}
void QQuickParticlePainter::reload(QQuickParticleData* d)
{
if (m_pleaseReset)
return;
- m_pendingCommits << qMakePair<int, int>(d->groupId, d->index);
+ m_pendingCommits << qMakePair(d->groupId, d->index);
}
void QQuickParticlePainter::reset()