diff options
Diffstat (limited to 'src/quick/items/context2d')
14 files changed, 45 insertions, 45 deletions
diff --git a/src/quick/items/context2d/qquickcanvascontext.cpp b/src/quick/items/context2d/qquickcanvascontext.cpp index 3e6e51c89d..bb1065bd6a 100644 --- a/src/quick/items/context2d/qquickcanvascontext.cpp +++ b/src/quick/items/context2d/qquickcanvascontext.cpp @@ -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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h index 6a2edef7a8..37b5fa33fa 100644 --- a/src/quick/items/context2d/qquickcanvascontext_p.h +++ b/src/quick/items/context2d/qquickcanvascontext_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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 7031294ecc..550ab20403 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -45,10 +45,10 @@ #include <private/qquickcanvascontext_p.h> #include <private/qquickcontext2d_p.h> #include <private/qquickcanvasitemnode_p.h> -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> -#include <qdeclarativeinfo.h> -#include <private/qdeclarativeengine_p.h> +#include <qqmlinfo.h> +#include <private/qqmlengine_p.h> #include <QtCore/QBuffer> QT_BEGIN_NAMESPACE @@ -71,7 +71,7 @@ public: QQuickCanvasItem::RenderTarget renderTarget; QQuickCanvasItem::RenderStrategy renderStrategy; QString contextType; - QHash<QUrl, QDeclarativePixmap*> images; + QHash<QUrl, QQuickPixmap*> images; QUrl baseUrl; QMap<int, v8::Persistent<v8::Function> > animationCallbacks; }; @@ -254,13 +254,13 @@ void QQuickCanvasItem::setContextType(const QString &contextType) this property will contain the current drawing context, otherwise null. */ -QDeclarativeV8Handle QQuickCanvasItem::context() const +QQmlV8Handle QQuickCanvasItem::context() const { Q_D(const QQuickCanvasItem); if (d->contextInitialized) - return QDeclarativeV8Handle::fromHandle(d->context->v8value()); + return QQmlV8Handle::fromHandle(d->context->v8value()); - return QDeclarativeV8Handle::fromHandle(v8::Null()); + return QQmlV8Handle::fromHandle(v8::Null()); } /*! @@ -532,7 +532,7 @@ void QQuickCanvasItem::updatePolish() foreach (int key, animationCallbacks.keys()) { v8::HandleScope handle_scope; - v8::Handle<v8::Object> self = QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this))->newQObject(this).As<v8::Object>(); + v8::Handle<v8::Object> self = QQmlEnginePrivate::getV8Engine(qmlEngine(this))->newQObject(this).As<v8::Object>(); v8::Handle<v8::Value> args[] = { v8::Uint32::New(QDateTime::currentDateTimeUtc().toTime_t()) }; v8::Persistent<v8::Function> f = animationCallbacks.value(key); f->Call(self, 1, args); @@ -591,7 +591,7 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData Canvas only supports a 2d context. */ -void QQuickCanvasItem::getContext(QDeclarativeV8Function *args) +void QQuickCanvasItem::getContext(QQmlV8Function *args) { Q_D(QQuickCanvasItem); @@ -633,7 +633,7 @@ void QQuickCanvasItem::getContext(QDeclarativeV8Function *args) scene. */ -void QQuickCanvasItem::requestAnimationFrame(QDeclarativeV8Function *args) +void QQuickCanvasItem::requestAnimationFrame(QQmlV8Function *args) { if (args->Length() < 1 || !(*args)[0]->IsFunction()) { qmlInfo(this) << "requestAnimationFrame should be called with an animation callback function"; @@ -659,7 +659,7 @@ void QQuickCanvasItem::requestAnimationFrame(QDeclarativeV8Function *args) This function will cancel the animation callback referenced by \a handle. */ -void QQuickCanvasItem::cancelRequestAnimationFrame(QDeclarativeV8Function *args) +void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV8Function *args) { if (args->Length() < 1 || !(*args)[0]->IsInt32()) { qmlInfo(this) << "cancelRequestAnimationFrame should be called with an animation callback id"; @@ -737,7 +737,7 @@ QImage QQuickCanvasItem::loadedImage(const QUrl& url) if (!d->images.contains(fullPathUrl)) { loadImage(url); } - QDeclarativePixmap* pix = d->images.value(fullPathUrl); + QQuickPixmap* pix = d->images.value(fullPathUrl); if (pix->isLoading() || pix->isError()) { return QImage(); } @@ -760,12 +760,12 @@ void QQuickCanvasItem::loadImage(const QUrl& url) Q_D(QQuickCanvasItem); QUrl fullPathUrl = d->baseUrl.resolved(url); if (!d->images.contains(fullPathUrl)) { - QDeclarativePixmap* pix = new QDeclarativePixmap(); + QQuickPixmap* pix = new QQuickPixmap(); d->images.insert(fullPathUrl, pix); pix->load(qmlEngine(this) , fullPathUrl - , QDeclarativePixmap::Cache | QDeclarativePixmap::Asynchronous); + , QQuickPixmap::Cache | QQuickPixmap::Asynchronous); if (pix->isLoading()) pix->connectFinished(this, SIGNAL(imageLoaded())); } @@ -918,7 +918,7 @@ void QQuickCanvasItem::initializeContext(QQuickCanvasContext *context, const QVa d->context = context; d->context->init(this, args); - d->context->setV8Engine(QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this))); + d->context->setV8Engine(QQmlEnginePrivate::getV8Engine(qmlEngine(this))); d->contextInitialized = true; connect(d->context, SIGNAL(textureChanged()), SLOT(update())); connect(d->context, SIGNAL(textureChanged()), SIGNAL(painted())); diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index 0dad629eea..9a57733d4c 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -60,7 +60,7 @@ class Q_QUICK_EXPORT QQuickCanvasItem : public QQuickItem Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged); Q_PROPERTY(QString contextType READ contextType WRITE setContextType NOTIFY contextTypeChanged) - Q_PROPERTY(QDeclarativeV8Handle context READ context NOTIFY contextChanged); + Q_PROPERTY(QQmlV8Handle context READ context NOTIFY contextChanged); Q_PROPERTY(QSizeF canvasSize READ canvasSize WRITE setCanvasSize NOTIFY canvasSizeChanged) Q_PROPERTY(QSize tileSize READ tileSize WRITE setTileSize NOTIFY tileSizeChanged) Q_PROPERTY(QRectF canvasWindow READ canvasWindow WRITE setCanvasWindow NOTIFY canvasWindowChanged) @@ -87,7 +87,7 @@ public: QString contextType() const; void setContextType(const QString &contextType); - QDeclarativeV8Handle context() const; + QQmlV8Handle context() const; QSizeF canvasSize() const; void setCanvasSize(const QSizeF &); @@ -108,10 +108,10 @@ public: QImage toImage(const QRectF& rect = QRectF()) const; - Q_INVOKABLE void getContext(QDeclarativeV8Function *args); + Q_INVOKABLE void getContext(QQmlV8Function *args); - Q_INVOKABLE void requestAnimationFrame(QDeclarativeV8Function *args); - Q_INVOKABLE void cancelRequestAnimationFrame(QDeclarativeV8Function *args); + Q_INVOKABLE void requestAnimationFrame(QQmlV8Function *args); + Q_INVOKABLE void cancelRequestAnimationFrame(QQmlV8Function *args); Q_INVOKABLE void requestPaint(); Q_INVOKABLE void markDirty(const QRectF& dirtyRect = QRectF()); diff --git a/src/quick/items/context2d/qquickcanvasitemnode.cpp b/src/quick/items/context2d/qquickcanvasitemnode.cpp index b9347dd33c..5a2dd80ff1 100644 --- a/src/quick/items/context2d/qquickcanvasitemnode.cpp +++ b/src/quick/items/context2d/qquickcanvasitemnode.cpp @@ -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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/context2d/qquickcanvasitemnode_p.h b/src/quick/items/context2d/qquickcanvasitemnode_p.h index 77181c64e6..7eb7d2aec5 100644 --- a/src/quick/items/context2d/qquickcanvasitemnode_p.h +++ b/src/quick/items/context2d/qquickcanvasitemnode_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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index ba709b7f66..fc2ada2867 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,17 +49,17 @@ #include <QtCore/qdebug.h> #include <QtQuick/private/qsgcontext_p.h> -#include <private/qdeclarativesvgparser_p.h> -#include <private/qdeclarativepath_p.h> +#include <private/qquicksvgparser_p.h> +#include <private/qquickpath_p.h> #include <private/qquickimage_p_p.h> #include <QtGui/qguiapplication.h> -#include <qdeclarativeinfo.h> +#include <qqmlinfo.h> #include <QtCore/qmath.h> #include <private/qv8engine_p.h> -#include <qdeclarativeengine.h> +#include <qqmlengine.h> #include <private/qv8domerrors_p.h> #include <QtCore/qnumeric.h> @@ -1586,12 +1586,12 @@ static void ctx2d_path_set(v8::Local<v8::String>, v8::Local<v8::Value> value, co r->context->beginPath(); if (value->IsObject()) { - QDeclarativePath* path = qobject_cast<QDeclarativePath*>(engine->toQObject(value)); + QQuickPath* path = qobject_cast<QQuickPath*>(engine->toQObject(value)); if (path) r->context->m_path = path->path(); } else { QString path = engine->toString(value->ToString()); - QDeclarativeSvgParser::parsePathDataFast(path, r->context->m_path); + QQuickSvgParser::parsePathDataFast(path, r->context->m_path); } r->context->m_v8path = value; } diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index 3cabb6b198..239a244739 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -43,8 +43,8 @@ #define QQUICKCONTEXT2D_P_H #include <QtQuick/qtquickglobal.h> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtQml/qqml.h> +#include <QtQml/qqmlcomponent.h> #include <private/qquickcanvascontext_p.h> #include <private/qquickcanvasitem_p.h> #include <QtGui/qpainter.h> @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE class QQuickContext2DCommandBuffer; class QQuickContext2DTexture; -class QDeclarativePixmap; +class QQuickPixmap; class QSGTexture; class QLockedCommandBuffer { diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp index 7342999864..591fc216a4 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp @@ -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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,7 +41,7 @@ #include "qquickcontext2dcommandbuffer_p.h" #include "qquickcanvasitem_p.h" -#include <qdeclarative.h> +#include <qqml.h> #include <QtCore/QMutex> #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY)) diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h index fc4c1a3a9c..f33c43a936 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -44,7 +44,7 @@ #include <QtCore/qmutex.h> #include "qquickcontext2d_p.h" -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> QT_BEGIN_HEADER diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 5d0c0ab63e..28460e2164 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h index bd4d4ff72c..9e00ece16c 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture_p.h +++ b/src/quick/items/context2d/qquickcontext2dtexture_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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/context2d/qquickcontext2dtile.cpp b/src/quick/items/context2d/qquickcontext2dtile.cpp index 284cdcef83..dd416e15af 100644 --- a/src/quick/items/context2d/qquickcontext2dtile.cpp +++ b/src/quick/items/context2d/qquickcontext2dtile.cpp @@ -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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/context2d/qquickcontext2dtile_p.h b/src/quick/items/context2d/qquickcontext2dtile_p.h index e05030cb88..2e6d61c8f2 100644 --- a/src/quick/items/context2d/qquickcontext2dtile_p.h +++ b/src/quick/items/context2d/qquickcontext2dtile_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 QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage |