X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fquick%2Fparticles%2Fqquickimageparticle_p.h;h=dca524bcab1e6c2c4b7e2b840ed13313d2fd9134;hb=0284817d6cd7e17afa8da26ee6e9199100754446;hp=a0f1595192c16249b881724ecc1a1bfaab0c46f0;hpb=36bd7f616f37f5f60e59bce1f0d8970248d627de;p=profile%2Fivi%2Fqtdeclarative.git diff --git a/src/quick/particles/qquickimageparticle_p.h b/src/quick/particles/qquickimageparticle_p.h index a0f1595..dca524b 100644 --- a/src/quick/particles/qquickimageparticle_p.h +++ b/src/quick/particles/qquickimageparticle_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,8 +43,8 @@ #define ULTRAPARTICLE_H #include "qquickparticlepainter_p.h" #include "qquickdirection_p.h" -#include -#include +#include +#include #include #include @@ -150,7 +150,7 @@ class QQuickImageParticle : public QQuickParticlePainter { Q_OBJECT Q_PROPERTY(QUrl source READ image WRITE setImage NOTIFY imageChanged) - Q_PROPERTY(QDeclarativeListProperty sprites READ sprites) + Q_PROPERTY(QQmlListProperty sprites READ sprites) Q_PROPERTY(Status status READ status NOTIFY statusChanged) //### Is it worth having progress like Image has? //Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) @@ -193,7 +193,7 @@ public: enum Status { Null, Ready, Loading, Error }; - QDeclarativeListProperty sprites(); + QQmlListProperty sprites(); QQuickStochasticEngine* spriteEngine() {return m_spriteEngine;} enum EntryEffect { @@ -357,7 +357,7 @@ private slots: private: struct ImageData { QUrl source; - QDeclarativePixmap pix; + QQuickPixmap pix; }; ImageData *m_image; ImageData *m_colorTable;