remove some unnecessary CONFIG additions

[profile/ivi/qtdeclarative.git] / src / particles / qquickparticlesystem_p.h

diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index f70cc5a..4dc41f1 100644 (file)
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -1,38 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQuick module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
 ** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
 **
 **
 ** $QT_END_LICENSE$
@@ -189,15 +189,18 @@ public:
     float ax;
     float ay;
 
-    //Other stuff, now universally shared
+    //Painter-specific stuff, now universally shared
+    //Used by ImageParticle color mode
     Color4ub color;
+    //Used by ImageParticle deform mode
     float xx;
     float xy;
     float yx;
     float yy;
     float rotation;
-    float rotationSpeed;
+    float rotationVelocity;
     float autoRotate;//Assume that GPUs prefer floats to bools
+    //Used by ImageParticle Sprite mode
     float animIdx;
     float frameDuration;
     float frameAt;//Used for duration -1
@@ -207,16 +210,19 @@ public:
     float animY;
     float animWidth;
     float animHeight;
-    float r;
-    QQuickItem* delegate;
-    int modelIndex;
-    float update;//Used by custom affectors
-
-    //Used by image particle
+    //Used by ImageParticle data shadowing
     QQuickImageParticle* colorOwner;
     QQuickImageParticle* rotationOwner;
     QQuickImageParticle* deformationOwner;
     QQuickImageParticle* animationOwner;
+    //Used by CustomParticle
+    float r;
+    //Used by ItemParticle
+    QQuickItem* delegate;
+    int modelIndex;
+    //Used by custom affectors
+    float update;
+
 
     void debugDump();
     bool stillAlive();//Only checks end, because usually that's all you need and it's a little faster.