diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-06-03 20:30:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-10 13:47:15 +0200 |
commit | 6f7bb92e5df069716bef9639c965b4c8a9aaaabf (patch) | |
tree | 8971961afb6b046dcbddb3ba6c7778b1e3f7b2da /src/particles | |
parent | a597b4c19f372b65773bb58539b1dfb362f12fdc (diff) |
Avoid string-based lookup in IS_SIGNAL_CONNECTED
Specify the signal as a member function suitable for passing to
QMetaMethod::fromSignal(), and use the new function
QMetaObjectPrivate::signalIndex(QMetaMethod) to get the index in the
signal range.
Change-Id: If16daa24c2699f7749a17decb611cf395d89d0c4
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/particles')
-rw-r--r-- | src/particles/qquickcustomaffector.cpp | 2 | ||||
-rw-r--r-- | src/particles/qquickparticleaffector.cpp | 2 | ||||
-rw-r--r-- | src/particles/qquickparticleemitter.cpp | 2 | ||||
-rw-r--r-- | src/particles/qquicktrailemitter.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp index 72b1536c54..819dd128fa 100644 --- a/src/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp @@ -103,7 +103,7 @@ QQuickCustomAffector::QQuickCustomAffector(QQuickItem *parent) : bool QQuickCustomAffector::isAffectConnected() { - IS_SIGNAL_CONNECTED(this, "affectParticles(QQmlV8Handle,qreal)"); + IS_SIGNAL_CONNECTED(this, QQuickCustomAffector, affectParticles, (QQmlV8Handle,qreal)); } void QQuickCustomAffector::affectSystem(qreal dt) diff --git a/src/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp index 978c53e9a2..61396b1579 100644 --- a/src/particles/qquickparticleaffector.cpp +++ b/src/particles/qquickparticleaffector.cpp @@ -135,7 +135,7 @@ QQuickParticleAffector::QQuickParticleAffector(QQuickItem *parent) : bool QQuickParticleAffector::isAffectedConnected() { - IS_SIGNAL_CONNECTED(this, "affected(qreal,qreal)"); + IS_SIGNAL_CONNECTED(this, QQuickParticleAffector, affected, (qreal,qreal)); } diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index eb965a7f81..6e53b0940c 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -255,7 +255,7 @@ QQuickParticleEmitter::~QQuickParticleEmitter() bool QQuickParticleEmitter::isEmitConnected() { - IS_SIGNAL_CONNECTED(this, "emitParticles(QQmlV8Handle)"); + IS_SIGNAL_CONNECTED(this, QQuickParticleEmitter, emitParticles, (QQmlV8Handle)); } void QQuickParticleEmitter::componentComplete() diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index e9d86118c0..68b43a0e99 100644 --- a/src/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp @@ -128,7 +128,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) : bool QQuickTrailEmitter::isEmitFollowConnected() { - IS_SIGNAL_CONNECTED(this, "emitFollowParticles(QQmlV8Handle,QQmlV8Handle)"); + IS_SIGNAL_CONNECTED(this, QQuickTrailEmitter, emitFollowParticles, (QQmlV8Handle,QQmlV8Handle)); } void QQuickTrailEmitter::recalcParticlesPerSecond(){ |