diff options
Diffstat (limited to 'src/quick/items/qquickspriteengine.cpp')
| -rw-r--r-- | src/quick/items/qquickspriteengine.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index c19a5e65c9..5a78472b45 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -41,8 +41,8 @@ #include "qquickspriteengine_p.h" #include "qquicksprite_p.h" -#include <qdeclarativeinfo.h> -#include <qdeclarative.h> +#include <qqmlinfo.h> +#include <qqml.h> #include <QDebug> #include <QPainter> #include <QSet> @@ -307,27 +307,27 @@ void QQuickStochasticEngine::setGoal(int state, int sprite, bool jump) return; } -QDeclarativePixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites +QQuickPixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites { if (!m_startedImageAssembly) - return QDeclarativePixmap::Null; + return QQuickPixmap::Null; int null, loading, ready; null = loading = ready = 0; foreach (QQuickSprite* s, m_sprites) { switch (s->m_pix.status()) { - case QDeclarativePixmap::Null : null++; break; - case QDeclarativePixmap::Loading : loading++; break; - case QDeclarativePixmap::Error : return QDeclarativePixmap::Error; - case QDeclarativePixmap::Ready : ready++; break; + case QQuickPixmap::Null : null++; break; + case QQuickPixmap::Loading : loading++; break; + case QQuickPixmap::Error : return QQuickPixmap::Error; + case QQuickPixmap::Ready : ready++; break; } } if (null) - return QDeclarativePixmap::Null; + return QQuickPixmap::Null; if (loading) - return QDeclarativePixmap::Loading; + return QQuickPixmap::Loading; if (ready) - return QDeclarativePixmap::Ready; - return QDeclarativePixmap::Null; + return QQuickPixmap::Ready; + return QQuickPixmap::Null; } void QQuickSpriteEngine::startAssemblingImage() @@ -348,13 +348,13 @@ void QQuickSpriteEngine::startAssemblingImage() QImage QQuickSpriteEngine::assembledImage() { - QDeclarativePixmap::Status stat = status(); - if (stat == QDeclarativePixmap::Error) + QQuickPixmap::Status stat = status(); + if (stat == QQuickPixmap::Error) foreach (QQuickSprite* s, m_sprites) if (s->m_pix.isError()) qmlInfo(s) << s->m_pix.error(); - if (stat != QDeclarativePixmap::Ready) + if (stat != QQuickPixmap::Ready) return QImage(); int h = 0; |