aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/context2d
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/items/context2d')
-rw-r--r--src/declarative/items/context2d/context2d.pri24
-rw-r--r--src/declarative/items/context2d/qquickcanvasitem.cpp (renamed from src/declarative/items/context2d/qsgcanvasitem.cpp)176
-rw-r--r--src/declarative/items/context2d/qquickcanvasitem_p.h (renamed from src/declarative/items/context2d/qsgcanvasitem_p.h)28
-rw-r--r--src/declarative/items/context2d/qquickcontext2d.cpp (renamed from src/declarative/items/context2d/qsgcontext2d.cpp)192
-rw-r--r--src/declarative/items/context2d/qquickcontext2d_p.h (renamed from src/declarative/items/context2d/qsgcontext2d_p.h)36
-rw-r--r--src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp (renamed from src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp)64
-rw-r--r--src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h (renamed from src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h)66
-rw-r--r--src/declarative/items/context2d/qquickcontext2dnode.cpp (renamed from src/declarative/items/context2d/qsgcontext2dnode.cpp)18
-rw-r--r--src/declarative/items/context2d/qquickcontext2dnode_p.h (renamed from src/declarative/items/context2d/qsgcontext2dnode_p.h)24
-rw-r--r--src/declarative/items/context2d/qquickcontext2dtexture.cpp (renamed from src/declarative/items/context2d/qsgcontext2dtexture.cpp)148
-rw-r--r--src/declarative/items/context2d/qquickcontext2dtexture_p.h (renamed from src/declarative/items/context2d/qsgcontext2dtexture_p.h)60
-rw-r--r--src/declarative/items/context2d/qquickcontext2dtile.cpp (renamed from src/declarative/items/context2d/qsgcontext2dtile.cpp)32
-rw-r--r--src/declarative/items/context2d/qquickcontext2dtile_p.h (renamed from src/declarative/items/context2d/qsgcontext2dtile_p.h)30
13 files changed, 449 insertions, 449 deletions
diff --git a/src/declarative/items/context2d/context2d.pri b/src/declarative/items/context2d/context2d.pri
index 31ed75d82a..60b3e4b0c1 100644
--- a/src/declarative/items/context2d/context2d.pri
+++ b/src/declarative/items/context2d/context2d.pri
@@ -1,16 +1,16 @@
SOURCES += \
- $$PWD/qsgcanvasitem.cpp \
- $$PWD/qsgcontext2d.cpp \
- $$PWD/qsgcontext2dnode.cpp \
- $$PWD/qsgcontext2dtile.cpp \
- $$PWD/qsgcontext2dtexture.cpp \
- $$PWD/qsgcontext2dcommandbuffer.cpp \
+ $$PWD/qquickcanvasitem.cpp \
+ $$PWD/qquickcontext2d.cpp \
+ $$PWD/qquickcontext2dnode.cpp \
+ $$PWD/qquickcontext2dtile.cpp \
+ $$PWD/qquickcontext2dtexture.cpp \
+ $$PWD/qquickcontext2dcommandbuffer.cpp \
HEADERS += \
- $$PWD/qsgcanvasitem_p.h \
- $$PWD/qsgcontext2d_p.h \
- $$PWD/qsgcontext2dnode_p.h \
- $$PWD/qsgcontext2dtile_p.h \
- $$PWD/qsgcontext2dtexture_p.h \
- $$PWD/qsgcontext2dcommandbuffer_p.h \
+ $$PWD/qquickcanvasitem_p.h \
+ $$PWD/qquickcontext2d_p.h \
+ $$PWD/qquickcontext2dnode_p.h \
+ $$PWD/qquickcontext2dtile_p.h \
+ $$PWD/qquickcontext2dtexture_p.h \
+ $$PWD/qquickcontext2dcommandbuffer_p.h \
diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qquickcanvasitem.cpp
index b3b4eab30d..86db5e616c 100644
--- a/src/declarative/items/context2d/qsgcanvasitem.cpp
+++ b/src/declarative/items/context2d/qquickcanvasitem.cpp
@@ -40,11 +40,11 @@
****************************************************************************/
#include <private/qsgadaptationlayer_p.h>
-#include "qsgcanvasitem_p.h"
-#include <private/qsgitem_p.h>
-#include "qsgcontext2d_p.h"
-#include "qsgcontext2dnode_p.h"
-#include "qsgcontext2dtexture_p.h"
+#include "qquickcanvasitem_p.h"
+#include <private/qquickitem_p.h>
+#include "qquickcontext2d_p.h"
+#include "qquickcontext2dnode_p.h"
+#include "qquickcontext2dtexture_p.h"
#include <private/qdeclarativepixmapcache_p.h>
#include <qdeclarativeinfo.h>
@@ -53,13 +53,13 @@
QT_BEGIN_NAMESPACE
-class QSGCanvasItemPrivate : public QSGItemPrivate
+class QQuickCanvasItemPrivate : public QQuickItemPrivate
{
public:
- QSGCanvasItemPrivate();
- ~QSGCanvasItemPrivate();
- QSGContext2D* context;
- QSGContext2DTexture* texture;
+ QQuickCanvasItemPrivate();
+ ~QQuickCanvasItemPrivate();
+ QQuickContext2D* context;
+ QQuickContext2DTexture* texture;
QSizeF canvasSize;
QSize tileSize;
QRectF canvasWindow;
@@ -69,13 +69,13 @@ public:
uint hasTileSize :1;
uint hasCanvasWindow :1;
uint componentCompleted :1;
- QSGCanvasItem::RenderTarget renderTarget;
+ QQuickCanvasItem::RenderTarget renderTarget;
QHash<QUrl, QDeclarativePixmap*> images;
QUrl baseUrl;
};
-QSGCanvasItemPrivate::QSGCanvasItemPrivate()
- : QSGItemPrivate()
+QQuickCanvasItemPrivate::QQuickCanvasItemPrivate()
+ : QQuickItemPrivate()
, context(0)
, texture(0)
, canvasSize(1, 1)
@@ -85,17 +85,17 @@ QSGCanvasItemPrivate::QSGCanvasItemPrivate()
, hasTileSize(false)
, hasCanvasWindow(false)
, componentCompleted(false)
- , renderTarget(QSGCanvasItem::FramebufferObject)
+ , renderTarget(QQuickCanvasItem::FramebufferObject)
{
}
-QSGCanvasItemPrivate::~QSGCanvasItemPrivate()
+QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
{
qDeleteAll(images);
}
/*!
- \qmlclass Canvas QSGCanvasItem
+ \qmlclass Canvas QQuickCanvasItem
\inqmlmodule QtQuick 2
\since QtQuick 2.0
\brief The Canvas item provides HTML5 like canvas element which enables you to
@@ -175,15 +175,15 @@ QSGCanvasItemPrivate::~QSGCanvasItemPrivate()
\sa QtQuick2::Context2D
*/
-QSGCanvasItem::QSGCanvasItem(QSGItem *parent)
- : QSGItem(*(new QSGCanvasItemPrivate), parent)
+QQuickCanvasItem::QQuickCanvasItem(QQuickItem *parent)
+ : QQuickItem(*(new QQuickCanvasItemPrivate), parent)
{
setFlag(ItemHasContents);
}
-QSGCanvasItem::~QSGCanvasItem()
+QQuickCanvasItem::~QQuickCanvasItem()
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
delete d->context;
}
@@ -198,15 +198,15 @@ QSGCanvasItem::~QSGCanvasItem()
the Canvas render engine.
\sa QtQuick2::Canvas::tileSize QtQuick2::Canvas::canvasWindow
*/
-QSizeF QSGCanvasItem::canvasSize() const
+QSizeF QQuickCanvasItem::canvasSize() const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
return d->canvasSize;
}
-void QSGCanvasItem::setCanvasSize(const QSizeF & size)
+void QQuickCanvasItem::setCanvasSize(const QSizeF & size)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
if (d->canvasSize != size) {
d->hasCanvasSize = true;
d->canvasSize = size;
@@ -231,15 +231,15 @@ void QSGCanvasItem::setCanvasSize(const QSizeF & size)
By default, the tile size is the same with the canvas size.
\sa QtQuick2::Canvas::canvaasSize QtQuick2::Canvas::canvasWindow
*/
-QSize QSGCanvasItem::tileSize() const
+QSize QQuickCanvasItem::tileSize() const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
return d->tileSize;
}
-void QSGCanvasItem::setTileSize(const QSize & size)
+void QQuickCanvasItem::setTileSize(const QSize & size)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
if (d->tileSize != size) {
d->hasTileSize = true;
d->tileSize = size;
@@ -262,15 +262,15 @@ void QSGCanvasItem::setTileSize(const QSize & size)
and/or position.
\sa QtQuick2::Canvas::canvasSize QtQuick2::Canvas::tileSize
*/
-QRectF QSGCanvasItem::canvasWindow() const
+QRectF QQuickCanvasItem::canvasWindow() const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
return d->canvasWindow;
}
-void QSGCanvasItem::setCanvasWindow(const QRectF& rect)
+void QQuickCanvasItem::setCanvasWindow(const QRectF& rect)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
if (d->canvasWindow != rect) {
d->canvasWindow = rect;
@@ -282,9 +282,9 @@ void QSGCanvasItem::setCanvasWindow(const QRectF& rect)
}
-QSGContext2D* QSGCanvasItem::context() const
+QQuickContext2D* QQuickCanvasItem::context() const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
return d->context;
}
/*!
@@ -302,9 +302,9 @@ QSGContext2D* QSGCanvasItem::context() const
The default value is false.
\sa QtQuick2::Canvas::renderTarget
*/
-bool QSGCanvasItem::renderInThread() const
+bool QQuickCanvasItem::renderInThread() const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
return d->renderInThread;
}
/*!
@@ -325,15 +325,15 @@ bool QSGCanvasItem::renderInThread() const
The default render target is \c Canvas.Image.
\sa QtQuick2::Canvas::renderInThread
*/
-QSGCanvasItem::RenderTarget QSGCanvasItem::renderTarget() const
+QQuickCanvasItem::RenderTarget QQuickCanvasItem::renderTarget() const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
return d->renderTarget;
}
-void QSGCanvasItem::setRenderTarget(RenderTarget target)
+void QQuickCanvasItem::setRenderTarget(RenderTarget target)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
if (d->renderTarget != target) {
d->renderTarget = target;
@@ -343,11 +343,11 @@ void QSGCanvasItem::setRenderTarget(RenderTarget target)
}
}
-void QSGCanvasItem::_doPainting(const QRectF& region)
+void QQuickCanvasItem::_doPainting(const QRectF& region)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
emit paint(QDeclarativeV8Handle::fromHandle(d->context->v8value())
- , QSGContext2DTexture::tiledRect(region, d->tileSize));
+ , QQuickContext2DTexture::tiledRect(region, d->tileSize));
if (d->texture)
d->texture->wake();
}
@@ -362,9 +362,9 @@ void QSGCanvasItem::_doPainting(const QRectF& region)
The default renderInThread value is false.
*/
-void QSGCanvasItem::setRenderInThread(bool renderInThread)
+void QQuickCanvasItem::setRenderInThread(bool renderInThread)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
if (d->renderInThread != renderInThread) {
d->renderInThread = renderInThread;
@@ -381,11 +381,11 @@ void QSGCanvasItem::setRenderInThread(bool renderInThread)
}
}
-void QSGCanvasItem::geometryChanged(const QRectF &newGeometry,
+void QQuickCanvasItem::geometryChanged(const QRectF &newGeometry,
const QRectF &oldGeometry)
{
- Q_D(QSGCanvasItem);
- QSGItem::geometryChanged(newGeometry, oldGeometry);
+ Q_D(QQuickCanvasItem);
+ QQuickItem::geometryChanged(newGeometry, oldGeometry);
const qreal w = newGeometry.width();
const qreal h = newGeometry.height();
@@ -409,10 +409,10 @@ void QSGCanvasItem::geometryChanged(const QRectF &newGeometry,
update();
}
-void QSGCanvasItem::componentComplete()
+void QQuickCanvasItem::componentComplete()
{
- Q_D(QSGCanvasItem);
- QSGItem::componentComplete();
+ Q_D(QQuickCanvasItem);
+ QQuickItem::componentComplete();
if (!d->context)
createContext();
@@ -425,10 +425,10 @@ void QSGCanvasItem::componentComplete()
d->componentCompleted = true;
}
-void QSGCanvasItem::updatePolish()
+void QQuickCanvasItem::updatePolish()
{
- Q_D(QSGCanvasItem);
- QSGItem::updatePolish();
+ Q_D(QQuickCanvasItem);
+ QQuickItem::updatePolish();
if (d->texture) {
if (!d->renderInThread && d->dirtyRect.isValid())
_doPainting(d->dirtyRect);
@@ -442,12 +442,12 @@ void QSGCanvasItem::updatePolish()
}
}
-QSGNode *QSGCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
{
- Q_D(QSGCanvasItem);
- QSGContext2DNode *node = static_cast<QSGContext2DNode *>(oldNode);
+ Q_D(QQuickCanvasItem);
+ QQuickContext2DNode *node = static_cast<QQuickContext2DNode *>(oldNode);
if (!node)
- node = new QSGContext2DNode(this);
+ node = new QQuickContext2DNode(this);
node->setTexture(d->texture);
node->setSize(d->canvasWindow.size());
@@ -455,9 +455,9 @@ QSGNode *QSGCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
return node;
}
-void QSGCanvasItem::createTexture()
+void QQuickCanvasItem::createTexture()
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
if (!d->texture
|| d->texture->threadRendering() != d->renderInThread
@@ -467,10 +467,10 @@ void QSGCanvasItem::createTexture()
d->texture = 0;
}
- if (d->renderTarget == QSGCanvasItem::Image) {
- d->texture = new QSGContext2DImageTexture(d->renderInThread);
- } else if (d->renderTarget == QSGCanvasItem::FramebufferObject) {
- d->texture = new QSGContext2DFBOTexture();
+ if (d->renderTarget == QQuickCanvasItem::Image) {
+ d->texture = new QQuickContext2DImageTexture(d->renderInThread);
+ } else if (d->renderTarget == QQuickCanvasItem::FramebufferObject) {
+ d->texture = new QQuickContext2DFBOTexture();
}
if (d->renderInThread && !d->texture->supportThreadRendering()) {
@@ -486,13 +486,13 @@ void QSGCanvasItem::createTexture()
}
}
-void QSGCanvasItem::createContext()
+void QQuickCanvasItem::createContext()
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
delete d->context;
- d->context = new QSGContext2D(this);
+ d->context = new QQuickContext2D(this);
QV8Engine *e = QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this));
d->context->setV8Engine(e);
@@ -505,9 +505,9 @@ void QSGCanvasItem::createContext()
parameter isn't provided or is "2d", then the QtQuick2::Context2D object is
returned, otherwise returns an invalid value.
*/
-QDeclarativeV8Handle QSGCanvasItem::getContext(const QString &contextId)
+QDeclarativeV8Handle QQuickCanvasItem::getContext(const QString &contextId)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
if (contextId.toLower() != QLatin1String("2d"))
return QDeclarativeV8Handle::fromHandle(v8::Undefined());
@@ -527,9 +527,9 @@ QDeclarativeV8Handle QSGCanvasItem::getContext(const QString &contextId)
\sa QtQuick2::Canvas::paint QtQuick2::Canvas::requestPaint
*/
-void QSGCanvasItem::markDirty(const QRectF& region)
+void QQuickCanvasItem::markDirty(const QRectF& region)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
d->dirtyRect |= region;
if (d->componentCompleted)
polish();
@@ -549,16 +549,16 @@ void QSGCanvasItem::markDirty(const QRectF& region)
\sa canvasWindow canvasSize toDataURL
*/
-bool QSGCanvasItem::save(const QString &filename) const
+bool QQuickCanvasItem::save(const QString &filename) const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
QUrl url = d->baseUrl.resolved(QUrl::fromLocalFile(filename));
return toImage().save(url.toLocalFile());
}
-QImage QSGCanvasItem::loadedImage(const QUrl& url)
+QImage QQuickCanvasItem::loadedImage(const QUrl& url)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
QUrl fullPathUrl = d->baseUrl.resolved(url);
if (!d->images.contains(fullPathUrl)) {
loadImage(url);
@@ -580,9 +580,9 @@ QImage QSGCanvasItem::loadedImage(const QUrl& url)
\sa QtQuick2::Canvas::unloadImage QtQuick2::Canvas::imageLoaded QtQuick2::Canvas::isImageLoaded
\sa QtQuick2::Context2D::createImageData QtQuick2::Context2D::drawImage
*/
-void QSGCanvasItem::loadImage(const QUrl& url)
+void QQuickCanvasItem::loadImage(const QUrl& url)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
QUrl fullPathUrl = d->baseUrl.resolved(url);
if (!d->images.contains(fullPathUrl)) {
QDeclarativePixmap* pix = new QDeclarativePixmap();
@@ -604,9 +604,9 @@ void QSGCanvasItem::loadImage(const QUrl& url)
\sa QtQuick2::Canvas::loadImage QtQuick2::Canvas::imageLoaded QtQuick2::Canvas::isImageLoaded
\sa QtQuick2::Context2D::createImageData QtQuick2::Context2D::drawImage
*/
-void QSGCanvasItem::unloadImage(const QUrl& url)
+void QQuickCanvasItem::unloadImage(const QUrl& url)
{
- Q_D(QSGCanvasItem);
+ Q_D(QQuickCanvasItem);
QUrl removeThis = d->baseUrl.resolved(url);
if (d->images.contains(removeThis)) {
delete d->images.value(removeThis);
@@ -620,9 +620,9 @@ void QSGCanvasItem::unloadImage(const QUrl& url)
\sa QtQuick2::Canvas::loadImage
*/
-bool QSGCanvasItem::isImageError(const QUrl& url) const
+bool QQuickCanvasItem::isImageError(const QUrl& url) const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
QUrl fullPathUrl = d->baseUrl.resolved(url);
return d->images.contains(fullPathUrl)
&& d->images.value(fullPathUrl)->isError();
@@ -634,9 +634,9 @@ bool QSGCanvasItem::isImageError(const QUrl& url) const
\sa QtQuick2::Canvas::loadImage
*/
-bool QSGCanvasItem::isImageLoading(const QUrl& url) const
+bool QQuickCanvasItem::isImageLoading(const QUrl& url) const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
QUrl fullPathUrl = d->baseUrl.resolved(url);
return d->images.contains(fullPathUrl)
&& d->images.value(fullPathUrl)->isLoading();
@@ -647,17 +647,17 @@ bool QSGCanvasItem::isImageLoading(const QUrl& url) const
\sa QtQuick2::Canvas::loadImage
*/
-bool QSGCanvasItem::isImageLoaded(const QUrl& url) const
+bool QQuickCanvasItem::isImageLoaded(const QUrl& url) const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
QUrl fullPathUrl = d->baseUrl.resolved(url);
return d->images.contains(fullPathUrl)
&& d->images.value(fullPathUrl)->isReady();
}
-QImage QSGCanvasItem::toImage(const QRectF& region) const
+QImage QQuickCanvasItem::toImage(const QRectF& region) const
{
- Q_D(const QSGCanvasItem);
+ Q_D(const QQuickCanvasItem);
if (d->texture) {
if (region.isEmpty())
return d->texture->toImage(canvasWindow());
@@ -676,7 +676,7 @@ QImage QSGCanvasItem::toImage(const QRectF& region) const
\sa QtQuick2::Canvas::save
*/
-QString QSGCanvasItem::toDataURL(const QString& mimeType) const
+QString QQuickCanvasItem::toDataURL(const QString& mimeType) const
{
QImage image = toImage();
diff --git a/src/declarative/items/context2d/qsgcanvasitem_p.h b/src/declarative/items/context2d/qquickcanvasitem_p.h
index 131a3f5fff..e0261192ed 100644
--- a/src/declarative/items/context2d/qsgcanvasitem_p.h
+++ b/src/declarative/items/context2d/qquickcanvasitem_p.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QSGCANVASITEM_P_H
-#define QSGCANVASITEM_P_H
+#ifndef QQUICKCANVASITEM_P_H
+#define QQUICKCANVASITEM_P_H
-#include <qsgitem.h>
+#include <qquickitem.h>
#include <private/qv8engine_p.h>
QT_BEGIN_HEADER
@@ -50,9 +50,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class QSGContext2D;
-class QSGCanvasItemPrivate;
-class Q_DECLARATIVE_EXPORT QSGCanvasItem : public QSGItem
+class QQuickContext2D;
+class QQuickCanvasItemPrivate;
+class Q_DECLARATIVE_EXPORT QQuickCanvasItem : public QQuickItem
{
Q_OBJECT
Q_ENUMS(RenderTarget)
@@ -80,8 +80,8 @@ public:
Convolute
};
- QSGCanvasItem(QSGItem *parent = 0);
- ~QSGCanvasItem();
+ QQuickCanvasItem(QQuickItem *parent = 0);
+ ~QQuickCanvasItem();
QSizeF canvasSize() const;
void setCanvasSize(const QSizeF &);
@@ -98,7 +98,7 @@ public:
RenderTarget renderTarget() const;
void setRenderTarget(RenderTarget target);
- QSGContext2D* context() const;
+ QQuickContext2D* context() const;
QImage toImage(const QRectF& region = QRectF()) const;
QImage loadedImage(const QUrl& url);
@@ -135,14 +135,14 @@ protected:
private:
void createContext();
void createTexture();
- Q_DECLARE_PRIVATE(QSGCanvasItem)
- friend class QSGContext2D;
- friend class QSGContext2DTexture;
+ Q_DECLARE_PRIVATE(QQuickCanvasItem)
+ friend class QQuickContext2D;
+ friend class QQuickContext2DTexture;
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QSGCanvasItem)
+QML_DECLARE_TYPE(QQuickCanvasItem)
QT_END_HEADER
-#endif //QSGCANVASITEM_P_H
+#endif //QQUICKCANVASITEM_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qquickcontext2d.cpp
index 5944a02658..0c0865b3b3 100644
--- a/src/declarative/items/context2d/qsgcontext2d.cpp
+++ b/src/declarative/items/context2d/qquickcontext2d.cpp
@@ -39,11 +39,11 @@
**
****************************************************************************/
-#include "qsgcontext2d_p.h"
-#include "qsgcontext2dcommandbuffer_p.h"
-#include "qsgcanvasitem_p.h"
-#include <private/qsgitem_p.h>
-#include <private/qsgshadereffectsource_p.h>
+#include "qquickcontext2d_p.h"
+#include "qquickcontext2dcommandbuffer_p.h"
+#include "qquickcanvasitem_p.h"
+#include <private/qquickitem_p.h>
+#include <private/qquickshadereffectsource_p.h>
#include <QtGui/qopenglframebufferobject.h>
#include <QtCore/qdebug.h>
@@ -51,7 +51,7 @@
#include <private/qdeclarativesvgparser_p.h>
#include <private/qdeclarativepath_p.h>
-#include <private/qsgimage_p_p.h>
+#include <private/qquickimage_p_p.h>
#include <QtGui/qguiapplication.h>
#include <qdeclarativeinfo.h>
@@ -64,7 +64,7 @@
QT_BEGIN_NAMESPACE
/*!
- \qmlclass Context2D QSGContext2D
+ \qmlclass Context2D QQuickContext2D
\inqmlmodule QtQuick 2
\since QtQuick 2.0
\brief The Context2D API allows you to draw 2d graphic shapes on the \c Canvas item.
@@ -200,11 +200,11 @@ QFont qt_font_from_string(const QString& fontString) {
-class QSGContext2DEngineData : public QV8Engine::Deletable
+class QQuickContext2DEngineData : public QV8Engine::Deletable
{
public:
- QSGContext2DEngineData(QV8Engine *engine);
- ~QSGContext2DEngineData();
+ QQuickContext2DEngineData(QV8Engine *engine);
+ ~QQuickContext2DEngineData();
v8::Persistent<v8::Function> constructorContext;
v8::Persistent<v8::Function> constructorGradient;
@@ -213,14 +213,14 @@ public:
v8::Persistent<v8::Function> constructorImageData;
};
-V8_DEFINE_EXTENSION(QSGContext2DEngineData, engineData)
+V8_DEFINE_EXTENSION(QQuickContext2DEngineData, engineData)
class QV8Context2DResource : public QV8ObjectResource
{
V8_RESOURCE_TYPE(Context2DType)
public:
QV8Context2DResource(QV8Engine *e) : QV8ObjectResource(e) {}
- QSGContext2D* context;
+ QQuickContext2D* context;
};
class QV8Context2DStyleResource : public QV8ObjectResource
@@ -408,7 +408,7 @@ static QString qt_composite_mode_to_string(QPainter::CompositionMode op)
static v8::Local<v8::Object> qt_create_image_data(qreal w, qreal h, QV8Engine* engine, const QImage& image)
{
- QSGContext2DEngineData *ed = engineData(engine);
+ QQuickContext2DEngineData *ed = engineData(engine);
v8::Local<v8::Object> imageData = ed->constructorImageData->NewInstance();
QV8Context2DPixelArrayResource *r = new QV8Context2DPixelArrayResource(engine);
if (image.isNull()) {
@@ -1049,7 +1049,7 @@ static v8::Handle<v8::Value> ctx2d_createLinearGradient(const v8::Arguments &arg
QV8Engine *engine = V8ENGINE();
if (args.Length() == 4) {
- QSGContext2DEngineData *ed = engineData(engine);
+ QQuickContext2DEngineData *ed = engineData(engine);
v8::Local<v8::Object> gradient = ed->constructorGradient->NewInstance();
QV8Context2DStyleResource *r = new QV8Context2DStyleResource(engine);
qreal x0 = args[0]->NumberValue();
@@ -1093,7 +1093,7 @@ static v8::Handle<v8::Value> ctx2d_createRadialGradient(const v8::Arguments &arg
QV8Engine *engine = V8ENGINE();
if (args.Length() == 6) {
- QSGContext2DEngineData *ed = engineData(engine);
+ QQuickContext2DEngineData *ed = engineData(engine);
v8::Local<v8::Object> gradient = ed->constructorGradient->NewInstance();
QV8Context2DStyleResource *r = new QV8Context2DStyleResource(engine);
@@ -1146,7 +1146,7 @@ static v8::Handle<v8::Value> ctx2d_createConicalGradient(const v8::Arguments &ar
QV8Engine *engine = V8ENGINE();
if (args.Length() == 6) {
- QSGContext2DEngineData *ed = engineData(engine);
+ QQuickContext2DEngineData *ed = engineData(engine);
v8::Local<v8::Object> gradient = ed->constructorGradient->NewInstance();
QV8Context2DStyleResource *r = new QV8Context2DStyleResource(engine);
@@ -1218,7 +1218,7 @@ static v8::Handle<v8::Value> ctx2d_createPattern(const v8::Arguments &args)
QV8Engine *engine = V8ENGINE();
if (args.Length() == 2) {
- QSGContext2DEngineData *ed = engineData(engine);
+ QQuickContext2DEngineData *ed = engineData(engine);
QV8Context2DStyleResource *styleResouce = new QV8Context2DStyleResource(engine);
QColor color = engine->toVariant(args[0], qMetaTypeId<QColor>()).value<QColor>();
@@ -2171,15 +2171,15 @@ v8::Handle<v8::Value> ctx2d_textAlign(v8::Local<v8::String>, const v8::AccessorI
CHECK_CONTEXT(r)
QV8Engine *engine = V8ENGINE_ACCESSOR();
switch (r->context->state.textAlign) {
- case QSGContext2D::Start:
+ case QQuickContext2D::Start:
return engine->toString(QLatin1String("start"));
- case QSGContext2D::End:
+ case QQuickContext2D::End:
return engine->toString(QLatin1String("end"));
- case QSGContext2D::Left:
+ case QQuickContext2D::Left:
return engine->toString(QLatin1String("left"));
- case QSGContext2D::Right:
+ case QQuickContext2D::Right:
return engine->toString(QLatin1String("right"));
- case QSGContext2D::Center:
+ case QQuickContext2D::Center:
return engine->toString(QLatin1String("center"));
default:
break;
@@ -2195,17 +2195,17 @@ static void ctx2d_textAlign_set(v8::Local<v8::String>, v8::Local<v8::Value> valu
QString textAlign = engine->toString(value);
- QSGContext2D::TextAlignType ta;
+ QQuickContext2D::TextAlignType ta;
if (textAlign == QLatin1String("start"))
- ta = QSGContext2D::Start;
+ ta = QQuickContext2D::Start;
else if (textAlign == QLatin1String("end"))
- ta = QSGContext2D::End;
+ ta = QQuickContext2D::End;
else if (textAlign == QLatin1String("left"))
- ta = QSGContext2D::Left;
+ ta = QQuickContext2D::Left;
else if (textAlign == QLatin1String("right"))
- ta = QSGContext2D::Right;
+ ta = QQuickContext2D::Right;
else if (textAlign == QLatin1String("center"))
- ta = QSGContext2D::Center;
+ ta = QQuickContext2D::Center;
else
return;
@@ -2236,15 +2236,15 @@ v8::Handle<v8::Value> ctx2d_textBaseline(v8::Local<v8::String>, const v8::Access
QV8Engine *engine = V8ENGINE_ACCESSOR();
switch (r->context->state.textBaseline) {
- case QSGContext2D::Alphabetic:
+ case QQuickContext2D::Alphabetic:
return engine->toString(QLatin1String("alphabetic"));
- case QSGContext2D::Hanging:
+ case QQuickContext2D::Hanging:
return engine->toString(QLatin1String("hanging"));
- case QSGContext2D::Top:
+ case QQuickContext2D::Top:
return engine->toString(QLatin1String("top"));
- case QSGContext2D::Bottom:
+ case QQuickContext2D::Bottom:
return engine->toString(QLatin1String("bottom"));
- case QSGContext2D::Middle:
+ case QQuickContext2D::Middle:
return engine->toString(QLatin1String("middle"));
default:
break;
@@ -2259,17 +2259,17 @@ static void ctx2d_textBaseline_set(v8::Local<v8::String>, v8::Local<v8::Value> v
QV8Engine *engine = V8ENGINE_ACCESSOR();
QString textBaseline = engine->toString(value);
- QSGContext2D::TextBaseLineType tb;
+ QQuickContext2D::TextBaseLineType tb;
if (textBaseline == QLatin1String("alphabetic"))
- tb = QSGContext2D::Alphabetic;
+ tb = QQuickContext2D::Alphabetic;
else if (textBaseline == QLatin1String("hanging"))
- tb = QSGContext2D::Hanging;
+ tb = QQuickContext2D::Hanging;
else if (textBaseline == QLatin1String("top"))
- tb = QSGContext2D::Top;
+ tb = QQuickContext2D::Top;
else if (textBaseline == QLatin1String("bottom"))
- tb = QSGContext2D::Bottom;
+ tb = QQuickContext2D::Bottom;
else if (textBaseline == QLatin1String("middle"))
- tb = QSGContext2D::Middle;
+ tb = QQuickContext2D::Middle;
else
return;
@@ -2443,8 +2443,8 @@ static v8::Handle<v8::Value> ctx2d_drawImage(const v8::Arguments &args)
image = r->context->createImage(url);
} else if (args[0]->IsObject()) {
- QSGImage *imageItem = qobject_cast<QSGImage*>(engine->toQObject(args[0]->ToObject()));
- QSGCanvasItem *canvas = qobject_cast<QSGCanvasItem*>(engine->toQObject(args[0]->ToObject()));
+ QQuickImage *imageItem = qobject_cast<QQuickImage*>(engine->toQObject(args[0]->ToObject()));
+ QQuickCanvasItem *canvas = qobject_cast<QQuickCanvasItem*>(engine->toQObject(args[0]->ToObject()));
QV8Context2DPixelArrayResource *pix = v8_resource_cast<QV8Context2DPixelArrayResource>(args[0]->ToObject()->GetInternalField(0)->ToObject());
if (pix) {
@@ -2627,12 +2627,12 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
if (args.Length() >= 1) {
int filterFlag = args[0]->IntegerValue();
switch (filterFlag) {
- case QSGCanvasItem::Mono :
+ case QQuickCanvasItem::Mono :
{
r->image = r->image.convertToFormat(QImage::Format_Mono).convertToFormat(QImage::Format_ARGB32_Premultiplied);
}
break;
- case QSGCanvasItem::GrayScale :
+ case QQuickCanvasItem::GrayScale :
{
for (int y = 0; y < r->image.height(); ++y) {
QRgb *row = (QRgb*)r->image.scanLine(y);
@@ -2643,7 +2643,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
}
}
break;
- case QSGCanvasItem::Threshold :
+ case QQuickCanvasItem::Threshold :
{
qreal threshold = 0.5;
if (args.Length() > 1)
@@ -2659,7 +2659,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
}
}
break;
- case QSGCanvasItem::Brightness :
+ case QQuickCanvasItem::Brightness :
{
int adjustment = 1;
if (args.Length() > 1)
@@ -2675,12 +2675,12 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
}
}
break;
- case QSGCanvasItem::Invert :
+ case QQuickCanvasItem::Invert :
{
r->image.invertPixels();
}
break;
- case QSGCanvasItem::Blur :
+ case QQuickCanvasItem::Blur :
{
int radius = 3;
bool quality = false;
@@ -2693,7 +2693,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
qt_image_boxblur(r->image, radius, quality);
}
break;
- case QSGCanvasItem::Opaque :
+ case QQuickCanvasItem::Opaque :
{
for (int y = 0; y < r->image.height(); ++y) {
QRgb *row = (QRgb*)r->image.scanLine(y);
@@ -2703,7 +2703,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
}
}
break;
- case QSGCanvasItem::Convolute :
+ case QQuickCanvasItem::Convolute :
{
if (args.Length() > 1 && args[1]->IsArray()) {
v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(args[1]);
@@ -3014,13 +3014,13 @@ static v8::Handle<v8::Value> ctx2d_gradient_addColorStop(const v8::Arguments &ar
}
-void QSGContext2D::beginPath()
+void QQuickContext2D::beginPath()
{
m_path = QPainterPath();
m_path.setFillRule(state.fillRule);
}
-void QSGContext2D::closePath()
+void QQuickContext2D::closePath()
{
if (m_path.isEmpty())
return;
@@ -3032,25 +3032,25 @@ void QSGContext2D::closePath()
//should be the first point of the previous subpath
}
-void QSGContext2D::moveTo( qreal x, qreal y)
+void QQuickContext2D::moveTo( qreal x, qreal y)
{
//FIXME: moveTo should not close the previous subpath
m_path.moveTo(state.matrix.map(QPointF(x, y)));
}
-void QSGContext2D::lineTo( qreal x, qreal y)
+void QQuickContext2D::lineTo( qreal x, qreal y)
{
m_path.lineTo(state.matrix.map(QPointF(x, y)));
}
-void QSGContext2D::quadraticCurveTo(qreal cpx, qreal cpy,
+void QQuickContext2D::quadraticCurveTo(qreal cpx, qreal cpy,
qreal x, qreal y)
{
m_path.quadTo(state.matrix.map(QPointF(cpx, cpy)),
state.matrix.map(QPointF(x, y)));
}
-void QSGContext2D::bezierCurveTo(qreal cp1x, qreal cp1y,
+void QQuickContext2D::bezierCurveTo(qreal cp1x, qreal cp1y,
qreal cp2x, qreal cp2y,
qreal x, qreal y)
{
@@ -3059,7 +3059,7 @@ void QSGContext2D::bezierCurveTo(qreal cp1x, qreal cp1y,
state.matrix.map(QPointF(x, y)));
}
-void QSGContext2D::addArcTo(const QPointF& p1, const QPointF& p2, float radius)
+void QQuickContext2D::addArcTo(const QPointF& p1, const QPointF& p2, float radius)
{
QPointF p0(m_path.currentPosition());
@@ -3117,7 +3117,7 @@ void QSGContext2D::addArcTo(const QPointF& p1, const QPointF& p2, float radius)
arc(p.x(), p.y(), radius, sa, ea, anticlockwise, false);
}
-void QSGContext2D::arcTo(qreal x1, qreal y1,
+void QQuickContext2D::arcTo(qreal x1, qreal y1,
qreal x2, qreal y2,
qreal radius)
{
@@ -3133,13 +3133,13 @@ void QSGContext2D::arcTo(qreal x1, qreal y1,
}
}
-void QSGContext2D::rect(qreal x, qreal y,
+void QQuickContext2D::rect(qreal x, qreal y,
qreal w, qreal h)
{
m_path.addPolygon(state.matrix.map(QRectF(x, y, w, h)));
}
-void QSGContext2D::roundedRect(qreal x, qreal y,
+void QQuickContext2D::roundedRect(qreal x, qreal y,
qreal w, qreal h,
qreal xr, qreal yr)
{
@@ -3148,7 +3148,7 @@ void QSGContext2D::roundedRect(qreal x, qreal y,
m_path.addPath(state.matrix.map(path));
}
-void QSGContext2D::ellipse(qreal x, qreal y,
+void QQuickContext2D::ellipse(qreal x, qreal y,
qreal w, qreal h)
{
QPainterPath path;
@@ -3156,14 +3156,14 @@ void QSGContext2D::ellipse(qreal x, qreal y,
m_path.addPath(state.matrix.map(path));
}
-void QSGContext2D::text(const QString& str, qreal x, qreal y)
+void QQuickContext2D::text(const QString& str, qreal x, qreal y)
{
QPainterPath path;
path.addText(x, y, state.font, str);
m_path.addPath(state.matrix.map(path));
}
-void QSGContext2D::arc(qreal xc,
+void QQuickContext2D::arc(qreal xc,
qreal yc,
qreal radius,
qreal sar,
@@ -3229,38 +3229,38 @@ void QSGContext2D::arc(qreal xc,
m_path.arcTo(xs, ys, width, height, sa, span);
}
-int baseLineOffset(QSGContext2D::TextBaseLineType value, const QFontMetrics &metrics)
+int baseLineOffset(QQuickContext2D::TextBaseLineType value, const QFontMetrics &metrics)
{
int offset = 0;
switch (value) {
- case QSGContext2D::Top:
+ case QQuickContext2D::Top:
break;
- case QSGContext2D::Alphabetic:
- case QSGContext2D::Middle:
- case QSGContext2D::Hanging:
+ case QQuickContext2D::Alphabetic:
+ case QQuickContext2D::Middle:
+ case QQuickContext2D::Hanging:
offset = metrics.ascent();
break;
- case QSGContext2D::Bottom:
+ case QQuickContext2D::Bottom:
offset = metrics.height();
break;
}
return offset;
}
-static int textAlignOffset(QSGContext2D::TextAlignType value, const QFontMetrics &metrics, const QString &text)
+static int textAlignOffset(QQuickContext2D::TextAlignType value, const QFontMetrics &metrics, const QString &text)
{
int offset = 0;
- if (value == QSGContext2D::Start)
- value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QSGContext2D::Left : QSGContext2D::Right;
- else if (value == QSGContext2D::End)
- value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QSGContext2D::Right: QSGContext2D::Left;
+ if (value == QQuickContext2D::Start)
+ value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QQuickContext2D::Left : QQuickContext2D::Right;
+ else if (value == QQuickContext2D::End)
+ value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QQuickContext2D::Right: QQuickContext2D::Left;
switch (value) {
- case QSGContext2D::Center:
+ case QQuickContext2D::Center:
offset = metrics.width(text)/2;
break;
- case QSGContext2D::Right:
+ case QQuickContext2D::Right:
offset = metrics.width(text);
- case QSGContext2D::Left:
+ case QQuickContext2D::Left:
default:
break;
}
@@ -3268,16 +3268,16 @@ static int textAlignOffset(QSGContext2D::TextAlignType value, const QFontMetrics
}
-QImage QSGContext2D::createImage(const QUrl& url)
+QImage QQuickContext2D::createImage(const QUrl& url)
{
return m_canvas->loadedImage(url);
}
-QPainterPath QSGContext2D::createTextGlyphs(qreal x, qreal y, const QString& text)
+QPainterPath QQuickContext2D::createTextGlyphs(qreal x, qreal y, const QString& text)
{
const QFontMetrics metrics(state.font);
- int yoffset = baseLineOffset(static_cast<QSGContext2D::TextBaseLineType>(state.textBaseline), metrics);
- int xoffset = textAlignOffset(static_cast<QSGContext2D::TextAlignType>(state.textAlign), metrics, text);
+ int yoffset = baseLineOffset(static_cast<QQuickContext2D::TextBaseLineType>(state.textBaseline), metrics);
+ int xoffset = textAlignOffset(static_cast<QQuickContext2D::TextAlignType>(state.textAlign), metrics, text);
QPainterPath textPath;
@@ -3287,29 +3287,29 @@ QPainterPath QSGContext2D::createTextGlyphs(qreal x, qreal y, const QString& tex
}
-bool QSGContext2D::isPointInPath(qreal x, qreal y) const
+bool QQuickContext2D::isPointInPath(qreal x, qreal y) const
{
return m_path.contains(QPointF(x, y));
}
-QSGContext2D::QSGContext2D(QSGCanvasItem* item)
+QQuickContext2D::QQuickContext2D(QQuickCanvasItem* item)
: m_canvas(item)
- , m_buffer(new QSGContext2DCommandBuffer)
+ , m_buffer(new QQuickContext2DCommandBuffer)
, m_v8engine(0)
{
reset();
}
-QSGContext2D::~QSGContext2D()
+QQuickContext2D::~QQuickContext2D()
{
}
-v8::Handle<v8::Object> QSGContext2D::v8value() const
+v8::Handle<v8::Object> QQuickContext2D::v8value() const
{
return m_v8value;
}
-QSGContext2DEngineData::QSGContext2DEngineData(QV8Engine *engine)
+QQuickContext2DEngineData::QQuickContext2DEngineData(QV8Engine *engine)
{
v8::HandleScope handle_scope;
v8::Context::Scope scope(engine->context());
@@ -3405,7 +3405,7 @@ QSGContext2DEngineData::QSGContext2DEngineData(QV8Engine *engine)
constructorImageData = qPersistentNew(ftImageData->GetFunction());
}
-QSGContext2DEngineData::~QSGContext2DEngineData()
+QQuickContext2DEngineData::~QQuickContext2DEngineData()
{
qPersistentDispose(constructorContext);
qPersistentDispose(constructorGradient);
@@ -3414,12 +3414,12 @@ QSGContext2DEngineData::~QSGContext2DEngineData()
qPersistentDispose(constructorPixelArray);
}
-void QSGContext2D::popState()
+void QQuickContext2D::popState()
{
if (m_stateStack.isEmpty())
return;
- QSGContext2D::State newState = m_stateStack.pop();
+ QQuickContext2D::State newState = m_stateStack.pop();
if (state.matrix != newState.matrix)
buffer()->updateMatrix(newState.matrix);
@@ -3465,14 +3465,14 @@ void QSGContext2D::popState()
buffer()->setShadowOffsetY(newState.shadowOffsetY);
state = newState;
}
-void QSGContext2D::pushState()
+void QQuickContext2D::pushState()
{
m_stateStack.push(state);
}
-void QSGContext2D::reset()
+void QQuickContext2D::reset()
{
- QSGContext2D::State newState;
+ QQuickContext2D::State newState;
newState.matrix = QTransform();
QPainterPath defaultClipPath;
@@ -3501,8 +3501,8 @@ void QSGContext2D::reset()
newState.shadowColor = qRgba(0, 0, 0, 0);
newState.globalCompositeOperation = QPainter::CompositionMode_SourceOver;
newState.font = QFont(QLatin1String("sans-serif"), 10);
- newState.textAlign = QSGContext2D::Start;
- newState.textBaseline = QSGContext2D::Alphabetic;
+ newState.textAlign = QQuickContext2D::Start;
+ newState.textBaseline = QQuickContext2D::Alphabetic;
m_stateStack.clear();
m_stateStack.push(newState);
@@ -3510,7 +3510,7 @@ void QSGContext2D::reset()
m_buffer->clearRect(0, 0, m_canvas->width(), m_canvas->height());
}
-void QSGContext2D::setV8Engine(QV8Engine *engine)
+void QQuickContext2D::setV8Engine(QV8Engine *engine)
{
v8::HandleScope handle_scope;
v8::Context::Scope scope(engine->context());
@@ -3523,7 +3523,7 @@ void QSGContext2D::setV8Engine(QV8Engine *engine)
if (m_v8engine == 0)
return;
- QSGContext2DEngineData *ed = engineData(engine);
+ QQuickContext2DEngineData *ed = engineData(engine);
m_v8value = qPersistentNew(ed->constructorContext->NewInstance());
QV8Context2DResource *r = new QV8Context2DResource(engine);
r->context = this;
diff --git a/src/declarative/items/context2d/qsgcontext2d_p.h b/src/declarative/items/context2d/qquickcontext2d_p.h
index 10c1e331f9..3c5e89c335 100644
--- a/src/declarative/items/context2d/qsgcontext2d_p.h
+++ b/src/declarative/items/context2d/qquickcontext2d_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QSGCONTEXT2D_P_H
-#define QSGCONTEXT2D_P_H
+#ifndef QQUICKCONTEXT2D_P_H
+#define QQUICKCONTEXT2D_P_H
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
@@ -53,9 +53,9 @@
-#define QSGCONTEXT2D_DEBUG //enable this for just DEBUG purpose!
+#define QQUICKCONTEXT2D_DEBUG //enable this for just DEBUG purpose!
-#ifdef QSGCONTEXT2D_DEBUG
+#ifdef QQUICKCONTEXT2D_DEBUG
#include <QElapsedTimer>
#endif
@@ -65,11 +65,11 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class QSGCanvasItem;
-class QSGContext2DCommandBuffer;
+class QQuickCanvasItem;
+class QQuickContext2DCommandBuffer;
class QDeclarativePixmap;
-class Q_DECLARATIVE_EXPORT QSGContext2D
+class Q_DECLARATIVE_EXPORT QQuickContext2D
{
public:
enum TextBaseLineType { Alphabetic=0, Top, Middle, Bottom, Hanging};
@@ -127,15 +127,15 @@ public:
QColor shadowColor;
QPainter::CompositionMode globalCompositeOperation;
QFont font;
- QSGContext2D::TextAlignType textAlign;
- QSGContext2D::TextBaseLineType textBaseline;
+ QQuickContext2D::TextAlignType textAlign;
+ QQuickContext2D::TextBaseLineType textBaseline;
};
- QSGContext2D(QSGCanvasItem* item);
- ~QSGContext2D();
+ QQuickContext2D(QQuickCanvasItem* item);
+ ~QQuickContext2D();
- inline QSGCanvasItem* canvas() const {return m_canvas;}
- inline QSGContext2DCommandBuffer* buffer() const {return m_buffer;}
+ inline QQuickCanvasItem* canvas() const {return m_canvas;}
+ inline QQuickContext2DCommandBuffer* buffer() const {return m_buffer;}
v8::Handle<v8::Object> v8value() const;
void setV8Engine(QV8Engine *eng);
@@ -167,9 +167,9 @@ public:
QImage createImage(const QUrl& url);
State state;
- QStack<QSGContext2D::State> m_stateStack;
- QSGCanvasItem* m_canvas;
- QSGContext2DCommandBuffer* m_buffer;
+ QStack<QQuickContext2D::State> m_stateStack;
+ QQuickCanvasItem* m_canvas;
+ QQuickContext2DCommandBuffer* m_buffer;
QPainterPath m_path;
v8::Local<v8::Value> m_fillStyle;
v8::Local<v8::Value> m_strokeStyle;
@@ -180,8 +180,8 @@ public:
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QSGContext2D)
+QML_DECLARE_TYPE(QQuickContext2D)
QT_END_HEADER
-#endif // QSGCONTEXT2D_P_H
+#endif // QQUICKCONTEXT2D_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp
index 29ed5fbc12..e91a21c8b0 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#include "qsgcontext2dcommandbuffer_p.h"
-#include "qsgcanvasitem_p.h"
+#include "qquickcontext2dcommandbuffer_p.h"
+#include "qquickcanvasitem_p.h"
#include <qdeclarative.h>
#include <QtCore/QMutex>
@@ -197,7 +197,7 @@ static inline void drawRepeatPattern(QPainter* p, const QImage& image, const QRe
}
}
-QPen QSGContext2DCommandBuffer::makePen(QSGContext2D::State state)
+QPen QQuickContext2DCommandBuffer::makePen(QQuickContext2D::State state)
{
QPen pen;
pen.setWidthF(state.lineWidth);
@@ -208,7 +208,7 @@ QPen QSGContext2DCommandBuffer::makePen(QSGContext2D::State state)
return pen;
}
-void QSGContext2DCommandBuffer::setPainterState(QPainter* p, QSGContext2D::State state, const QPen& pen)
+void QQuickContext2DCommandBuffer::setPainterState(QPainter* p, QQuickContext2D::State state, const QPen& pen)
{
p->setTransform(state.matrix * p->transform());
@@ -229,7 +229,7 @@ void QSGContext2DCommandBuffer::setPainterState(QPainter* p, QSGContext2D::State
p->setCompositionMode(state.globalCompositeOperation);
}
-QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D::State state)
+QQuickContext2D::State QQuickContext2DCommandBuffer::replay(QPainter* p, QQuickContext2D::State state)
{
if (!p)
return state;
@@ -242,15 +242,15 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
setPainterState(p, state, pen);
while (hasNext()) {
- QSGContext2D::PaintCommand cmd = takeNextCommand();
+ QQuickContext2D::PaintCommand cmd = takeNextCommand();
switch (cmd) {
- case QSGContext2D::UpdateMatrix:
+ case QQuickContext2D::UpdateMatrix:
{
state.matrix = takeMatrix();
p->setTransform(state.matrix * originMatrix);
break;
}
- case QSGContext2D::ClearRect:
+ case QQuickContext2D::ClearRect:
{
QPainter::CompositionMode cm = p->compositionMode();
qreal alpha = p->opacity();
@@ -261,7 +261,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
p->setOpacity(alpha);
break;
}
- case QSGContext2D::FillRect:
+ case QQuickContext2D::FillRect:
{
QRectF r = takeRect();
if (HAS_SHADOW(state.shadowOffsetX, state.shadowOffsetY, state.shadowBlur, state.shadowColor))
@@ -270,27 +270,27 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
p->fillRect(r, p->brush());
break;
}
- case QSGContext2D::ShadowColor:
+ case QQuickContext2D::ShadowColor:
{
state.shadowColor = takeColor();
break;
}
- case QSGContext2D::ShadowBlur:
+ case QQuickContext2D::ShadowBlur:
{
state.shadowBlur = takeShadowBlur();
break;
}
- case QSGContext2D::ShadowOffsetX:
+ case QQuickContext2D::ShadowOffsetX:
{
state.shadowOffsetX = takeShadowOffsetX();
break;
}
- case QSGContext2D::ShadowOffsetY:
+ case QQuickContext2D::ShadowOffsetY:
{
state.shadowOffsetY = takeShadowOffsetY();
break;
}
- case QSGContext2D::FillStyle:
+ case QQuickContext2D::FillStyle:
{
state.fillStyle = takeFillStyle();
state.fillPatternRepeatX = takeBool();
@@ -298,7 +298,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
p->setBrush(state.fillStyle);
break;
}
- case QSGContext2D::StrokeStyle:
+ case QQuickContext2D::StrokeStyle:
{
state.strokeStyle = takeStrokeStyle();
state.strokePatternRepeatX = takeBool();
@@ -307,38 +307,38 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
p->setPen(pen);
break;
}
- case QSGContext2D::LineWidth:
+ case QQuickContext2D::LineWidth:
{
state.lineWidth = takeLineWidth();
pen.setWidth(state.lineWidth);
p->setPen(pen);
break;
}
- case QSGContext2D::LineCap:
+ case QQuickContext2D::LineCap:
{
state.lineCap = takeLineCap();
pen.setCapStyle(state.lineCap);
p->setPen(pen);
break;
}
- case QSGContext2D::LineJoin:
+ case QQuickContext2D::LineJoin:
{
state.lineJoin = takeLineJoin();
pen.setJoinStyle(state.lineJoin);
p->setPen(pen);
break;
}
- case QSGContext2D::MiterLimit:
+ case QQuickContext2D::MiterLimit:
{
state.miterLimit = takeMiterLimit();
pen.setMiterLimit(state.miterLimit);
p->setPen(pen);
break;
}
- case QSGContext2D::TextAlign:
- case QSGContext2D::TextBaseline:
+ case QQuickContext2D::TextAlign:
+ case QQuickContext2D::TextBaseline:
break;
- case QSGContext2D::Fill:
+ case QQuickContext2D::Fill:
{
QPainterPath path = takePath();
path.closeSubpath();
@@ -348,7 +348,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
p->fillPath(path, p->brush());
break;
}
- case QSGContext2D::Stroke:
+ case QQuickContext2D::Stroke:
{
if (HAS_SHADOW(state.shadowOffsetX, state.shadowOffsetY, state.shadowBlur, state.shadowColor))
strokeShadowPath(p,takePath(), state.shadowOffsetX, state.shadowOffsetY, state.shadowBlur, state.shadowColor);
@@ -356,26 +356,26 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
p->strokePath(takePath(), p->pen());
break;
}
- case QSGContext2D::Clip:
+ case QQuickContext2D::Clip:
{
state.clipPath = takePath();
p->setClipping(true);
p->setClipPath(state.clipPath);
break;
}
- case QSGContext2D::GlobalAlpha:
+ case QQuickContext2D::GlobalAlpha:
{
state.globalAlpha = takeGlobalAlpha();
p->setOpacity(state.globalAlpha);
break;
}
- case QSGContext2D::GlobalCompositeOperation:
+ case QQuickContext2D::GlobalCompositeOperation:
{
state.globalCompositeOperation = takeGlobalCompositeOperation();
p->setCompositionMode(state.globalCompositeOperation);
break;
}
- case QSGContext2D::DrawImage:
+ case QQuickContext2D::DrawImage:
{
qreal sx = takeReal();
qreal sy = takeReal();
@@ -407,7 +407,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
}
break;
}
- case QSGContext2D::GetImageData:
+ case QQuickContext2D::GetImageData:
{
//TODO:
break;
@@ -421,7 +421,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
return state;
}
-QSGContext2DCommandBuffer::QSGContext2DCommandBuffer()
+QQuickContext2DCommandBuffer::QQuickContext2DCommandBuffer()
: cmdIdx(0)
, intIdx(0)
, boolIdx(0)
@@ -435,11 +435,11 @@ QSGContext2DCommandBuffer::QSGContext2DCommandBuffer()
}
-QSGContext2DCommandBuffer::~QSGContext2DCommandBuffer()
+QQuickContext2DCommandBuffer::~QQuickContext2DCommandBuffer()
{
}
-void QSGContext2DCommandBuffer::clear()
+void QQuickContext2DCommandBuffer::clear()
{
commands.clear();
ints.clear();
@@ -453,7 +453,7 @@ void QSGContext2DCommandBuffer::clear()
reset();
}
-void QSGContext2DCommandBuffer::reset()
+void QQuickContext2DCommandBuffer::reset()
{
cmdIdx = 0;
intIdx = 0;
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h b/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h
index cab82e2f67..46964d3411 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QSGCONTEXT2DCOMMANDBUFFER_P_H
-#define QSGCONTEXT2DCOMMANDBUFFER_P_H
+#ifndef QQUICKCONTEXT2DCOMMANDBUFFER_P_H
+#define QQUICKCONTEXT2DCOMMANDBUFFER_P_H
-#include "qsgcontext2d_p.h"
+#include "qquickcontext2d_p.h"
#include <private/qdeclarativepixmapcache_p.h>
@@ -52,20 +52,20 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class QSGCanvasItem;
+class QQuickCanvasItem;
class QMutex;
-class QSGContext2DCommandBuffer
+class QQuickContext2DCommandBuffer
{
public:
- QSGContext2DCommandBuffer();
- ~QSGContext2DCommandBuffer();
+ QQuickContext2DCommandBuffer();
+ ~QQuickContext2DCommandBuffer();
void reset();
void clear();
inline int size() {return commands.size();}
inline bool isEmpty() const {return commands.isEmpty(); }
inline bool hasNext() const {return cmdIdx < commands.size(); }
- inline QSGContext2D::PaintCommand takeNextCommand() { return commands[cmdIdx++]; }
+ inline QQuickContext2D::PaintCommand takeNextCommand() { return commands[cmdIdx++]; }
inline qreal takeGlobalAlpha() { return takeReal(); }
inline QPainter::CompositionMode takeGlobalCompositeOperation(){ return static_cast<QPainter::CompositionMode>(takeInt()); }
@@ -79,26 +79,26 @@ public:
inline void setGlobalAlpha( qreal alpha)
{
- commands << QSGContext2D::GlobalAlpha;
+ commands << QQuickContext2D::GlobalAlpha;
reals << alpha;
}
inline void setGlobalCompositeOperation(QPainter::CompositionMode cm)
{
- commands << QSGContext2D::GlobalCompositeOperation;
+ commands << QQuickContext2D::GlobalCompositeOperation;
ints << cm;
}
inline void setStrokeStyle(const QBrush &style, bool repeatX = false, bool repeatY = false)
{
- commands << QSGContext2D::StrokeStyle;
+ commands << QQuickContext2D::StrokeStyle;
brushes << style;
bools << repeatX << repeatY;
}
inline void drawImage(const QImage& image, qreal sx, qreal sy, qreal sw, qreal sh, qreal dx, qreal dy, qreal dw, qreal dh)
{
- commands << QSGContext2D::DrawImage;
+ commands << QQuickContext2D::DrawImage;
images << image;
reals << sx << sy << sw << sh << dx << dy << dw << dh;
}
@@ -111,19 +111,19 @@ public:
inline void updateMatrix(const QTransform& matrix)
{
- commands << QSGContext2D::UpdateMatrix;
+ commands << QQuickContext2D::UpdateMatrix;
matrixes << matrix;
}
inline void clearRect(qreal x, qreal y, qreal w, qreal h)
{
- commands << QSGContext2D::ClearRect;
+ commands << QQuickContext2D::ClearRect;
reals << x << y << w << h;
}
inline void fillRect(qreal x, qreal y, qreal w, qreal h)
{
- commands << QSGContext2D::FillRect;
+ commands << QQuickContext2D::FillRect;
reals << x << y << w << h;
}
@@ -132,27 +132,27 @@ public:
QPainterPath p;
p.addRect(x, y, w, h);
- commands << QSGContext2D::Stroke;
+ commands << QQuickContext2D::Stroke;
pathes << p;
}
inline void fill(const QPainterPath& path)
{
- commands << QSGContext2D::Fill;
+ commands << QQuickContext2D::Fill;
pathes << path;
}
inline void stroke(const QPainterPath& path)
{
- commands << QSGContext2D::Stroke;
+ commands << QQuickContext2D::Stroke;
pathes << path;
}
inline void clip(const QPainterPath& path)
{
- commands << QSGContext2D::Clip;
+ commands << QQuickContext2D::Clip;
pathes << path;
}
@@ -160,7 +160,7 @@ public:
inline void setFillStyle(const QBrush &style, bool repeatX = false, bool repeatY = false)
{
- commands << QSGContext2D::FillStyle;
+ commands << QQuickContext2D::FillStyle;
brushes << style;
bools << repeatX << repeatY;
}
@@ -168,49 +168,49 @@ public:
inline void setLineWidth( qreal w)
{
- commands << QSGContext2D::LineWidth;
+ commands << QQuickContext2D::LineWidth;
reals << w;
}
inline void setLineCap(Qt::PenCapStyle cap)
{
- commands << QSGContext2D::LineCap;
+ commands << QQuickContext2D::LineCap;
ints << cap;
}
inline void setLineJoin(Qt::PenJoinStyle join)
{
- commands << QSGContext2D::LineJoin;
+ commands << QQuickContext2D::LineJoin;
ints << join;
}
inline void setMiterLimit( qreal limit)
{
- commands << QSGContext2D::MiterLimit;
+ commands << QQuickContext2D::MiterLimit;
reals << limit;
}
inline void setShadowOffsetX( qreal x)
{
- commands << QSGContext2D::ShadowOffsetX;
+ commands << QQuickContext2D::ShadowOffsetX;
reals << x;
}
inline void setShadowOffsetY( qreal y)
{
- commands << QSGContext2D::ShadowOffsetY;
+ commands << QQuickContext2D::ShadowOffsetY;
reals << y;
}
inline void setShadowBlur( qreal b)
{
- commands << QSGContext2D::ShadowBlur;
+ commands << QQuickContext2D::ShadowBlur;
reals << b;
}
inline void setShadowColor(const QColor &color)
{
- commands << QSGContext2D::ShadowColor;
+ commands << QQuickContext2D::ShadowColor;
colors << color;
}
@@ -236,10 +236,10 @@ public:
inline QColor takeColor() { return colors[colorIdx++]; }
inline QBrush takeBrush() { return brushes[brushIdx++]; }
- QSGContext2D::State replay(QPainter* painter, QSGContext2D::State state);
+ QQuickContext2D::State replay(QPainter* painter, QQuickContext2D::State state);
private:
- QPen makePen(QSGContext2D::State state);
- void setPainterState(QPainter* painter, QSGContext2D::State state, const QPen& pen);
+ QPen makePen(QQuickContext2D::State state);
+ void setPainterState(QPainter* painter, QQuickContext2D::State state, const QPen& pen);
int cmdIdx;
int intIdx;
int boolIdx;
@@ -249,7 +249,7 @@ private:
int brushIdx;
int pathIdx;
int imageIdx;
- QVector<QSGContext2D::PaintCommand> commands;
+ QVector<QQuickContext2D::PaintCommand> commands;
QVector<int> ints;
QVector<bool> bools;
@@ -265,4 +265,4 @@ QT_END_HEADER
QT_END_NAMESPACE
-#endif // QSGCONTEXT2DCOMMANDBUFFER_P_H
+#endif // QQUICKCONTEXT2DCOMMANDBUFFER_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dnode.cpp b/src/declarative/items/context2d/qquickcontext2dnode.cpp
index 87de8cf157..76b50d9747 100644
--- a/src/declarative/items/context2d/qsgcontext2dnode.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dnode.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qsgcontext2dnode_p.h"
+#include "qquickcontext2dnode_p.h"
#include <private/qsgcontext_p.h>
#include <QtCore/qmath.h>
@@ -47,7 +47,7 @@
QT_BEGIN_NAMESPACE
-QSGContext2DNode::QSGContext2DNode(QSGCanvasItem* item)
+QQuickContext2DNode::QQuickContext2DNode(QQuickCanvasItem* item)
: QSGGeometryNode()
, m_item(item)
, m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
@@ -62,12 +62,12 @@ QSGContext2DNode::QSGContext2DNode(QSGCanvasItem* item)
setFlag(UsePreprocess, true);
}
-QSGContext2DNode::~QSGContext2DNode()
+QQuickContext2DNode::~QQuickContext2DNode()
{
delete m_texture;
}
-void QSGContext2DNode::setSize(const QSizeF& size)
+void QQuickContext2DNode::setSize(const QSizeF& size)
{
if (m_size != size) {
m_dirtyGeometry = true;
@@ -75,7 +75,7 @@ void QSGContext2DNode::setSize(const QSizeF& size)
}
}
-void QSGContext2DNode::preprocess()
+void QQuickContext2DNode::preprocess()
{
bool doDirty = false;
QSGDynamicTexture *t = qobject_cast<QSGDynamicTexture *>(m_material.texture());
@@ -87,7 +87,7 @@ void QSGContext2DNode::preprocess()
markDirty(DirtyMaterial);
}
}
-void QSGContext2DNode::setTexture(QSGContext2DTexture* texture)
+void QQuickContext2DNode::setTexture(QQuickContext2DTexture* texture)
{
if (texture != m_texture) {
m_dirtyTexture = true;
@@ -95,7 +95,7 @@ void QSGContext2DNode::setTexture(QSGContext2DTexture* texture)
}
}
-void QSGContext2DNode::update()
+void QQuickContext2DNode::update()
{
if (m_dirtyGeometry)
updateGeometry();
@@ -106,14 +106,14 @@ void QSGContext2DNode::update()
m_dirtyTexture = false;
}
-void QSGContext2DNode::updateTexture()
+void QQuickContext2DNode::updateTexture()
{
m_material.setTexture(m_texture);
m_materialO.setTexture(m_texture);
markDirty(DirtyMaterial);
}
-void QSGContext2DNode::updateGeometry()
+void QQuickContext2DNode::updateGeometry()
{
QRectF source = m_texture->textureSubRect();
QSGGeometry::updateTexturedRectGeometry(&m_geometry,
diff --git a/src/declarative/items/context2d/qsgcontext2dnode_p.h b/src/declarative/items/context2d/qquickcontext2dnode_p.h
index 88c3619095..7403acaf07 100644
--- a/src/declarative/items/context2d/qsgcontext2dnode_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dnode_p.h
@@ -39,15 +39,15 @@
**
****************************************************************************/
-#ifndef QSGCONTEXT2DNODE_P_H
-#define QSGCONTEXT2DNODE_P_H
+#ifndef QQUICKCONTEXT2DNODE_P_H
+#define QQUICKCONTEXT2DNODE_P_H
#include <qsgnode.h>
#include <qsgtexturematerial.h>
-#include "qsgcanvasitem_p.h"
-#include "qsgcontext2dtexture_p.h"
-#include "qsgcontext2d_p.h"
+#include "qquickcanvasitem_p.h"
+#include "qquickcontext2dtexture_p.h"
+#include "qquickcontext2d_p.h"
QT_BEGIN_HEADER
@@ -55,12 +55,12 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class QSGContext2DNode : public QSGGeometryNode
+class QQuickContext2DNode : public QSGGeometryNode
{
public:
- QSGContext2DNode(QSGCanvasItem* item);
- virtual ~QSGContext2DNode();
- void setTexture(QSGContext2DTexture* texture);
+ QQuickContext2DNode(QQuickCanvasItem* item);
+ virtual ~QQuickContext2DNode();
+ void setTexture(QQuickContext2DTexture* texture);
void update();
void preprocess();
void setSize(const QSizeF& size);
@@ -68,11 +68,11 @@ private:
void updateTexture();
void updateGeometry();
- QSGCanvasItem* m_item;
+ QQuickCanvasItem* m_item;
QSGOpaqueTextureMaterial m_material;
QSGTextureMaterial m_materialO;
QSGGeometry m_geometry;
- QSGContext2DTexture* m_texture;
+ QQuickContext2DTexture* m_texture;
QSizeF m_size;
bool m_dirtyGeometry;
@@ -83,4 +83,4 @@ QT_END_HEADER
QT_END_NAMESPACE
-#endif // QSGCONTEXT2DNODE_P_H
+#endif // QQUICKCONTEXT2DNODE_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture.cpp b/src/declarative/items/context2d/qquickcontext2dtexture.cpp
index 721f847978..9518f91d45 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dtexture.cpp
@@ -39,12 +39,12 @@
**
****************************************************************************/
-#include "qsgcontext2dtexture_p.h"
-#include "qsgcontext2dtile_p.h"
-#include "qsgcanvasitem_p.h"
-#include <private/qsgitem_p.h>
+#include "qquickcontext2dtexture_p.h"
+#include "qquickcontext2dtile_p.h"
+#include "qquickcanvasitem_p.h"
+#include <private/qquickitem_p.h>
#include <private/qsgtexture_p.h>
-#include "qsgcontext2dcommandbuffer_p.h"
+#include "qquickcontext2dcommandbuffer_p.h"
#include <QOpenGLPaintDevice>
#include <QOpenGLFramebufferObject>
@@ -69,7 +69,7 @@ static inline int qt_next_power_of_two(int v)
Q_GLOBAL_STATIC(QThread, globalCanvasThreadRenderInstance)
-QSGContext2DTexture::QSGContext2DTexture()
+QQuickContext2DTexture::QQuickContext2DTexture()
: QSGDynamicTexture()
, m_context(0)
, m_canvasSize(QSize(1, 1))
@@ -85,17 +85,17 @@ QSGContext2DTexture::QSGContext2DTexture()
{
}
-QSGContext2DTexture::~QSGContext2DTexture()
+QQuickContext2DTexture::~QQuickContext2DTexture()
{
clearTiles();
}
-QSize QSGContext2DTexture::textureSize() const
+QSize QQuickContext2DTexture::textureSize() const
{
return m_canvasWindow.size();
}
-void QSGContext2DTexture::markDirtyTexture()
+void QQuickContext2DTexture::markDirtyTexture()
{
lock();
m_dirtyTexture = true;
@@ -103,7 +103,7 @@ void QSGContext2DTexture::markDirtyTexture()
emit textureChanged();
}
-bool QSGContext2DTexture::setCanvasSize(const QSize &size)
+bool QQuickContext2DTexture::setCanvasSize(const QSize &size)
{
if (m_canvasSize != size) {
m_canvasSize = size;
@@ -113,7 +113,7 @@ bool QSGContext2DTexture::setCanvasSize(const QSize &size)
return false;
}
-bool QSGContext2DTexture::setTileSize(const QSize &size)
+bool QQuickContext2DTexture::setTileSize(const QSize &size)
{
if (m_tileSize != size) {
m_tileSize = size;
@@ -123,12 +123,12 @@ bool QSGContext2DTexture::setTileSize(const QSize &size)
return false;
}
-void QSGContext2DTexture::setSmooth(bool smooth)
+void QQuickContext2DTexture::setSmooth(bool smooth)
{
m_smooth = smooth;
}
-void QSGContext2DTexture::setItem(QSGCanvasItem* item)
+void QQuickContext2DTexture::setItem(QQuickCanvasItem* item)
{
if (!item) {
lock();
@@ -146,7 +146,7 @@ void QSGContext2DTexture::setItem(QSGCanvasItem* item)
}
}
-bool QSGContext2DTexture::setCanvasWindow(const QRect& r)
+bool QQuickContext2DTexture::setCanvasWindow(const QRect& r)
{
if (m_canvasWindow != r) {
m_canvasWindow = r;
@@ -155,11 +155,11 @@ bool QSGContext2DTexture::setCanvasWindow(const QRect& r)
return false;
}
-bool QSGContext2DTexture::setDirtyRect(const QRect &r)
+bool QQuickContext2DTexture::setDirtyRect(const QRect &r)
{
bool doDirty = false;
if (m_tiledCanvas) {
- foreach (QSGContext2DTile* t, m_tiles) {
+ foreach (QQuickContext2DTile* t, m_tiles) {
bool dirty = t->rect().intersected(r).isValid();
t->markDirty(dirty);
if (dirty)
@@ -171,7 +171,7 @@ bool QSGContext2DTexture::setDirtyRect(const QRect &r)
return doDirty;
}
-void QSGContext2DTexture::canvasChanged(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth)
+void QQuickContext2DTexture::canvasChanged(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth)
{
lock();
@@ -209,9 +209,9 @@ void QSGContext2DTexture::canvasChanged(const QSize& canvasSize, const QSize& ti
unlock();
}
-void QSGContext2DTexture::paintWithoutTiles()
+void QQuickContext2DTexture::paintWithoutTiles()
{
- QSGContext2DCommandBuffer* ccb = m_context->buffer();
+ QQuickContext2DCommandBuffer* ccb = m_context->buffer();
if (ccb->isEmpty() && m_threadRendering && !m_doGrabImage) {
lock();
@@ -246,7 +246,7 @@ void QSGContext2DTexture::paintWithoutTiles()
endPainting();
}
-bool QSGContext2DTexture::canvasDestroyed()
+bool QQuickContext2DTexture::canvasDestroyed()
{
bool noCanvas = false;
lock();
@@ -255,7 +255,7 @@ bool QSGContext2DTexture::canvasDestroyed()
return noCanvas;
}
-void QSGContext2DTexture::paint()
+void QQuickContext2DTexture::paint()
{
if (canvasDestroyed())
return;
@@ -263,8 +263,8 @@ void QSGContext2DTexture::paint()
if (!m_tiledCanvas) {
paintWithoutTiles();
} else {
- QSGContext2D::State oldState = m_state;
- QSGContext2DCommandBuffer* ccb = m_context->buffer();
+ QQuickContext2D::State oldState = m_state;
+ QQuickContext2DCommandBuffer* ccb = m_context->buffer();
lock();
QRect tiledRegion = createTiles(m_canvasWindow.intersected(QRect(QPoint(0, 0), m_canvasSize)));
@@ -275,7 +275,7 @@ void QSGContext2DTexture::paint()
QRect dirtyRect;
lock();
- foreach (QSGContext2DTile* tile, m_tiles) {
+ foreach (QQuickContext2DTile* tile, m_tiles) {
if (tile->dirty()) {
if (dirtyRect.isEmpty())
dirtyRect = tile->rect();
@@ -295,7 +295,7 @@ void QSGContext2DTexture::paint()
}
if (beginPainting()) {
- foreach (QSGContext2DTile* tile, m_tiles) {
+ foreach (QQuickContext2DTile* tile, m_tiles) {
bool dirtyTile = false, dirtyCanvas = false, smooth = false;
lock();
@@ -328,7 +328,7 @@ void QSGContext2DTexture::paint()
}
}
-QRect QSGContext2DTexture::tiledRect(const QRectF& window, const QSize& tileSize)
+QRect QQuickContext2DTexture::tiledRect(const QRectF& window, const QSize& tileSize)
{
if (window.isEmpty())
return QRect();
@@ -344,9 +344,9 @@ QRect QSGContext2DTexture::tiledRect(const QRectF& window, const QSize& tileSize
return QRect(h1 * tw, v1 * th, htiles * tw, vtiles * th);
}
-QRect QSGContext2DTexture::createTiles(const QRect& window)
+QRect QQuickContext2DTexture::createTiles(const QRect& window)
{
- QList<QSGContext2DTile*> oldTiles = m_tiles;
+ QList<QQuickContext2DTile*> oldTiles = m_tiles;
m_tiles.clear();
if (window.isEmpty()) {
@@ -370,7 +370,7 @@ QRect QSGContext2DTexture::createTiles(const QRect& window)
int ht = xx + h1;
int vt = yy + v1;
- QSGContext2DTile* tile = 0;
+ QQuickContext2DTile* tile = 0;
QPoint pos(ht * tw, vt * th);
QRect rect(pos, m_tileSize);
@@ -396,14 +396,14 @@ QRect QSGContext2DTexture::createTiles(const QRect& window)
return r;
}
-void QSGContext2DTexture::clearTiles()
+void QQuickContext2DTexture::clearTiles()
{
qDeleteAll(m_tiles);
m_tiles.clear();
}
-QSGContext2DFBOTexture::QSGContext2DFBOTexture()
- : QSGContext2DTexture()
+QQuickContext2DFBOTexture::QQuickContext2DFBOTexture()
+ : QQuickContext2DTexture()
, m_fbo(0)
, m_multisampledFbo(0)
, m_paint_device(0)
@@ -411,14 +411,14 @@ QSGContext2DFBOTexture::QSGContext2DFBOTexture()
m_threadRendering = false;
}
-QSGContext2DFBOTexture::~QSGContext2DFBOTexture()
+QQuickContext2DFBOTexture::~QQuickContext2DFBOTexture()
{
delete m_fbo;
delete m_multisampledFbo;
delete m_paint_device;
}
-bool QSGContext2DFBOTexture::setCanvasSize(const QSize &size)
+bool QQuickContext2DFBOTexture::setCanvasSize(const QSize &size)
{
QSize s = QSize(qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.width()))
, qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.height())));
@@ -431,7 +431,7 @@ bool QSGContext2DFBOTexture::setCanvasSize(const QSize &size)
return false;
}
-bool QSGContext2DFBOTexture::setTileSize(const QSize &size)
+bool QQuickContext2DFBOTexture::setTileSize(const QSize &size)
{
QSize s = QSize(qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.width()))
, qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.height())));
@@ -443,7 +443,7 @@ bool QSGContext2DFBOTexture::setTileSize(const QSize &size)
return false;
}
-bool QSGContext2DFBOTexture::setCanvasWindow(const QRect& canvasWindow)
+bool QQuickContext2DFBOTexture::setCanvasWindow(const QRect& canvasWindow)
{
QSize s = QSize(qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(canvasWindow.size().width()))
, qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(canvasWindow.size().height())));
@@ -461,13 +461,13 @@ bool QSGContext2DFBOTexture::setCanvasWindow(const QRect& canvasWindow)
return doChanged;
}
-void QSGContext2DFBOTexture::bind()
+void QQuickContext2DFBOTexture::bind()
{
glBindTexture(GL_TEXTURE_2D, textureId());
updateBindOptions();
}
-QRectF QSGContext2DFBOTexture::textureSubRect() const
+QRectF QQuickContext2DFBOTexture::textureSubRect() const
{
return QRectF(0
, 0
@@ -476,13 +476,13 @@ QRectF QSGContext2DFBOTexture::textureSubRect() const
}
-int QSGContext2DFBOTexture::textureId() const
+int QQuickContext2DFBOTexture::textureId() const
{
return m_fbo? m_fbo->texture() : 0;
}
-bool QSGContext2DFBOTexture::updateTexture()
+bool QQuickContext2DFBOTexture::updateTexture()
{
if (!m_context->buffer()->isEmpty()) {
paint();
@@ -500,19 +500,19 @@ bool QSGContext2DFBOTexture::updateTexture()
return textureUpdated;
}
-QSGContext2DTile* QSGContext2DFBOTexture::createTile() const
+QQuickContext2DTile* QQuickContext2DFBOTexture::createTile() const
{
- return new QSGContext2DFBOTile();
+ return new QQuickContext2DFBOTile();
}
-void QSGContext2DFBOTexture::grabImage()
+void QQuickContext2DFBOTexture::grabImage()
{
if (m_fbo) {
m_grabedImage = m_fbo->toImage();
}
}
-bool QSGContext2DFBOTexture::doMultisampling() const
+bool QQuickContext2DFBOTexture::doMultisampling() const
{
static bool extensionsChecked = false;
static bool multisamplingSupported = false;
@@ -527,7 +527,7 @@ bool QSGContext2DFBOTexture::doMultisampling() const
return multisamplingSupported && m_smooth;
}
-QImage QSGContext2DFBOTexture::toImage(const QRectF& region)
+QImage QQuickContext2DFBOTexture::toImage(const QRectF& region)
{
#define QML_CONTEXT2D_WAIT_MAX 5000
@@ -550,9 +550,9 @@ QImage QSGContext2DFBOTexture::toImage(const QRectF& region)
return grabbed;
}
-void QSGContext2DFBOTexture::compositeTile(QSGContext2DTile* tile)
+void QQuickContext2DFBOTexture::compositeTile(QQuickContext2DTile* tile)
{
- QSGContext2DFBOTile* t = static_cast<QSGContext2DFBOTile*>(tile);
+ QQuickContext2DFBOTile* t = static_cast<QQuickContext2DFBOTile*>(tile);
QRect target = t->rect().intersect(m_canvasWindow);
if (target.isValid()) {
QRect source = target;
@@ -563,13 +563,13 @@ void QSGContext2DFBOTexture::compositeTile(QSGContext2DTile* tile)
QOpenGLFramebufferObject::blitFramebuffer(m_fbo, target, t->fbo(), source);
}
}
-QSGCanvasItem::RenderTarget QSGContext2DFBOTexture::renderTarget() const
+QQuickCanvasItem::RenderTarget QQuickContext2DFBOTexture::renderTarget() const
{
- return QSGCanvasItem::FramebufferObject;
+ return QQuickCanvasItem::FramebufferObject;
}
-QPaintDevice* QSGContext2DFBOTexture::beginPainting()
+QPaintDevice* QQuickContext2DFBOTexture::beginPainting()
{
- QSGContext2DTexture::beginPainting();
+ QQuickContext2DTexture::beginPainting();
if (m_canvasWindow.size().isEmpty() && !m_threadRendering) {
delete m_fbo;
@@ -615,9 +615,9 @@ QPaintDevice* QSGContext2DFBOTexture::beginPainting()
return m_paint_device;
}
-void QSGContext2DFBOTexture::endPainting()
+void QQuickContext2DFBOTexture::endPainting()
{
- QSGContext2DTexture::endPainting();
+ QQuickContext2DTexture::endPainting();
if (m_multisampledFbo) {
QOpenGLFramebufferObject::blitFramebuffer(m_fbo, m_multisampledFbo);
m_multisampledFbo->release();
@@ -634,8 +634,8 @@ void qt_quit_context2d_render_thread()
}
}
-QSGContext2DImageTexture::QSGContext2DImageTexture(bool threadRendering)
- : QSGContext2DTexture()
+QQuickContext2DImageTexture::QQuickContext2DImageTexture(bool threadRendering)
+ : QQuickContext2DTexture()
, m_texture(new QSGPlainTexture())
{
m_texture->setOwnsTexture(true);
@@ -654,55 +654,55 @@ QSGContext2DImageTexture::QSGContext2DImageTexture(bool threadRendering)
}
}
-QSGContext2DImageTexture::~QSGContext2DImageTexture()
+QQuickContext2DImageTexture::~QQuickContext2DImageTexture()
{
delete m_texture;
}
-int QSGContext2DImageTexture::textureId() const
+int QQuickContext2DImageTexture::textureId() const
{
return m_texture->textureId();
}
-void QSGContext2DImageTexture::lock()
+void QQuickContext2DImageTexture::lock()
{
if (m_threadRendering)
m_mutex.lock();
}
-void QSGContext2DImageTexture::unlock()
+void QQuickContext2DImageTexture::unlock()
{
if (m_threadRendering)
m_mutex.unlock();
}
-void QSGContext2DImageTexture::wait()
+void QQuickContext2DImageTexture::wait()
{
if (m_threadRendering)
m_waitCondition.wait(&m_mutex);
}
-void QSGContext2DImageTexture::wake()
+void QQuickContext2DImageTexture::wake()
{
if (m_threadRendering)
m_waitCondition.wakeOne();
}
-bool QSGContext2DImageTexture::supportDirectRendering() const
+bool QQuickContext2DImageTexture::supportDirectRendering() const
{
return !m_threadRendering;
}
-QSGCanvasItem::RenderTarget QSGContext2DImageTexture::renderTarget() const
+QQuickCanvasItem::RenderTarget QQuickContext2DImageTexture::renderTarget() const
{
- return QSGCanvasItem::Image;
+ return QQuickCanvasItem::Image;
}
-void QSGContext2DImageTexture::bind()
+void QQuickContext2DImageTexture::bind()
{
m_texture->bind();
}
-bool QSGContext2DImageTexture::updateTexture()
+bool QQuickContext2DImageTexture::updateTexture()
{
lock();
bool textureUpdated = m_dirtyTexture;
@@ -714,12 +714,12 @@ bool QSGContext2DImageTexture::updateTexture()
return textureUpdated;
}
-QSGContext2DTile* QSGContext2DImageTexture::createTile() const
+QQuickContext2DTile* QQuickContext2DImageTexture::createTile() const
{
- return new QSGContext2DImageTile();
+ return new QQuickContext2DImageTile();
}
-void QSGContext2DImageTexture::grabImage(const QRect& r)
+void QQuickContext2DImageTexture::grabImage(const QRect& r)
{
m_doGrabImage = true;
paint();
@@ -727,7 +727,7 @@ void QSGContext2DImageTexture::grabImage(const QRect& r)
m_grabedImage = m_image.copy(r);
}
-QImage QSGContext2DImageTexture::toImage(const QRectF& region)
+QImage QQuickContext2DImageTexture::toImage(const QRectF& region)
{
QRect r = region.isValid() ? region.toRect() : QRect(QPoint(0, 0), m_canvasWindow.size());
if (threadRendering()) {
@@ -741,9 +741,9 @@ QImage QSGContext2DImageTexture::toImage(const QRectF& region)
return image;
}
-QPaintDevice* QSGContext2DImageTexture::beginPainting()
+QPaintDevice* QQuickContext2DImageTexture::beginPainting()
{
- QSGContext2DTexture::beginPainting();
+ QQuickContext2DTexture::beginPainting();
if (m_canvasWindow.size().isEmpty())
return 0;
@@ -757,10 +757,10 @@ QPaintDevice* QSGContext2DImageTexture::beginPainting()
return &m_image;
}
-void QSGContext2DImageTexture::compositeTile(QSGContext2DTile* tile)
+void QQuickContext2DImageTexture::compositeTile(QQuickContext2DTile* tile)
{
Q_ASSERT(!tile->dirty());
- QSGContext2DImageTile* t = static_cast<QSGContext2DImageTile*>(tile);
+ QQuickContext2DImageTile* t = static_cast<QQuickContext2DImageTile*>(tile);
QRect target = t->rect().intersect(m_canvasWindow);
if (target.isValid()) {
QRect source = target;
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture_p.h b/src/declarative/items/context2d/qquickcontext2dtexture_p.h
index dbc383d7fc..ed45a09f7c 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dtexture_p.h
@@ -39,12 +39,12 @@
**
****************************************************************************/
-#ifndef QSGCONTEXT2DTEXTURE_P_H
-#define QSGCONTEXT2DTEXTURE_P_H
+#ifndef QQUICKCONTEXT2DTEXTURE_P_H
+#define QQUICKCONTEXT2DTEXTURE_P_H
#include <qsgtexture.h>
-#include "qsgcanvasitem_p.h"
-#include "qsgcontext2d_p.h"
+#include "qquickcanvasitem_p.h"
+#include "qquickcontext2d_p.h"
#include <QOpenGLContext>
#include <QOpenGLFramebufferObject>
@@ -59,15 +59,15 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class QSGContext2DTile;
-class QSGContext2DCommandBuffer;
+class QQuickContext2DTile;
+class QQuickContext2DCommandBuffer;
-class QSGContext2DTexture : public QSGDynamicTexture
+class QQuickContext2DTexture : public QSGDynamicTexture
{
Q_OBJECT
public:
- QSGContext2DTexture();
- ~QSGContext2DTexture();
+ QQuickContext2DTexture();
+ ~QQuickContext2DTexture();
virtual bool hasAlphaChannel() const {return true;}
virtual bool hasMipmaps() const {return false;}
@@ -79,7 +79,7 @@ public:
bool threadRendering() const {return m_threadRendering;}
virtual bool supportThreadRendering() const = 0;
virtual bool supportDirectRendering() const = 0;
- virtual QSGCanvasItem::RenderTarget renderTarget() const = 0;
+ virtual QQuickCanvasItem::RenderTarget renderTarget() const = 0;
virtual QImage toImage(const QRectF& region = QRectF()) = 0;
static QRect tiledRect(const QRectF& window, const QSize& tileSize);
@@ -95,25 +95,25 @@ Q_SIGNALS:
public Q_SLOTS:
void markDirtyTexture();
- void setItem(QSGCanvasItem* item);
+ void setItem(QQuickCanvasItem* item);
void paint();
protected:
void paintWithoutTiles();
virtual QPaintDevice* beginPainting() {m_painting = true; return 0; }
virtual void endPainting() {m_painting = false;}
- virtual QSGContext2DTile* createTile() const = 0;
- virtual void compositeTile(QSGContext2DTile* tile) = 0;
+ virtual QQuickContext2DTile* createTile() const = 0;
+ virtual void compositeTile(QQuickContext2DTile* tile) = 0;
void clearTiles();
QRect createTiles(const QRect& window);
- QList<QSGContext2DTile*> m_tiles;
- QSGContext2D* m_context;
+ QList<QQuickContext2DTile*> m_tiles;
+ QQuickContext2D* m_context;
- QSGContext2D::State m_state;
+ QQuickContext2D::State m_state;
- QSGCanvasItem* m_item;
+ QQuickCanvasItem* m_item;
QSize m_canvasSize;
QSize m_tileSize;
QRect m_canvasWindow;
@@ -127,24 +127,24 @@ protected:
uint m_painting : 1;
};
-class QSGContext2DFBOTexture : public QSGContext2DTexture
+class QQuickContext2DFBOTexture : public QQuickContext2DTexture
{
Q_OBJECT
public:
- QSGContext2DFBOTexture();
- ~QSGContext2DFBOTexture();
+ QQuickContext2DFBOTexture();
+ ~QQuickContext2DFBOTexture();
virtual int textureId() const;
virtual bool updateTexture();
- virtual QSGContext2DTile* createTile() const;
+ virtual QQuickContext2DTile* createTile() const;
virtual QImage toImage(const QRectF& region = QRectF());
virtual QPaintDevice* beginPainting();
virtual void endPainting();
QRectF textureSubRect() const;
virtual bool supportThreadRendering() const {return false;}
virtual bool supportDirectRendering() const {return false;}
- virtual QSGCanvasItem::RenderTarget renderTarget() const;
- virtual void compositeTile(QSGContext2DTile* tile);
+ virtual QQuickCanvasItem::RenderTarget renderTarget() const;
+ virtual void compositeTile(QQuickContext2DTile* tile);
virtual void bind();
virtual bool setCanvasSize(const QSize &size);
virtual bool setTileSize(const QSize &size);
@@ -164,28 +164,28 @@ private:
};
class QSGPlainTexture;
-class QSGContext2DImageTexture : public QSGContext2DTexture
+class QQuickContext2DImageTexture : public QQuickContext2DTexture
{
Q_OBJECT
public:
- QSGContext2DImageTexture(bool threadRendering = true);
- ~QSGContext2DImageTexture();
+ QQuickContext2DImageTexture(bool threadRendering = true);
+ ~QQuickContext2DImageTexture();
virtual int textureId() const;
virtual void bind();
virtual bool supportThreadRendering() const {return true;}
virtual bool supportDirectRendering() const;
- virtual QSGCanvasItem::RenderTarget renderTarget() const;
+ virtual QQuickCanvasItem::RenderTarget renderTarget() const;
virtual void lock();
virtual void unlock();
virtual void wait();
virtual void wake();
virtual bool updateTexture();
- virtual QSGContext2DTile* createTile() const;
+ virtual QQuickContext2DTile* createTile() const;
virtual QImage toImage(const QRectF& region = QRectF());
virtual QPaintDevice* beginPainting();
- virtual void compositeTile(QSGContext2DTile* tile);
+ virtual void compositeTile(QQuickContext2DTile* tile);
private Q_SLOTS:
void grabImage(const QRect& r);
@@ -202,4 +202,4 @@ QT_END_HEADER
QT_END_NAMESPACE
-#endif // QSGCONTEXT2DTEXTURE_P_H
+#endif // QQUICKCONTEXT2DTEXTURE_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dtile.cpp b/src/declarative/items/context2d/qquickcontext2dtile.cpp
index 8c8ef836b0..6217c66094 100644
--- a/src/declarative/items/context2d/qsgcontext2dtile.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dtile.cpp
@@ -39,26 +39,26 @@
**
****************************************************************************/
-#include "qsgcontext2dtile_p.h"
+#include "qquickcontext2dtile_p.h"
#include <QOpenGLFramebufferObject>
#include <QOpenGLFramebufferObjectFormat>
#include <QOpenGLPaintDevice>
-QSGContext2DTile::QSGContext2DTile()
+QQuickContext2DTile::QQuickContext2DTile()
: m_dirty(true)
, m_rect(QRect(0, 0, 1, 1))
, m_device(0)
{
}
-QSGContext2DTile::~QSGContext2DTile()
+QQuickContext2DTile::~QQuickContext2DTile()
{
if (m_painter.isActive())
m_painter.end();
}
-QPainter* QSGContext2DTile::createPainter(bool smooth)
+QPainter* QQuickContext2DTile::createPainter(bool smooth)
{
if (m_painter.isActive())
m_painter.end();
@@ -69,7 +69,7 @@ QPainter* QSGContext2DTile::createPainter(bool smooth)
m_painter.resetTransform();
m_painter.setCompositionMode(QPainter::CompositionMode_Source);
-#ifdef QSGCONTEXT2D_DEBUG
+#ifdef QQUICKCONTEXT2D_DEBUG
int v = 100;
int gray = (m_rect.x() / m_rect.width() + m_rect.y() / m_rect.height()) % 2;
if (gray)
@@ -93,19 +93,19 @@ QPainter* QSGContext2DTile::createPainter(bool smooth)
return 0;
}
-QSGContext2DFBOTile::QSGContext2DFBOTile()
- : QSGContext2DTile()
+QQuickContext2DFBOTile::QQuickContext2DFBOTile()
+ : QQuickContext2DTile()
, m_fbo(0)
{
}
-QSGContext2DFBOTile::~QSGContext2DFBOTile()
+QQuickContext2DFBOTile::~QQuickContext2DFBOTile()
{
delete m_fbo;
}
-void QSGContext2DFBOTile::aboutToDraw()
+void QQuickContext2DFBOTile::aboutToDraw()
{
m_fbo->bind();
if (!m_device) {
@@ -117,12 +117,12 @@ void QSGContext2DFBOTile::aboutToDraw()
}
}
-void QSGContext2DFBOTile::drawFinished()
+void QQuickContext2DFBOTile::drawFinished()
{
m_fbo->release();
}
-void QSGContext2DFBOTile::setRect(const QRect& r)
+void QQuickContext2DFBOTile::setRect(const QRect& r)
{
if (m_rect == r)
return;
@@ -143,16 +143,16 @@ void QSGContext2DFBOTile::setRect(const QRect& r)
}
-QSGContext2DImageTile::QSGContext2DImageTile()
- : QSGContext2DTile()
+QQuickContext2DImageTile::QQuickContext2DImageTile()
+ : QQuickContext2DTile()
{
}
-QSGContext2DImageTile::~QSGContext2DImageTile()
+QQuickContext2DImageTile::~QQuickContext2DImageTile()
{
}
-void QSGContext2DImageTile::setRect(const QRect& r)
+void QQuickContext2DImageTile::setRect(const QRect& r)
{
if (m_rect == r)
return;
@@ -162,4 +162,4 @@ void QSGContext2DImageTile::setRect(const QRect& r)
m_image = QImage(r.size(), QImage::Format_ARGB32_Premultiplied);
}
m_device = &m_image;
-} \ No newline at end of file
+}
diff --git a/src/declarative/items/context2d/qsgcontext2dtile_p.h b/src/declarative/items/context2d/qquickcontext2dtile_p.h
index 57b68ef67d..92c59efbcf 100644
--- a/src/declarative/items/context2d/qsgcontext2dtile_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dtile_p.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QSGCONTEXT2DTILE_P_H
-#define QSGCONTEXT2DTILE_P_H
+#ifndef QQUICKCONTEXT2DTILE_P_H
+#define QQUICKCONTEXT2DTILE_P_H
-#include "qsgcontext2d_p.h"
+#include "qquickcontext2d_p.h"
#include <QOpenGLFramebufferObject>
QT_BEGIN_HEADER
@@ -51,14 +51,14 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class QSGContext2DTexture;
-class QSGContext2DCommandBuffer;
+class QQuickContext2DTexture;
+class QQuickContext2DCommandBuffer;
-class QSGContext2DTile
+class QQuickContext2DTile
{
public:
- QSGContext2DTile();
- ~QSGContext2DTile();
+ QQuickContext2DTile();
+ ~QQuickContext2DTile();
bool dirty() const {return m_dirty;}
void markDirty(bool dirty) {m_dirty = dirty;}
@@ -78,11 +78,11 @@ protected:
};
-class QSGContext2DFBOTile : public QSGContext2DTile
+class QQuickContext2DFBOTile : public QQuickContext2DTile
{
public:
- QSGContext2DFBOTile();
- ~QSGContext2DFBOTile();
+ QQuickContext2DFBOTile();
+ ~QQuickContext2DFBOTile();
virtual void setRect(const QRect& r);
QOpenGLFramebufferObject* fbo() const {return m_fbo;}
void drawFinished();
@@ -95,11 +95,11 @@ private:
QOpenGLFramebufferObject *m_fbo;
};
-class QSGContext2DImageTile : public QSGContext2DTile
+class QQuickContext2DImageTile : public QQuickContext2DTile
{
public:
- QSGContext2DImageTile();
- ~QSGContext2DImageTile();
+ QQuickContext2DImageTile();
+ ~QQuickContext2DImageTile();
void setRect(const QRect& r);
const QImage& image() const {return m_image;}
private:
@@ -109,4 +109,4 @@ QT_END_HEADER
QT_END_NAMESPACE
-#endif // QSGCONTEXT2DTILE_P_H
+#endif // QQUICKCONTEXT2DTILE_P_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 14:49:41 +0000