From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Thu, 16 Feb 2012 14:43:03 +1000
Subject: 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>
---
 src/quick/particles/qquicktrailemitter.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/quick/particles/qquicktrailemitter.cpp')

diff --git a/src/quick/particles/qquicktrailemitter.cpp b/src/quick/particles/qquicktrailemitter.cpp
index f5bc78c9cb..e5317567fe 100644
--- a/src/quick/particles/qquicktrailemitter.cpp
+++ b/src/quick/particles/qquicktrailemitter.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquicktrailemitter_p.h"
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
 #include <cmath>
 QT_BEGIN_NAMESPACE
 
@@ -126,7 +126,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
 
 bool QQuickTrailEmitter::isEmitFollowConnected()
 {
-    static int idx = QObjectPrivate::get(this)->signalIndex("emitFollowParticles(QDeclarativeV8Handle,QDeclarativeV8Handle)");
+    static int idx = QObjectPrivate::get(this)->signalIndex("emitFollowParticles(QQmlV8Handle,QQmlV8Handle)");
     return QObjectPrivate::get(this)->isSignalConnected(idx);
 }
 
@@ -265,15 +265,15 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
 
         if (isEmitConnected() || isEmitFollowConnected()) {
             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());
 
             if (isEmitFollowConnected())
-                emitFollowParticles(QDeclarativeV8Handle::fromHandle(array), d->v8Value());//A chance for many arbitrary JS changes
+                emitFollowParticles(QQmlV8Handle::fromHandle(array), d->v8Value());//A chance for many arbitrary JS changes
             else if (isEmitConnected())
-                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);
-- 
cgit v1.2.3