Rename Qt Quick-specific classes to QQuick*

[profile/ivi/qtdeclarative.git] / src / declarative / items / qquickspriteimage.cpp

diff --git a/src/declarative/items/qsgspriteimage.cpp b/src/declarative/items/qquickspriteimage.cpp
similarity index 90%
rename from src/declarative/items/qsgspriteimage.cpp
rename to src/declarative/items/qquickspriteimage.cpp
index f6cd35f..36ab734 100644 (file)
--- a/src/declarative/items/qsgspriteimage.cpp
+++ b/src/declarative/items/qquickspriteimage.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsgspriteimage_p.h"
-#include "qsgsprite_p.h"
-#include "qsgspriteengine_p.h"
+#include "qquickspriteimage_p.h"
+#include "qquicksprite_p.h"
+#include "qquickspriteengine_p.h"
 #include <private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <qsgnode.h>
@@ -96,16 +96,16 @@ static const char fragmentShaderCode[] =
     "    gl_FragColor = mix(texture2D(texture, fTexS.xy), texture2D(texture, fTexS.zw), progress) * qt_Opacity;\n"
     "}\n";
 
-class QSGSpriteMaterial : public QSGMaterial
+class QQuickSpriteMaterial : public QSGMaterial
 {
 public:
-    QSGSpriteMaterial();
-    virtual ~QSGSpriteMaterial();
+    QQuickSpriteMaterial();
+    virtual ~QQuickSpriteMaterial();
     virtual QSGMaterialType *type() const { static QSGMaterialType type; return &type; }
     virtual QSGMaterialShader *createShader() const;
     virtual int compare(const QSGMaterial *other) const
     {
-        return this - static_cast<const QSGSpriteMaterial *>(other);
+        return this - static_cast<const QQuickSpriteMaterial *>(other);
     }
 
     QSGTexture *texture;
@@ -125,7 +125,7 @@ public:
     float elementHeight;
 };
 
-QSGSpriteMaterial::QSGSpriteMaterial()
+QQuickSpriteMaterial::QQuickSpriteMaterial()
     : timestamp(0)
     , interpolate(1.0f)
     , frameDuration(1.0f)
@@ -143,7 +143,7 @@ QSGSpriteMaterial::QSGSpriteMaterial()
     setFlag(Blending, true);
 }
 
-QSGSpriteMaterial::~QSGSpriteMaterial()
+QQuickSpriteMaterial::~QQuickSpriteMaterial()
 {
     delete texture;
 }
@@ -165,7 +165,7 @@ public:
 
     virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *)
     {
-        QSGSpriteMaterial *m = static_cast<QSGSpriteMaterial *>(newEffect);
+        QQuickSpriteMaterial *m = static_cast<QQuickSpriteMaterial *>(newEffect);
         m->texture->bind();
 
         program()->setUniformValue(m_opacity_id, state.opacity());
@@ -210,7 +210,7 @@ public:
 
 float SpriteMaterialData::chunkOfBytes[1024];
 
-QSGMaterialShader *QSGSpriteMaterial::createShader() const
+QSGMaterialShader *QQuickSpriteMaterial::createShader() const
 {
     return new SpriteMaterialData;
 }
@@ -228,7 +228,7 @@ struct SpriteVertices {
 };
 
 /*!
-    \qmlclass SpriteImage QSGSpriteImage
+    \qmlclass SpriteImage QQuickSpriteImage
     \inqmlmodule QtQuick 2
     \inherits Item
     \brief The SpriteImage element draws a sprite animation
@@ -256,8 +256,8 @@ struct SpriteVertices {
 */
 
 //TODO: Implicitly size element to size of first sprite?
-QSGSpriteImage::QSGSpriteImage(QSGItem *parent) :
-    QSGItem(parent)
+QQuickSpriteImage::QQuickSpriteImage(QQuickItem *parent) :
+    QQuickItem(parent)
     , m_node(0)
     , m_material(0)
     , m_spriteEngine(0)
@@ -270,18 +270,18 @@ QSGSpriteImage::QSGSpriteImage(QSGItem *parent) :
             this, SLOT(update()));
 }
 
-QDeclarativeListProperty<QSGSprite> QSGSpriteImage::sprites()
+QDeclarativeListProperty<QQuickSprite> QQuickSpriteImage::sprites()
 {
-    return QDeclarativeListProperty<QSGSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
+    return QDeclarativeListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
 }
 
-void QSGSpriteImage::createEngine()
+void QQuickSpriteImage::createEngine()
 {
     //TODO: delay until component complete
     if (m_spriteEngine)
         delete m_spriteEngine;
     if (m_sprites.count())
-        m_spriteEngine = new QSGSpriteEngine(m_sprites, this);
+        m_spriteEngine = new QQuickSpriteEngine(m_sprites, this);
     else
         m_spriteEngine = 0;
     reset();
@@ -298,14 +298,14 @@ static QSGGeometry::AttributeSet SpriteImage_AttributeSet =
     SpriteImage_Attributes
 };
 
-QSGGeometryNode* QSGSpriteImage::buildNode()
+QSGGeometryNode* QQuickSpriteImage::buildNode()
 {
     if (!m_spriteEngine) {
         qWarning() << "SpriteImage: No sprite engine...";
         return 0;
     }
 
-    m_material = new QSGSpriteMaterial();
+    m_material = new QQuickSpriteMaterial();
 
     QImage image = m_spriteEngine->assembledImage();
     if (image.isNull())
@@ -362,12 +362,12 @@ QSGGeometryNode* QSGSpriteImage::buildNode()
     return m_node;
 }
 
-void QSGSpriteImage::reset()
+void QQuickSpriteImage::reset()
 {
     m_pleaseReset = true;
 }
 
-QSGNode *QSGSpriteImage::updatePaintNode(QSGNode *, UpdatePaintNodeData *)
+QSGNode *QQuickSpriteImage::updatePaintNode(QSGNode *, UpdatePaintNodeData *)
 {
     if (m_pleaseReset) {
         delete m_node;
@@ -389,7 +389,7 @@ QSGNode *QSGSpriteImage::updatePaintNode(QSGNode *, UpdatePaintNodeData *)
     return m_node;
 }
 
-void QSGSpriteImage::prepareNextFrame()
+void QQuickSpriteImage::prepareNextFrame()
 {
     if (m_node == 0)
         m_node = buildNode();