aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-18 11:00:02 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-19 10:31:31 +0200
commit5ddcd47dbdab9710a547244d29fe038bde3d8c98 (patch)
treefb6176ee512708eabc01cbe43f557c4d306e8c82 /src/declarative/particles
parent8f72ef77d1f37b46583deed532951c6b0e5937ae (diff)
Declarative: Fix MSVC and g++ warnings
Potentially severe: - Fix int/bool mismatches - Use of uninitialized variable - Do connectionMask shift operations in 64bit - Enum type mismatch for QLineControl::EchoMode Various: - class/struct mismatches - UnhandledEnumeration values - Unused variables - Constructor initialization order Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/particles')
-rw-r--r--src/declarative/particles/qsgparticlesystem.cpp11
-rw-r--r--src/declarative/particles/qsgspritegoal.cpp7
2 files changed, 14 insertions, 4 deletions
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp
index 1d4498891f..1b01081a67 100644
--- a/src/declarative/particles/qsgparticlesystem.cpp
+++ b/src/declarative/particles/qsgparticlesystem.cpp
@@ -388,11 +388,11 @@ QSGParticleData::QSGParticleData(QSGParticleSystem* sys)
, system(sys)
, index(0)
, systemIndex(-1)
- , v8Datum(0)
, colorOwner(0)
, rotationOwner(0)
, deformationOwner(0)
, animationOwner(0)
+ , v8Datum(0)
{
x = 0;
y = 0;
@@ -617,8 +617,13 @@ void QSGParticleData::extendLife(float time)
}
QSGParticleSystem::QSGParticleSystem(QSGItem *parent) :
- QSGItem(parent), particleCount(0), m_running(true), m_paused(false)
- , m_nextIndex(0), m_componentComplete(false), stateEngine(0)
+ QSGItem(parent),
+ stateEngine(0),
+ m_running(true),
+ particleCount(0),
+ m_nextIndex(0),
+ m_componentComplete(false),
+ m_paused(false)
{
connect(&m_painterMapper, SIGNAL(mapped(QObject*)),
this, SLOT(loadPainter(QObject*)));
diff --git a/src/declarative/particles/qsgspritegoal.cpp b/src/declarative/particles/qsgspritegoal.cpp
index 12d985f0c3..260929f28f 100644
--- a/src/declarative/particles/qsgspritegoal.cpp
+++ b/src/declarative/particles/qsgspritegoal.cpp
@@ -80,7 +80,12 @@ QT_BEGIN_NAMESPACE
*/
QSGSpriteGoalAffector::QSGSpriteGoalAffector(QSGItem *parent) :
- QSGParticleAffector(parent), m_goalIdx(-1), m_jump(false), m_systemStates(false), m_lastEngine(0), m_notUsingEngine(false)
+ QSGParticleAffector(parent),
+ m_goalIdx(-1),
+ m_lastEngine(0),
+ m_jump(false),
+ m_systemStates(false),
+ m_notUsingEngine(false)
{
}