diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/particles/qquickparticleemitter.cpp | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
download | qtdeclarative-b855240b782395f94315f43ea3e7e182299fac48.tar.gz |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/particles/qquickparticleemitter.cpp')
-rw-r--r-- | src/quick/particles/qquickparticleemitter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/particles/qquickparticleemitter.cpp b/src/quick/particles/qquickparticleemitter.cpp index 88c062b1f5..1625f1498a 100644 --- a/src/quick/particles/qquickparticleemitter.cpp +++ b/src/quick/particles/qquickparticleemitter.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickparticleemitter_p.h" -#include <private/qdeclarativeengine_p.h> +#include <private/qqmlengine_p.h> QT_BEGIN_NAMESPACE @@ -253,7 +253,7 @@ QQuickParticleEmitter::~QQuickParticleEmitter() bool QQuickParticleEmitter::isEmitConnected() { - static int idx = QObjectPrivate::get(this)->signalIndex("emitParticles(QDeclarativeV8Handle)"); + static int idx = QObjectPrivate::get(this)->signalIndex("emitParticles(QQmlV8Handle)"); return QObjectPrivate::get(this)->isSignalConnected(idx); } @@ -479,12 +479,12 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) if (isEmitConnected()) { v8::HandleScope handle_scope; - v8::Context::Scope scope(QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this))->context()); + v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context()); v8::Handle<v8::Array> array = v8::Array::New(toEmit.size()); for (int i=0; i<toEmit.size(); i++) array->Set(i, toEmit[i]->v8Value().toHandle()); - emitParticles(QDeclarativeV8Handle::fromHandle(array));//A chance for arbitrary JS changes + emitParticles(QQmlV8Handle::fromHandle(array));//A chance for arbitrary JS changes } foreach (QQuickParticleData* d, toEmit) m_system->emitParticle(d); |