diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-14 10:51:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 11:53:26 +0200 |
commit | bfb3c424abc7c839dc44de0e36024ede99ece736 (patch) | |
tree | b6814d0238bead8518b23c078beb818432de6ce4 /src/declarative/particles/qsgparticlesystem.cpp | |
parent | 2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff) |
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.
All the classes and files in the declarative/items
directory have been renamed.
In particular, for classes that are currently public,
the renaming is as follows:
QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem
The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).
Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgparticlesystem.cpp')
-rw-r--r-- | src/declarative/particles/qsgparticlesystem.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp index 1b01081a67..0523563843 100644 --- a/src/declarative/particles/qsgparticlesystem.cpp +++ b/src/declarative/particles/qsgparticlesystem.cpp @@ -44,8 +44,8 @@ #include "qsgparticleemitter_p.h" #include "qsgparticleaffector_p.h" #include "qsgparticlepainter_p.h" -#include <private/qsgspriteengine_p.h> -#include <private/qsgsprite_p.h> +#include <private/qquickspriteengine_p.h> +#include <private/qquicksprite_p.h> #include "qsgv8particledata_p.h" #include "qsgparticlegroup_p.h" @@ -616,8 +616,8 @@ void QSGParticleData::extendLife(float time) vy = evy; } -QSGParticleSystem::QSGParticleSystem(QSGItem *parent) : - QSGItem(parent), +QSGParticleSystem::QSGParticleSystem(QQuickItem *parent) : + QQuickItem(parent), stateEngine(0), m_running(true), particleCount(0), @@ -756,7 +756,7 @@ void QSGParticleSystem::stateRedirect(QSGParticleGroup* group, QSGParticleSystem void QSGParticleSystem::componentComplete() { - QSGItem::componentComplete(); + QQuickItem::componentComplete(); m_componentComplete = true; m_animation = new QSGParticleSystemAnimation(this); reset();//restarts animation as well @@ -925,12 +925,12 @@ void QSGParticleSystem::createEngine() } } m_groups = newList; - QList<QSGStochasticState*> states; + QList<QQuickStochasticState*> states; foreach (QSGParticleGroup* g, m_groups) - states << (QSGStochasticState*)g; + states << (QQuickStochasticState*)g; if (!stateEngine) - stateEngine = new QSGStochasticEngine(this); + stateEngine = new QQuickStochasticEngine(this); stateEngine->setCount(particleCount); stateEngine->m_states = states; |