diff options
Diffstat (limited to 'src/quick/items')
148 files changed, 2111 insertions, 1473 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 diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index 54220434b4..b8b4e1104c 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -58,8 +58,8 @@ HEADERS += \ $$PWD/qquickclipnode_p.h \ $$PWD/qquickview.h \ $$PWD/qquickview_p.h \ - $$PWD/qquickanimation_p.h \ - $$PWD/qquickanimation_p_p.h \ + $$PWD/qquickitemanimation_p.h \ + $$PWD/qquickitemanimation_p_p.h \ $$PWD/qquickstateoperations_p.h \ $$PWD/qquickimplicitsizeitem_p.h \ $$PWD/qquickimplicitsizeitem_p_p.h \ @@ -113,7 +113,7 @@ SOURCES += \ $$PWD/qquicktranslate.cpp \ $$PWD/qquickclipnode.cpp \ $$PWD/qquickview.cpp \ - $$PWD/qquickanimation.cpp \ + $$PWD/qquickitemanimation.cpp \ $$PWD/qquickstateoperations.cpp \ $$PWD/qquickimplicitsizeitem.cpp \ $$PWD/qquickspriteengine.cpp \ diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp index b28c28ba29..177454eedc 100644 --- a/src/quick/items/qquickaccessibleattached.cpp +++ b/src/quick/items/qquickaccessibleattached.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/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 02b427337e..5eea44b6e4 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_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/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp index 2df304e15d..b7071b9598 100644 --- a/src/quick/items/qquickanchors.cpp +++ b/src/quick/items/qquickanchors.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 @@ -44,7 +44,7 @@ #include "qquickitem.h" #include "qquickitem_p.h" -#include <qdeclarativeinfo.h> +#include <qqmlinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h index 52248db3b8..9076fbe697 100644 --- a/src/quick/items/qquickanchors_p.h +++ b/src/quick/items/qquickanchors_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 @@ -42,7 +42,7 @@ #ifndef QQUICKANCHORS_P_H #define QQUICKANCHORS_P_H -#include <qdeclarative.h> +#include <qqml.h> #include <QtCore/QObject> diff --git a/src/quick/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h index b2b587932b..1814185980 100644 --- a/src/quick/items/qquickanchors_p_p.h +++ b/src/quick/items/qquickanchors_p_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/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp index 7bea56cc53..eef20db361 100644 --- a/src/quick/items/qquickanimatedimage.cpp +++ b/src/quick/items/qquickanimatedimage.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 @@ -44,12 +44,12 @@ #ifndef QT_NO_MOVIE -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtGui/qmovie.h> #include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkreply.h> -#include <private/qdeclarativeengine_p.h> +#include <private/qqmlengine_p.h> QT_BEGIN_NAMESPACE /*! @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE \bold Note: Unlike images, animated images are not cached or shared internally. \clearfloat - \snippet doc/src/snippets/declarative/animatedimage.qml document + \snippet doc/src/snippets/qml/animatedimage.qml document \sa BorderImage, Image */ @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE AnimatedImage can handle any image format supported by Qt, loaded from any URL scheme supported by Qt. - \sa QDeclarativeImageProvider + \sa QQmlImageProvider */ /*! @@ -264,7 +264,7 @@ void QQuickAnimatedImage::load() if (d->progress != oldProgress) emit progressChanged(d->progress); } else { - QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url); + QString lf = QQmlEnginePrivate::urlToLocalFileOrQrc(d->url); if (!lf.isEmpty()) { //### should be unified with movieRequestFinished d->_movie = new QMovie(lf); diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h index 3c1f77d674..86910199ac 100644 --- a/src/quick/items/qquickanimatedimage_p.h +++ b/src/quick/items/qquickanimatedimage_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/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h index b1288d78a1..95142f5f1f 100644 --- a/src/quick/items/qquickanimatedimage_p_p.h +++ b/src/quick/items/qquickanimatedimage_p_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/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index ef79d052a8..618178fd1c 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.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 Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,7 +49,7 @@ #include <QtQuick/qsgtexturematerial.h> #include <QtQuick/qsgtexture.h> #include <QtQuick/qquickcanvas.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QFile> #include <cmath> #include <qmath.h> @@ -454,11 +454,11 @@ QSGGeometryNode* QQuickAnimatedSprite::buildNode() if (!m_spriteEngine) { qmlInfo(this) << "No sprite engine..."; return 0; - } else if (m_spriteEngine->status() == QDeclarativePixmap::Null) { + } else if (m_spriteEngine->status() == QQuickPixmap::Null) { m_spriteEngine->startAssemblingImage(); update();//Schedule another update, where we will check again return 0; - } else if (m_spriteEngine->status() == QDeclarativePixmap::Loading) { + } else if (m_spriteEngine->status() == QQuickPixmap::Loading) { update();//Schedule another update, where we will check again return 0; } diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index 062b191621..708f94b7ec 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index 67b5cdf737..5beb345afc 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.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 @@ -43,10 +43,11 @@ #include "qquickborderimage_p_p.h" #include "qquickninepatchnode_p.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtCore/qfile.h> -#include <private/qdeclarativeengine_p.h> +#include <private/qqmlglobal_p.h> +#include <private/qqmlengine_p.h> QT_BEGIN_NAMESPACE @@ -97,7 +98,7 @@ QT_BEGIN_NAMESPACE used to determine the parts of the image that will lie inside the unscaled corner areas and the parts that will be stretched horizontally and vertically. - \snippet doc/src/snippets/declarative/borderimage/normal-image.qml normal image + \snippet doc/src/snippets/qml/borderimage/normal-image.qml normal image \clearfloat \beginfloatleft @@ -111,7 +112,7 @@ QT_BEGIN_NAMESPACE is set to \l{BorderImage::verticalTileMode}{BorderImage.Stretch}, the parts of image in regions 4 and 6 are stretched vertically. - \snippet doc/src/snippets/declarative/borderimage/borderimage-scaled.qml scaled border image + \snippet doc/src/snippets/qml/borderimage/borderimage-scaled.qml scaled border image \clearfloat \beginfloatleft @@ -125,7 +126,7 @@ QT_BEGIN_NAMESPACE \l{BorderImage::verticalTileMode}{BorderImage.Repeat}, the parts of image in regions 4 and 6 are tiled so that they fill the space at the left and right of the element. - \snippet doc/src/snippets/declarative/borderimage/borderimage-tiled.qml tiled border image + \snippet doc/src/snippets/qml/borderimage/borderimage-tiled.qml tiled border image \clearfloat In some situations, the width of regions 2 and 8 may not be an exact multiple of the width @@ -256,7 +257,7 @@ QQuickBorderImage::~QQuickBorderImage() The URL may be absolute, or relative to the URL of the component. - \sa QDeclarativeImageProvider + \sa QQmlImageProvider */ /*! @@ -305,7 +306,7 @@ void QQuickBorderImage::load() } else { d->status = Loading; if (d->url.path().endsWith(QLatin1String("sci"))) { - QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url); + QString lf = QQmlEnginePrivate::urlToLocalFileOrQrc(d->url); if (!lf.isEmpty()) { QFile file(lf); file.open(QIODevice::ReadOnly); @@ -317,11 +318,11 @@ void QQuickBorderImage::load() } } else { - QDeclarativePixmap::Options options; + QQuickPixmap::Options options; if (d->async) - options |= QDeclarativePixmap::Asynchronous; + options |= QQuickPixmap::Asynchronous; if (d->cache) - options |= QDeclarativePixmap::Cache; + options |= QQuickPixmap::Cache; d->pix.clear(this); d->pix.load(qmlEngine(this), d->url, options); @@ -448,11 +449,11 @@ void QQuickBorderImage::setGridScaledImage(const QQuickGridScaledImage& sci) d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl())); - QDeclarativePixmap::Options options; + QQuickPixmap::Options options; if (d->async) - options |= QDeclarativePixmap::Asynchronous; + options |= QQuickPixmap::Asynchronous; if (d->cache) - options |= QDeclarativePixmap::Cache; + options |= QQuickPixmap::Cache; d->pix.clear(this); d->pix.load(qmlEngine(this), d->sciurl, options); diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h index 93dc452e87..80532b7082 100644 --- a/src/quick/items/qquickborderimage_p.h +++ b/src/quick/items/qquickborderimage_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/qquickborderimage_p_p.h b/src/quick/items/qquickborderimage_p_p.h index b9b5723a06..07a62b4d29 100644 --- a/src/quick/items/qquickborderimage_p_p.h +++ b/src/quick/items/qquickborderimage_p_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 @@ -56,6 +56,8 @@ #include "qquickimagebase_p_p.h" #include "qquickscalegrid_p_p.h" +#include <private/qqmlglobal_p.h> + QT_BEGIN_NAMESPACE class QNetworkReply; diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index f135975b3c..92a422a56d 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.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 @@ -65,11 +65,11 @@ #include <QtGui/qstylehints.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qabstractanimation.h> -#include <QtDeclarative/qdeclarativeincubator.h> +#include <QtQml/qqmlincubator.h> -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> -#include <private/qdeclarativeprofilerservice_p.h> +#include <private/qqmlprofilerservice_p.h> QT_BEGIN_NAMESPACE @@ -83,7 +83,7 @@ void QQuickCanvasPrivate::updateFocusItemTransform() qApp->inputMethod()->setInputItemTransform(QQuickItemPrivate::get(focus)->itemToCanvasTransform()); } -class QQuickCanvasIncubationController : public QObject, public QDeclarativeIncubationController +class QQuickCanvasIncubationController : public QObject, public QQmlIncubationController { public: QQuickCanvasIncubationController(QQuickCanvasPrivate *canvas) @@ -341,7 +341,7 @@ void QQuickCanvasPrivate::init(QQuickCanvas *c) engine->setCanvas(q); } -QDeclarativeListProperty<QObject> QQuickCanvasPrivate::data() +QQmlListProperty<QObject> QQuickCanvasPrivate::data() { initRootItem(); return QQuickItemPrivate::get(rootItem)->data(); @@ -676,7 +676,7 @@ void QQuickCanvasPrivate::clearFocusInScope(QQuickItem *scope, QQuickItem *item, void QQuickCanvasPrivate::notifyFocusChangesRecur(QQuickItem **items, int remaining) { - QDeclarativeGuard<QQuickItem> item(*items); + QQmlGuard<QQuickItem> item(*items); if (remaining) notifyFocusChangesRecur(items + 1, remaining - 1); @@ -775,7 +775,7 @@ void QQuickCanvas::releaseResources() { Q_D(QQuickCanvas); d->windowManager->releaseResources(); - QDeclarativePixmap::purgeCache(); + QQuickPixmap::purgeCache(); } @@ -2058,12 +2058,12 @@ QImage QQuickCanvas::grabFrameBuffer() /*! Returns an incubation controller that splices incubation between frames for this canvas. QQuickView automatically installs this controller for you, - otherwise you will need to install it yourself using \l{QDeclarativeEngine::setIncubationController} + otherwise you will need to install it yourself using \l{QQmlEngine::setIncubationController} The controller is owned by the canvas and will be destroyed when the canvas is deleted. */ -QDeclarativeIncubationController *QQuickCanvas::incubationController() const +QQmlIncubationController *QQuickCanvas::incubationController() const { Q_D(const QQuickCanvas); diff --git a/src/quick/items/qquickcanvas.h b/src/quick/items/qquickcanvas.h index 3246d53a42..0b6b01b05a 100644 --- a/src/quick/items/qquickcanvas.h +++ b/src/quick/items/qquickcanvas.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 @@ -58,13 +58,13 @@ class QSGTexture; class QInputMethodEvent; class QQuickCanvasPrivate; class QOpenGLFramebufferObject; -class QDeclarativeIncubationController; +class QQmlIncubationController; class QInputMethodEvent; class Q_QUICK_EXPORT QQuickCanvas : public QWindow { Q_OBJECT - Q_PRIVATE_PROPERTY(QQuickCanvas::d_func(), QDeclarativeListProperty<QObject> data READ data DESIGNABLE false) + Q_PRIVATE_PROPERTY(QQuickCanvas::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false) Q_PROPERTY(QColor color READ clearColor WRITE setClearColor NOTIFY clearColorChanged) Q_CLASSINFO("DefaultProperty", "data") Q_DECLARE_PRIVATE(QQuickCanvas) @@ -100,7 +100,7 @@ public: uint renderTargetId() const; QSize renderTargetSize() const; - QDeclarativeIncubationController *incubationController() const; + QQmlIncubationController *incubationController() const; virtual QAccessibleInterface *accessibleRoot() const; diff --git a/src/quick/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h index d4d6a01f75..147526466e 100644 --- a/src/quick/items/qquickcanvas_p.h +++ b/src/quick/items/qquickcanvas_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 @@ -55,7 +55,7 @@ #include "qquickitem.h" #include "qquickcanvas.h" -#include <private/qdeclarativeguard_p.h> +#include <private/qqmlguard_p.h> #include <QtQuick/private/qsgcontext_p.h> #include <private/qquickdrag_p.h> @@ -108,7 +108,7 @@ public: QQuickRootItem *rootItem; QSet<QQuickItem *> parentlessItems; - QDeclarativeListProperty<QObject> data(); + QQmlListProperty<QObject> data(); QQuickItem *activeFocusItem; QQuickItem *mouseGrabberItem; diff --git a/src/quick/items/qquickclipnode.cpp b/src/quick/items/qquickclipnode.cpp index 168e973927..f9894edb48 100644 --- a/src/quick/items/qquickclipnode.cpp +++ b/src/quick/items/qquickclipnode.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/qquickclipnode_p.h b/src/quick/items/qquickclipnode_p.h index a48972532c..02902a758e 100644 --- a/src/quick/items/qquickclipnode_p.h +++ b/src/quick/items/qquickclipnode_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/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp index c44e1acd4b..f8c1281af5 100644 --- a/src/quick/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.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,7 +45,7 @@ #include <QtQuick/private/qquickevents_p_p.h> #include <private/qquickitemchangelistener_p.h> #include <private/qv8engine_p.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtGui/qevent.h> QT_BEGIN_NAMESPACE @@ -76,8 +76,8 @@ public: QQuickDragGrabber dragGrabber; - QDeclarativeGuard<QObject> source; - QDeclarativeGuard<QObject> target; + QQmlGuard<QObject> source; + QQmlGuard<QObject> target; QQuickItem *attachedItem; QQuickDragMimeData *mimeData; Qt::DropAction proposedAction; @@ -106,7 +106,7 @@ public: However, dragging is not limited to mouse drags, anything that can move an item can generate drag events, this can include touch events, animations and bindings. - \snippet doc/src/snippets/declarative/drag.qml 0 + \snippet doc/src/snippets/qml/drag.qml 0 A drag can be terminated either by canceling it with Drag.cancel() or setting Drag.active to false, or it can be terminated with a drop event by calling @@ -377,7 +377,7 @@ void QQuickDragAttachedPrivate::start(Qt::DropActions supportedActions) property for the started sequence. */ -void QQuickDragAttached::start(QDeclarativeV8Function *args) +void QQuickDragAttached::start(QQmlV8Function *args) { Q_D(QQuickDragAttached); if (d->inEvent) { diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h index eca3927624..ac19c021e0 100644 --- a/src/quick/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_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,10 +60,10 @@ class QQuickDragPrivate; class QQuickDragGrabber { - class Item : public QDeclarativeGuard<QQuickItem> + class Item : public QQmlGuard<QQuickItem> { public: - Item(QQuickItem *item) : QDeclarativeGuard<QQuickItem>(item) {} + Item(QQuickItem *item) : QQmlGuard<QQuickItem>(item) {} QIntrusiveListNode node; protected: @@ -142,7 +142,7 @@ private: friend class QQuickDragAttachedPrivate; }; -class QDeclarativeV8Function; +class QQmlV8Function; class QQuickDragAttachedPrivate; class QQuickDragAttached : public QObject @@ -183,7 +183,7 @@ public: Q_INVOKABLE int drop(); public Q_SLOTS: - void start(QDeclarativeV8Function *); + void start(QQmlV8Function *); void cancel(); Q_SIGNALS: diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index 0534fb5bb0..ed5fb23658 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.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 @@ -44,7 +44,7 @@ #include "qquickitem_p.h" #include "qquickcanvas.h" -#include <private/qdeclarativeengine_p.h> +#include <private/qqmlengine_p.h> QT_BEGIN_NAMESPACE @@ -74,8 +74,8 @@ public: QRegExp keyRegExp; QPointF dragPosition; QQuickDropAreaDrag *drag; - QDeclarativeGuard<QObject> source; - QDeclarativeGuard<QMimeData> mimeData; + QQmlGuard<QObject> source; + QQmlGuard<QMimeData> mimeData; }; QQuickDropAreaPrivate::QQuickDropAreaPrivate() @@ -409,7 +409,7 @@ QStringList QQuickDropEvent::keys() const If an \a action is specified it will overwrite the value of the \l action property. */ -void QQuickDropEvent::accept(QDeclarativeV8Function *args) +void QQuickDropEvent::accept(QQmlV8Function *args) { Qt::DropAction action = event->dropAction(); diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h index 6fdfc4b03b..e207787198 100644 --- a/src/quick/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_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 "qquickitem.h" -#include <private/qdeclarativeguard_p.h> +#include <private/qqmlguard_p.h> #include <private/qv8engine_p.h> #include <QtGui/qevent.h> @@ -82,7 +82,7 @@ public: bool accepted() const { return event->isAccepted(); } void setAccepted(bool accepted) { event->setAccepted(accepted); } - Q_INVOKABLE void accept(QDeclarativeV8Function *); + Q_INVOKABLE void accept(QQmlV8Function *); private: QQuickDropAreaPrivate *d; diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index 6e7769f1d3..597e64eb18 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.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/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 7ff4835b4c..6300b0f2a7 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_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 @@ -54,7 +54,7 @@ // #include <QtQuick/qtquickglobal.h> -#include <qdeclarative.h> +#include <qqml.h> #include <QtCore/qobject.h> #include <QtGui/qvector2d.h> diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 0e8097af15..f75ca14989 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.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,7 +45,9 @@ #include "qquickcanvas_p.h" #include "qquickevents_p_p.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <private/qqmlglobal_p.h> + +#include <QtQml/qqmlinfo.h> #include <QtGui/qevent.h> #include <QtGui/qguiapplication.h> #include <QtGui/qstylehints.h> @@ -204,7 +206,7 @@ QQuickFlickablePrivate::QQuickFlickablePrivate() void QQuickFlickablePrivate::init() { Q_Q(QQuickFlickable); - QDeclarative_setParent_noEvent(contentItem, q); + QQml_setParent_noEvent(contentItem, q); contentItem->setParentItem(q); FAST_CONNECT(&timeline, SIGNAL(completed()), q, SLOT(movementEnding())) q->setAcceptedMouseButtons(Qt::LeftButton); @@ -277,7 +279,7 @@ void QQuickFlickablePrivate::flickY(qreal velocity) } void QQuickFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal, - QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity) + QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) { Q_Q(QQuickFlickable); qreal maxDistance = -1; @@ -303,7 +305,7 @@ void QQuickFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExt timeline.accel(data.move, v, deceleration); else timeline.accel(data.move, v, deceleration, maxDistance); - timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this)); + timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this)); if (!hData.flicking && q->xflick() && (&data == &hData)) { hData.flicking = true; emit q->flickingChanged(); @@ -507,7 +509,7 @@ is finished. The following example shows a small view onto a large image in which the user can drag or flick the image in order to view different parts of it. - \snippet doc/src/snippets/declarative/flickable.qml document + \snippet doc/src/snippets/qml/flickable.qml document \clearfloat @@ -569,9 +571,9 @@ is finished. These properties are typically used to draw a scrollbar. For example: - \snippet doc/src/snippets/declarative/flickableScrollbar.qml 0 + \snippet doc/src/snippets/qml/flickableScrollbar.qml 0 \dots 8 - \snippet doc/src/snippets/declarative/flickableScrollbar.qml 1 + \snippet doc/src/snippets/qml/flickableScrollbar.qml 1 \sa {declarative/ui-components/scrollbar}{scrollbar example} */ @@ -1304,7 +1306,7 @@ void QQuickFlickable::viewportMoved() qreal maxDistance = d->overShootDistance(height()); d->timeline.reset(d->vData.move); d->timeline.accel(d->vData.move, -d->vData.smoothVelocity.value(), d->deceleration*QML_FLICK_OVERSHOOTFRICTION, maxDistance); - d->timeline.callback(QDeclarativeTimeLineCallback(&d->vData.move, d->fixupY_callback, d)); + d->timeline.callback(QQuickTimeLineCallback(&d->vData.move, d->fixupY_callback, d)); } if (!d->hData.inOvershoot && !d->hData.fixingUp && d->hData.flicking && (d->hData.move.value() > minXExtent() || d->hData.move.value() < maxXExtent()) @@ -1314,7 +1316,7 @@ void QQuickFlickable::viewportMoved() qreal maxDistance = d->overShootDistance(width()); d->timeline.reset(d->hData.move); d->timeline.accel(d->hData.move, -d->hData.smoothVelocity.value(), d->deceleration*QML_FLICK_OVERSHOOTFRICTION, maxDistance); - d->timeline.callback(QDeclarativeTimeLineCallback(&d->hData.move, d->fixupX_callback, d)); + d->timeline.callback(QQuickTimeLineCallback(&d->hData.move, d->fixupX_callback, d)); } d->lastFlickablePosition = QPointF(d->hData.move.value(), d->vData.move.value()); @@ -1388,7 +1390,7 @@ void QQuickFlickable::cancelFlick() movementEnding(); } -void QQuickFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o) +void QQuickFlickablePrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) { QQuickItem *i = qobject_cast<QQuickItem *>(o); if (i) { @@ -1398,33 +1400,33 @@ void QQuickFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop } } -int QQuickFlickablePrivate::data_count(QDeclarativeListProperty<QObject> *) +int QQuickFlickablePrivate::data_count(QQmlListProperty<QObject> *) { // XXX todo return 0; } -QObject *QQuickFlickablePrivate::data_at(QDeclarativeListProperty<QObject> *, int) +QObject *QQuickFlickablePrivate::data_at(QQmlListProperty<QObject> *, int) { // XXX todo return 0; } -void QQuickFlickablePrivate::data_clear(QDeclarativeListProperty<QObject> *) +void QQuickFlickablePrivate::data_clear(QQmlListProperty<QObject> *) { // XXX todo } -QDeclarativeListProperty<QObject> QQuickFlickable::flickableData() +QQmlListProperty<QObject> QQuickFlickable::flickableData() { Q_D(QQuickFlickable); - return QDeclarativeListProperty<QObject>(this, (void *)d, QQuickFlickablePrivate::data_append, + return QQmlListProperty<QObject>(this, (void *)d, QQuickFlickablePrivate::data_append, QQuickFlickablePrivate::data_count, QQuickFlickablePrivate::data_at, QQuickFlickablePrivate::data_clear); } -QDeclarativeListProperty<QQuickItem> QQuickFlickable::flickableChildren() +QQmlListProperty<QQuickItem> QQuickFlickable::flickableChildren() { Q_D(QQuickFlickable); return QQuickItemPrivate::get(d->contentItem)->children(); @@ -1477,7 +1479,7 @@ void QQuickFlickable::setBoundsBehavior(BoundsBehavior b) The following snippet shows how these properties are used to display an image that is larger than the Flickable item itself: - \snippet doc/src/snippets/declarative/flickable.qml document + \snippet doc/src/snippets/qml/flickable.qml document In some cases, the the content dimensions can be automatically set using the \l {Item::childrenRect.width}{childrenRect.width} diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 9d6ca94770..7a19b0c05a 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_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 @@ -97,8 +97,8 @@ class Q_QUICK_EXPORT QQuickFlickable : public QQuickItem Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY pixelAlignedChanged) - Q_PROPERTY(QDeclarativeListProperty<QObject> flickableData READ flickableData) - Q_PROPERTY(QDeclarativeListProperty<QQuickItem> flickableChildren READ flickableChildren) + Q_PROPERTY(QQmlListProperty<QObject> flickableData READ flickableData) + Q_PROPERTY(QQmlListProperty<QQuickItem> flickableChildren READ flickableChildren) Q_CLASSINFO("DefaultProperty", "flickableData") Q_ENUMS(FlickableDirection) @@ -108,8 +108,8 @@ public: QQuickFlickable(QQuickItem *parent=0); ~QQuickFlickable(); - QDeclarativeListProperty<QObject> flickableData(); - QDeclarativeListProperty<QQuickItem> flickableChildren(); + QQmlListProperty<QObject> flickableData(); + QQmlListProperty<QQuickItem> flickableChildren(); enum BoundsBehavior { StopAtBounds, DragOverBounds, DragAndOvershootBounds }; BoundsBehavior boundsBehavior() const; diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 7b16f1ac52..ac6f2fffed 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_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 @@ -57,12 +57,12 @@ #include "qquickitem_p.h" #include "qquickitemchangelistener_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtCore/qdatetime.h> #include "qplatformdefs.h" -#include <private/qdeclarativetimeline_p_p.h> -#include <private/qdeclarativeanimation_p_p.h> +#include <private/qquicktimeline_p_p.h> +#include <private/qquickanimation_p_p.h> QT_BEGIN_NAMESPACE @@ -80,13 +80,13 @@ public: QQuickFlickablePrivate(); void init(); - struct Velocity : public QDeclarativeTimeLineValue + struct Velocity : public QQuickTimeLineValue { Velocity(QQuickFlickablePrivate *p) : parent(p) {} virtual void setValue(qreal v) { if (v != value()) { - QDeclarativeTimeLineValue::setValue(v); + QQuickTimeLineValue::setValue(v); parent->updateVelocity(); } } @@ -119,7 +119,7 @@ public: void addVelocitySample(qreal v, qreal maxVelocity); void updateVelocity(); - QDeclarativeTimeLineValueProxy<QQuickFlickablePrivate> move; + QQuickTimeLineValueProxy<QQuickFlickablePrivate> move; qreal viewSize; qreal pressPos; qreal dragStartOffset; @@ -148,7 +148,7 @@ public: void flickX(qreal velocity); void flickY(qreal velocity); virtual void flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize, - QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity); + QQuickTimeLineCallback::Callback fixupCallback, qreal velocity); void fixupX(); void fixupY(); @@ -176,7 +176,7 @@ public: AxisData hData; AxisData vData; - QDeclarativeTimeLine timeline; + QQuickTimeLine timeline; bool hMoved : 1; bool vMoved : 1; bool stealMouse : 1; @@ -209,7 +209,7 @@ public: void updateVelocity(); int vTime; - QDeclarativeTimeLine velocityTimeline; + QQuickTimeLine velocityTimeline; QQuickFlickableVisibleArea *visibleArea; QQuickFlickable::FlickableDirection flickableDirection; QQuickFlickable::BoundsBehavior boundsBehavior; @@ -221,10 +221,10 @@ public: qint64 computeCurrentTime(QInputEvent *event); // flickableData property - static void data_append(QDeclarativeListProperty<QObject> *, QObject *); - static int data_count(QDeclarativeListProperty<QObject> *); - static QObject *data_at(QDeclarativeListProperty<QObject> *, int); - static void data_clear(QDeclarativeListProperty<QObject> *); + static void data_append(QQmlListProperty<QObject> *, QObject *); + static int data_count(QQmlListProperty<QObject> *); + static QObject *data_at(QQmlListProperty<QObject> *, int); + static void data_clear(QQmlListProperty<QObject> *); }; class QQuickFlickableVisibleArea : public QObject diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp index a29c6f0d83..f454ce54d5 100644 --- a/src/quick/items/qquickflipable.cpp +++ b/src/quick/items/qquickflipable.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 @@ -42,9 +42,9 @@ #include "qquickflipable_p.h" #include "qquickitem_p.h" -#include <private/qdeclarativeguard_p.h> +#include <private/qqmlguard_p.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> QT_BEGIN_NAMESPACE @@ -78,9 +78,9 @@ public: void setBackTransform(); QQuickFlipable::Side current; - QDeclarativeGuard<QQuickLocalTransform> backTransform; - QDeclarativeGuard<QQuickItem> front; - QDeclarativeGuard<QQuickItem> back; + QQmlGuard<QQuickLocalTransform> backTransform; + QQmlGuard<QQuickItem> front; + QQmlGuard<QQuickItem> back; bool sideDirty; bool wantBackXFlipped; @@ -113,7 +113,7 @@ public: degrees to produce the flipping effect. When \c flipped is false, the item reverts to the default state, in which the \c angle value is 0. - \snippet doc/src/snippets/declarative/flipable/flipable.qml 0 + \snippet doc/src/snippets/qml/flipable/flipable.qml 0 \image flipable.gif diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h index cf17bce314..dd53ec3d49 100644 --- a/src/quick/items/qquickflipable_p.h +++ b/src/quick/items/qquickflipable_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/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp index b1d3516d3b..7ef2476b30 100644 --- a/src/quick/items/qquickfocusscope.cpp +++ b/src/quick/items/qquickfocusscope.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/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h index 889b45ca1c..6d43dbb619 100644 --- a/src/quick/items/qquickfocusscope_p.h +++ b/src/quick/items/qquickfocusscope_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/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index 8b9f8059fb..45fbc9f93e 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.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 @@ -44,7 +44,7 @@ #include "qquickflickable_p_p.h" #include "qquickitemview_p_p.h" -#include <private/qdeclarativesmoothedanimation_p_p.h> +#include <private/qquicksmoothedanimation_p_p.h> #include <private/qlistmodelinterface_p.h> #include <QtGui/qevent.h> @@ -190,7 +190,7 @@ public: virtual void setPosition(qreal pos); virtual void layoutVisibleItems(int fromModelIndex = 0); - virtual bool applyInsertionChange(const QDeclarativeChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView); + virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView); virtual void translateAndTransitionItemsAfter(int afterModelIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult); virtual bool needsRefillForAddedOrRemovedIndex(int index) const; @@ -208,7 +208,7 @@ public: virtual void fixupPosition(); virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent); virtual void flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize, - QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity); + QQuickTimeLineCallback::Callback fixupCallback, qreal velocity); QQuickGridView::Flow flow; qreal cellWidth; @@ -689,10 +689,10 @@ void QQuickGridViewPrivate::createHighlight() if (autoHighlight) resetHighlightPosition(); highlightXAnimator = new QSmoothedAnimation; - highlightXAnimator->target = QDeclarativeProperty(item, QLatin1String("x")); + highlightXAnimator->target = QQmlProperty(item, QLatin1String("x")); highlightXAnimator->userDuration = highlightMoveDuration; highlightYAnimator = new QSmoothedAnimation; - highlightYAnimator->target = QDeclarativeProperty(item, QLatin1String("y")); + highlightYAnimator->target = QQmlProperty(item, QLatin1String("y")); highlightYAnimator->userDuration = highlightMoveDuration; highlight = newHighlight; @@ -957,7 +957,7 @@ void QQuickGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExte } void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize, - QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity) + QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) { Q_Q(QQuickGridView); data.fixingUp = false; @@ -1057,7 +1057,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte } timeline.reset(data.move); timeline.accel(data.move, v, accel, maxDistance + overshootDist); - timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this)); + timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this)); if (!hData.flicking && q->xflick()) { hData.flicking = true; emit q->flickingChanged(); @@ -1100,7 +1100,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte The following example shows the definition of a simple list model defined in a file called \c ContactModel.qml: - \snippet doc/src/snippets/declarative/gridview/ContactModel.qml 0 + \snippet doc/src/snippets/qml/gridview/ContactModel.qml 0 \div {class="float-right"} \inlineimage gridview-simple.png @@ -1114,9 +1114,9 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte (containing \l Image and \l Text elements) for its delegate. \clearfloat - \snippet doc/src/snippets/declarative/gridview/gridview.qml import + \snippet doc/src/snippets/qml/gridview/gridview.qml import \codeline - \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs simple + \snippet doc/src/snippets/qml/gridview/gridview.qml classdocs simple \div {class="float-right"} \inlineimage gridview-highlight.png @@ -1129,7 +1129,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte into a separate \c contactDelegate component. \clearfloat - \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs advanced + \snippet doc/src/snippets/qml/gridview/gridview.qml classdocs advanced The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property, and \c focus is set to \c true to enable keyboard navigation for the grid view. @@ -1143,7 +1143,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte this attached property directly as \c GridView.isCurrentItem, while the child \c contactInfo object must refer to this property as \c wrapper.GridView.isCurrentItem. - \snippet doc/src/snippets/declarative/gridview/gridview.qml isCurrentItem + \snippet doc/src/snippets/qml/gridview/gridview.qml isCurrentItem \note Views do not set the \l{Item::}{clip} property automatically. If the view is not clipped by another item or the screen, it will be necessary @@ -1187,7 +1187,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) It is attached to each instance of the delegate. - \snippet doc/src/snippets/declarative/gridview/gridview.qml isCurrentItem + \snippet doc/src/snippets/qml/gridview/gridview.qml isCurrentItem */ /*! @@ -1199,7 +1199,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) until an animation completes. The example delegate below ensures that the animation completes before the item is removed from the list. - \snippet doc/src/snippets/declarative/gridview/gridview.qml delayRemove + \snippet doc/src/snippets/qml/gridview/gridview.qml delayRemove If a \l remove transition has been specified, it will not be applied until delayRemove is returned to \c false. @@ -1307,7 +1307,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) Here is a highlight with its motion defined by a \l {SpringAnimation} item: - \snippet doc/src/snippets/declarative/gridview/gridview.qml highlightFollowsCurrentItem + \snippet doc/src/snippets/qml/gridview/gridview.qml highlightFollowsCurrentItem */ @@ -2103,7 +2103,7 @@ void QQuickGridView::moveCurrentIndexRight() } } -bool QQuickGridViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) +bool QQuickGridViewPrivate::applyInsertionChange(const QQuickChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) { Q_Q(QQuickGridView); diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h index b8f44ed0e1..ac3c8f097d 100644 --- a/src/quick/items/qquickgridview_p.h +++ b/src/quick/items/qquickgridview_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 "qquickitemview_p.h" -#include <private/qdeclarativeguard_p.h> +#include <private/qqmlguard_p.h> QT_BEGIN_HEADER @@ -131,7 +131,7 @@ Q_SIGNALS: void viewChanged(); public: - QDeclarativeGuard<QQuickGridView> m_view; + QQmlGuard<QQuickGridView> m_view; }; diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index a71c666977..a939365e98 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.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 @@ -120,7 +120,7 @@ QQuickImagePrivate::QQuickImagePrivate() The following example shows the simplest usage of the Image element. - \snippet doc/src/snippets/declarative/image.qml document + \snippet doc/src/snippets/qml/image.qml document \beginfloatleft \image declarative-qtlogo.png @@ -147,7 +147,7 @@ QQuickImagePrivate::QQuickImagePrivate() size bounded via the \l sourceSize property. This is especially important for content that is loaded from external sources or provided by the user. - \sa {declarative/imageelements/image}{Image example}, QDeclarativeImageProvider + \sa {declarative/imageelements/image}{Image example}, QQmlImageProvider */ QQuickImage::QQuickImage(QQuickItem *parent) @@ -431,7 +431,7 @@ qreal QQuickImage::paintedHeight() const The URL may be absolute, or relative to the URL of the component. - \sa QDeclarativeImageProvider + \sa QQmlImageProvider */ /*! diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h index 35337dfd09..a9e37b47e1 100644 --- a/src/quick/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_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/qquickimage_p_p.h b/src/quick/items/qquickimage_p_p.h index 25e267ccff..6a0ba1535f 100644 --- a/src/quick/items/qquickimage_p_p.h +++ b/src/quick/items/qquickimage_p_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/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp index 8b127ba571..0bdfab67a9 100644 --- a/src/quick/items/qquickimagebase.cpp +++ b/src/quick/items/qquickimagebase.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 @@ -42,7 +42,7 @@ #include "qquickimagebase_p.h" #include "qquickimagebase_p_p.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> QT_BEGIN_NAMESPACE @@ -202,11 +202,11 @@ void QQuickImageBase::load() emit statusChanged(d->status); update(); } else { - QDeclarativePixmap::Options options; + QQuickPixmap::Options options; if (d->async) - options |= QDeclarativePixmap::Asynchronous; + options |= QQuickPixmap::Asynchronous; if (d->cache) - options |= QDeclarativePixmap::Cache; + options |= QQuickPixmap::Cache; d->pix.clear(this); pixmapChange(); d->pix.load(qmlEngine(this), d->url, d->explicitSourceSize ? sourceSize() : QSize(), options); diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h index bbda9dba9a..dfff1e4b0e 100644 --- a/src/quick/items/qquickimagebase_p.h +++ b/src/quick/items/qquickimagebase_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/qquickimagebase_p_p.h b/src/quick/items/qquickimagebase_p_p.h index dd9185676f..7c2fce1e79 100644 --- a/src/quick/items/qquickimagebase_p_p.h +++ b/src/quick/items/qquickimagebase_p_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 @@ -56,7 +56,7 @@ #include "qquickimplicitsizeitem_p_p.h" #include "qquickimagebase_p.h" -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> QT_BEGIN_NAMESPACE @@ -76,7 +76,7 @@ public: { } - QDeclarativePixmap pix; + QQuickPixmap pix; QQuickImageBase::Status status; QUrl url; qreal progress; diff --git a/src/quick/items/qquickimplicitsizeitem.cpp b/src/quick/items/qquickimplicitsizeitem.cpp index 040263e35a..427be42312 100644 --- a/src/quick/items/qquickimplicitsizeitem.cpp +++ b/src/quick/items/qquickimplicitsizeitem.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/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h index 5c4bac3585..a6d58325d8 100644 --- a/src/quick/items/qquickimplicitsizeitem_p.h +++ b/src/quick/items/qquickimplicitsizeitem_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/qquickimplicitsizeitem_p_p.h b/src/quick/items/qquickimplicitsizeitem_p_p.h index 15ca8b3127..84e3027e64 100644 --- a/src/quick/items/qquickimplicitsizeitem_p_p.h +++ b/src/quick/items/qquickimplicitsizeitem_p_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/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 7ca683fac3..77808a61d9 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.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 @@ -42,15 +42,15 @@ #include "qquickitem.h" #include "qquickcanvas.h" -#include <QtDeclarative/qjsengine.h> +#include <QtQml/qjsengine.h> #include "qquickcanvas_p.h" #include "qquickevents_p_p.h" #include "qquickscreen_p.h" -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlcomponent.h> +#include <QtQml/qqmlinfo.h> #include <QtGui/qpen.h> #include <QtGui/qcursor.h> #include <QtGui/qguiapplication.h> @@ -59,13 +59,14 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qnumeric.h> -#include <private/qdeclarativeengine_p.h> -#include <QtQuick/private/qdeclarativestategroup_p.h> -#include <private/qdeclarativeopenmetaobject_p.h> -#include <QtQuick/private/qdeclarativestate_p.h> +#include <private/qqmlglobal_p.h> +#include <private/qqmlengine_p.h> +#include <QtQuick/private/qquickstategroup_p.h> +#include <private/qqmlopenmetaobject_p.h> +#include <QtQuick/private/qquickstate_p.h> #include <private/qlistmodelinterface_p.h> #include <private/qquickitem_p.h> -#include <private/qdeclarativeaccessors_p.h> +#include <private/qqmlaccessors_p.h> #include <QtQuick/private/qquickaccessibleattached_p.h> #include <float.h> @@ -74,7 +75,7 @@ QT_BEGIN_NAMESPACE -static void QQuickItem_parentNotifier(QObject *o, intptr_t, QDeclarativeNotifier **n) +static void QQuickItem_parentNotifier(QObject *o, intptr_t, QQmlNotifier **n) { QQuickItemPrivate *d = QQuickItemPrivate::get(static_cast<QQuickItem *>(o)); *n = &d->parentNotifier; @@ -86,11 +87,11 @@ QML_PRIVATE_ACCESSOR(QQuickItem, qreal, y, y) QML_PRIVATE_ACCESSOR(QQuickItem, qreal, width, width) QML_PRIVATE_ACCESSOR(QQuickItem, qreal, height, height) -static QDeclarativeAccessors QQuickItem_parent = { QQuickItem_parentRead, QQuickItem_parentNotifier }; -static QDeclarativeAccessors QQuickItem_x = { QQuickItem_xRead, 0 }; -static QDeclarativeAccessors QQuickItem_y = { QQuickItem_yRead, 0 }; -static QDeclarativeAccessors QQuickItem_width = { QQuickItem_widthRead, 0 }; -static QDeclarativeAccessors QQuickItem_height = { QQuickItem_heightRead, 0 }; +static QQmlAccessors QQuickItem_parent = { QQuickItem_parentRead, QQuickItem_parentNotifier }; +static QQmlAccessors QQuickItem_x = { QQuickItem_xRead, 0 }; +static QQmlAccessors QQuickItem_y = { QQuickItem_yRead, 0 }; +static QQmlAccessors QQuickItem_width = { QQuickItem_widthRead, 0 }; +static QQmlAccessors QQuickItem_height = { QQuickItem_heightRead, 0 }; QML_DECLARE_PROPERTIES(QQuickItem) { { QML_PROPERTY_NAME(parent), 0, &QQuickItem_parent }, @@ -233,7 +234,7 @@ void QQuickItemPrivate::registerAccessorProperties() rotations you must specify the axis to rotate around in addition to the origin point. The following example shows various 3D-like rotations applied to an \l Image. - \snippet doc/src/snippets/declarative/rotation.qml 0 + \snippet doc/src/snippets/qml/rotation.qml 0 \image axisrotation.png @@ -491,7 +492,7 @@ void QQuickItemKeyFilter::componentComplete() The following example provides key navigation for a 2x2 grid of items: - \snippet doc/src/snippets/declarative/keynavigation.qml 0 + \snippet doc/src/snippets/qml/keynavigation.qml 0 The top-left item initially receives focus by setting \l {Item::}{focus} to \c true. When an arrow key is pressed, the focus will move to the @@ -912,13 +913,13 @@ bool QQuickKeysAttachedPrivate::isConnected(const char *signalName) be used to test for a certain key; in this case, the left cursor key: - \snippet doc/src/snippets/declarative/keys/keys-pressed.qml key item + \snippet doc/src/snippets/qml/keys/keys-pressed.qml key item Some keys may alternatively be handled via specific signal properties, for example \e onSelectPressed. These handlers automatically set \e event.accepted to true. - \snippet doc/src/snippets/declarative/keys/keys-handler.qml key item + \snippet doc/src/snippets/qml/keys/keys-handler.qml key item See \l{Qt::Key}{Qt.Key} for the list of keyboard codes. @@ -1460,7 +1461,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) from left to right by default, they are now positioned from right to left instead, as demonstrated by the numbering and opacity of the items: - \snippet doc/src/snippets/declarative/layoutmirroring.qml 0 + \snippet doc/src/snippets/qml/layoutmirroring.qml 0 \image layoutmirroring.png @@ -1626,7 +1627,7 @@ void QQuickItemPrivate::setAccessibleFlagAndListener() \inmodule QtQuick - All visual items in Qt Declarative inherit from QQuickItem. Although QQuickItem + All visual items in Qt Quick inherit from QQuickItem. Although QQuickItem has no visual appearance, it defines all the properties that are common across visual items - such as the x and y position, the width and height, \l {anchor-layout}{anchoring} and key handling. @@ -1645,7 +1646,7 @@ void QQuickItemPrivate::setAccessibleFlagAndListener() \ingroup qml-basic-visual-elements \brief The Item is the most basic of all visual items in QML. - All visual items in Qt Declarative inherit from Item. Although Item + All visual items in Qt Quick inherit from Item. Although Item has no visual appearance, it defines all the properties that are common across visual items - such as the x and y position, the width and height, \l {anchor-layout}{anchoring} and key handling. @@ -2351,7 +2352,7 @@ void QQuickItemPrivate::init(QQuickItem *parent) } } -void QQuickItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o) +void QQuickItemPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) { if (!o) return; @@ -2410,14 +2411,14 @@ void QQuickItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QOb specify it. */ -int QQuickItemPrivate::data_count(QDeclarativeListProperty<QObject> *prop) +int QQuickItemPrivate::data_count(QQmlListProperty<QObject> *prop) { Q_UNUSED(prop); // XXX todo return 0; } -QObject *QQuickItemPrivate::data_at(QDeclarativeListProperty<QObject> *prop, int i) +QObject *QQuickItemPrivate::data_at(QQmlListProperty<QObject> *prop, int i) { Q_UNUSED(prop); Q_UNUSED(i); @@ -2425,13 +2426,13 @@ QObject *QQuickItemPrivate::data_at(QDeclarativeListProperty<QObject> *prop, int return 0; } -void QQuickItemPrivate::data_clear(QDeclarativeListProperty<QObject> *prop) +void QQuickItemPrivate::data_clear(QQmlListProperty<QObject> *prop) { Q_UNUSED(prop); // XXX todo } -QObject *QQuickItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop, int index) +QObject *QQuickItemPrivate::resources_at(QQmlListProperty<QObject> *prop, int index) { const QObjectList children = prop->object->children(); if (index < children.count()) @@ -2440,18 +2441,18 @@ QObject *QQuickItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop return 0; } -void QQuickItemPrivate::resources_append(QDeclarativeListProperty<QObject> *prop, QObject *o) +void QQuickItemPrivate::resources_append(QQmlListProperty<QObject> *prop, QObject *o) { // XXX todo - do we really want this behavior? o->setParent(prop->object); } -int QQuickItemPrivate::resources_count(QDeclarativeListProperty<QObject> *prop) +int QQuickItemPrivate::resources_count(QQmlListProperty<QObject> *prop) { return prop->object->children().count(); } -void QQuickItemPrivate::resources_clear(QDeclarativeListProperty<QObject> *prop) +void QQuickItemPrivate::resources_clear(QQmlListProperty<QObject> *prop) { // XXX todo - do we really want this behavior? const QObjectList children = prop->object->children(); @@ -2459,7 +2460,7 @@ void QQuickItemPrivate::resources_clear(QDeclarativeListProperty<QObject> *prop) children.at(index)->setParent(0); } -QQuickItem *QQuickItemPrivate::children_at(QDeclarativeListProperty<QQuickItem> *prop, int index) +QQuickItem *QQuickItemPrivate::children_at(QQmlListProperty<QQuickItem> *prop, int index) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); if (index >= p->childItems.count() || index < 0) @@ -2468,7 +2469,7 @@ QQuickItem *QQuickItemPrivate::children_at(QDeclarativeListProperty<QQuickItem> return p->childItems.at(index); } -void QQuickItemPrivate::children_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *o) +void QQuickItemPrivate::children_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *o) { if (!o) return; @@ -2480,13 +2481,13 @@ void QQuickItemPrivate::children_append(QDeclarativeListProperty<QQuickItem> *pr o->setParentItem(that); } -int QQuickItemPrivate::children_count(QDeclarativeListProperty<QQuickItem> *prop) +int QQuickItemPrivate::children_count(QQmlListProperty<QQuickItem> *prop) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); return p->childItems.count(); } -void QQuickItemPrivate::children_clear(QDeclarativeListProperty<QQuickItem> *prop) +void QQuickItemPrivate::children_clear(QQmlListProperty<QQuickItem> *prop) { QQuickItem *that = static_cast<QQuickItem *>(prop->object); QQuickItemPrivate *p = QQuickItemPrivate::get(that); @@ -2494,13 +2495,13 @@ void QQuickItemPrivate::children_clear(QDeclarativeListProperty<QQuickItem> *pro p->childItems.at(0)->setParentItem(0); } -void QQuickItemPrivate::visibleChildren_append(QDeclarativeListProperty<QQuickItem>*, QQuickItem *self) +void QQuickItemPrivate::visibleChildren_append(QQmlListProperty<QQuickItem>*, QQuickItem *self) { // do nothing qmlInfo(self) << "QQuickItem: visibleChildren property is readonly and cannot be assigned to."; } -int QQuickItemPrivate::visibleChildren_count(QDeclarativeListProperty<QQuickItem> *prop) +int QQuickItemPrivate::visibleChildren_count(QQmlListProperty<QQuickItem> *prop) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); int visibleCount = 0; @@ -2512,7 +2513,7 @@ int QQuickItemPrivate::visibleChildren_count(QDeclarativeListProperty<QQuickItem return visibleCount; } -QQuickItem *QQuickItemPrivate::visibleChildren_at(QDeclarativeListProperty<QQuickItem> *prop, int index) +QQuickItem *QQuickItemPrivate::visibleChildren_at(QQmlListProperty<QQuickItem> *prop, int index) { QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object)); const int childCount = p->childItems.count(); @@ -2527,7 +2528,7 @@ QQuickItem *QQuickItemPrivate::visibleChildren_at(QDeclarativeListProperty<QQuic return 0; } -int QQuickItemPrivate::transform_count(QDeclarativeListProperty<QQuickTransform> *prop) +int QQuickItemPrivate::transform_count(QQmlListProperty<QQuickTransform> *prop) { QQuickItem *that = static_cast<QQuickItem *>(prop->object); QQuickItemPrivate *p = QQuickItemPrivate::get(that); @@ -2573,7 +2574,7 @@ void QQuickTransform::prependToItem(QQuickItem *item) p->dirty(QQuickItemPrivate::Transform); } -void QQuickItemPrivate::transform_append(QDeclarativeListProperty<QQuickTransform> *prop, QQuickTransform *transform) +void QQuickItemPrivate::transform_append(QQmlListProperty<QQuickTransform> *prop, QQuickTransform *transform) { if (!transform) return; @@ -2582,7 +2583,7 @@ void QQuickItemPrivate::transform_append(QDeclarativeListProperty<QQuickTransfor transform->appendToItem(that); } -QQuickTransform *QQuickItemPrivate::transform_at(QDeclarativeListProperty<QQuickTransform> *prop, int idx) +QQuickTransform *QQuickItemPrivate::transform_at(QQmlListProperty<QQuickTransform> *prop, int idx) { QQuickItem *that = static_cast<QQuickItem *>(prop->object); QQuickItemPrivate *p = QQuickItemPrivate::get(that); @@ -2593,7 +2594,7 @@ QQuickTransform *QQuickItemPrivate::transform_at(QDeclarativeListProperty<QQuick return p->transforms.at(idx); } -void QQuickItemPrivate::transform_clear(QDeclarativeListProperty<QQuickTransform> *prop) +void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) { QQuickItem *that = static_cast<QQuickItem *>(prop->object); QQuickItemPrivate *p = QQuickItemPrivate::get(that); @@ -2852,9 +2853,9 @@ void QQuickItemPrivate::siblingOrderChanged() } } -QDeclarativeListProperty<QObject> QQuickItemPrivate::data() +QQmlListProperty<QObject> QQuickItemPrivate::data() { - return QDeclarativeListProperty<QObject>(q_func(), 0, QQuickItemPrivate::data_append, + return QQmlListProperty<QObject>(q_func(), 0, QQuickItemPrivate::data_append, QQuickItemPrivate::data_count, QQuickItemPrivate::data_at, QQuickItemPrivate::data_clear); @@ -3233,7 +3234,7 @@ void QQuickItem::polish() } } -void QQuickItem::mapFromItem(QDeclarativeV8Function *args) const +void QQuickItem::mapFromItem(QQmlV8Function *args) const { if (args->Length() != 0) { v8::Local<v8::Value> item = (*args)[0]; @@ -3276,7 +3277,7 @@ QTransform QQuickItem::itemTransform(QQuickItem *other, bool *ok) const return t; } -void QQuickItem::mapToItem(QDeclarativeV8Function *args) const +void QQuickItem::mapToItem(QQmlV8Function *args) const { if (args->Length() != 0) { v8::Local<v8::Value> item = (*args)[0]; @@ -3332,17 +3333,17 @@ QQuickItem *QQuickItem::childAt(qreal x, qreal y) const return 0; } -QDeclarativeListProperty<QObject> QQuickItemPrivate::resources() +QQmlListProperty<QObject> QQuickItemPrivate::resources() { - return QDeclarativeListProperty<QObject>(q_func(), 0, QQuickItemPrivate::resources_append, + return QQmlListProperty<QObject>(q_func(), 0, QQuickItemPrivate::resources_append, QQuickItemPrivate::resources_count, QQuickItemPrivate::resources_at, QQuickItemPrivate::resources_clear); } -QDeclarativeListProperty<QQuickItem> QQuickItemPrivate::children() +QQmlListProperty<QQuickItem> QQuickItemPrivate::children() { - return QDeclarativeListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::children_append, + return QQmlListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::children_append, QQuickItemPrivate::children_count, QQuickItemPrivate::children_at, QQuickItemPrivate::children_clear); @@ -3355,20 +3356,20 @@ QDeclarativeListProperty<QQuickItem> QQuickItemPrivate::children() Note that a child's visibility may have changed explicitly, or because the visibility of this (it's parent) item or another grandparent changed. */ -QDeclarativeListProperty<QQuickItem> QQuickItemPrivate::visibleChildren() +QQmlListProperty<QQuickItem> QQuickItemPrivate::visibleChildren() { - return QDeclarativeListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::visibleChildren_append, + return QQmlListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::visibleChildren_append, QQuickItemPrivate::visibleChildren_count, QQuickItemPrivate::visibleChildren_at); } -QDeclarativeListProperty<QDeclarativeState> QQuickItemPrivate::states() +QQmlListProperty<QQuickState> QQuickItemPrivate::states() { return _states()->statesProperty(); } -QDeclarativeListProperty<QDeclarativeTransition> QQuickItemPrivate::transitions() +QQmlListProperty<QQuickTransition> QQuickItemPrivate::transitions() { return _states()->transitionsProperty(); } @@ -3398,9 +3399,9 @@ void QQuickItem::setState(const QString &state) d->setState(state); } -QDeclarativeListProperty<QQuickTransform> QQuickItem::transform() +QQmlListProperty<QQuickTransform> QQuickItem::transform() { - return QDeclarativeListProperty<QQuickTransform>(this, 0, QQuickItemPrivate::transform_append, + return QQmlListProperty<QQuickTransform>(this, 0, QQuickItemPrivate::transform_append, QQuickItemPrivate::transform_count, QQuickItemPrivate::transform_at, QQuickItemPrivate::transform_clear); @@ -3439,11 +3440,11 @@ void QQuickItem::componentComplete() d->extra->contents->complete(); } -QDeclarativeStateGroup *QQuickItemPrivate::_states() +QQuickStateGroup *QQuickItemPrivate::_states() { Q_Q(QQuickItem); if (!_stateGroup) { - _stateGroup = new QDeclarativeStateGroup; + _stateGroup = new QQuickStateGroup; if (!componentComplete) _stateGroup->classBegin(); FAST_CONNECT(_stateGroup, SIGNAL(stateChanged(QString)), @@ -5566,7 +5567,7 @@ void QQuickItemLayer::deactivateEffect() \sa samplerName */ -void QQuickItemLayer::setEffect(QDeclarativeComponent *component) +void QQuickItemLayer::setEffect(QQmlComponent *component) { if (component == m_effectComponent) return; diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 7f98db9168..c44192bd3a 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.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 QQUICKITEM_H #include <QtQuick/qtquickglobal.h> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtQml/qqml.h> +#include <QtQml/qqmlcomponent.h> #include <QtCore/QObject> #include <QtCore/QList> @@ -81,10 +81,10 @@ private: }; class QQuickItemLayer; -class QDeclarativeV8Function; -class QDeclarativeState; +class QQmlV8Function; +class QQuickState; class QQuickAnchorLine; -class QDeclarativeTransition; +class QQuickTransition; class QQuickKeyEvent; class QQuickAnchors; class QQuickItemPrivate; @@ -95,15 +95,15 @@ class QSGNode; class QSGTransformNode; class QSGTextureProvider; -class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatus +class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL) - Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QObject> data READ data DESIGNABLE false) - Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QObject> resources READ resources DESIGNABLE false) - Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false) + Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false) + Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QObject> resources READ resources DESIGNABLE false) + Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false) Q_PROPERTY(QPointF pos READ pos FINAL) Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged FINAL) @@ -115,10 +115,10 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatu Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL) - Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QQuickItem> visibleChildren READ visibleChildren NOTIFY visibleChildrenChanged DESIGNABLE false) + Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickItem> visibleChildren READ visibleChildren NOTIFY visibleChildrenChanged DESIGNABLE false) - Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QDeclarativeState> states READ states DESIGNABLE false) - Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitions DESIGNABLE false) + Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickState> states READ states DESIGNABLE false) + Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickTransition> transitions READ transitions DESIGNABLE false) Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged) Q_PROPERTY(QRectF childrenRect READ childrenRect NOTIFY childrenRectChanged DESIGNABLE false FINAL) Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL) @@ -140,7 +140,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatu Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged) Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint) // XXX todo - notify? - Q_PROPERTY(QDeclarativeListProperty<QQuickTransform> transform READ transform DESIGNABLE false FINAL) + Q_PROPERTY(QQmlListProperty<QQuickTransform> transform READ transform DESIGNABLE false FINAL) Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged) Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged) @@ -215,7 +215,7 @@ public: qreal baselineOffset() const; void setBaselineOffset(qreal); - QDeclarativeListProperty<QQuickTransform> transform(); + QQmlListProperty<QQuickTransform> transform(); qreal x() const; qreal y() const; @@ -303,8 +303,8 @@ public: void polish(); - Q_INVOKABLE void mapFromItem(QDeclarativeV8Function*) const; - Q_INVOKABLE void mapToItem(QDeclarativeV8Function*) const; + Q_INVOKABLE void mapFromItem(QQmlV8Function*) const; + Q_INVOKABLE void mapToItem(QQmlV8Function*) const; Q_INVOKABLE void forceActiveFocus(); Q_INVOKABLE QQuickItem *childAt(qreal x, qreal y) const; diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index fd02334ab3..03fc66eadb 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_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 @@ -65,14 +65,14 @@ #include "qquickclipnode_p.h" #include <private/qpodvector_p.h> -#include <QtQuick/private/qdeclarativestate_p.h> -#include <private/qdeclarativenullablevalue_p_p.h> -#include <private/qdeclarativenotifier_p.h> -#include <private/qdeclarativeglobal_p.h> +#include <QtQuick/private/qquickstate_p.h> +#include <private/qqmlnullablevalue_p_p.h> +#include <private/qqmlnotifier_p.h> +#include <private/qqmlglobal_p.h> #include <private/qlazilyallocated_p.h> -#include <qdeclarative.h> -#include <qdeclarativecontext.h> +#include <qqml.h> +#include <qqmlcontext.h> #include <QtCore/qlist.h> #include <QtCore/qdebug.h> @@ -149,7 +149,7 @@ class QQuickItemLayer : public QObject, public QQuickItemChangeListener Q_PROPERTY(QQuickShaderEffectSource::WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged) Q_PROPERTY(QQuickShaderEffectSource::Format format READ format WRITE setFormat NOTIFY formatChanged) Q_PROPERTY(QByteArray samplerName READ name WRITE setName NOTIFY nameChanged) - Q_PROPERTY(QDeclarativeComponent *effect READ effect WRITE setEffect NOTIFY effectChanged) + Q_PROPERTY(QQmlComponent *effect READ effect WRITE setEffect NOTIFY effectChanged) public: QQuickItemLayer(QQuickItem *item); ~QQuickItemLayer(); @@ -181,8 +181,8 @@ public: QByteArray name() const { return m_name; } void setName(const QByteArray &name); - QDeclarativeComponent *effect() const { return m_effectComponent; } - void setEffect(QDeclarativeComponent *effect); + QQmlComponent *effect() const { return m_effectComponent; } + void setEffect(QQmlComponent *effect); QQuickShaderEffectSource *effectSource() const { return m_effectSource; } @@ -203,7 +203,7 @@ signals: void mipmapChanged(bool mipmap); void wrapModeChanged(QQuickShaderEffectSource::WrapMode mode); void nameChanged(const QByteArray &name); - void effectChanged(QDeclarativeComponent *component); + void effectChanged(QQmlComponent *component); void smoothChanged(bool smooth); void formatChanged(QQuickShaderEffectSource::Format format); void sourceRectChanged(const QRectF &sourceRect); @@ -224,7 +224,7 @@ private: QSize m_size; QRectF m_sourceRect; QByteArray m_name; - QDeclarativeComponent *m_effectComponent; + QQmlComponent *m_effectComponent; QQuickItem *m_effect; QQuickShaderEffectSource *m_effectSource; }; @@ -243,13 +243,13 @@ public: ~QQuickItemPrivate(); void init(QQuickItem *parent); - QDeclarativeListProperty<QObject> data(); - QDeclarativeListProperty<QObject> resources(); - QDeclarativeListProperty<QQuickItem> children(); - QDeclarativeListProperty<QQuickItem> visibleChildren(); + QQmlListProperty<QObject> data(); + QQmlListProperty<QObject> resources(); + QQmlListProperty<QQuickItem> children(); + QQmlListProperty<QQuickItem> visibleChildren(); - QDeclarativeListProperty<QDeclarativeState> states(); - QDeclarativeListProperty<QDeclarativeTransition> transitions(); + QQmlListProperty<QQuickState> states(); + QQmlListProperty<QQuickTransition> transitions(); QString state() const; void setState(const QString &); @@ -265,33 +265,33 @@ public: QQuickItemLayer *layer() const; // data property - static void data_append(QDeclarativeListProperty<QObject> *, QObject *); - static int data_count(QDeclarativeListProperty<QObject> *); - static QObject *data_at(QDeclarativeListProperty<QObject> *, int); - static void data_clear(QDeclarativeListProperty<QObject> *); + static void data_append(QQmlListProperty<QObject> *, QObject *); + static int data_count(QQmlListProperty<QObject> *); + static QObject *data_at(QQmlListProperty<QObject> *, int); + static void data_clear(QQmlListProperty<QObject> *); // resources property - static QObject *resources_at(QDeclarativeListProperty<QObject> *, int); - static void resources_append(QDeclarativeListProperty<QObject> *, QObject *); - static int resources_count(QDeclarativeListProperty<QObject> *); - static void resources_clear(QDeclarativeListProperty<QObject> *); + static QObject *resources_at(QQmlListProperty<QObject> *, int); + static void resources_append(QQmlListProperty<QObject> *, QObject *); + static int resources_count(QQmlListProperty<QObject> *); + static void resources_clear(QQmlListProperty<QObject> *); // children property - static void children_append(QDeclarativeListProperty<QQuickItem> *, QQuickItem *); - static int children_count(QDeclarativeListProperty<QQuickItem> *); - static QQuickItem *children_at(QDeclarativeListProperty<QQuickItem> *, int); - static void children_clear(QDeclarativeListProperty<QQuickItem> *); + static void children_append(QQmlListProperty<QQuickItem> *, QQuickItem *); + static int children_count(QQmlListProperty<QQuickItem> *); + static QQuickItem *children_at(QQmlListProperty<QQuickItem> *, int); + static void children_clear(QQmlListProperty<QQuickItem> *); // visibleChildren property - static void visibleChildren_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *o); - static int visibleChildren_count(QDeclarativeListProperty<QQuickItem> *prop); - static QQuickItem *visibleChildren_at(QDeclarativeListProperty<QQuickItem> *prop, int index); + static void visibleChildren_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *o); + static int visibleChildren_count(QQmlListProperty<QQuickItem> *prop); + static QQuickItem *visibleChildren_at(QQmlListProperty<QQuickItem> *prop, int index); // transform property - static int transform_count(QDeclarativeListProperty<QQuickTransform> *list); - static void transform_append(QDeclarativeListProperty<QQuickTransform> *list, QQuickTransform *); - static QQuickTransform *transform_at(QDeclarativeListProperty<QQuickTransform> *list, int); - static void transform_clear(QDeclarativeListProperty<QQuickTransform> *list); + static int transform_count(QQmlListProperty<QQuickTransform> *list); + static void transform_append(QQmlListProperty<QQuickTransform> *list, QQuickTransform *); + static QQuickTransform *transform_at(QQmlListProperty<QQuickTransform> *list, int); + static void transform_clear(QQmlListProperty<QQuickTransform> *list); enum ChangeType { Geometry = 0x01, @@ -372,8 +372,8 @@ public: void updateOrAddGeometryChangeListener(QQuickItemChangeListener *listener, GeometryChangeTypes types); void updateOrRemoveGeometryChangeListener(QQuickItemChangeListener *listener, GeometryChangeTypes types); - QDeclarativeStateGroup *_states(); - QDeclarativeStateGroup *_stateGroup; + QQuickStateGroup *_states(); + QQuickStateGroup *_stateGroup; inline QQuickItem::TransformOrigin origin() const; @@ -453,7 +453,7 @@ public: inline QSGContext *sceneGraphContext() const; QQuickItem *parentItem; - QDeclarativeNotifier parentNotifier; + QQmlNotifier parentNotifier; QList<QQuickItem *> childItems; mutable QList<QQuickItem *> *sortedChildItems; @@ -723,7 +723,7 @@ class QQuickKeysAttached : public QObject, public QQuickItemKeyFilter Q_DECLARE_PRIVATE(QQuickKeysAttached) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) - Q_PROPERTY(QDeclarativeListProperty<QQuickItem> forwardTo READ forwardTo) + Q_PROPERTY(QQmlListProperty<QQuickItem> forwardTo READ forwardTo) Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged) Q_ENUMS(Priority) @@ -745,9 +745,9 @@ public: Priority priority() const; void setPriority(Priority); - QDeclarativeListProperty<QQuickItem> forwardTo() { + QQmlListProperty<QQuickItem> forwardTo() { Q_D(QQuickKeysAttached); - return QDeclarativeListProperty<QQuickItem>(this, d->targets); + return QQmlListProperty<QQuickItem>(this, d->targets); } virtual void componentComplete(); diff --git a/src/quick/items/qquickanimation.cpp b/src/quick/items/qquickitemanimation.cpp index 641fbb2d37..32f1047e51 100644 --- a/src/quick/items/qquickanimation.cpp +++ b/src/quick/items/qquickitemanimation.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 @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "qquickanimation_p.h" -#include "qquickanimation_p_p.h" +#include "qquickitemanimation_p.h" +#include "qquickitemanimation_p_p.h" #include "qquickstateoperations_p.h" -#include <private/qdeclarativeproperty_p.h> -#include <private/qdeclarativepath_p.h> +#include <private/qqmlproperty_p.h> +#include <private/qquickpath_p.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtCore/qmath.h> #include "private/qsequentialanimationgroupjob_p.h" #include "private/qparallelanimationgroupjob_p.h" @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE the transition, ensures the item animates smoothly as it moves to its new parent: - \snippet doc/src/snippets/declarative/parentanimation.qml 0 + \snippet doc/src/snippets/qml/parentanimation.qml 0 A ParentAnimation can contain any number of animations. These animations will be run in parallel; to run them sequentially, define them within a @@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example} */ QQuickParentAnimation::QQuickParentAnimation(QObject *parent) - : QDeclarativeAnimationGroup(*(new QQuickParentAnimationPrivate), parent) + : QQuickAnimationGroup(*(new QQuickParentAnimationPrivate), parent) { } @@ -204,8 +204,8 @@ QPointF QQuickParentAnimationPrivate::computeTransformOrigin(QQuickItem::Transfo } } -QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateActions &actions, - QDeclarativeProperties &modified, +QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &actions, + QQmlProperties &modified, TransitionDirection direction, QObject *defaultTarget) { @@ -216,14 +216,14 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction QQuickParentAnimationData() {} ~QQuickParentAnimationData() { qDeleteAll(pc); } - QDeclarativeStateActions actions; + QQuickStateActions actions; //### reverse should probably apply on a per-action basis bool reverse; QList<QQuickParentChange *> pc; virtual void doAction() { for (int ii = 0; ii < actions.count(); ++ii) { - const QDeclarativeAction &action = actions.at(ii); + const QQuickAction &action = actions.at(ii); if (reverse) action.event->reverse(); else @@ -238,7 +238,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction bool hasExplicit = false; if (d->target && d->newParent) { data->reverse = false; - QDeclarativeAction myAction; + QQuickAction myAction; QQuickParentChange *pc = new QQuickParentChange; pc->setObject(d->target); pc->setParent(d->newParent); @@ -248,7 +248,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction hasExplicit = true; if (d->via) { viaData->reverse = false; - QDeclarativeAction myVAction; + QQuickAction myVAction; QQuickParentChange *vpc = new QQuickParentChange; vpc->setObject(d->target); vpc->setParent(d->via); @@ -262,12 +262,12 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction if (!hasExplicit) for (int i = 0; i < actions.size(); ++i) { - QDeclarativeAction &action = actions[i]; - if (action.event && action.event->type() == QDeclarativeActionEvent::ParentChange + QQuickAction &action = actions[i]; + if (action.event && action.event->type() == QQuickActionEvent::ParentChange && (!d->target || static_cast<QQuickParentChange*>(action.event)->object() == d->target)) { QQuickParentChange *pc = static_cast<QQuickParentChange*>(action.event); - QDeclarativeAction myAction = action; + QQuickAction myAction = action; data->reverse = action.reverseEvent; //### this logic differs from PropertyAnimation @@ -287,18 +287,18 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction if (d->via) { viaData->reverse = false; - QDeclarativeAction myAction; + QQuickAction myAction; QQuickParentChange *vpc = new QQuickParentChange; vpc->setObject(pc->object()); vpc->setParent(d->via); myAction.event = vpc; viaData->pc << vpc; viaData->actions << myAction; - QDeclarativeAction dummyAction; - QDeclarativeAction &xAction = pc->xIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; - QDeclarativeAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; - QDeclarativeAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; - QDeclarativeAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickAction dummyAction; + QQuickAction &xAction = pc->xIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; QQuickItem *target = pc->object(); QQuickItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent(); @@ -393,7 +393,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction } //TODO: simplify/clarify logic - bool forwards = direction == QDeclarativeAbstractAnimation::Forward; + bool forwards = direction == QQuickAbstractAnimation::Forward; if (forwards) { topLevelGroup->appendAnimation(d->via ? viaAction : targetAction); topLevelGroup->appendAnimation(ag); @@ -424,7 +424,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction In the following snippet we animate the addition of a right anchor to a \l Rectangle: - \snippet doc/src/snippets/declarative/anchoranimation.qml 0 + \snippet doc/src/snippets/qml/anchoranimation.qml 0 For convenience, when an AnchorAnimation is used in a \l Transition, it will animate any AnchorChanges that have occurred during the state change. @@ -439,7 +439,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction \sa {QML Animation and Transitions}, AnchorChanges */ QQuickAnchorAnimation::QQuickAnchorAnimation(QObject *parent) -: QDeclarativeAbstractAnimation(*(new QQuickAnchorAnimationPrivate), parent) +: QQuickAbstractAnimation(*(new QQuickAnchorAnimationPrivate), parent) { } @@ -454,10 +454,10 @@ QQuickAnchorAnimation::~QQuickAnchorAnimation() If no targets are specified all AnchorChanges will be animated by the AnchorAnimation. */ -QDeclarativeListProperty<QQuickItem> QQuickAnchorAnimation::targets() +QQmlListProperty<QQuickItem> QQuickAnchorAnimation::targets() { Q_D(QQuickAnchorAnimation); - return QDeclarativeListProperty<QQuickItem>(this, d->targets); + return QQmlListProperty<QQuickItem>(this, d->targets); } /*! @@ -520,15 +520,15 @@ void QQuickAnchorAnimation::setEasing(const QEasingCurve &e) emit easingChanged(e); } -QAbstractAnimationJob* QQuickAnchorAnimation::transition(QDeclarativeStateActions &actions, - QDeclarativeProperties &modified, +QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &actions, + QQmlProperties &modified, TransitionDirection direction, QObject *defaultTarget) { Q_UNUSED(modified); Q_UNUSED(defaultTarget); Q_D(QQuickAnchorAnimation); - QDeclarativeAnimationPropertyUpdater *data = new QDeclarativeAnimationPropertyUpdater; + QQuickAnimationPropertyUpdater *data = new QQuickAnimationPropertyUpdater; data->interpolatorType = QMetaType::QReal; data->interpolator = d->interpolator; data->reverse = direction == Backward ? true : false; @@ -536,14 +536,14 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QDeclarativeStateAction data->fromDefined = false; for (int ii = 0; ii < actions.count(); ++ii) { - QDeclarativeAction &action = actions[ii]; - if (action.event && action.event->type() == QDeclarativeActionEvent::AnchorChanges + QQuickAction &action = actions[ii]; + if (action.event && action.event->type() == QQuickActionEvent::AnchorChanges && (d->targets.isEmpty() || d->targets.contains(static_cast<QQuickAnchorChanges*>(action.event)->object()))) { data->actions << static_cast<QQuickAnchorChanges*>(action.event)->additionalActions(); } } - QDeclarativeBulkValueAnimator *animator = new QDeclarativeBulkValueAnimator; + QQuickBulkValueAnimator *animator = new QQuickBulkValueAnimator; if (data->actions.count()) { animator->setAnimValue(data); animator->setFromSourcedValue(&data->fromSourced); @@ -582,7 +582,7 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QDeclarativeStateAction \sa {QML Animation and Transitions}, PathInterpolator */ QQuickPathAnimation::QQuickPathAnimation(QObject *parent) -: QDeclarativeAbstractAnimation(*(new QQuickPathAnimationPrivate), parent) +: QQuickAbstractAnimation(*(new QQuickPathAnimationPrivate), parent) { } @@ -657,13 +657,13 @@ void QQuickPathAnimation::setEasing(const QEasingCurve &e) For more information on defining a path see the \l Path documentation. */ -QDeclarativePath *QQuickPathAnimation::path() const +QQuickPath *QQuickPathAnimation::path() const { Q_D(const QQuickPathAnimation); return d->path; } -void QQuickPathAnimation::setPath(QDeclarativePath *path) +void QQuickPathAnimation::setPath(QQuickPath *path) { Q_D(QQuickPathAnimation); if (d->path == path) @@ -826,8 +826,8 @@ void QQuickPathAnimation::setEndRotation(qreal rotation) emit endRotationChanged(d->endRotation); } -QAbstractAnimationJob* QQuickPathAnimation::transition(QDeclarativeStateActions &actions, - QDeclarativeProperties &modified, +QAbstractAnimationJob* QQuickPathAnimation::transition(QQuickStateActions &actions, + QQmlProperties &modified, TransitionDirection direction, QObject *defaultTarget) { @@ -868,7 +868,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QDeclarativeStateActions int origModifiedSize = modified.count(); for (int i = 0; i < actions.count(); ++i) { - QDeclarativeAction &action = actions[i]; + QQuickAction &action = actions[i]; if (action.event) continue; if (action.specifiedObject == target && action.property.name() == QLatin1String("x")) { @@ -896,7 +896,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QDeclarativeStateActions // treat interruptions specially, otherwise we end up with strange paths if ((data->reverse || prevData.reverse) && prevData.currentV > 0 && prevData.currentV < 1) { if (!data->fromDefined && !data->toDefined && !prevData.painterPath.isEmpty()) { - QPointF pathPos = QDeclarativePath::sequentialPointAt(prevData.painterPath, prevData.pathLength, prevData.attributePoints, prevData.prevBez, prevData.currentV); + QPointF pathPos = QQuickPath::sequentialPointAt(prevData.painterPath, prevData.pathLength, prevData.attributePoints, prevData.prevBez, prevData.currentV); if (!prevData.anchorPoint.isNull()) pathPos -= prevData.anchorPoint; if (pathPos == data->target->pos()) { //only treat as interruption if we interrupted ourself diff --git a/src/quick/items/qquickanimation_p.h b/src/quick/items/qquickitemanimation_p.h index 0823ba0cdd..a3a7e77871 100644 --- a/src/quick/items/qquickanimation_p.h +++ b/src/quick/items/qquickitemanimation_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 @@ -39,19 +39,19 @@ ** ****************************************************************************/ -#ifndef QQUICKANIMATION_H -#define QQUICKANIMATION_H +#ifndef QQUICKITEMANIMATION_H +#define QQUICKITEMANIMATION_H #include "qquickitem.h" -#include <QtQuick/private/qdeclarativeanimation_p.h> +#include <QtQuick/private/qquickanimation_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickParentAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickParentAnimation : public QDeclarativeAnimationGroup +class Q_QUICK_PRIVATE_EXPORT QQuickParentAnimation : public QQuickAnimationGroup { Q_OBJECT Q_DECLARE_PRIVATE(QQuickParentAnimation) @@ -79,18 +79,18 @@ Q_SIGNALS: void viaChanged(); protected: - virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions, - QDeclarativeProperties &modified, + virtual QAbstractAnimationJob* transition(QQuickStateActions &actions, + QQmlProperties &modified, TransitionDirection direction, QObject *defaultTarget = 0); }; class QQuickAnchorAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickAnchorAnimation : public QDeclarativeAbstractAnimation +class Q_QUICK_PRIVATE_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnchorAnimation) - Q_PROPERTY(QDeclarativeListProperty<QQuickItem> targets READ targets) + Q_PROPERTY(QQmlListProperty<QQuickItem> targets READ targets) Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) @@ -98,7 +98,7 @@ public: QQuickAnchorAnimation(QObject *parent=0); virtual ~QQuickAnchorAnimation(); - QDeclarativeListProperty<QQuickItem> targets(); + QQmlListProperty<QQuickItem> targets(); int duration() const; void setDuration(int); @@ -111,23 +111,23 @@ Q_SIGNALS: void easingChanged(const QEasingCurve&); protected: - virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions, - QDeclarativeProperties &modified, + virtual QAbstractAnimationJob* transition(QQuickStateActions &actions, + QQmlProperties &modified, TransitionDirection direction, QObject *defaultTarget = 0); }; class QQuickItem; -class QDeclarativePath; +class QQuickPath; class QQuickPathAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPathAnimation : public QDeclarativeAbstractAnimation +class Q_QUICK_PRIVATE_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPathAnimation) Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) - Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged) + Q_PROPERTY(QQuickPath *path READ path WRITE setPath NOTIFY pathChanged) Q_PROPERTY(QQuickItem *target READ target WRITE setTargetObject NOTIFY targetChanged) Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged) Q_PROPERTY(QPointF anchorPoint READ anchorPoint WRITE setAnchorPoint NOTIFY anchorPointChanged) @@ -154,8 +154,8 @@ public: QEasingCurve easing() const; void setEasing(const QEasingCurve &); - QDeclarativePath *path() const; - void setPath(QDeclarativePath *); + QQuickPath *path() const; + void setPath(QQuickPath *); QQuickItem *target() const; void setTargetObject(QQuickItem *); @@ -176,8 +176,8 @@ public: void setEndRotation(qreal); protected: - virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions, - QDeclarativeProperties &modified, + virtual QAbstractAnimationJob* transition(QQuickStateActions &actions, + QQmlProperties &modified, TransitionDirection direction, QObject *defaultTarget = 0); Q_SIGNALS: @@ -200,4 +200,4 @@ QML_DECLARE_TYPE(QQuickPathAnimation) QT_END_HEADER -#endif // QQUICKANIMATION_H +#endif // QQUICKITEMANIMATION_H diff --git a/src/quick/items/qquickanimation_p_p.h b/src/quick/items/qquickitemanimation_p_p.h index c34b5ab963..f61b255218 100644 --- a/src/quick/items/qquickanimation_p_p.h +++ b/src/quick/items/qquickitemanimation_p_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 @@ -53,19 +53,19 @@ // We mean it. // -#include "qquickanimation_p.h" +#include "qquickitemanimation_p.h" -#include <private/qdeclarativepath_p.h> -#include <private/qdeclarativeanimation_p_p.h> +#include <private/qquickpath_p.h> +#include <private/qquickanimation_p_p.h> QT_BEGIN_NAMESPACE -class QQuickParentAnimationPrivate : public QDeclarativeAnimationGroupPrivate +class QQuickParentAnimationPrivate : public QQuickAnimationGroupPrivate { Q_DECLARE_PUBLIC(QQuickParentAnimation) public: QQuickParentAnimationPrivate() - : QDeclarativeAnimationGroupPrivate(), target(0), newParent(0), via(0) {} + : QQuickAnimationGroupPrivate(), target(0), newParent(0), via(0) {} QQuickItem *target; QQuickItem *newParent; @@ -74,7 +74,7 @@ public: QPointF computeTransformOrigin(QQuickItem::TransformOrigin origin, qreal width, qreal height) const; }; -class QQuickAnchorAnimationPrivate : public QDeclarativeAbstractAnimationPrivate +class QQuickAnchorAnimationPrivate : public QQuickAbstractAnimationPrivate { Q_DECLARE_PUBLIC(QQuickAnchorAnimation) public: @@ -86,7 +86,7 @@ public: QList<QQuickItem*> targets; }; -class QQuickPathAnimationUpdater : public QDeclarativeBulkValueUpdater +class QQuickPathAnimationUpdater : public QQuickBulkValueUpdater { public: QQuickPathAnimationUpdater() : path(0), target(0), reverse(false), @@ -97,12 +97,12 @@ public: void setValue(qreal v); - QDeclarativePath *path; + QQuickPath *path; QPainterPath painterPath; - QDeclarativeCachedBezier prevBez; + QQuickCachedBezier prevBez; qreal pathLength; - QList<QDeclarativePath::AttributePoint> attributePoints; + QList<QQuickPath::AttributePoint> attributePoints; QQuickItem *target; bool reverse; @@ -112,18 +112,18 @@ public: qreal toX; qreal toY; qreal currentV; - QDeclarativeNullableValue<qreal> interruptStart; + QQmlNullableValue<qreal> interruptStart; //TODO: bundle below into common struct QQuickPathAnimation::Orientation orientation; QPointF anchorPoint; qreal entryInterval; qreal exitInterval; - QDeclarativeNullableValue<qreal> endRotation; - QDeclarativeNullableValue<qreal> startRotation; + QQmlNullableValue<qreal> endRotation; + QQmlNullableValue<qreal> startRotation; }; class QQuickPathAnimationPrivate; -class QQuickPathAnimationAnimator : public QDeclarativeBulkValueAnimator +class QQuickPathAnimationAnimator : public QQuickBulkValueAnimator { public: QQuickPathAnimationAnimator(QQuickPathAnimationPrivate * = 0); @@ -136,20 +136,20 @@ private: QQuickPathAnimationPrivate *animationTemplate; }; -class QQuickPathAnimationPrivate : public QDeclarativeAbstractAnimationPrivate +class QQuickPathAnimationPrivate : public QQuickAbstractAnimationPrivate { Q_DECLARE_PUBLIC(QQuickPathAnimation) public: QQuickPathAnimationPrivate() : path(0), target(0), orientation(QQuickPathAnimation::Fixed), entryDuration(0), exitDuration(0), duration(250) {} - QDeclarativePath *path; + QQuickPath *path; QQuickItem *target; QQuickPathAnimation::Orientation orientation; QPointF anchorPoint; qreal entryDuration; qreal exitDuration; - QDeclarativeNullableValue<qreal> endRotation; + QQmlNullableValue<qreal> endRotation; int duration; QEasingCurve easingCurve; QHash<QQuickItem*, QQuickPathAnimationAnimator* > activeAnimations; diff --git a/src/quick/items/qquickitemchangelistener_p.h b/src/quick/items/qquickitemchangelistener_p.h index d59b5b8856..3a5c25f5f5 100644 --- a/src/quick/items/qquickitemchangelistener_p.h +++ b/src/quick/items/qquickitemchangelistener_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/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index f50237427b..3d23f7b03a 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.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 @@ -62,8 +62,8 @@ #include "qquickgridview_p.h" #include "qquickpathview_p.h" #include "qquickitemviewtransition_p.h" -#include <private/qdeclarativepath_p.h> -#include <private/qdeclarativepathinterpolator_p.h> +#include <private/qquickpath_p.h> +#include <private/qquickpathinterpolator_p.h> #include "qquickpositioners_p.h" #include "qquickrepeater_p.h" #include "qquickloader_p.h" @@ -71,7 +71,7 @@ #include "qquickflipable_p.h" #include "qquicktranslate_p.h" #include "qquickstateoperations_p.h" -#include "qquickanimation_p.h" +#include "qquickitemanimation_p.h" #include <private/qquickshadereffect_p.h> #include <QtQuick/private/qquickshadereffectsource_p.h> //#include <private/qquickpincharea_p.h> @@ -83,21 +83,21 @@ #include "qquickdrag_p.h" #include "qquickdroparea_p.h" #include "qquickmultipointtoucharea_p.h" -#include <private/qdeclarativemetatype_p.h> +#include <private/qqmlmetatype_p.h> #include <QtQuick/private/qquickaccessibleattached_p.h> -static QDeclarativePrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject *parent) +static QQmlPrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject *parent) { QQuickItem *item = qobject_cast<QQuickItem *>(obj); if (!item) - return QDeclarativePrivate::IncompatibleObject; + return QQmlPrivate::IncompatibleObject; QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent); if (!parentItem) - return QDeclarativePrivate::IncompatibleParent; + return QQmlPrivate::IncompatibleParent; item->setParentItem(parentItem); - return QDeclarativePrivate::Parented; + return QQmlPrivate::Parented; } static bool compareQQuickAnchorLines(const void *p1, const void *p2) @@ -109,8 +109,8 @@ static bool compareQQuickAnchorLines(const void *p1, const void *p2) static void qt_quickitems_defineModule(const char *uri, int major, int minor) { - QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent }; - QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent); + QQmlPrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent }; + QQmlPrivate::qmlregister(QQmlPrivate::AutoParentRegistration, &autoparent); QQuickItemPrivate::registerAccessorProperties(); #ifdef QT_NO_MOVIE @@ -123,7 +123,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickFlickable>(uri,major,minor,"Flickable"); qmlRegisterType<QQuickFlipable>(uri,major,minor,"Flipable"); qmlRegisterType<QQuickFlow>(uri,major,minor,"Flow"); -// qmlRegisterType<QDeclarativeFocusPanel>(uri,major,minor,"FocusPanel"); +// qmlRegisterType<QQuickFocusPanel>(uri,major,minor,"FocusPanel"); qmlRegisterType<QQuickFocusScope>(uri,major,minor,"FocusScope"); qmlRegisterType<QQuickGradient>(uri,major,minor,"Gradient"); qmlRegisterType<QQuickGradientStop>(uri,major,minor,"GradientStop"); @@ -134,15 +134,15 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickListView>(uri,major,minor,"ListView"); qmlRegisterType<QQuickLoader>(uri,major,minor,"Loader"); qmlRegisterType<QQuickMouseArea>(uri,major,minor,"MouseArea"); - qmlRegisterType<QDeclarativePath>(uri,major,minor,"Path"); - qmlRegisterType<QDeclarativePathAttribute>(uri,major,minor,"PathAttribute"); - qmlRegisterType<QDeclarativePathCubic>(uri,major,minor,"PathCubic"); - qmlRegisterType<QDeclarativePathLine>(uri,major,minor,"PathLine"); - qmlRegisterType<QDeclarativePathPercent>(uri,major,minor,"PathPercent"); - qmlRegisterType<QDeclarativePathQuad>(uri,major,minor,"PathQuad"); - qmlRegisterType<QDeclarativePathCatmullRomCurve>("QtQuick",2,0,"PathCurve"); - qmlRegisterType<QDeclarativePathArc>("QtQuick",2,0,"PathArc"); - qmlRegisterType<QDeclarativePathSvg>("QtQuick",2,0,"PathSvg"); + qmlRegisterType<QQuickPath>(uri,major,minor,"Path"); + qmlRegisterType<QQuickPathAttribute>(uri,major,minor,"PathAttribute"); + qmlRegisterType<QQuickPathCubic>(uri,major,minor,"PathCubic"); + qmlRegisterType<QQuickPathLine>(uri,major,minor,"PathLine"); + qmlRegisterType<QQuickPathPercent>(uri,major,minor,"PathPercent"); + qmlRegisterType<QQuickPathQuad>(uri,major,minor,"PathQuad"); + qmlRegisterType<QQuickPathCatmullRomCurve>("QtQuick",2,0,"PathCurve"); + qmlRegisterType<QQuickPathArc>("QtQuick",2,0,"PathArc"); + qmlRegisterType<QQuickPathSvg>("QtQuick",2,0,"PathSvg"); qmlRegisterType<QQuickPathView>(uri,major,minor,"PathView"); qmlRegisterUncreatableType<QQuickBasePositioner>(uri,major,minor,"Positioner", QStringLiteral("Positioner is an abstract type that is only available as an attached property.")); @@ -170,8 +170,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickKeyEvent>(); qmlRegisterType<QQuickMouseEvent>(); qmlRegisterType<QQuickTransform>(); - qmlRegisterType<QDeclarativePathElement>(); - qmlRegisterType<QDeclarativeCurve>(); + qmlRegisterType<QQuickPathElement>(); + qmlRegisterType<QQuickCurve>(); qmlRegisterType<QQuickScaleGrid>(); qmlRegisterType<QQuickTextLine>(); #ifndef QT_NO_VALIDATOR @@ -181,7 +181,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickPen>(); qmlRegisterType<QQuickFlickableVisibleArea>(); qRegisterMetaType<QQuickAnchorLine>("QQuickAnchorLine"); - QDeclarativeMetaType::setQQuickAnchorLineCompareFunction(compareQQuickAnchorLines); + QQmlMetaType::setQQuickAnchorLineCompareFunction(compareQQuickAnchorLines); qmlRegisterUncreatableType<QQuickKeyNavigationAttached>(uri,major,minor,"KeyNavigation",QQuickKeyNavigationAttached::tr("KeyNavigation is only available via attached properties")); qmlRegisterUncreatableType<QQuickKeysAttached>(uri,major,minor,"Keys",QQuickKeysAttached::tr("Keys is only available via attached properties")); @@ -212,7 +212,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickAnchorAnimation>(uri, major, minor,"AnchorAnimation"); qmlRegisterType<QQuickParentAnimation>(uri, major, minor,"ParentAnimation"); qmlRegisterType<QQuickPathAnimation>("QtQuick",2,0,"PathAnimation"); - qmlRegisterType<QDeclarativePathInterpolator>("QtQuick",2,0,"PathInterpolator"); + qmlRegisterType<QQuickPathInterpolator>("QtQuick",2,0,"PathInterpolator"); qmlRegisterType<QQuickDropArea>("QtQuick", 2, 0, "DropArea"); qmlRegisterType<QQuickDropEvent>(); diff --git a/src/quick/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h index cc51771a0b..1d6844ca5e 100644 --- a/src/quick/items/qquickitemsmodule_p.h +++ b/src/quick/items/qquickitemsmodule_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 @@ -42,7 +42,7 @@ #ifndef QQUICKITEMSMODULE_P_H #define QQUICKITEMSMODULE_P_H -#include <qdeclarative.h> +#include <qqml.h> QT_BEGIN_HEADER diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 5d58cbf4f5..516cf0c1bb 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.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 @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickitemview_p_p.h" -#include <QtQuick/private/qdeclarativetransition_p.h> +#include <QtQuick/private/qquicktransition_p.h> QT_BEGIN_NAMESPACE @@ -71,14 +71,14 @@ bool QQuickItemViewChangeSet::hasPendingChanges() const return !pendingChanges.isEmpty(); } -void QQuickItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSet) +void QQuickItemViewChangeSet::applyChanges(const QQuickChangeSet &changeSet) { pendingChanges.apply(changeSet); int moveId = -1; int moveOffset = 0; - foreach (const QDeclarativeChangeSet::Remove &r, changeSet.removes()) { + foreach (const QQuickChangeSet::Remove &r, changeSet.removes()) { itemCount -= r.count; if (moveId == -1 && newCurrentIndex >= r.index + r.count) { newCurrentIndex -= r.count; @@ -97,7 +97,7 @@ void QQuickItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSe currentChanged = true; } } - foreach (const QDeclarativeChangeSet::Insert &i, changeSet.inserts()) { + foreach (const QQuickChangeSet::Insert &i, changeSet.inserts()) { if (moveId == -1) { if (itemCount && newCurrentIndex >= i.index) { newCurrentIndex += i.count; @@ -178,8 +178,8 @@ void QQuickItemView::setModel(const QVariant &model) if (d->modelVariant == model) return; if (d->model) { - disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)), - this, SLOT(modelUpdated(QDeclarativeChangeSet,bool))); + disconnect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)), + this, SLOT(modelUpdated(QQuickChangeSet,bool))); disconnect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*))); disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*))); disconnect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*))); @@ -241,14 +241,14 @@ void QQuickItemView::setModel(const QVariant &model) polish(); } } - connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)), - this, SLOT(modelUpdated(QDeclarativeChangeSet,bool))); + connect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)), + this, SLOT(modelUpdated(QQuickChangeSet,bool))); emit countChanged(); } emit modelChanged(); } -QDeclarativeComponent *QQuickItemView::delegate() const +QQmlComponent *QQuickItemView::delegate() const { Q_D(const QQuickItemView); if (d->model) { @@ -259,7 +259,7 @@ QDeclarativeComponent *QQuickItemView::delegate() const return 0; } -void QQuickItemView::setDelegate(QDeclarativeComponent *delegate) +void QQuickItemView::setDelegate(QQmlComponent *delegate) { Q_D(QQuickItemView); if (delegate == this->delegate()) @@ -394,7 +394,7 @@ Qt::LayoutDirection QQuickItemView::effectiveLayoutDirection() const } -QDeclarativeComponent *QQuickItemView::header() const +QQmlComponent *QQuickItemView::header() const { Q_D(const QQuickItemView); return d->headerComponent; @@ -407,7 +407,7 @@ QQuickItem *QQuickItemView::headerItem() const return d->header ? d->header->item : 0; } -void QQuickItemView::setHeader(QDeclarativeComponent *headerComponent) +void QQuickItemView::setHeader(QQmlComponent *headerComponent) { Q_D(QQuickItemView); if (d->headerComponent != headerComponent) { @@ -430,7 +430,7 @@ void QQuickItemView::setHeader(QDeclarativeComponent *headerComponent) } } -QDeclarativeComponent *QQuickItemView::footer() const +QQmlComponent *QQuickItemView::footer() const { Q_D(const QQuickItemView); return d->footerComponent; @@ -443,7 +443,7 @@ QQuickItem *QQuickItemView::footerItem() const return d->footer ? d->footer->item : 0; } -void QQuickItemView::setFooter(QDeclarativeComponent *footerComponent) +void QQuickItemView::setFooter(QQmlComponent *footerComponent) { Q_D(QQuickItemView); if (d->footerComponent != footerComponent) { @@ -463,14 +463,14 @@ void QQuickItemView::setFooter(QDeclarativeComponent *footerComponent) } } -QDeclarativeComponent *QQuickItemView::highlight() const +QQmlComponent *QQuickItemView::highlight() const { Q_D(const QQuickItemView); const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges(); return d->highlightComponent; } -void QQuickItemView::setHighlight(QDeclarativeComponent *highlightComponent) +void QQuickItemView::setHighlight(QQmlComponent *highlightComponent) { Q_D(QQuickItemView); if (highlightComponent != d->highlightComponent) { @@ -593,13 +593,13 @@ void QQuickItemView::setHighlightMoveDuration(int duration) } } -QDeclarativeTransition *QQuickItemView::populateTransition() const +QQuickTransition *QQuickItemView::populateTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->populateTransition : 0; } -void QQuickItemView::setPopulateTransition(QDeclarativeTransition *transition) +void QQuickItemView::setPopulateTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -609,13 +609,13 @@ void QQuickItemView::setPopulateTransition(QDeclarativeTransition *transition) } } -QDeclarativeTransition *QQuickItemView::addTransition() const +QQuickTransition *QQuickItemView::addTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->addTransition : 0; } -void QQuickItemView::setAddTransition(QDeclarativeTransition *transition) +void QQuickItemView::setAddTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -625,13 +625,13 @@ void QQuickItemView::setAddTransition(QDeclarativeTransition *transition) } } -QDeclarativeTransition *QQuickItemView::addDisplacedTransition() const +QQuickTransition *QQuickItemView::addDisplacedTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->addDisplacedTransition : 0; } -void QQuickItemView::setAddDisplacedTransition(QDeclarativeTransition *transition) +void QQuickItemView::setAddDisplacedTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -641,13 +641,13 @@ void QQuickItemView::setAddDisplacedTransition(QDeclarativeTransition *transitio } } -QDeclarativeTransition *QQuickItemView::moveTransition() const +QQuickTransition *QQuickItemView::moveTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->moveTransition : 0; } -void QQuickItemView::setMoveTransition(QDeclarativeTransition *transition) +void QQuickItemView::setMoveTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -657,13 +657,13 @@ void QQuickItemView::setMoveTransition(QDeclarativeTransition *transition) } } -QDeclarativeTransition *QQuickItemView::moveDisplacedTransition() const +QQuickTransition *QQuickItemView::moveDisplacedTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->moveDisplacedTransition : 0; } -void QQuickItemView::setMoveDisplacedTransition(QDeclarativeTransition *transition) +void QQuickItemView::setMoveDisplacedTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -673,13 +673,13 @@ void QQuickItemView::setMoveDisplacedTransition(QDeclarativeTransition *transiti } } -QDeclarativeTransition *QQuickItemView::removeTransition() const +QQuickTransition *QQuickItemView::removeTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->removeTransition : 0; } -void QQuickItemView::setRemoveTransition(QDeclarativeTransition *transition) +void QQuickItemView::setRemoveTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -689,13 +689,13 @@ void QQuickItemView::setRemoveTransition(QDeclarativeTransition *transition) } } -QDeclarativeTransition *QQuickItemView::removeDisplacedTransition() const +QQuickTransition *QQuickItemView::removeDisplacedTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->removeDisplacedTransition : 0; } -void QQuickItemView::setRemoveDisplacedTransition(QDeclarativeTransition *transition) +void QQuickItemView::setRemoveDisplacedTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -705,13 +705,13 @@ void QQuickItemView::setRemoveDisplacedTransition(QDeclarativeTransition *transi } } -QDeclarativeTransition *QQuickItemView::displacedTransition() const +QQuickTransition *QQuickItemView::displacedTransition() const { Q_D(const QQuickItemView); return d->transitioner ? d->transitioner->displacedTransition : 0; } -void QQuickItemView::setDisplacedTransition(QDeclarativeTransition *transition) +void QQuickItemView::setDisplacedTransition(QQuickTransition *transition) { Q_D(QQuickItemView); d->createTransitioner(); @@ -855,7 +855,7 @@ void QQuickItemViewPrivate::applyPendingChanges() layout(); } -int QQuickItemViewPrivate::findMoveKeyIndex(QDeclarativeChangeSet::MoveKey key, const QVector<QDeclarativeChangeSet::Remove> &changes) const +int QQuickItemViewPrivate::findMoveKeyIndex(QQuickChangeSet::MoveKey key, const QVector<QQuickChangeSet::Remove> &changes) const { for (int i=0; i<changes.count(); i++) { for (int j=changes[i].index; j<changes[i].index + changes[i].count; j++) { @@ -954,7 +954,7 @@ void QQuickItemView::destroyRemoved() polish(); } -void QQuickItemView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) +void QQuickItemView::modelUpdated(const QQuickChangeSet &changeSet, bool reset) { Q_D(QQuickItemView); if (reset) { @@ -1701,7 +1701,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult || !currentChanges.pendingChanges.inserts().isEmpty(); FxViewItem *prevFirstVisible = firstVisibleItem(); - QDeclarativeNullableValue<qreal> prevViewPos; + QQmlNullableValue<qreal> prevViewPos; int prevFirstVisibleIndex = -1; if (prevFirstVisible) { prevViewPos = prevFirstVisible->position(); @@ -1712,8 +1712,8 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult totalInsertionResult->visiblePos = prevViewPos; totalRemovalResult->visiblePos = prevViewPos; - const QVector<QDeclarativeChangeSet::Remove> &removals = currentChanges.pendingChanges.removes(); - const QVector<QDeclarativeChangeSet::Insert> &insertions = currentChanges.pendingChanges.inserts(); + const QVector<QQuickChangeSet::Remove> &removals = currentChanges.pendingChanges.removes(); + const QVector<QQuickChangeSet::Insert> &insertions = currentChanges.pendingChanges.inserts(); ChangeResult insertionResult(prevViewPos); ChangeResult removalResult(prevViewPos); @@ -1732,7 +1732,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult } } if (runDelayedRemoveTransition) { - QDeclarativeChangeSet::Remove removal; + QQuickChangeSet::Remove removal; for (QList<FxViewItem*>::Iterator it = visibleItems.begin(); it != visibleItems.end();) { FxViewItem *item = *it; if (item->index == -1 && !item->attached->delayRemove()) { @@ -1800,7 +1800,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult // Whatever removed/moved items remain are no longer visible items. prepareRemoveTransitions(¤tChanges.removedItems); - for (QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *>::Iterator it = currentChanges.removedItems.begin(); + for (QHash<QQuickChangeSet::MoveKey, FxViewItem *>::Iterator it = currentChanges.removedItems.begin(); it != currentChanges.removedItems.end(); ++it) { releaseItem(it.value()); } @@ -1830,7 +1830,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult return visibleAffected; } -bool QQuickItemViewPrivate::applyRemovalChange(const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult, int *removedCount) +bool QQuickItemViewPrivate::applyRemovalChange(const QQuickChangeSet::Remove &removal, ChangeResult *removeResult, int *removedCount) { Q_Q(QQuickItemView); bool visibleAffected = false; @@ -1882,7 +1882,7 @@ bool QQuickItemViewPrivate::applyRemovalChange(const QDeclarativeChangeSet::Remo return visibleAffected; } -void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult) +void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QQuickChangeSet::Remove &removal, ChangeResult *removeResult) { if (removeResult->visiblePos.isValid()) { if (item->position() < removeResult->visiblePos) @@ -1896,7 +1896,7 @@ void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QDeclarativeChang transitioner->transitionNextReposition(item, QQuickItemViewTransitioner::MoveTransition, true); } else { // track item so it is released later - currentChanges.removedItems.insertMulti(QDeclarativeChangeSet::MoveKey(), item); + currentChanges.removedItems.insertMulti(QQuickChangeSet::MoveKey(), item); } if (!removeResult->changedFirstItem && item == *visibleItems.constBegin()) removeResult->changedFirstItem = true; @@ -1908,7 +1908,7 @@ void QQuickItemViewPrivate::repositionFirstItem(FxViewItem *prevVisibleItemsFirs ChangeResult *insertionResult, ChangeResult *removalResult) { - const QDeclarativeNullableValue<qreal> prevViewPos = insertionResult->visiblePos; + const QQmlNullableValue<qreal> prevViewPos = insertionResult->visiblePos; // reposition visibleItems.first() correctly so that the content y doesn't jump if (visibleItems.count()) { @@ -1987,7 +1987,7 @@ void QQuickItemViewPrivate::prepareVisibleItemTransitions() } } -void QQuickItemViewPrivate::prepareRemoveTransitions(QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> *removedItems) +void QQuickItemViewPrivate::prepareRemoveTransitions(QHash<QQuickChangeSet::MoveKey, FxViewItem *> *removedItems) { if (!transitioner) return; @@ -1996,7 +1996,7 @@ void QQuickItemViewPrivate::prepareRemoveTransitions(QHash<QDeclarativeChangeSet transitioner->removeTransitionTargets.clear(); if (transitioner->canTransition(QQuickItemViewTransitioner::RemoveTransition, true)) { - for (QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *>::Iterator it = removedItems->begin(); + for (QHash<QQuickChangeSet::MoveKey, FxViewItem *>::Iterator it = removedItems->begin(); it != removedItems->end(); ) { bool isRemove = it.key().moveId < 0; if (isRemove) { @@ -2083,7 +2083,7 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, bool asynchronous) if (QQuickItem *item = model->item(modelIndex, asynchronous)) { item->setParentItem(q->contentItem()); - QDeclarative_setParent_noEvent(item, q->contentItem()); + QQml_setParent_noEvent(item, q->contentItem()); requestedIndex = -1; FxViewItem *viewItem = requestedItem; if (!viewItem) @@ -2130,7 +2130,7 @@ void QQuickItemView::initItem(int index, QQuickItem *item) if (d->requestedAsync) item->setVisible(false); item->setParentItem(contentItem()); - QDeclarative_setParent_noEvent(item, contentItem()); + QQml_setParent_noEvent(item, contentItem()); d->requestedItem = d->newViewItem(index, item); } } @@ -2165,18 +2165,18 @@ QQuickItem *QQuickItemViewPrivate::createHighlightItem() return createComponentItem(highlightComponent, true, true); } -QQuickItem *QQuickItemViewPrivate::createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault) +QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, bool receiveItemGeometryChanges, bool createDefault) { Q_Q(QQuickItemView); QQuickItem *item = 0; if (component) { - QDeclarativeContext *creationContext = component->creationContext(); - QDeclarativeContext *context = new QDeclarativeContext( + QQmlContext *creationContext = component->creationContext(); + QQmlContext *context = new QQmlContext( creationContext ? creationContext : qmlContext(q)); QObject *nobj = component->create(context); if (nobj) { - QDeclarative_setParent_noEvent(context, nobj); + QQml_setParent_noEvent(context, nobj); item = qobject_cast<QQuickItem *>(nobj); if (!item) delete nobj; @@ -2187,7 +2187,7 @@ QQuickItem *QQuickItemViewPrivate::createComponentItem(QDeclarativeComponent *co item = new QQuickItem; } if (item) { - QDeclarative_setParent_noEvent(item, q->contentItem()); + QQml_setParent_noEvent(item, q->contentItem()); item->setParentItem(q->contentItem()); if (receiveItemGeometryChanges) { QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index 69a3d4a0c8..f252fb58f1 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_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 @@ -48,9 +48,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) +QT_MODULE(Quick) -class QDeclarativeChangeSet; +class QQuickChangeSet; class QQuickItemViewPrivate; @@ -59,7 +59,7 @@ class Q_AUTOTEST_EXPORT QQuickItemView : public QQuickFlickable Q_OBJECT Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged) - Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) @@ -71,21 +71,21 @@ class Q_AUTOTEST_EXPORT QQuickItemView : public QQuickFlickable Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged) Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged) - Q_PROPERTY(QDeclarativeComponent *header READ header WRITE setHeader NOTIFY headerChanged) + Q_PROPERTY(QQmlComponent *header READ header WRITE setHeader NOTIFY headerChanged) Q_PROPERTY(QQuickItem *headerItem READ headerItem NOTIFY headerItemChanged) - Q_PROPERTY(QDeclarativeComponent *footer READ footer WRITE setFooter NOTIFY footerChanged) + Q_PROPERTY(QQmlComponent *footer READ footer WRITE setFooter NOTIFY footerChanged) Q_PROPERTY(QQuickItem *footerItem READ footerItem NOTIFY footerItemChanged) - Q_PROPERTY(QDeclarativeTransition *populate READ populateTransition WRITE setPopulateTransition NOTIFY populateTransitionChanged) - Q_PROPERTY(QDeclarativeTransition *add READ addTransition WRITE setAddTransition NOTIFY addTransitionChanged) - Q_PROPERTY(QDeclarativeTransition *addDisplaced READ addDisplacedTransition WRITE setAddDisplacedTransition NOTIFY addDisplacedTransitionChanged) - Q_PROPERTY(QDeclarativeTransition *move READ moveTransition WRITE setMoveTransition NOTIFY moveTransitionChanged) - Q_PROPERTY(QDeclarativeTransition *moveDisplaced READ moveDisplacedTransition WRITE setMoveDisplacedTransition NOTIFY moveDisplacedTransitionChanged) - Q_PROPERTY(QDeclarativeTransition *remove READ removeTransition WRITE setRemoveTransition NOTIFY removeTransitionChanged) - Q_PROPERTY(QDeclarativeTransition *removeDisplaced READ removeDisplacedTransition WRITE setRemoveDisplacedTransition NOTIFY removeDisplacedTransitionChanged) - Q_PROPERTY(QDeclarativeTransition *displaced READ displacedTransition WRITE setDisplacedTransition NOTIFY displacedTransitionChanged) + Q_PROPERTY(QQuickTransition *populate READ populateTransition WRITE setPopulateTransition NOTIFY populateTransitionChanged) + Q_PROPERTY(QQuickTransition *add READ addTransition WRITE setAddTransition NOTIFY addTransitionChanged) + Q_PROPERTY(QQuickTransition *addDisplaced READ addDisplacedTransition WRITE setAddDisplacedTransition NOTIFY addDisplacedTransitionChanged) + Q_PROPERTY(QQuickTransition *move READ moveTransition WRITE setMoveTransition NOTIFY moveTransitionChanged) + Q_PROPERTY(QQuickTransition *moveDisplaced READ moveDisplacedTransition WRITE setMoveDisplacedTransition NOTIFY moveDisplacedTransitionChanged) + Q_PROPERTY(QQuickTransition *remove READ removeTransition WRITE setRemoveTransition NOTIFY removeTransitionChanged) + Q_PROPERTY(QQuickTransition *removeDisplaced READ removeDisplacedTransition WRITE setRemoveDisplacedTransition NOTIFY removeDisplacedTransitionChanged) + Q_PROPERTY(QQuickTransition *displaced READ displacedTransition WRITE setDisplacedTransition NOTIFY displacedTransitionChanged) - Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged) + Q_PROPERTY(QQmlComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged) Q_PROPERTY(QQuickItem *highlightItem READ highlightItem NOTIFY highlightItemChanged) Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem NOTIFY highlightFollowsCurrentItemChanged) Q_PROPERTY(HighlightRangeMode highlightRangeMode READ highlightRangeMode WRITE setHighlightRangeMode NOTIFY highlightRangeModeChanged) @@ -103,8 +103,8 @@ public: QVariant model() const; void setModel(const QVariant &); - QDeclarativeComponent *delegate() const; - void setDelegate(QDeclarativeComponent *); + QQmlComponent *delegate() const; + void setDelegate(QQmlComponent *); int count() const; @@ -123,40 +123,40 @@ public: void setLayoutDirection(Qt::LayoutDirection); Qt::LayoutDirection effectiveLayoutDirection() const; - QDeclarativeComponent *footer() const; - void setFooter(QDeclarativeComponent *); + QQmlComponent *footer() const; + void setFooter(QQmlComponent *); QQuickItem *footerItem() const; - QDeclarativeComponent *header() const; - void setHeader(QDeclarativeComponent *); + QQmlComponent *header() const; + void setHeader(QQmlComponent *); QQuickItem *headerItem() const; - QDeclarativeTransition *populateTransition() const; - void setPopulateTransition(QDeclarativeTransition *transition); + QQuickTransition *populateTransition() const; + void setPopulateTransition(QQuickTransition *transition); - QDeclarativeTransition *addTransition() const; - void setAddTransition(QDeclarativeTransition *transition); + QQuickTransition *addTransition() const; + void setAddTransition(QQuickTransition *transition); - QDeclarativeTransition *addDisplacedTransition() const; - void setAddDisplacedTransition(QDeclarativeTransition *transition); + QQuickTransition *addDisplacedTransition() const; + void setAddDisplacedTransition(QQuickTransition *transition); - QDeclarativeTransition *moveTransition() const; - void setMoveTransition(QDeclarativeTransition *transition); + QQuickTransition *moveTransition() const; + void setMoveTransition(QQuickTransition *transition); - QDeclarativeTransition *moveDisplacedTransition() const; - void setMoveDisplacedTransition(QDeclarativeTransition *transition); + QQuickTransition *moveDisplacedTransition() const; + void setMoveDisplacedTransition(QQuickTransition *transition); - QDeclarativeTransition *removeTransition() const; - void setRemoveTransition(QDeclarativeTransition *transition); + QQuickTransition *removeTransition() const; + void setRemoveTransition(QQuickTransition *transition); - QDeclarativeTransition *removeDisplacedTransition() const; - void setRemoveDisplacedTransition(QDeclarativeTransition *transition); + QQuickTransition *removeDisplacedTransition() const; + void setRemoveDisplacedTransition(QQuickTransition *transition); - QDeclarativeTransition *displacedTransition() const; - void setDisplacedTransition(QDeclarativeTransition *transition); + QQuickTransition *displacedTransition() const; + void setDisplacedTransition(QQuickTransition *transition); - QDeclarativeComponent *highlight() const; - void setHighlight(QDeclarativeComponent *); + QQmlComponent *highlight() const; + void setHighlight(QQmlComponent *); QQuickItem *highlightItem() const; @@ -239,7 +239,7 @@ protected slots: void destroyRemoved(); void createdItem(int index, QQuickItem *item); void initItem(int index, QQuickItem *item); - void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset); + void modelUpdated(const QQuickChangeSet &changeSet, bool reset); void destroyingItem(QQuickItem *item); void animStopped(); void trackedPositionChanged(); diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 57860a43c6..80dacc0cb4 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_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 @@ -47,14 +47,14 @@ #include "qquickflickable_p_p.h" #include "qquickvisualdatamodel_p.h" #include "qquickvisualitemmodel_p.h" -#include <private/qdeclarativechangeset_p.h> +#include <private/qquickchangeset_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) +QT_MODULE(Quick) class FxViewItem : public QQuickViewItem @@ -86,12 +86,12 @@ public: void prepare(int currentIndex, int count); void reset(); - void applyChanges(const QDeclarativeChangeSet &changeSet); + void applyChanges(const QQuickChangeSet &changeSet); int itemCount; int newCurrentIndex; - QDeclarativeChangeSet pendingChanges; - QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> removedItems; + QQuickChangeSet pendingChanges; + QHash<QQuickChangeSet::MoveKey, FxViewItem *> removedItems; bool active : 1; bool currentChanged : 1; @@ -107,7 +107,7 @@ public: ~QQuickItemViewPrivate(); struct ChangeResult { - QDeclarativeNullableValue<qreal> visiblePos; + QQmlNullableValue<qreal> visiblePos; bool changedFirstItem; qreal sizeChangesBeforeVisiblePos; qreal sizeChangesAfterVisiblePos; @@ -119,7 +119,7 @@ public: sizeChangesBeforeVisiblePos(0), sizeChangesAfterVisiblePos(0), countChangeBeforeVisible(0), countChangeAfterVisibleItems(0) {} - ChangeResult(const QDeclarativeNullableValue<qreal> &p) + ChangeResult(const QQmlNullableValue<qreal> &p) : visiblePos(p), changedFirstItem(false), sizeChangesBeforeVisiblePos(0), sizeChangesAfterVisiblePos(0), countChangeBeforeVisible(0), countChangeAfterVisibleItems(0) {} @@ -173,7 +173,7 @@ public: virtual bool releaseItem(FxViewItem *item); QQuickItem *createHighlightItem(); - QQuickItem *createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault = false); + QQuickItem *createComponentItem(QQmlComponent *component, bool receiveItemGeometryChanges, bool createDefault = false); void updateCurrent(int modelIndex); void updateTrackedItem(); @@ -183,18 +183,18 @@ public: void positionViewAtIndex(int index, int mode); void applyPendingChanges(); bool applyModelChanges(ChangeResult *insertionResult, ChangeResult *removalResult); - bool applyRemovalChange(const QDeclarativeChangeSet::Remove &removal, ChangeResult *changeResult, int *removedCount); - void removeItem(FxViewItem *item, const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult); + bool applyRemovalChange(const QQuickChangeSet::Remove &removal, ChangeResult *changeResult, int *removedCount); + void removeItem(FxViewItem *item, const QQuickChangeSet::Remove &removal, ChangeResult *removeResult); void repositionFirstItem(FxViewItem *prevVisibleItemsFirst, qreal prevVisibleItemsFirstPos, FxViewItem *prevFirstVisible, ChangeResult *insertionResult, ChangeResult *removalResult); void createTransitioner(); void prepareVisibleItemTransitions(); - void prepareRemoveTransitions(QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> *removedItems); + void prepareRemoveTransitions(QHash<QQuickChangeSet::MoveKey, FxViewItem *> *removedItems); bool prepareNonVisibleItemTransition(FxViewItem *item, const QRectF &viewBounds); virtual void viewItemTransitionFinished(QQuickViewItem *item); - int findMoveKeyIndex(QDeclarativeChangeSet::MoveKey key, const QVector<QDeclarativeChangeSet::Remove> &changes) const; + int findMoveKeyIndex(QQuickChangeSet::MoveKey key, const QVector<QQuickChangeSet::Remove> &changes) const; void checkVisible() const; void showVisibleItems() const; @@ -206,7 +206,7 @@ public: hData.markExtentsDirty(); } - QDeclarativeGuard<QQuickVisualModel> model; + QQmlGuard<QQuickVisualModel> model; QVariant modelVariant; int itemCount; int buffer; @@ -225,22 +225,22 @@ public: FxViewItem *requestedItem; QQuickItemViewChangeSet currentChanges; - QDeclarativeComponent *highlightComponent; + QQmlComponent *highlightComponent; FxViewItem *highlight; int highlightRange; // enum value qreal highlightRangeStart; qreal highlightRangeEnd; int highlightMoveDuration; - QDeclarativeComponent *headerComponent; + QQmlComponent *headerComponent; FxViewItem *header; - QDeclarativeComponent *footerComponent; + QQmlComponent *footerComponent; FxViewItem *footer; struct MovedItem { FxViewItem *item; - QDeclarativeChangeSet::MoveKey moveKey; - MovedItem(FxViewItem *i, QDeclarativeChangeSet::MoveKey k) + QQuickChangeSet::MoveKey moveKey; + MovedItem(FxViewItem *i, QQuickChangeSet::MoveKey k) : item(i), moveKey(k) {} }; QQuickItemViewTransitioner *transitioner; @@ -300,7 +300,7 @@ protected: virtual void layoutVisibleItems(int fromModelIndex = 0) = 0; virtual void changedVisibleIndex(int newIndex) = 0; - virtual bool applyInsertionChange(const QDeclarativeChangeSet::Insert &insert, ChangeResult *changeResult, + virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *newItems, QList<MovedItem> *movingIntoView) = 0; virtual bool needsRefillForAddedOrRemovedIndex(int) const { return false; } diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 3febc9b113..54375bf4ff 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.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 "qquickitemviewtransition_p.h" #include <QtQuick/qquickitem.h> -#include <QtQuick/private/qdeclarativetransition_p.h> +#include <QtQuick/private/qquicktransition_p.h> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ static QList<int> qquickitemviewtransition_emptyIndexes = QList<int>(); static QList<QObject *> qquickitemviewtransition_emptyTargets = QList<QObject *>(); -class QQuickItemViewTransitionJob : public QDeclarativeTransitionManager +class QQuickItemViewTransitionJob : public QQuickTransitionManager { public: QQuickItemViewTransitionJob(); @@ -95,7 +95,7 @@ void QQuickItemViewTransitionJob::startTransition(QQuickViewItem *item, QQuickIt return; } - QDeclarativeTransition *trans = transitioner->transitionObject(type, isTargetItem); + QQuickTransition *trans = transitioner->transitionObject(type, isTargetItem); if (!trans) { qWarning("QQuickItemView: invalid view transition!"); return; @@ -122,17 +122,17 @@ void QQuickItemViewTransitionJob::startTransition(QQuickViewItem *item, QQuickIt emit attached->targetItemsChanged(); } - QDeclarativeStateOperation::ActionList actions; - actions << QDeclarativeAction(item->item, QLatin1String("x"), QVariant(to.x())); - actions << QDeclarativeAction(item->item, QLatin1String("y"), QVariant(to.y())); + QQuickStateOperation::ActionList actions; + actions << QQuickAction(item->item, QLatin1String("x"), QVariant(to.x())); + actions << QQuickAction(item->item, QLatin1String("y"), QVariant(to.y())); m_transitioner->runningJobs << this; - QDeclarativeTransitionManager::transition(actions, trans, item->item); + QQuickTransitionManager::transition(actions, trans, item->item); } void QQuickItemViewTransitionJob::finished() { - QDeclarativeTransitionManager::finished(); + QQuickTransitionManager::finished(); if (m_transitioner) m_transitioner->finishedTransition(this, m_item); @@ -218,7 +218,7 @@ void QQuickItemViewTransitioner::transitionNextReposition(QQuickViewItem *item, } } -QDeclarativeTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) +QQuickTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) { if (type == QQuickItemViewTransitioner::NoTransition) return 0; @@ -226,7 +226,7 @@ QDeclarativeTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemV if (type == PopulateTransition) asTarget = true; // no separate displaced transition - QDeclarativeTransition *trans = 0; + QQuickTransition *trans = 0; switch (type) { case NoTransition: break; @@ -863,9 +863,9 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) \sa QtQuick2::ViewTransition::targetIndexes */ -QDeclarativeListProperty<QObject> QQuickViewTransitionAttached::targetItems() +QQmlListProperty<QObject> QQuickViewTransitionAttached::targetItems() { - return QDeclarativeListProperty<QObject>(this, m_targetItems); + return QQmlListProperty<QObject>(this, m_targetItems); } QQuickViewTransitionAttached *QQuickViewTransitionAttached::qmlAttachedProperties(QObject *obj) diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index 57ea85bae6..3fb43d6b96 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_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 @@ -42,13 +42,13 @@ #ifndef QQUICKITEMVIEWTRANSITION_P_P_H #define QQUICKITEMVIEWTRANSITION_P_P_H -#include <private/qdeclarativetransitionmanager_p_p.h> +#include <private/qquicktransitionmanager_p_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) +QT_MODULE(Quick) class QQuickItem; class QQuickViewItem; @@ -82,7 +82,7 @@ public: bool canTransition(QQuickItemViewTransitioner::TransitionType type, bool asTarget) const; void transitionNextReposition(QQuickViewItem *item, QQuickItemViewTransitioner::TransitionType type, bool isTarget); - QDeclarativeTransition *transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget); + QQuickTransition *transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget); const QList<int> &targetIndexes(QQuickItemViewTransitioner::TransitionType type) const; const QList<QObject *> &targetItems(QQuickItemViewTransitioner::TransitionType type) const; @@ -98,14 +98,14 @@ public: QList<QObject *> moveTransitionTargets; QList<QObject *> removeTransitionTargets; - QDeclarativeTransition *populateTransition; - QDeclarativeTransition *addTransition; - QDeclarativeTransition *addDisplacedTransition; - QDeclarativeTransition *moveTransition; - QDeclarativeTransition *moveDisplacedTransition; - QDeclarativeTransition *removeTransition; - QDeclarativeTransition *removeDisplacedTransition; - QDeclarativeTransition *displacedTransition; + QQuickTransition *populateTransition; + QQuickTransition *addTransition; + QQuickTransition *addDisplacedTransition; + QQuickTransition *moveTransition; + QQuickTransition *moveDisplacedTransition; + QQuickTransition *removeTransition; + QQuickTransition *removeDisplacedTransition; + QQuickTransition *displacedTransition; private: friend class QQuickItemViewTransitionJob; @@ -167,7 +167,7 @@ class QQuickViewTransitionAttached : public QObject Q_PROPERTY(QPointF destination READ destination NOTIFY destinationChanged) Q_PROPERTY(QList<int> targetIndexes READ targetIndexes NOTIFY targetIndexesChanged) - Q_PROPERTY(QDeclarativeListProperty<QObject> targetItems READ targetItems NOTIFY targetItemsChanged) + Q_PROPERTY(QQmlListProperty<QObject> targetItems READ targetItems NOTIFY targetItemsChanged) public: QQuickViewTransitionAttached(QObject *parent); @@ -177,7 +177,7 @@ public: QPointF destination() const { return m_destination; } QList<int> targetIndexes() const { return m_targetIndexes; } - QDeclarativeListProperty<QObject> targetItems(); + QQmlListProperty<QObject> targetItems(); static QQuickViewTransitionAttached *qmlAttachedProperties(QObject *); diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index 876859eeb1..5e9a685cf5 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.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 @@ -43,14 +43,14 @@ #include "qquickitemview_p_p.h" #include "qquickvisualitemmodel_p.h" -#include <QtDeclarative/qdeclarativeexpression.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlexpression.h> +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlinfo.h> #include <QtGui/qevent.h> #include <QtCore/qmath.h> #include <QtCore/qcoreapplication.h> -#include <private/qdeclarativesmoothedanimation_p_p.h> +#include <private/qquicksmoothedanimation_p_p.h> #include <private/qlistmodelinterface_p.h> #include "qplatformdefs.h" @@ -106,7 +106,7 @@ public: virtual void setPosition(qreal pos); virtual void layoutVisibleItems(int fromModelIndex = 0); - virtual bool applyInsertionChange(const QDeclarativeChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView); + virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView); virtual void translateAndTransitionItemsAfter(int afterIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult); virtual void updateSections(); @@ -132,7 +132,7 @@ public: virtual void fixupPosition(); virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent); virtual void flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize, - QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity); + QQuickTimeLineCallback::Callback fixupCallback, qreal velocity); QQuickListView::Orientation orient; qreal visiblePos; @@ -205,7 +205,7 @@ void QQuickViewSection::setCriteria(QQuickViewSection::SectionCriteria criteria) } } -void QQuickViewSection::setDelegate(QDeclarativeComponent *delegate) +void QQuickViewSection::setDelegate(QQmlComponent *delegate) { if (delegate != m_delegate) { m_delegate = delegate; @@ -844,7 +844,7 @@ void QQuickListViewPrivate::createHighlight() } const QLatin1String posProp(orient == QQuickListView::Vertical ? "y" : "x"); highlightPosAnimator = new QSmoothedAnimation; - highlightPosAnimator->target = QDeclarativeProperty(item, posProp); + highlightPosAnimator->target = QQmlProperty(item, posProp); highlightPosAnimator->velocity = highlightMoveSpeed; highlightPosAnimator->userDuration = highlightMoveDuration; @@ -852,7 +852,7 @@ void QQuickListViewPrivate::createHighlight() highlightSizeAnimator = new QSmoothedAnimation; highlightSizeAnimator->velocity = highlightResizeSpeed; highlightSizeAnimator->userDuration = highlightResizeDuration; - highlightSizeAnimator->target = QDeclarativeProperty(item, sizeProp); + highlightSizeAnimator->target = QQmlProperty(item, sizeProp); highlight = newHighlight; changed = true; @@ -907,22 +907,22 @@ QQuickItem * QQuickListViewPrivate::getSectionItem(const QString §ion) sectionItem = sectionCache[i]; sectionCache[i] = 0; sectionItem->setVisible(true); - QDeclarativeContext *context = QDeclarativeEngine::contextForObject(sectionItem)->parentContext(); + QQmlContext *context = QQmlEngine::contextForObject(sectionItem)->parentContext(); context->setContextProperty(QLatin1String("section"), section); } else { - QDeclarativeContext *creationContext = sectionCriteria->delegate()->creationContext(); - QDeclarativeContext *context = new QDeclarativeContext( + QQmlContext *creationContext = sectionCriteria->delegate()->creationContext(); + QQmlContext *context = new QQmlContext( creationContext ? creationContext : qmlContext(q)); context->setContextProperty(QLatin1String("section"), section); QObject *nobj = sectionCriteria->delegate()->beginCreate(context); if (nobj) { - QDeclarative_setParent_noEvent(context, nobj); + QQml_setParent_noEvent(context, nobj); sectionItem = qobject_cast<QQuickItem *>(nobj); if (!sectionItem) { delete nobj; } else { sectionItem->setZ(2); - QDeclarative_setParent_noEvent(sectionItem, contentItem); + QQml_setParent_noEvent(sectionItem, contentItem); sectionItem->setParentItem(contentItem); } } else { @@ -960,7 +960,7 @@ void QQuickListViewPrivate::updateInlineSection(FxListItemSG *listItem) listItem->setSection(getSectionItem(listItem->attached->m_section)); listItem->setPosition(pos); } else { - QDeclarativeContext *context = QDeclarativeEngine::contextForObject(listItem->section())->parentContext(); + QQmlContext *context = QQmlEngine::contextForObject(listItem->section())->parentContext(); context->setContextProperty(QLatin1String("section"), listItem->attached->m_section); } } else if (listItem->section()) { @@ -1013,7 +1013,7 @@ void QQuickListViewPrivate::updateStickySections() if (!currentSectionItem) { currentSectionItem = getSectionItem(currentSection); } else if (currentStickySection != currentSection) { - QDeclarativeContext *context = QDeclarativeEngine::contextForObject(currentSectionItem)->parentContext(); + QQmlContext *context = QQmlEngine::contextForObject(currentSectionItem)->parentContext(); context->setContextProperty(QLatin1String("section"), currentSection); } currentStickySection = currentSection; @@ -1046,7 +1046,7 @@ void QQuickListViewPrivate::updateStickySections() if (!nextSectionItem) { nextSectionItem = getSectionItem(nextSection); } else if (nextStickySection != nextSection) { - QDeclarativeContext *context = QDeclarativeEngine::contextForObject(nextSectionItem)->parentContext(); + QQmlContext *context = QQmlEngine::contextForObject(nextSectionItem)->parentContext(); context->setContextProperty(QLatin1String("section"), nextSection); } nextStickySection = nextSection; @@ -1419,7 +1419,7 @@ void QQuickListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExte } void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize, - QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity) + QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) { Q_Q(QQuickListView); @@ -1533,7 +1533,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte } timeline.reset(data.move); timeline.accel(data.move, v, accel, maxDistance + overshootDist); - timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this)); + timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this)); if (!hData.flicking && q->xflick()) { hData.flicking = true; emit q->flickingChanged(); @@ -1574,7 +1574,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte } timeline.reset(data.move); timeline.accelDistance(data.move, v, -dist); - timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this)); + timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this)); } } else { correctFlick = false; @@ -1606,13 +1606,13 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte The following example shows the definition of a simple list model defined in a file called \c ContactModel.qml: - \snippet doc/src/snippets/declarative/listview/ContactModel.qml 0 + \snippet doc/src/snippets/qml/listview/ContactModel.qml 0 Another component can display this model data in a ListView, like this: - \snippet doc/src/snippets/declarative/listview/listview.qml import + \snippet doc/src/snippets/qml/listview/listview.qml import \codeline - \snippet doc/src/snippets/declarative/listview/listview.qml classdocs simple + \snippet doc/src/snippets/qml/listview/listview.qml classdocs simple \image listview-simple.png @@ -1623,7 +1623,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte An improved list view is shown below. The delegate is visually improved and is moved into a separate \c contactDelegate component. - \snippet doc/src/snippets/declarative/listview/listview.qml classdocs advanced + \snippet doc/src/snippets/qml/listview/listview.qml classdocs advanced \image listview-highlight.png The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property, @@ -1638,7 +1638,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte this attached property directly as \c ListView.isCurrentItem, while the child \c contactInfo object must refer to this property as \c wrapper.ListView.isCurrentItem. - \snippet doc/src/snippets/declarative/listview/listview.qml isCurrentItem + \snippet doc/src/snippets/qml/listview/listview.qml isCurrentItem \note Views do not enable \e clip automatically. If the view is not clipped by another item or the screen, it will be necessary @@ -1664,7 +1664,7 @@ QQuickListView::~QQuickListView() This property may be used to adjust the appearance of the current item, for example: - \snippet doc/src/snippets/declarative/listview/listview.qml isCurrentItem + \snippet doc/src/snippets/qml/listview/listview.qml isCurrentItem */ /*! @@ -1711,7 +1711,7 @@ QQuickListView::~QQuickListView() until an animation completes. The example delegate below ensures that the animation completes before the item is removed from the list. - \snippet doc/src/snippets/declarative/listview/listview.qml delayRemove + \snippet doc/src/snippets/qml/listview/listview.qml delayRemove If a \l remove transition has been specified, it will not be applied until delayRemove is returned to \c false. @@ -1821,7 +1821,7 @@ QQuickListView::~QQuickListView() Here is a highlight with its motion defined by a \l {SpringAnimation} item: - \snippet doc/src/snippets/declarative/listview/listview.qml highlightFollowsCurrentItem + \snippet doc/src/snippets/qml/listview/listview.qml highlightFollowsCurrentItem Note that the highlight animation also affects the way that the view is scrolled. This is because the view moves to maintain the @@ -2720,7 +2720,7 @@ void QQuickListView::updateSections() } } -bool QQuickListViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) +bool QQuickListViewPrivate::applyInsertionChange(const QQuickChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) { int modelIndex = change.index; int count = change.count; diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index 058c50f4d7..ef989ba839 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_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 "qquickitemview_p.h" -#include <private/qdeclarativeguard_p.h> +#include <private/qqmlguard_p.h> QT_BEGIN_HEADER @@ -57,7 +57,7 @@ class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject Q_OBJECT Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY criteriaChanged) - Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(int labelPositioning READ labelPositioning WRITE setLabelPositioning NOTIFY labelPositioningChanged) Q_ENUMS(SectionCriteria) Q_ENUMS(LabelPositioning) @@ -71,8 +71,8 @@ public: SectionCriteria criteria() const { return m_criteria; } void setCriteria(SectionCriteria); - QDeclarativeComponent *delegate() const { return m_delegate; } - void setDelegate(QDeclarativeComponent *delegate); + QQmlComponent *delegate() const { return m_delegate; } + void setDelegate(QQmlComponent *delegate); QString sectionString(const QString &value); @@ -89,7 +89,7 @@ Q_SIGNALS: private: QString m_property; SectionCriteria m_criteria; - QDeclarativeComponent *m_delegate; + QQmlComponent *m_delegate; int m_labelPositioning; QQuickListViewPrivate *m_view; }; @@ -197,7 +197,7 @@ Q_SIGNALS: void viewChanged(); public: - QDeclarativeGuard<QQuickListView> m_view; + QQmlGuard<QQuickListView> m_view; QQuickItem *m_sectionItem; }; diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 92724f4095..bbc51a4d26 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.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,12 +41,12 @@ #include "qquickloader_p_p.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> -#include <private/qdeclarativeengine_p.h> -#include <private/qdeclarativeglobal_p.h> +#include <private/qqmlengine_p.h> +#include <private/qqmlglobal_p.h> -#include <private/qdeclarativecomponent_p.h> +#include <private/qqmlcomponent_p.h> #include <private/qv8_p.h> @@ -133,7 +133,7 @@ void QQuickLoaderPrivate::initResize() Here is a Loader that loads "Page1.qml" as a component when the \l MouseArea is clicked: - \snippet doc/src/snippets/declarative/loader/simple.qml 0 + \snippet doc/src/snippets/qml/loader/simple.qml 0 The loaded item can be accessed using the \l item property. @@ -165,8 +165,8 @@ void QQuickLoaderPrivate::initResize() \o sizeloader.qml \o sizeitem.qml \row - \o \snippet doc/src/snippets/declarative/loader/sizeloader.qml 0 - \o \snippet doc/src/snippets/declarative/loader/sizeitem.qml 0 + \o \snippet doc/src/snippets/qml/loader/sizeloader.qml 0 + \o \snippet doc/src/snippets/qml/loader/sizeitem.qml 0 \row \o The red rectangle will be sized to the size of the root item. \o The red rectangle will be 50x50, centered in the root item. @@ -185,8 +185,8 @@ void QQuickLoaderPrivate::initResize() \o application.qml \o MyItem.qml \row - \o \snippet doc/src/snippets/declarative/loader/connections.qml 0 - \o \snippet doc/src/snippets/declarative/loader/MyItem.qml 0 + \o \snippet doc/src/snippets/qml/loader/connections.qml 0 + \o \snippet doc/src/snippets/qml/loader/MyItem.qml 0 \endtable Alternatively, since \c MyItem.qml is loaded within the scope of the @@ -212,8 +212,8 @@ void QQuickLoaderPrivate::initResize() \o application.qml \o KeyReader.qml \row - \o \snippet doc/src/snippets/declarative/loader/focus.qml 0 - \o \snippet doc/src/snippets/declarative/loader/KeyReader.qml 0 + \o \snippet doc/src/snippets/qml/loader/focus.qml 0 + \o \snippet doc/src/snippets/qml/loader/KeyReader.qml 0 \endtable Once \c KeyReader.qml is loaded, it accepts key events and sets @@ -344,7 +344,7 @@ void QQuickLoader::loadFromSource() } if (isComponentComplete()) { - d->component = new QDeclarativeComponent(qmlEngine(this), d->source, this); + d->component = new QQmlComponent(qmlEngine(this), d->source, this); d->load(); } } @@ -371,13 +371,13 @@ void QQuickLoader::loadFromSource() \sa source, progress */ -QDeclarativeComponent *QQuickLoader::sourceComponent() const +QQmlComponent *QQuickLoader::sourceComponent() const { Q_D(const QQuickLoader); return d->component; } -void QQuickLoader::setSourceComponent(QDeclarativeComponent *comp) +void QQuickLoader::setSourceComponent(QQmlComponent *comp) { Q_D(QQuickLoader); if (comp == d->component) @@ -476,7 +476,7 @@ void QQuickLoader::loadFromSourceComponent() \sa source, active */ -void QQuickLoader::setSource(QDeclarativeV8Function *args) +void QQuickLoader::setSource(QQmlV8Function *args) { Q_ASSERT(args); Q_D(QQuickLoader); @@ -516,7 +516,7 @@ void QQuickLoaderPrivate::load() if (!component->isLoading()) { _q_sourceLoaded(); } else { - QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), + QObject::connect(component, SIGNAL(statusChanged(QQmlComponent::Status)), q, SLOT(_q_sourceLoaded())); QObject::connect(component, SIGNAL(progressChanged(qreal)), q, SIGNAL(progressChanged())); @@ -541,15 +541,15 @@ void QQuickLoaderPrivate::setInitialState(QObject *obj) QQuickItem *item = qobject_cast<QQuickItem*>(obj); if (item) { - QDeclarative_setParent_noEvent(itemContext, obj); - QDeclarative_setParent_noEvent(item, q); + QQml_setParent_noEvent(itemContext, obj); + QQml_setParent_noEvent(item, q); item->setParentItem(q); } if (initialPropertyValues.IsEmpty()) return; - QDeclarativeComponentPrivate *d = QDeclarativeComponentPrivate::get(component); + QQmlComponentPrivate *d = QQmlComponentPrivate::get(component); Q_ASSERT(d && d->engine); d->initializeObjectWithInitialProperties(qmlGlobalForIpv, initialPropertyValues, obj); } @@ -559,13 +559,13 @@ void QQuickLoaderIncubator::statusChanged(Status status) loader->incubatorStateChanged(status); } -void QQuickLoaderPrivate::incubatorStateChanged(QDeclarativeIncubator::Status status) +void QQuickLoaderPrivate::incubatorStateChanged(QQmlIncubator::Status status) { Q_Q(QQuickLoader); - if (status == QDeclarativeIncubator::Loading || status == QDeclarativeIncubator::Null) + if (status == QQmlIncubator::Loading || status == QQmlIncubator::Null) return; - if (status == QDeclarativeIncubator::Ready) { + if (status == QQmlIncubator::Ready) { QObject *obj = incubator->object(); item = qobject_cast<QQuickItem*>(obj); if (item) { @@ -579,9 +579,9 @@ void QQuickLoaderPrivate::incubatorStateChanged(QDeclarativeIncubator::Status st emit q->itemChanged(); } incubator->clear(); - } else if (status == QDeclarativeIncubator::Error) { + } else if (status == QQmlIncubator::Error) { if (!incubator->errors().isEmpty()) - QDeclarativeEnginePrivate::warning(qmlEngine(q), incubator->errors()); + QQmlEnginePrivate::warning(qmlEngine(q), incubator->errors()); delete itemContext; itemContext = 0; delete incubator->object(); @@ -603,7 +603,7 @@ void QQuickLoaderPrivate::_q_sourceLoaded() Q_Q(QQuickLoader); if (!component || !component->errors().isEmpty()) { if (component) - QDeclarativeEnginePrivate::warning(qmlEngine(q), component->errors()); + QQmlEnginePrivate::warning(qmlEngine(q), component->errors()); if (loadingFromSource) emit q->sourceChanged(); else @@ -614,17 +614,17 @@ void QQuickLoaderPrivate::_q_sourceLoaded() return; } - QDeclarativeContext *creationContext = component->creationContext(); + QQmlContext *creationContext = component->creationContext(); if (!creationContext) creationContext = qmlContext(q); - itemContext = new QDeclarativeContext(creationContext); + itemContext = new QQmlContext(creationContext); itemContext->setContextObject(q); delete incubator; - incubator = new QQuickLoaderIncubator(this, asynchronous ? QDeclarativeIncubator::Asynchronous : QDeclarativeIncubator::AsynchronousIfNested); + incubator = new QQuickLoaderIncubator(this, asynchronous ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); component->create(*incubator, itemContext); - if (incubator && incubator->status() == QDeclarativeIncubator::Loading) + if (incubator && incubator->status() == QQmlIncubator::Loading) emit q->statusChanged(); } @@ -677,11 +677,11 @@ QQuickLoader::Status QQuickLoader::status() const if (d->component) { switch (d->component->status()) { - case QDeclarativeComponent::Loading: + case QQmlComponent::Loading: return Loading; - case QDeclarativeComponent::Error: + case QQmlComponent::Error: return Error; - case QDeclarativeComponent::Null: + case QQmlComponent::Null: return Null; default: break; @@ -690,9 +690,9 @@ QQuickLoader::Status QQuickLoader::status() const if (d->incubator) { switch (d->incubator->status()) { - case QDeclarativeIncubator::Loading: + case QQmlIncubator::Loading: return Loading; - case QDeclarativeIncubator::Error: + case QQmlIncubator::Error: return Error; default: break; @@ -711,7 +711,7 @@ void QQuickLoader::componentComplete() QQuickItem::componentComplete(); if (active()) { if (d->loadingFromSource) { - d->component = new QDeclarativeComponent(qmlEngine(this), d->source, this); + d->component = new QQmlComponent(qmlEngine(this), d->source, this); } d->load(); } @@ -826,19 +826,19 @@ void QQuickLoader::geometryChanged(const QRectF &newGeometry, const QRectF &oldG QQuickItem::geometryChanged(newGeometry, oldGeometry); } -QUrl QQuickLoaderPrivate::resolveSourceUrl(QDeclarativeV8Function *args) +QUrl QQuickLoaderPrivate::resolveSourceUrl(QQmlV8Function *args) { QV8Engine *v8engine = args->engine(); QString arg = v8engine->toString((*args)[0]->ToString()); if (arg.isEmpty()) return QUrl(); - QDeclarativeContextData *context = args->context(); + QQmlContextData *context = args->context(); Q_ASSERT(context); return context->resolvedUrl(QUrl(arg)); } -v8::Handle<v8::Object> QQuickLoaderPrivate::extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error) +v8::Handle<v8::Object> QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV8Function *args, QObject *loader, bool *error) { v8::Local<v8::Object> valuemap; if (args->Length() >= 2) { diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h index a6cc5a18d9..c5f544b0e8 100644 --- a/src/quick/items/qquickloader_p.h +++ b/src/quick/items/qquickloader_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 @@ -56,7 +56,7 @@ class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged) Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) - Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceComponentChanged) + Q_PROPERTY(QQmlComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceComponentChanged) Q_PROPERTY(QQuickItem *item READ item NOTIFY itemChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) @@ -69,13 +69,13 @@ public: bool active() const; void setActive(bool newVal); - Q_INVOKABLE void setSource(QDeclarativeV8Function *); + Q_INVOKABLE void setSource(QQmlV8Function *); QUrl source() const; void setSource(const QUrl &); - QDeclarativeComponent *sourceComponent() const; - void setSourceComponent(QDeclarativeComponent *); + QQmlComponent *sourceComponent() const; + void setSourceComponent(QQmlComponent *); void resetSourceComponent(); enum Status { Null, Ready, Loading, Error }; diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h index 3ef0038493..1ad7756ed8 100644 --- a/src/quick/items/qquickloader_p_p.h +++ b/src/quick/items/qquickloader_p_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 @@ -56,7 +56,7 @@ #include "qquickloader_p.h" #include "qquickimplicitsizeitem_p_p.h" #include "qquickitemchangelistener_p.h" -#include <qdeclarativeincubator.h> +#include <qqmlincubator.h> #include <private/qv8_p.h> @@ -64,10 +64,10 @@ QT_BEGIN_NAMESPACE class QQuickLoaderPrivate; -class QQuickLoaderIncubator : public QDeclarativeIncubator +class QQuickLoaderIncubator : public QQmlIncubator { public: - QQuickLoaderIncubator(QQuickLoaderPrivate *l, IncubationMode mode) : QDeclarativeIncubator(mode), loader(l) {} + QQuickLoaderIncubator(QQuickLoaderPrivate *l, IncubationMode mode) : QQmlIncubator(mode), loader(l) {} protected: virtual void statusChanged(Status); @@ -77,7 +77,7 @@ private: QQuickLoaderPrivate *loader; }; -class QDeclarativeContext; +class QQmlContext; class QQuickLoaderPrivate : public QQuickImplicitSizeItemPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickLoader) @@ -91,16 +91,16 @@ public: void initResize(); void load(); - void incubatorStateChanged(QDeclarativeIncubator::Status status); + void incubatorStateChanged(QQmlIncubator::Status status); void setInitialState(QObject *o); void disposeInitialPropertyValues(); - QUrl resolveSourceUrl(QDeclarativeV8Function *args); - v8::Handle<v8::Object> extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error); + QUrl resolveSourceUrl(QQmlV8Function *args); + v8::Handle<v8::Object> extractInitialPropertyValues(QQmlV8Function *args, QObject *loader, bool *error); QUrl source; QQuickItem *item; - QDeclarativeComponent *component; - QDeclarativeContext *itemContext; + QQmlComponent *component; + QQmlContext *itemContext; QQuickLoaderIncubator *incubator; v8::Persistent<v8::Object> initialPropertyValues; v8::Persistent<v8::Object> qmlGlobalForIpv; diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index d0894e9590..ec2c980879 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.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 @@ -348,9 +348,9 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i The following example uses a MouseArea in a \l Rectangle that changes the \l Rectangle color to red when clicked: - \snippet doc/src/snippets/declarative/mousearea/mousearea.qml import + \snippet doc/src/snippets/qml/mousearea/mousearea.qml import \codeline - \snippet doc/src/snippets/declarative/mousearea/mousearea.qml intro + \snippet doc/src/snippets/qml/mousearea/mousearea.qml intro \clearfloat Many MouseArea signals pass a \l{MouseEvent}{mouse} parameter that contains @@ -360,7 +360,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i Here is an extension of the previous example that produces a different color when the area is right clicked: - \snippet doc/src/snippets/declarative/mousearea/mousearea.qml intro-extended + \snippet doc/src/snippets/qml/mousearea/mousearea.qml intro-extended Behavioral Change in QtQuick 2.0 @@ -659,7 +659,7 @@ void QQuickMouseArea::setPropagateComposedEvents(bool prevent) The code below displays "right" when the right mouse buttons is pressed: - \snippet doc/src/snippets/declarative/mousearea/mousearea.qml mousebuttons + \snippet doc/src/snippets/qml/mousearea/mousearea.qml mousebuttons \sa acceptedButtons */ @@ -1148,7 +1148,7 @@ bool QQuickMouseArea::setPressed(bool p) The following example displays a \l Rectangle that can be dragged along the X-axis. The opacity of the rectangle is reduced when it is dragged to the right. - \snippet doc/src/snippets/declarative/mousearea/mousearea.qml drag + \snippet doc/src/snippets/qml/mousearea/mousearea.qml drag \note Items cannot be dragged if they are anchored for the requested \c drag.axis. For example, if \c anchors.left or \c anchors.right was set @@ -1159,7 +1159,7 @@ bool QQuickMouseArea::setPressed(bool p) If \c drag.filterChildren is set to true, a drag can override descendant MouseAreas. This enables a parent MouseArea to handle drags, for example, while descendants handle clicks: - \snippet doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml dragfilter + \snippet doc/src/snippets/qml/mousearea/mouseareadragfilter.qml dragfilter */ diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h index 0723f8326f..93a0635eb5 100644 --- a/src/quick/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_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 @@ -132,7 +132,7 @@ class Q_QUICK_EXPORT QQuickMouseArea : public QQuickItem Q_PROPERTY(Qt::MouseButtons pressedButtons READ pressedButtons NOTIFY pressedChanged) Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged) Q_PROPERTY(bool hoverEnabled READ hoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged) - Q_PROPERTY(QQuickDrag *drag READ drag CONSTANT) //### add flicking to QQuickDrag or add a QDeclarativeFlick ??? + Q_PROPERTY(QQuickDrag *drag READ drag CONSTANT) //### add flicking to QQuickDrag or add a QQuickFlick ??? Q_PROPERTY(bool preventStealing READ preventStealing WRITE setPreventStealing NOTIFY preventStealingChanged) Q_PROPERTY(bool propagateComposedEvents READ propagateComposedEvents WRITE setPropagateComposedEvents NOTIFY propagateComposedEventsChanged) diff --git a/src/quick/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h index 2060671698..bcdf033cba 100644 --- a/src/quick/items/qquickmousearea_p_p.h +++ b/src/quick/items/qquickmousearea_p_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 @@ -99,7 +99,7 @@ public: QPointF startScene; QPointF targetStartPos; QPointF lastPos; - QDeclarativeNullableValue<QPointF> lastScenePos; + QQmlNullableValue<QPointF> lastScenePos; Qt::MouseButton lastButton; Qt::MouseButtons lastButtons; Qt::KeyboardModifiers lastModifiers; diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index c1c60c1756..7dd6ec0589 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.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 @@ -309,7 +309,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) In the following example, we have two small rectangles that follow our touch points. - \snippet doc/src/snippets/declarative/multipointtoucharea/multipointtoucharea.qml 0 + \snippet doc/src/snippets/qml/multipointtoucharea/multipointtoucharea.qml 0 By default this property holds an empty list. diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index ccb086fd7e..3651278735 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_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 @@ -166,7 +166,7 @@ private: class QQuickGrabGestureEvent : public QObject { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty<QObject> touchPoints READ touchPoints) + Q_PROPERTY(QQmlListProperty<QObject> touchPoints READ touchPoints) Q_PROPERTY(qreal dragThreshold READ dragThreshold) public: QQuickGrabGestureEvent() : _grab(false), _dragThreshold(qApp->styleHints()->startDragDistance()) {} @@ -174,8 +174,8 @@ public: Q_INVOKABLE void grab() { _grab = true; } bool wantsGrab() const { return _grab; } - QDeclarativeListProperty<QObject> touchPoints() { - return QDeclarativeListProperty<QObject>(this, _touchPoints); + QQmlListProperty<QObject> touchPoints() { + return QQmlListProperty<QObject>(this, _touchPoints); } qreal dragThreshold() const { return _dragThreshold; } @@ -190,7 +190,7 @@ class Q_AUTOTEST_EXPORT QQuickMultiPointTouchArea : public QQuickItem { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty<QQuickTouchPoint> touchPoints READ touchPoints) + Q_PROPERTY(QQmlListProperty<QQuickTouchPoint> touchPoints READ touchPoints) Q_PROPERTY(int minimumTouchPoints READ minimumTouchPoints WRITE setMinimumTouchPoints NOTIFY minimumTouchPointsChanged) Q_PROPERTY(int maximumTouchPoints READ maximumTouchPoints WRITE setMaximumTouchPoints NOTIFY maximumTouchPointsChanged) @@ -203,21 +203,21 @@ public: int maximumTouchPoints() const; void setMaximumTouchPoints(int num); - QDeclarativeListProperty<QQuickTouchPoint> touchPoints() { - return QDeclarativeListProperty<QQuickTouchPoint>(this, 0, QQuickMultiPointTouchArea::touchPoint_append, QQuickMultiPointTouchArea::touchPoint_count, QQuickMultiPointTouchArea::touchPoint_at, 0); + QQmlListProperty<QQuickTouchPoint> touchPoints() { + return QQmlListProperty<QQuickTouchPoint>(this, 0, QQuickMultiPointTouchArea::touchPoint_append, QQuickMultiPointTouchArea::touchPoint_count, QQuickMultiPointTouchArea::touchPoint_at, 0); } - static void touchPoint_append(QDeclarativeListProperty<QQuickTouchPoint> *list, QQuickTouchPoint* touch) { + static void touchPoint_append(QQmlListProperty<QQuickTouchPoint> *list, QQuickTouchPoint* touch) { QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object); q->addTouchPrototype(touch); } - static int touchPoint_count(QDeclarativeListProperty<QQuickTouchPoint> *list) { + static int touchPoint_count(QQmlListProperty<QQuickTouchPoint> *list) { QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object); return q->_touchPrototypes.count(); } - static QQuickTouchPoint* touchPoint_at(QDeclarativeListProperty<QQuickTouchPoint> *list, int index) { + static QQuickTouchPoint* touchPoint_at(QQmlListProperty<QQuickTouchPoint> *list, int index) { QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object); return q->_touchPrototypes[index]; } diff --git a/src/quick/items/qquickninepatchnode.cpp b/src/quick/items/qquickninepatchnode.cpp index ff265b3a97..649fa527ee 100644 --- a/src/quick/items/qquickninepatchnode.cpp +++ b/src/quick/items/qquickninepatchnode.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/qquickninepatchnode_p.h b/src/quick/items/qquickninepatchnode_p.h index 277b368de7..c2761f74e5 100644 --- a/src/quick/items/qquickninepatchnode_p.h +++ b/src/quick/items/qquickninepatchnode_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/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp index 02afc0c4f5..349f2ff3c1 100644 --- a/src/quick/items/qquickpainteditem.cpp +++ b/src/quick/items/qquickpainteditem.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/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h index 06768796ca..15afdf8339 100644 --- a/src/quick/items/qquickpainteditem.h +++ b/src/quick/items/qquickpainteditem.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/qquickpainteditem_p.h b/src/quick/items/qquickpainteditem_p.h index 8c0a1475a7..d98216ffb0 100644 --- a/src/quick/items/qquickpainteditem_p.h +++ b/src/quick/items/qquickpainteditem_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/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index afc336fa04..f8098c8f65 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.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 @@ -43,10 +43,11 @@ #include "qquickpathview_p_p.h" #include "qquickcanvas.h" -#include <QtQuick/private/qdeclarativestate_p.h> -#include <private/qdeclarativeopenmetaobject_p.h> +#include <QtQuick/private/qquickstate_p.h> +#include <private/qqmlglobal_p.h> +#include <private/qqmlopenmetaobject_p.h> #include <private/qlistmodelinterface_p.h> -#include <private/qdeclarativechangeset_p.h> +#include <private/qquickchangeset_p.h> #include <QtGui/qevent.h> #include <QtGui/qevent.h> @@ -78,16 +79,16 @@ inline qreal qmlMod(qreal x, qreal y) return fmod(x, y); } -static QDeclarativeOpenMetaObjectType *qPathViewAttachedType = 0; +static QQmlOpenMetaObjectType *qPathViewAttachedType = 0; QQuickPathViewAttached::QQuickPathViewAttached(QObject *parent) : QObject(parent), m_percent(-1), m_view(0), m_onPath(false), m_isCurrent(false) { if (qPathViewAttachedType) { - m_metaobject = new QDeclarativeOpenMetaObject(this, qPathViewAttachedType); + m_metaobject = new QQmlOpenMetaObject(this, qPathViewAttachedType); m_metaobject->setCached(true); } else { - m_metaobject = new QDeclarativeOpenMetaObject(this); + m_metaobject = new QQmlOpenMetaObject(this); } } @@ -126,7 +127,7 @@ QQuickItem *QQuickPathViewPrivate::getItem(int modelIndex, qreal z, bool onPath) inRequest = true; QQuickItem *item = model->item(modelIndex, false); if (item) { - QDeclarative_setParent_noEvent(item, q); + QQml_setParent_noEvent(item, q); item->setParentItem(q); requestedIndex = -1; qPathViewAttachedType = attType; @@ -153,7 +154,7 @@ void QQuickPathView::createdItem(int index, QQuickItem *item) att->setOnPath(false); } item->setParentItem(this); - QDeclarative_setParent_noEvent(item, this); + QQml_setParent_noEvent(item, this); d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0); } else { d->requestedIndex = -1; @@ -200,12 +201,12 @@ QQuickPathViewAttached *QQuickPathViewPrivate::attached(QQuickItem *item) return static_cast<QQuickPathViewAttached *>(qmlAttachedPropertiesObject<QQuickPathView>(item, false)); } -QDeclarativeOpenMetaObjectType *QQuickPathViewPrivate::attachedType() +QQmlOpenMetaObjectType *QQuickPathViewPrivate::attachedType() { Q_Q(QQuickPathView); if (!attType) { // pre-create one metatype to share with all attached objects - attType = new QDeclarativeOpenMetaObjectType(&QQuickPathViewAttached::staticMetaObject, qmlEngine(q)); + attType = new QQmlOpenMetaObjectType(&QQuickPathViewAttached::staticMetaObject, qmlEngine(q)); foreach (const QString &attr, path->attributes()) attType->createProperty(attr.toUtf8()); } @@ -273,12 +274,12 @@ void QQuickPathViewPrivate::createHighlight() QQuickItem *item = 0; if (highlightComponent) { - QDeclarativeContext *creationContext = highlightComponent->creationContext(); - QDeclarativeContext *highlightContext = new QDeclarativeContext( + QQmlContext *creationContext = highlightComponent->creationContext(); + QQmlContext *highlightContext = new QQmlContext( creationContext ? creationContext : qmlContext(q)); QObject *nobj = highlightComponent->create(highlightContext); if (nobj) { - QDeclarative_setParent_noEvent(highlightContext, nobj); + QQml_setParent_noEvent(highlightContext, nobj); item = qobject_cast<QQuickItem *>(nobj); if (!item) delete nobj; @@ -289,7 +290,7 @@ void QQuickPathViewPrivate::createHighlight() item = new QQuickItem; } if (item) { - QDeclarative_setParent_noEvent(item, q); + QQml_setParent_noEvent(item, q); item->setParentItem(q); highlightItem = item; changed = true; @@ -426,11 +427,11 @@ void QQuickPathViewPrivate::regenerate() For example, if there is a simple list model defined in a file \c ContactModel.qml like this: - \snippet doc/src/snippets/declarative/pathview/ContactModel.qml 0 + \snippet doc/src/snippets/qml/pathview/ContactModel.qml 0 This data can be represented as a PathView, like this: - \snippet doc/src/snippets/declarative/pathview/pathview.qml 0 + \snippet doc/src/snippets/qml/pathview/pathview.qml 0 \image pathview.gif @@ -463,7 +464,7 @@ void QQuickPathViewPrivate::regenerate() this attached property directly as \c PathView.isCurrentItem, while the child \c nameText object must refer to this property as \c wrapper.PathView.isCurrentItem. - \snippet doc/src/snippets/declarative/pathview/pathview.qml 1 + \snippet doc/src/snippets/qml/pathview/pathview.qml 1 \bold Note that views do not enable \e clip automatically. If the view is not clipped by another item or the screen, it will be necessary @@ -525,7 +526,7 @@ QQuickPathView::~QQuickPathView() This property may be used to adjust the appearance of the current item. - \snippet doc/src/snippets/declarative/pathview/pathview.qml 1 + \snippet doc/src/snippets/qml/pathview/pathview.qml 1 */ /*! @@ -551,8 +552,8 @@ void QQuickPathView::setModel(const QVariant &model) return; if (d->model) { - disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)), - this, SLOT(modelUpdated(QDeclarativeChangeSet,bool))); + disconnect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)), + this, SLOT(modelUpdated(QQuickChangeSet,bool))); disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*))); disconnect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*))); for (int i=0; i<d->items.count(); i++){ @@ -583,8 +584,8 @@ void QQuickPathView::setModel(const QVariant &model) } d->modelCount = 0; if (d->model) { - connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)), - this, SLOT(modelUpdated(QDeclarativeChangeSet,bool))); + connect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)), + this, SLOT(modelUpdated(QQuickChangeSet,bool))); connect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*))); connect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*))); d->modelCount = d->model->count(); @@ -617,13 +618,13 @@ int QQuickPathView::count() const This property holds the path used to lay out the items. For more information see the \l Path documentation. */ -QDeclarativePath *QQuickPathView::path() const +QQuickPath *QQuickPathView::path() const { Q_D(const QQuickPathView); return d->path; } -void QQuickPathView::setPath(QDeclarativePath *path) +void QQuickPathView::setPath(QQuickPath *path) { Q_D(QQuickPathView); if (d->path == path) @@ -786,13 +787,13 @@ void QQuickPathViewPrivate::setAdjustedOffset(qreal o) \sa highlightItem, highlightRangeMode */ -QDeclarativeComponent *QQuickPathView::highlight() const +QQmlComponent *QQuickPathView::highlight() const { Q_D(const QQuickPathView); return d->highlightComponent; } -void QQuickPathView::setHighlight(QDeclarativeComponent *highlight) +void QQuickPathView::setHighlight(QQmlComponent *highlight) { Q_D(QQuickPathView); if (highlight != d->highlightComponent) { @@ -1069,9 +1070,9 @@ bool QQuickPathView::isFlicking() const item in the delegate. Here is an example delegate: - \snippet doc/src/snippets/declarative/pathview/pathview.qml 1 + \snippet doc/src/snippets/qml/pathview/pathview.qml 1 */ -QDeclarativeComponent *QQuickPathView::delegate() const +QQmlComponent *QQuickPathView::delegate() const { Q_D(const QQuickPathView); if (d->model) { @@ -1082,7 +1083,7 @@ QDeclarativeComponent *QQuickPathView::delegate() const return 0; } -void QQuickPathView::setDelegate(QDeclarativeComponent *delegate) +void QQuickPathView::setDelegate(QQmlComponent *delegate) { Q_D(QQuickPathView); if (delegate == this->delegate()) @@ -1337,7 +1338,7 @@ void QQuickPathViewPrivate::handleMouseReleaseEvent(QMouseEvent *) offsetAdj = 0.0; moveOffset.setValue(offset); tl.accel(moveOffset, velocity, accel, dist); - tl.callback(QDeclarativeTimeLineCallback(&moveOffset, fixOffsetCallback, this)); + tl.callback(QQuickTimeLineCallback(&moveOffset, fixOffsetCallback, this)); if (!flicking) { flicking = true; emit q->flickingChanged(); @@ -1583,7 +1584,7 @@ void QQuickPathView::refill() d->releaseItem(d->itemCache.takeLast()); } -void QQuickPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) +void QQuickPathView::modelUpdated(const QQuickChangeSet &changeSet, bool reset) { Q_D(QQuickPathView); if (!d->model || !d->model->isValid() || !d->path || !isComponentComplete()) @@ -1604,7 +1605,7 @@ void QQuickPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r int moveOffset; bool currentChanged = false; bool changedOffset = false; - foreach (const QDeclarativeChangeSet::Remove &r, changeSet.removes()) { + foreach (const QQuickChangeSet::Remove &r, changeSet.removes()) { if (moveId == -1 && d->currentIndex >= r.index + r.count) { d->currentIndex -= r.count; currentChanged = true; @@ -1630,7 +1631,7 @@ void QQuickPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r } d->modelCount -= r.count; } - foreach (const QDeclarativeChangeSet::Insert &i, changeSet.inserts()) { + foreach (const QQuickChangeSet::Insert &i, changeSet.inserts()) { if (d->modelCount) { if (moveId == -1 && i.index <= d->currentIndex) { d->currentIndex += i.count; diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h index 77348302ea..8f1ecd6caf 100644 --- a/src/quick/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_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,13 +44,13 @@ #include "qquickitem.h" -#include <private/qdeclarativepath_p.h> +#include <private/qquickpath_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeChangeSet; +class QQuickChangeSet; class QQuickPathViewPrivate; class QQuickPathViewAttached; @@ -59,12 +59,12 @@ class Q_AUTOTEST_EXPORT QQuickPathView : public QQuickItem Q_OBJECT Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged) - Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged) + Q_PROPERTY(QQuickPath *path READ path WRITE setPath NOTIFY pathChanged) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentItemChanged) Q_PROPERTY(qreal offset READ offset WRITE setOffset NOTIFY offsetChanged) - Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged) + Q_PROPERTY(QQmlComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged) Q_PROPERTY(QQuickItem *highlightItem READ highlightItem NOTIFY highlightItemChanged) Q_PROPERTY(qreal preferredHighlightBegin READ preferredHighlightBegin WRITE setPreferredHighlightBegin NOTIFY preferredHighlightBeginChanged) @@ -80,7 +80,7 @@ class Q_AUTOTEST_EXPORT QQuickPathView : public QQuickItem Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged) Q_PROPERTY(int count READ count NOTIFY countChanged) - Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(int pathItemCount READ pathItemCount WRITE setPathItemCount NOTIFY pathItemCountChanged) Q_ENUMS(HighlightRangeMode) @@ -92,8 +92,8 @@ public: QVariant model() const; void setModel(const QVariant &); - QDeclarativePath *path() const; - void setPath(QDeclarativePath *); + QQuickPath *path() const; + void setPath(QQuickPath *); int currentIndex() const; void setCurrentIndex(int idx); @@ -103,8 +103,8 @@ public: qreal offset() const; void setOffset(qreal offset); - QDeclarativeComponent *highlight() const; - void setHighlight(QDeclarativeComponent *highlight); + QQmlComponent *highlight() const; + void setHighlight(QQmlComponent *highlight); QQuickItem *highlightItem(); enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange }; @@ -134,8 +134,8 @@ public: int count() const; - QDeclarativeComponent *delegate() const; - void setDelegate(QDeclarativeComponent *); + QQmlComponent *delegate() const; + void setDelegate(QQmlComponent *); int pathItemCount() const; void setPathItemCount(int); @@ -186,7 +186,7 @@ private Q_SLOTS: void refill(); void ticked(); void movementEnding(); - void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset); + void modelUpdated(const QQuickChangeSet &changeSet, bool reset); void createdItem(int index, QQuickItem *item); void initItem(int index, QQuickItem *item); void destroyingItem(QQuickItem *item); @@ -198,7 +198,7 @@ private: Q_DECLARE_PRIVATE(QQuickPathView) }; -class QDeclarativeOpenMetaObject; +class QQmlOpenMetaObject; class QQuickPathViewAttached : public QObject { Q_OBJECT @@ -241,7 +241,7 @@ private: friend class QQuickPathViewPrivate; friend class QQuickPathView; QQuickPathView *m_view; - QDeclarativeOpenMetaObject *m_metaobject; + QQmlOpenMetaObject *m_metaobject; bool m_onPath : 1; bool m_isCurrent : 1; }; diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index b57aa13cbf..a80c01f320 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_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 @@ -57,17 +57,17 @@ #include "qquickitem_p.h" #include "qquickvisualdatamodel_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtCore/qdatetime.h> #include <QtCore/qcoreapplication.h> -#include <private/qdeclarativeanimation_p_p.h> -#include <private/qdeclarativeguard_p.h> -#include <private/qdeclarativetimeline_p_p.h> +#include <private/qquickanimation_p_p.h> +#include <private/qqmlguard_p.h> +#include <private/qquicktimeline_p_p.h> QT_BEGIN_NAMESPACE -class QDeclarativeOpenMetaObjectType; +class QQmlOpenMetaObjectType; class QQuickPathViewAttached; class QQuickPathViewPrivate : public QQuickItemPrivate, public QQuickItemChangeListener { @@ -114,7 +114,7 @@ public: QQuickItem *getItem(int modelIndex, qreal z = 0, bool onPath=true); void releaseItem(QQuickItem *item); QQuickPathViewAttached *attached(QQuickItem *item); - QDeclarativeOpenMetaObjectType *attachedType(); + QQmlOpenMetaObjectType *attachedType(); void clear(); void updateMappedRange(); qreal positionOfIndex(qreal index) const; @@ -143,9 +143,9 @@ public: void addVelocitySample(qreal v); qreal calcVelocity() const; - QDeclarativePath *path; + QQuickPath *path; int currentIndex; - QDeclarativeGuard<QQuickItem> currentItem; + QQmlGuard<QQuickItem> currentItem; qreal currentItemOffset; qreal startPc; QPointF startPoint; @@ -169,24 +169,24 @@ public: QPointF lastPos; qreal dragMargin; qreal deceleration; - QDeclarativeTimeLine tl; - QDeclarativeTimeLineValueProxy<QQuickPathViewPrivate> moveOffset; + QQuickTimeLine tl; + QQuickTimeLineValueProxy<QQuickPathViewPrivate> moveOffset; int firstIndex; int pathItems; int requestedIndex; qreal requestedZ; QList<QQuickItem *> items; QList<QQuickItem *> itemCache; - QDeclarativeGuard<QQuickVisualModel> model; + QQmlGuard<QQuickVisualModel> model; QVariant modelVariant; enum MovementReason { Other, SetIndex, Mouse }; MovementReason moveReason; enum MovementDirection { Shortest, Negative, Positive }; MovementDirection moveDirection; - QDeclarativeOpenMetaObjectType *attType; - QDeclarativeComponent *highlightComponent; + QQmlOpenMetaObjectType *attType; + QQmlComponent *highlightComponent; QQuickItem *highlightItem; - QDeclarativeTimeLineValueProxy<QQuickPathViewPrivate> moveHighlight; + QQuickTimeLineValueProxy<QQuickPathViewPrivate> moveHighlight; qreal highlightPosition; qreal highlightRangeStart; qreal highlightRangeEnd; diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index 6ed35a9f42..e1d0457916 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.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 @@ -42,15 +42,15 @@ #include "qquickpositioners_p.h" #include "qquickpositioners_p_p.h" -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqml.h> +#include <QtQml/qqmlinfo.h> #include <QtCore/qmath.h> #include <QtCore/qcoreapplication.h> -#include <QtQuick/private/qdeclarativestate_p.h> -#include <QtQuick/private/qdeclarativestategroup_p.h> -#include <private/qdeclarativestateoperations_p.h> -#include <QtQuick/private/qdeclarativetransition_p.h> +#include <QtQuick/private/qquickstate_p.h> +#include <QtQuick/private/qquickstategroup_p.h> +#include <private/qquickstatechangescript_p.h> +#include <QtQuick/private/qquicktransition_p.h> QT_BEGIN_NAMESPACE @@ -140,13 +140,13 @@ void QQuickBasePositioner::setSpacing(qreal s) emit spacingChanged(); } -QDeclarativeTransition *QQuickBasePositioner::move() const +QQuickTransition *QQuickBasePositioner::move() const { Q_D(const QQuickBasePositioner); return d->transitioner ? d->transitioner->displacedTransition : 0; } -void QQuickBasePositioner::setMove(QDeclarativeTransition *mt) +void QQuickBasePositioner::setMove(QQuickTransition *mt) { Q_D(QQuickBasePositioner); if (!d->transitioner) @@ -158,13 +158,13 @@ void QQuickBasePositioner::setMove(QDeclarativeTransition *mt) emit moveChanged(); } -QDeclarativeTransition *QQuickBasePositioner::add() const +QQuickTransition *QQuickBasePositioner::add() const { Q_D(const QQuickBasePositioner); return d->transitioner ? d->transitioner->addTransition : 0; } -void QQuickBasePositioner::setAdd(QDeclarativeTransition *add) +void QQuickBasePositioner::setAdd(QQuickTransition *add) { Q_D(QQuickBasePositioner); if (!d->transitioner) @@ -497,7 +497,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) Below is a Column that contains three rectangles of various sizes: - \snippet doc/src/snippets/declarative/column/vertical-positioner.qml document + \snippet doc/src/snippets/qml/column/vertical-positioner.qml document The Column automatically positions these items in a vertical formation, like this: @@ -526,7 +526,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) For example, the Column below sets the \l move property to a specific \l Transition: - \snippet doc/src/snippets/declarative/column/column-transitions.qml document + \snippet doc/src/snippets/qml/column/column-transitions.qml document When the Space key is pressed, the \l {Item::visible}{visible} value of the green \l Rectangle is toggled. As it appears and disappears, the blue \l Rectangle moves within @@ -534,7 +534,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \image verticalpositioner_transition.gif - \sa Row, Grid, Flow, Positioner, {declarative/positioners}{Positioners example} + \sa Row, Grid, Flow, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Column::add @@ -574,7 +574,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) See the \l ViewTransition documentation for more details and examples on using these transitions. - \sa add, ViewTransition, {declarative/positioners}{Positioners example} + \sa add, ViewTransition, {qml/positioners}{Positioners example} */ /*! \qmlproperty real QtQuick2::Column::spacing @@ -645,7 +645,7 @@ void QQuickColumn::reportConflictingAnchors() Below is a Row that contains three rectangles of various sizes: - \snippet doc/src/snippets/declarative/row/row.qml document + \snippet doc/src/snippets/qml/row/row.qml document The Row automatically positions these items in a horizontal formation, like this: @@ -667,7 +667,7 @@ void QQuickColumn::reportConflictingAnchors() \l{Item Layouts}. - \sa Column, Grid, Flow, Positioner, {declarative/positioners}{Positioners example} + \sa Column, Grid, Flow, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Row::add @@ -707,7 +707,7 @@ void QQuickColumn::reportConflictingAnchors() See the \l ViewTransition documentation for more details and examples on using these transitions. - \sa add, ViewTransition, {declarative/positioners}{Positioners example} + \sa add, ViewTransition, {qml/positioners}{Positioners example} */ /*! \qmlproperty real QtQuick2::Row::spacing @@ -736,7 +736,7 @@ QQuickRow::QQuickRow(QQuickItem *parent) the right anchor remains to the right of the row. \endlist - \sa Grid::layoutDirection, Flow::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example} + \sa Grid::layoutDirection, Flow::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example} */ Qt::LayoutDirection QQuickRow::layoutDirection() const @@ -863,7 +863,7 @@ void QQuickRow::reportConflictingAnchors() For example, below is a Grid that contains five rectangles of various sizes: - \snippet doc/src/snippets/declarative/grid/grid.qml document + \snippet doc/src/snippets/qml/grid/grid.qml document The Grid automatically positions the child items in a grid formation: @@ -879,7 +879,7 @@ void QQuickRow::reportConflictingAnchors() \l{Item Layouts}. - \sa Flow, Row, Column, Positioner, {declarative/positioners}{Positioners example} + \sa Flow, Row, Column, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Grid::add @@ -919,7 +919,7 @@ void QQuickRow::reportConflictingAnchors() See the \l ViewTransition documentation for more details and examples on using these transitions. - \sa add, ViewTransition, {declarative/positioners}{Positioners example} + \sa add, ViewTransition, {qml/positioners}{Positioners example} */ /*! \qmlproperty qreal QtQuick2::Grid::spacing @@ -1074,7 +1074,7 @@ void QQuickGrid::setColumnSpacing(const qreal columnSpacing) \l Grid::flow property. \endlist - \sa Flow::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example} + \sa Flow::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example} */ Qt::LayoutDirection QQuickGrid::layoutDirection() const { @@ -1276,7 +1276,7 @@ void QQuickGrid::reportConflictingAnchors() Below is a Flow that contains various \l Text items: - \snippet doc/src/snippets/declarative/flow.qml flow item + \snippet doc/src/snippets/qml/flow.qml flow item The Flow item automatically positions the child \l Text items side by side, wrapping as necessary: @@ -1292,7 +1292,7 @@ void QQuickGrid::reportConflictingAnchors() For more information on using Flow and other related positioner-type elements, see \l{Item Layouts}. - \sa Column, Row, Grid, Positioner, {declarative/positioners}{Positioners example} + \sa Column, Row, Grid, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Flow::add @@ -1332,7 +1332,7 @@ void QQuickGrid::reportConflictingAnchors() See the \l ViewTransition documentation for more details and examples on using these transitions. - \sa add, ViewTransition, {declarative/positioners}{Positioners example} + \sa add, ViewTransition, {qml/positioners}{Positioners example} */ /*! \qmlproperty real QtQuick2::Flow::spacing @@ -1410,7 +1410,7 @@ void QQuickFlow::setFlow(Flow flow) \l Flow::flow property. \endlist - \sa Grid::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example} + \sa Grid::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example} */ Qt::LayoutDirection QQuickFlow::layoutDirection() const diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h index 32dd9030fe..8921bfa39b 100644 --- a/src/quick/items/qquickpositioners_p.h +++ b/src/quick/items/qquickpositioners_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 @@ -45,7 +45,7 @@ #include "qquickimplicitsizeitem_p.h" #include "qquickitemviewtransition_p.h" -#include <QtQuick/private/qdeclarativestate_p.h> +#include <QtQuick/private/qquickstate_p.h> #include <private/qpodvector_p.h> #include <QtCore/qobject.h> @@ -93,8 +93,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeIte Q_OBJECT Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged) - Q_PROPERTY(QDeclarativeTransition *move READ move WRITE setMove NOTIFY moveChanged) - Q_PROPERTY(QDeclarativeTransition *add READ add WRITE setAdd NOTIFY addChanged) + Q_PROPERTY(QQuickTransition *move READ move WRITE setMove NOTIFY moveChanged) + Q_PROPERTY(QQuickTransition *add READ add WRITE setAdd NOTIFY addChanged) public: enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 }; @@ -104,11 +104,11 @@ public: qreal spacing() const; void setSpacing(qreal); - QDeclarativeTransition *move() const; - void setMove(QDeclarativeTransition *); + QQuickTransition *move() const; + void setMove(QQuickTransition *); - QDeclarativeTransition *add() const; - void setAdd(QDeclarativeTransition *); + QQuickTransition *add() const; + void setAdd(QQuickTransition *); static QQuickPositionerAttached *qmlAttachedProperties(QObject *obj); diff --git a/src/quick/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h index f1d174dc0a..21fa67574b 100644 --- a/src/quick/items/qquickpositioners_p_p.h +++ b/src/quick/items/qquickpositioners_p_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 @@ -56,9 +56,9 @@ #include "qquickpositioners_p.h" #include "qquickimplicitsizeitem_p_p.h" -#include <QtQuick/private/qdeclarativestate_p.h> -#include <private/qdeclarativetransitionmanager_p_p.h> -#include <private/qdeclarativestateoperations_p.h> +#include <QtQuick/private/qquickstate_p.h> +#include <private/qquicktransitionmanager_p_p.h> +#include <private/qquickstatechangescript_p.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp index e2dbf17a29..062df127b3 100644 --- a/src/quick/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.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 @@ -207,7 +207,7 @@ void QQuickGradientStop::updateGradient() with red, blending to yellow at one third of the height of the rectangle, and ending with green: - \snippet doc/src/snippets/declarative/gradient.qml code + \snippet doc/src/snippets/qml/gradient.qml code \clearfloat \section1 Performance and Limitations @@ -248,9 +248,9 @@ QQuickGradient::~QQuickGradient() delete m_gradient; } -QDeclarativeListProperty<QQuickGradientStop> QQuickGradient::stops() +QQmlListProperty<QQuickGradientStop> QQuickGradient::stops() { - return QDeclarativeListProperty<QQuickGradientStop>(this, m_stops); + return QQmlListProperty<QQuickGradientStop>(this, m_stops); } const QGradient *QQuickGradient::gradient() const @@ -309,7 +309,7 @@ int QQuickRectanglePrivate::doUpdateSlotIdx = -1; The following example shows the effects of some of the common properties on a Rectangle item, which in this case is used to create a square: - \snippet doc/src/snippets/declarative/rectangle/rectangle.qml document + \snippet doc/src/snippets/qml/rectangle/rectangle.qml document \clearfloat \section1 Performance @@ -370,7 +370,7 @@ void QQuickRectangle::doUpdate() \inlineimage rect-border-width.png \enddiv - \snippet doc/src/snippets/declarative/rectangle/rect-border-width.qml 0 + \snippet doc/src/snippets/qml/rectangle/rect-border-width.qml 0 \clearfloat Here, the innermost rectangle's border is clipped on the bottom and right edges by its @@ -394,7 +394,7 @@ QQuickPen *QQuickRectangle::border() \inlineimage declarative-rect_gradient.png \enddiv - \snippet doc/src/snippets/declarative/rectangle/rectangle-gradient.qml rectangles + \snippet doc/src/snippets/qml/rectangle/rectangle-gradient.qml rectangles \clearfloat If both a gradient and a color are specified, the gradient will be used. @@ -463,7 +463,7 @@ void QQuickRectangle::setRadius(qreal radius) The following example shows rectangles with colors specified using hexadecimal and named color notation: - \snippet doc/src/snippets/declarative/rectangle/rectangle-colors.qml rectangles + \snippet doc/src/snippets/qml/rectangle/rectangle-colors.qml rectangles \clearfloat If both a gradient and a color are specified, the gradient will be used. diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h index 621e9dd980..eec2b56fd3 100644 --- a/src/quick/items/qquickrectangle_p.h +++ b/src/quick/items/qquickrectangle_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 @@ -111,14 +111,14 @@ class Q_AUTOTEST_EXPORT QQuickGradient : public QObject { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty<QQuickGradientStop> stops READ stops) + Q_PROPERTY(QQmlListProperty<QQuickGradientStop> stops READ stops) Q_CLASSINFO("DefaultProperty", "stops") public: QQuickGradient(QObject *parent=0); ~QQuickGradient(); - QDeclarativeListProperty<QQuickGradientStop> stops(); + QQmlListProperty<QQuickGradientStop> stops(); const QGradient *gradient() const; diff --git a/src/quick/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h index b2f53108a4..cb923ee563 100644 --- a/src/quick/items/qquickrectangle_p_p.h +++ b/src/quick/items/qquickrectangle_p_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/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp index 4dcbac772d..d26ebed85e 100644 --- a/src/quick/items/qquickrepeater.cpp +++ b/src/quick/items/qquickrepeater.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 @@ -43,10 +43,10 @@ #include "qquickrepeater_p_p.h" #include "qquickvisualdatamodel_p.h" -#include <private/qdeclarativeglobal_p.h> -#include <private/qdeclarativelistaccessor_p.h> +#include <private/qqmlglobal_p.h> +#include <private/qquicklistaccessor_p.h> #include <private/qlistmodelinterface_p.h> -#include <private/qdeclarativechangeset_p.h> +#include <private/qquickchangeset_p.h> QT_BEGIN_NAMESPACE @@ -79,9 +79,9 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate() The following Repeater creates three instances of a \l Rectangle item within a \l Row: - \snippet doc/src/snippets/declarative/repeaters/repeater.qml import + \snippet doc/src/snippets/qml/repeaters/repeater.qml import \codeline - \snippet doc/src/snippets/declarative/repeaters/repeater.qml simple + \snippet doc/src/snippets/qml/repeaters/repeater.qml simple \image repeater-simple.png @@ -96,7 +96,7 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate() a Repeater to be used inside a layout. For example, the following Repeater's items are stacked between a red rectangle and a blue rectangle: - \snippet doc/src/snippets/declarative/repeaters/repeater.qml layout + \snippet doc/src/snippets/qml/repeaters/repeater.qml layout \image repeater.png @@ -186,8 +186,8 @@ void QQuickRepeater::setModel(const QVariant &model) clear(); if (d->model) { - disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)), - this, SLOT(modelUpdated(QDeclarativeChangeSet,bool))); + disconnect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)), + this, SLOT(modelUpdated(QQuickChangeSet,bool))); disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*))); disconnect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*))); // disconnect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*))); @@ -212,8 +212,8 @@ void QQuickRepeater::setModel(const QVariant &model) dataModel->setModel(model); } if (d->model) { - connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)), - this, SLOT(modelUpdated(QDeclarativeChangeSet,bool))); + connect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)), + this, SLOT(modelUpdated(QQuickChangeSet,bool))); connect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*))); connect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*))); // connect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*))); @@ -235,7 +235,7 @@ void QQuickRepeater::setModel(const QVariant &model) \table \row - \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml index + \o \snippet doc/src/snippets/qml/repeaters/repeater.qml index \o \image repeater-index.png \endtable @@ -246,7 +246,7 @@ void QQuickRepeater::setModel(const QVariant &model) \table \row - \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml modeldata + \o \snippet doc/src/snippets/qml/repeaters/repeater.qml modeldata \o \image repeater-modeldata.png \endtable @@ -256,7 +256,7 @@ void QQuickRepeater::setModel(const QVariant &model) \sa {QML Data Models} */ -QDeclarativeComponent *QQuickRepeater::delegate() const +QQmlComponent *QQuickRepeater::delegate() const { Q_D(const QQuickRepeater); if (d->model) { @@ -267,7 +267,7 @@ QDeclarativeComponent *QQuickRepeater::delegate() const return 0; } -void QQuickRepeater::setDelegate(QDeclarativeComponent *delegate) +void QQuickRepeater::setDelegate(QQmlComponent *delegate) { Q_D(QQuickRepeater); if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model)) @@ -379,7 +379,7 @@ void QQuickRepeaterPrivate::createItems() break; } deletables[ii] = item; - QDeclarative_setParent_noEvent(item, q->parentItem()); + QQml_setParent_noEvent(item, q->parentItem()); item->setParentItem(q->parentItem()); if (ii > 0 && deletables.at(ii-1)) { item->stackAfter(deletables.at(ii-1)); @@ -408,11 +408,11 @@ void QQuickRepeater::createdItem(int, QQuickItem *) void QQuickRepeater::initItem(int, QQuickItem *item) { - QDeclarative_setParent_noEvent(item, parentItem()); + QQml_setParent_noEvent(item, parentItem()); item->setParentItem(parentItem()); } -void QQuickRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) +void QQuickRepeater::modelUpdated(const QQuickChangeSet &changeSet, bool reset) { Q_D(QQuickRepeater); @@ -426,7 +426,7 @@ void QQuickRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r int difference = 0; QHash<int, QVector<QPointer<QQuickItem> > > moved; - foreach (const QDeclarativeChangeSet::Remove &remove, changeSet.removes()) { + foreach (const QQuickChangeSet::Remove &remove, changeSet.removes()) { int index = qMin(remove.index, d->deletables.count()); int count = qMin(remove.index + remove.count, d->deletables.count()) - index; if (remove.isMove()) { @@ -447,7 +447,7 @@ void QQuickRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r } d->createFrom = -1; - foreach (const QDeclarativeChangeSet::Insert &insert, changeSet.inserts()) { + foreach (const QQuickChangeSet::Insert &insert, changeSet.inserts()) { int index = qMin(insert.index, d->deletables.count()); if (insert.isMove()) { QVector<QPointer<QQuickItem> > items = moved.value(insert.moveId); diff --git a/src/quick/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h index f23b1a3034..c67b065def 100644 --- a/src/quick/items/qquickrepeater_p.h +++ b/src/quick/items/qquickrepeater_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 @@ -48,7 +48,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeChangeSet; +class QQuickChangeSet; class QQuickRepeaterPrivate; class Q_AUTOTEST_EXPORT QQuickRepeater : public QQuickItem @@ -56,7 +56,7 @@ class Q_AUTOTEST_EXPORT QQuickRepeater : public QQuickItem Q_OBJECT Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged) - Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(int count READ count NOTIFY countChanged) Q_CLASSINFO("DefaultProperty", "delegate") @@ -67,8 +67,8 @@ public: QVariant model() const; void setModel(const QVariant &); - QDeclarativeComponent *delegate() const; - void setDelegate(QDeclarativeComponent *); + QQmlComponent *delegate() const; + void setDelegate(QQmlComponent *); int count() const; @@ -93,7 +93,7 @@ protected: private Q_SLOTS: void createdItem(int index, QQuickItem *item); void initItem(int, QQuickItem *item); - void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset); + void modelUpdated(const QQuickChangeSet &changeSet, bool reset); private: Q_DISABLE_COPY(QQuickRepeater) diff --git a/src/quick/items/qquickrepeater_p_p.h b/src/quick/items/qquickrepeater_p_p.h index 761e00c7b0..88e0c94218 100644 --- a/src/quick/items/qquickrepeater_p_p.h +++ b/src/quick/items/qquickrepeater_p_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 @@ QT_BEGIN_NAMESPACE -class QDeclarativeContext; +class QQmlContext; class QQuickVisualModel; class QQuickRepeaterPrivate : public QQuickItemPrivate { diff --git a/src/quick/items/qquickscalegrid.cpp b/src/quick/items/qquickscalegrid.cpp index c9b1d3eba7..de10d8de47 100644 --- a/src/quick/items/qquickscalegrid.cpp +++ b/src/quick/items/qquickscalegrid.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 "qquickscalegrid_p_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h index 9d02b6afb3..ae5627a48e 100644 --- a/src/quick/items/qquickscalegrid_p_p.h +++ b/src/quick/items/qquickscalegrid_p_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,10 +44,10 @@ #include "qquickborderimage_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtCore/qobject.h> -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> #include <private/qtquickglobal_p.h> QT_BEGIN_HEADER diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp index 3dfeb90ee0..a00df4600d 100644 --- a/src/quick/items/qquickscreen.cpp +++ b/src/quick/items/qquickscreen.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/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 7e2c389d6c..1a501f2f0f 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_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 @@ -42,10 +42,10 @@ #ifndef QQUICKSCREEN_P_H #define QQUICKSCREEN_P_H -#include <qdeclarative.h> +#include <qqml.h> #include <QRect> #include <QSize> -#include <private/qdeclarativeglobal_p.h> +#include <private/qqmlglobal_p.h> QT_BEGIN_HEADER diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index d90d8761c8..3024c31d51 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.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/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 2217cbc827..4475c22b28 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_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/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp index 8a43fb55f0..eff5910a09 100644 --- a/src/quick/items/qquickshadereffectmesh.cpp +++ b/src/quick/items/qquickshadereffectmesh.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/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h index 2e57d7db4c..0d8f5a24d0 100644 --- a/src/quick/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_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 @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeparserstatus.h" +#include "qqmlparserstatus.h" #include <QtQuick/qtquickglobal.h> #include <QtGui/qcolor.h> diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp index c809c70612..ae61ad940d 100644 --- a/src/quick/items/qquickshadereffectnode.cpp +++ b/src/quick/items/qquickshadereffectnode.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/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h index 295ac61d94..fc47f626e1 100644 --- a/src/quick/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_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/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp index 54590292c5..708d75d137 100644 --- a/src/quick/items/qquickshadereffectsource.cpp +++ b/src/quick/items/qquickshadereffectsource.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/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h index 55d72c18d9..793e89cd69 100644 --- a/src/quick/items/qquickshadereffectsource_p.h +++ b/src/quick/items/qquickshadereffectsource_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/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp index 2a1bd08d59..e0535ed77e 100644 --- a/src/quick/items/qquicksprite.cpp +++ b/src/quick/items/qquicksprite.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 Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquicksprite_p.h" -#include <qdeclarative.h> +#include <qqml.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h index dd6560f5ab..85e3ed8b16 100644 --- a/src/quick/items/qquicksprite_p.h +++ b/src/quick/items/qquicksprite_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -45,8 +45,8 @@ #include <QObject> #include <QUrl> #include <QVariantMap> -#include <QDeclarativeListProperty> -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <QQmlListProperty> +#include <QtQuick/private/qquickpixmapcache_p.h> #include "qquickspriteengine_p.h" #include <QDebug> @@ -312,7 +312,7 @@ private: int m_frameDuration; int m_frameDurationVariation; bool m_frameSync; - QDeclarativePixmap m_pix; + QQuickPixmap m_pix; }; QT_END_NAMESPACE diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index c19a5e65c9..1c35688c29 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.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 Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -41,8 +41,8 @@ #include "qquickspriteengine_p.h" #include "qquicksprite_p.h" -#include <qdeclarativeinfo.h> -#include <qdeclarative.h> +#include <qqmlinfo.h> +#include <qqml.h> #include <QDebug> #include <QPainter> #include <QSet> @@ -307,27 +307,27 @@ void QQuickStochasticEngine::setGoal(int state, int sprite, bool jump) return; } -QDeclarativePixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites +QQuickPixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites { if (!m_startedImageAssembly) - return QDeclarativePixmap::Null; + return QQuickPixmap::Null; int null, loading, ready; null = loading = ready = 0; foreach (QQuickSprite* s, m_sprites) { switch (s->m_pix.status()) { - case QDeclarativePixmap::Null : null++; break; - case QDeclarativePixmap::Loading : loading++; break; - case QDeclarativePixmap::Error : return QDeclarativePixmap::Error; - case QDeclarativePixmap::Ready : ready++; break; + case QQuickPixmap::Null : null++; break; + case QQuickPixmap::Loading : loading++; break; + case QQuickPixmap::Error : return QQuickPixmap::Error; + case QQuickPixmap::Ready : ready++; break; } } if (null) - return QDeclarativePixmap::Null; + return QQuickPixmap::Null; if (loading) - return QDeclarativePixmap::Loading; + return QQuickPixmap::Loading; if (ready) - return QDeclarativePixmap::Ready; - return QDeclarativePixmap::Null; + return QQuickPixmap::Ready; + return QQuickPixmap::Null; } void QQuickSpriteEngine::startAssemblingImage() @@ -348,13 +348,13 @@ void QQuickSpriteEngine::startAssemblingImage() QImage QQuickSpriteEngine::assembledImage() { - QDeclarativePixmap::Status stat = status(); - if (stat == QDeclarativePixmap::Error) + QQuickPixmap::Status stat = status(); + if (stat == QQuickPixmap::Error) foreach (QQuickSprite* s, m_sprites) if (s->m_pix.isError()) qmlInfo(s) << s->m_pix.error(); - if (stat != QDeclarativePixmap::Ready) + if (stat != QQuickPixmap::Ready) return QImage(); int h = 0; diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 500d526da5..3763509462 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -47,10 +47,10 @@ #include <QTimer> #include <QTime> #include <QList> -#include <QDeclarativeListProperty> +#include <QQmlListProperty> #include <QImage> #include <QPair> -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> QT_BEGIN_HEADER @@ -178,15 +178,15 @@ class Q_AUTOTEST_EXPORT QQuickStochasticEngine : public QObject Q_OBJECT //TODO: Optimize single state case? Q_PROPERTY(QString globalGoal READ globalGoal WRITE setGlobalGoal NOTIFY globalGoalChanged) - Q_PROPERTY(QDeclarativeListProperty<QQuickStochasticState> states READ states) + Q_PROPERTY(QQmlListProperty<QQuickStochasticState> states READ states) public: explicit QQuickStochasticEngine(QObject *parent = 0); QQuickStochasticEngine(QList<QQuickStochasticState*> states, QObject *parent=0); ~QQuickStochasticEngine(); - QDeclarativeListProperty<QQuickStochasticState> states() + QQmlListProperty<QQuickStochasticState> states() { - return QDeclarativeListProperty<QQuickStochasticState>(this, m_states); + return QQmlListProperty<QQuickStochasticState>(this, m_states); } QString globalGoal() const @@ -255,14 +255,14 @@ protected: class QQuickSpriteEngine : public QQuickStochasticEngine { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites) + Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites) public: explicit QQuickSpriteEngine(QObject *parent = 0); QQuickSpriteEngine(QList<QQuickSprite*> sprites, QObject *parent=0); ~QQuickSpriteEngine(); - QDeclarativeListProperty<QQuickSprite> sprites() + QQmlListProperty<QQuickSprite> sprites() { - return QDeclarativeListProperty<QQuickSprite>(this, m_sprites); + return QQmlListProperty<QQuickSprite>(this, m_sprites); } QQuickSprite* sprite(int sprite=0); @@ -280,12 +280,12 @@ public: virtual void restart(int index=0); virtual void advance(int index=0); - //Similar API to QDeclarativePixmap for async loading convenience - bool isNull() { return status() == QDeclarativePixmap::Null; } - bool isReady() { return status() == QDeclarativePixmap::Ready; } - bool isLoading() { return status() == QDeclarativePixmap::Loading; } - bool isError() { return status() == QDeclarativePixmap::Error; } - QDeclarativePixmap::Status status();//Composed status of all Sprites + //Similar API to QQuickPixmap for async loading convenience + bool isNull() { return status() == QQuickPixmap::Null; } + bool isReady() { return status() == QQuickPixmap::Ready; } + bool isLoading() { return status() == QQuickPixmap::Loading; } + bool isError() { return status() == QQuickPixmap::Error; } + QQuickPixmap::Status status();//Composed status of all Sprites void startAssemblingImage(); QImage assembledImage(); @@ -296,24 +296,24 @@ private: }; //Common use is to have your own list property which is transparently an engine -inline void spriteAppend(QDeclarativeListProperty<QQuickSprite> *p, QQuickSprite* s) +inline void spriteAppend(QQmlListProperty<QQuickSprite> *p, QQuickSprite* s) { reinterpret_cast<QList<QQuickSprite *> *>(p->data)->append(s); p->object->metaObject()->invokeMethod(p->object, "createEngine"); } -inline QQuickSprite* spriteAt(QDeclarativeListProperty<QQuickSprite> *p, int idx) +inline QQuickSprite* spriteAt(QQmlListProperty<QQuickSprite> *p, int idx) { return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->at(idx); } -inline void spriteClear(QDeclarativeListProperty<QQuickSprite> *p) +inline void spriteClear(QQmlListProperty<QQuickSprite> *p) { reinterpret_cast<QList<QQuickSprite *> *>(p->data)->clear(); p->object->metaObject()->invokeMethod(p->object, "createEngine"); } -inline int spriteCount(QDeclarativeListProperty<QQuickSprite> *p) +inline int spriteCount(QQmlListProperty<QQuickSprite> *p) { return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->count(); } diff --git a/src/quick/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp new file mode 100644 index 0000000000..6edb3ad8c3 --- /dev/null +++ b/src/quick/items/qquickspriteimage.cpp @@ -0,0 +1,482 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the Declarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickspriteimage_p.h" +#include "qquicksprite_p.h" +#include "qquickspriteengine_p.h" +#include <QtQuick/private/qsgcontext_p.h> +#include <private/qsgadaptationlayer_p.h> +#include <QtQuick/qsgnode.h> +#include <QtQuick/qsgengine.h> +#include <QtQuick/qsgtexturematerial.h> +#include <QtQuick/qsgtexture.h> +#include <QtQuick/qquickcanvas.h> +#include <QtQml/qqmlinfo.h> +#include <QFile> +#include <cmath> +#include <qmath.h> +#include <QDebug> + +QT_BEGIN_NAMESPACE + +static const char vertexShaderCode[] = + "attribute highp vec2 vTex;\n" + "uniform highp vec3 animData;// w,h(premultiplied of anim), interpolation progress\n" + "uniform highp vec4 animPos;//x,y, x,y (two frames for interpolation)\n" + "uniform highp vec2 size;//w,h of element\n" + "\n" + "uniform highp mat4 qt_Matrix;\n" + "\n" + "varying highp vec4 fTexS;\n" + "varying lowp float progress;\n" + "\n" + "\n" + "void main() {\n" + " progress = animData.z;\n" + " //Calculate frame location in texture\n" + " fTexS.xy = animPos.xy + vTex.xy * animData.xy;\n" + " //Next frame is also passed, for interpolation\n" + " fTexS.zw = animPos.zw + vTex.xy * animData.xy;\n" + "\n" + " gl_Position = qt_Matrix * vec4(size.x * vTex.x, size.y * vTex.y, 0, 1);\n" + "}\n"; + +static const char fragmentShaderCode[] = + "uniform sampler2D texture;\n" + "uniform lowp float qt_Opacity;\n" + "\n" + "varying highp vec4 fTexS;\n" + "varying lowp float progress;\n" + "\n" + "void main() {\n" + " gl_FragColor = mix(texture2D(texture, fTexS.xy), texture2D(texture, fTexS.zw), progress) * qt_Opacity;\n" + "}\n"; + +class QQuickSpriteImageMaterial : public QSGMaterial +{ +public: + QQuickSpriteImageMaterial(); + ~QQuickSpriteImageMaterial(); + virtual QSGMaterialType *type() const { static QSGMaterialType type; return &type; } + virtual QSGMaterialShader *createShader() const; + virtual int compare(const QSGMaterial *other) const + { + return this - static_cast<const QQuickSpriteImageMaterial *>(other); + } + + QSGTexture *texture; + + float animT; + float animX1; + float animY1; + float animX2; + float animY2; + float animW; + float animH; + float elementWidth; + float elementHeight; +}; + +QQuickSpriteImageMaterial::QQuickSpriteImageMaterial() + : animT(0.0f) + , animX1(0.0f) + , animY1(0.0f) + , animX2(0.0f) + , animY2(0.0f) + , animW(1.0f) + , animH(1.0f) + , elementWidth(1.0f) + , elementHeight(1.0f) +{ + setFlag(Blending, true); +} + +QQuickSpriteImageMaterial::~QQuickSpriteImageMaterial() +{ + delete texture; +} + +class SpriteImageMaterialData : public QSGMaterialShader +{ +public: + SpriteImageMaterialData(const char * /* vertexFile */ = 0, const char * /* fragmentFile */ = 0) + { + } + + void deactivate() { + QSGMaterialShader::deactivate(); + + for (int i=0; i<8; ++i) { + program()->setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); + } + } + + virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) + { + QQuickSpriteImageMaterial *m = static_cast<QQuickSpriteImageMaterial *>(newEffect); + m->texture->bind(); + + program()->setUniformValue(m_opacity_id, state.opacity()); + program()->setUniformValue(m_animData_id, m->animW, m->animH, m->animT); + program()->setUniformValue(m_animPos_id, m->animX1, m->animY1, m->animX2, m->animY2); + program()->setUniformValue(m_size_id, m->elementWidth, m->elementHeight); + + if (state.isMatrixDirty()) + program()->setUniformValue(m_matrix_id, state.combinedMatrix()); + } + + virtual void initialize() { + m_matrix_id = program()->uniformLocation("qt_Matrix"); + m_opacity_id = program()->uniformLocation("qt_Opacity"); + m_animData_id = program()->uniformLocation("animData"); + m_animPos_id = program()->uniformLocation("animPos"); + m_size_id = program()->uniformLocation("size"); + } + + virtual const char *vertexShader() const { return vertexShaderCode; } + virtual const char *fragmentShader() const { return fragmentShaderCode; } + + virtual char const *const *attributeNames() const { + static const char *attr[] = { + "vTex", + 0 + }; + return attr; + } + + int m_matrix_id; + int m_opacity_id; + int m_animData_id; + int m_animPos_id; + int m_size_id; + + static float chunkOfBytes[1024]; +}; + +float SpriteImageMaterialData::chunkOfBytes[1024]; + +QSGMaterialShader *QQuickSpriteImageMaterial::createShader() const +{ + return new SpriteImageMaterialData; +} + +struct SpriteVertex { + float tx; + float ty; +}; + +struct SpriteVertices { + SpriteVertex v1; + SpriteVertex v2; + SpriteVertex v3; + SpriteVertex v4; +}; + +/*! + \qmlclass SpriteImage QQuickSpriteImage + \inqmlmodule QtQuick 2 + \inherits Item + \brief The SpriteImage element draws a sprite animation + +*/ +/*! + \qmlproperty bool QtQuick2::SpriteImage::running + + Whether the sprite is animating or not. + + Default is true +*/ +/*! + \qmlproperty bool QtQuick2::SpriteImage::interpolate + + If true, interpolation will occur between sprite frames to make the + animation appear smoother. + + Default is true. +*/ +/*! + \qmlproperty string QtQuick2::SpriteImage::goalSprite + + The name of the Sprite which is currently animating. +*/ +/*! + \qmlproperty string QtQuick2::SpriteImage::goalSprite + + The name of the Sprite which the animation should move to. + + Sprite states have defined durations and transitions between them, setting goalState + will cause it to disregard any path weightings (including 0) and head down the path + which will reach the goalState quickest (fewest animations). It will pass through + intermediate states on that path, and animate them for their duration. + + If it is possible to return to the goalState from the starting point of the goalState + it will continue to do so until goalState is set to "" or an unreachable state. +*/ +/*! \qmlmethod void QtQuick2::SpriteImage::jumpTo(string sprite) + + This function causes the sprite to jump to the specified state immediately, intermediate + states are not played. +*/ +/*! + \qmlproperty list<Sprite> QtQuick2::SpriteImage::sprites + + The sprite or sprites to draw. Sprites will be scaled to the size of this element. +*/ + +//TODO: Implicitly size element to size of first sprite? +QQuickSpriteImage::QQuickSpriteImage(QQuickItem *parent) : + QQuickItem(parent) + , m_node(0) + , m_material(0) + , m_spriteEngine(0) + , m_curFrame(0) + , m_pleaseReset(false) + , m_running(true) + , m_interpolate(true) + , m_curStateIdx(0) +{ + setFlag(ItemHasContents); + connect(this, SIGNAL(runningChanged(bool)), + this, SLOT(update())); +} + +void QQuickSpriteImage::jumpTo(const QString &sprite) +{ + if (!m_spriteEngine) + return; + m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite), 0, true); +} + +void QQuickSpriteImage::setGoalSprite(const QString &sprite) +{ + if (m_goalState != sprite){ + m_goalState = sprite; + emit goalSpriteChanged(sprite); + m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite)); + } +} + +QQmlListProperty<QQuickSprite> QQuickSpriteImage::sprites() +{ + return QQmlListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear); +} + +void QQuickSpriteImage::createEngine() +{ + //TODO: delay until component complete + if (m_spriteEngine) + delete m_spriteEngine; + if (m_sprites.count()) + m_spriteEngine = new QQuickSpriteEngine(m_sprites, this); + else + m_spriteEngine = 0; + reset(); +} + +static QSGGeometry::Attribute SpriteImage_Attributes[] = { + QSGGeometry::Attribute::create(0, 2, GL_FLOAT), // tex +}; + +static QSGGeometry::AttributeSet SpriteImage_AttributeSet = +{ + 1, // Attribute Count + 2 * sizeof(float), + SpriteImage_Attributes +}; + +QSGGeometryNode* QQuickSpriteImage::buildNode() +{ + if (!m_spriteEngine) { + qmlInfo(this) << "No sprite engine..."; + return 0; + } else if (m_spriteEngine->status() == QQuickPixmap::Null) { + m_spriteEngine->startAssemblingImage(); + update();//Schedule another update, where we will check again + return 0; + } else if (m_spriteEngine->status() == QQuickPixmap::Loading) { + update();//Schedule another update, where we will check again + return 0; + } + + m_material = new QQuickSpriteImageMaterial(); + + QImage image = m_spriteEngine->assembledImage(); + if (image.isNull()) + return 0; + m_sheetSize = QSizeF(image.size()); + m_material->texture = canvas()->createTextureFromImage(image); + m_material->texture->setFiltering(QSGTexture::Linear); + m_spriteEngine->start(0); + m_material->animT = 0; + m_material->animX1 = m_spriteEngine->spriteX() / m_sheetSize.width(); + m_material->animY1 = m_spriteEngine->spriteY() / m_sheetSize.height(); + m_material->animX2 = m_material->animX1; + m_material->animY2 = m_material->animY1; + m_material->animW = m_spriteEngine->spriteWidth() / m_sheetSize.width(); + m_material->animH = m_spriteEngine->spriteHeight() / m_sheetSize.height(); + m_material->elementWidth = width(); + m_material->elementHeight = height(); + m_curState = m_spriteEngine->state(m_spriteEngine->curState())->name(); + emit currentSpriteChanged(m_curState); + + int vCount = 4; + int iCount = 6; + QSGGeometry *g = new QSGGeometry(SpriteImage_AttributeSet, vCount, iCount); + g->setDrawingMode(GL_TRIANGLES); + + SpriteVertices *p = (SpriteVertices *) g->vertexData(); + + p->v1.tx = 0; + p->v1.ty = 0; + + p->v2.tx = 1.0; + p->v2.ty = 0; + + p->v3.tx = 0; + p->v3.ty = 1.0; + + p->v4.tx = 1.0; + p->v4.ty = 1.0; + + quint16 *indices = g->indexDataAsUShort(); + indices[0] = 0; + indices[1] = 1; + indices[2] = 2; + indices[3] = 1; + indices[4] = 3; + indices[5] = 2; + + + m_timestamp.start(); + m_node = new QSGGeometryNode(); + m_node->setGeometry(g); + m_node->setMaterial(m_material); + m_node->setFlag(QSGGeometryNode::OwnsMaterial); + return m_node; +} + +void QQuickSpriteImage::reset() +{ + m_pleaseReset = true; +} + +QSGNode *QQuickSpriteImage::updatePaintNode(QSGNode *, UpdatePaintNodeData *) +{ + if (m_pleaseReset) { + delete m_node; + + m_node = 0; + m_material = 0; + m_pleaseReset = false; + } + + prepareNextFrame(); + + if (m_running) { + update(); + if (m_node) + m_node->markDirty(QSGNode::DirtyMaterial); + } + + return m_node; +} + +void QQuickSpriteImage::prepareNextFrame() +{ + if (m_node == 0) + m_node = buildNode(); + if (m_node == 0) //error creating node + return; + + uint timeInt = m_timestamp.elapsed(); + qreal time = timeInt / 1000.; + m_material->elementHeight = height(); + m_material->elementWidth = width(); + + //Advance State + m_spriteEngine->updateSprites(timeInt); + if (m_curStateIdx != m_spriteEngine->curState()) { + m_curStateIdx = m_spriteEngine->curState(); + m_curState = m_spriteEngine->state(m_spriteEngine->curState())->name(); + emit currentSpriteChanged(m_curState); + m_curFrame= -1; + } + + //Advance Sprite + qreal animT = m_spriteEngine->spriteStart()/1000.0; + qreal frameCount = m_spriteEngine->spriteFrames(); + qreal frameDuration = m_spriteEngine->spriteDuration()/frameCount; + double frameAt; + qreal progress; + if (frameDuration > 0) { + qreal frame = (time - animT)/(frameDuration / 1000.0); + frame = qBound(qreal(0.0), frame, frameCount - qreal(1.0));//Stop at count-1 frames until we have between anim interpolation + progress = modf(frame,&frameAt); + } else { + m_curFrame++; + if (m_curFrame >= frameCount){ + m_curFrame = 0; + m_spriteEngine->advance(); + } + frameAt = m_curFrame; + progress = 0; + } + if (m_spriteEngine->sprite()->reverse()) + frameAt = (m_spriteEngine->spriteFrames() - 1) - frameAt; + qreal y = m_spriteEngine->spriteY() / m_sheetSize.height(); + qreal w = m_spriteEngine->spriteWidth() / m_sheetSize.width(); + qreal h = m_spriteEngine->spriteHeight() / m_sheetSize.height(); + qreal x1 = m_spriteEngine->spriteX() / m_sheetSize.width(); + x1 += frameAt * w; + qreal x2 = x1; + if (frameAt < (frameCount-1)) + x2 += w; + + m_material->animX1 = x1; + m_material->animY1 = y; + m_material->animX2 = x2; + m_material->animY2 = y; + m_material->animW = w; + m_material->animH = h; + m_material->animT = m_interpolate ? progress : 0.0; +} + +QT_END_NAMESPACE diff --git a/src/quick/items/qquickspriteimage_p.h b/src/quick/items/qquickspriteimage_p.h new file mode 100644 index 0000000000..1574afcb75 --- /dev/null +++ b/src/quick/items/qquickspriteimage_p.h @@ -0,0 +1,148 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the Declarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKSPRITEIMAGE_P_H +#define QQUICKSPRITEIMAGE_P_H + +#include <QtQuick/QQuickItem> +#include <QTime> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +class QSGContext; +class QQuickSprite; +class QQuickSpriteEngine; +class QSGGeometryNode; +class QQuickSpriteImageMaterial; +class Q_AUTOTEST_EXPORT QQuickSpriteImage : public QQuickItem +{ + Q_OBJECT + Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged) + Q_PROPERTY(bool interpolate READ interpolate WRITE setInterpolate NOTIFY interpolateChanged) + Q_PROPERTY(QString goalSprite READ goalSprite WRITE setGoalSprite NOTIFY goalSpriteChanged) + Q_PROPERTY(QString currentSprite READ currentSprite NOTIFY currentSpriteChanged) + //###try to share similar spriteEngines for less overhead? + Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites) + Q_CLASSINFO("DefaultProperty", "sprites") + +public: + explicit QQuickSpriteImage(QQuickItem *parent = 0); + + QQmlListProperty<QQuickSprite> sprites(); + + bool running() const + { + return m_running; + } + + bool interpolate() const + { + return m_interpolate; + } + + QString goalSprite() const + { + return m_goalState; + } + + QString currentSprite() const + { + return m_curState; + } + +signals: + + void runningChanged(bool arg); + void interpolateChanged(bool arg); + void goalSpriteChanged(QString arg); + void currentSpriteChanged(QString arg); + +public slots: + + void jumpTo(const QString &sprite); + void setGoalSprite(const QString &sprite); + + void setRunning(bool arg) + { + if (m_running != arg) { + m_running = arg; + emit runningChanged(arg); + } + } + + void setInterpolate(bool arg) + { + if (m_interpolate != arg) { + m_interpolate = arg; + emit interpolateChanged(arg); + } + } + +private slots: + void createEngine(); +protected: + void reset(); + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); +private: + void prepareNextFrame(); + QSGGeometryNode* buildNode(); + QSGGeometryNode *m_node; + QQuickSpriteImageMaterial *m_material; + QList<QQuickSprite*> m_sprites; + QQuickSpriteEngine* m_spriteEngine; + QTime m_timestamp; + int m_curFrame; + bool m_pleaseReset; + bool m_running; + bool m_interpolate; + QString m_goalState; + QString m_curState; + int m_curStateIdx; + QSizeF m_sheetSize; +}; + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QQUICKSPRITEIMAGE_P_H diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp index a3a8a6ee8c..ce0a246748 100644 --- a/src/quick/items/qquickspritesequence.cpp +++ b/src/quick/items/qquickspritesequence.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 Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -49,7 +49,7 @@ #include <QtQuick/qsgtexturematerial.h> #include <QtQuick/qsgtexture.h> #include <QtQuick/qquickcanvas.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QFile> #include <cmath> #include <qmath.h> @@ -294,9 +294,9 @@ void QQuickSpriteSequence::setGoalSprite(const QString &sprite) } } -QDeclarativeListProperty<QQuickSprite> QQuickSpriteSequence::sprites() +QQmlListProperty<QQuickSprite> QQuickSpriteSequence::sprites() { - return QDeclarativeListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear); + return QQmlListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear); } void QQuickSpriteSequence::createEngine() @@ -327,11 +327,11 @@ QSGGeometryNode* QQuickSpriteSequence::buildNode() if (!m_spriteEngine) { qmlInfo(this) << "No sprite engine..."; return 0; - } else if (m_spriteEngine->status() == QDeclarativePixmap::Null) { + } else if (m_spriteEngine->status() == QQuickPixmap::Null) { m_spriteEngine->startAssemblingImage(); update();//Schedule another update, where we will check again return 0; - } else if (m_spriteEngine->status() == QDeclarativePixmap::Loading) { + } else if (m_spriteEngine->status() == QQuickPixmap::Loading) { update();//Schedule another update, where we will check again return 0; } diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h index 8a95594f61..a2f9e4139a 100644 --- a/src/quick/items/qquickspritesequence_p.h +++ b/src/quick/items/qquickspritesequence_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -62,13 +62,13 @@ class Q_AUTOTEST_EXPORT QQuickSpriteSequence : public QQuickItem Q_PROPERTY(QString goalSprite READ goalSprite WRITE setGoalSprite NOTIFY goalSpriteChanged) Q_PROPERTY(QString currentSprite READ currentSprite NOTIFY currentSpriteChanged) //###try to share similar spriteEngines for less overhead? - Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites) + Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites) Q_CLASSINFO("DefaultProperty", "sprites") public: explicit QQuickSpriteSequence(QQuickItem *parent = 0); - QDeclarativeListProperty<QQuickSprite> sprites(); + QQmlListProperty<QQuickSprite> sprites(); bool running() const { diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp index ca2a94716a..668c7c07d7 100644 --- a/src/quick/items/qquickstateoperations.cpp +++ b/src/quick/items/qquickstateoperations.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 @@ -42,14 +42,14 @@ #include "qquickstateoperations_p.h" #include "qquickitem_p.h" -#include <private/qdeclarativestate_p_p.h> +#include <private/qquickstate_p_p.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtCore/qmath.h> QT_BEGIN_NAMESPACE -class QQuickParentChangePrivate : public QDeclarativeStateOperationPrivate +class QQuickParentChangePrivate : public QQuickStateOperationPrivate { Q_DECLARE_PUBLIC(QQuickParentChange) public: @@ -57,18 +57,18 @@ public: rewindParent(0), rewindStackBefore(0) {} QQuickItem *target; - QDeclarativeGuard<QQuickItem> parent; - QDeclarativeGuard<QQuickItem> origParent; - QDeclarativeGuard<QQuickItem> origStackBefore; + QQmlGuard<QQuickItem> parent; + QQmlGuard<QQuickItem> origParent; + QQmlGuard<QQuickItem> origStackBefore; QQuickItem *rewindParent; QQuickItem *rewindStackBefore; - QDeclarativeNullableValue<QDeclarativeScriptString> xString; - QDeclarativeNullableValue<QDeclarativeScriptString> yString; - QDeclarativeNullableValue<QDeclarativeScriptString> widthString; - QDeclarativeNullableValue<QDeclarativeScriptString> heightString; - QDeclarativeNullableValue<QDeclarativeScriptString> scaleString; - QDeclarativeNullableValue<QDeclarativeScriptString> rotationString; + QQmlNullableValue<QQmlScriptString> xString; + QQmlNullableValue<QQmlScriptString> yString; + QQmlNullableValue<QQmlScriptString> widthString; + QQmlNullableValue<QQmlScriptString> heightString; + QQmlNullableValue<QQmlScriptString> scaleString; + QQmlNullableValue<QQmlScriptString> rotationString; void doChange(QQuickItem *targetParent, QQuickItem *stackBefore = 0); }; @@ -147,7 +147,7 @@ void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *s } QQuickParentChange::QQuickParentChange(QObject *parent) - : QDeclarativeStateOperation(*(new QQuickParentChangePrivate), parent) + : QQuickStateOperation(*(new QQuickParentChangePrivate), parent) { } @@ -155,13 +155,13 @@ QQuickParentChange::~QQuickParentChange() { } -QDeclarativeScriptString QQuickParentChange::x() const +QQmlScriptString QQuickParentChange::x() const { Q_D(const QQuickParentChange); return d->xString.value; } -void QQuickParentChange::setX(QDeclarativeScriptString x) +void QQuickParentChange::setX(QQmlScriptString x) { Q_D(QQuickParentChange); d->xString = x; @@ -173,13 +173,13 @@ bool QQuickParentChange::xIsSet() const return d->xString.isValid(); } -QDeclarativeScriptString QQuickParentChange::y() const +QQmlScriptString QQuickParentChange::y() const { Q_D(const QQuickParentChange); return d->yString.value; } -void QQuickParentChange::setY(QDeclarativeScriptString y) +void QQuickParentChange::setY(QQmlScriptString y) { Q_D(QQuickParentChange); d->yString = y; @@ -191,13 +191,13 @@ bool QQuickParentChange::yIsSet() const return d->yString.isValid(); } -QDeclarativeScriptString QQuickParentChange::width() const +QQmlScriptString QQuickParentChange::width() const { Q_D(const QQuickParentChange); return d->widthString.value; } -void QQuickParentChange::setWidth(QDeclarativeScriptString width) +void QQuickParentChange::setWidth(QQmlScriptString width) { Q_D(QQuickParentChange); d->widthString = width; @@ -209,13 +209,13 @@ bool QQuickParentChange::widthIsSet() const return d->widthString.isValid(); } -QDeclarativeScriptString QQuickParentChange::height() const +QQmlScriptString QQuickParentChange::height() const { Q_D(const QQuickParentChange); return d->heightString.value; } -void QQuickParentChange::setHeight(QDeclarativeScriptString height) +void QQuickParentChange::setHeight(QQmlScriptString height) { Q_D(QQuickParentChange); d->heightString = height; @@ -227,13 +227,13 @@ bool QQuickParentChange::heightIsSet() const return d->heightString.isValid(); } -QDeclarativeScriptString QQuickParentChange::scale() const +QQmlScriptString QQuickParentChange::scale() const { Q_D(const QQuickParentChange); return d->scaleString.value; } -void QQuickParentChange::setScale(QDeclarativeScriptString scale) +void QQuickParentChange::setScale(QQmlScriptString scale) { Q_D(QQuickParentChange); d->scaleString = scale; @@ -245,13 +245,13 @@ bool QQuickParentChange::scaleIsSet() const return d->scaleString.isValid(); } -QDeclarativeScriptString QQuickParentChange::rotation() const +QQmlScriptString QQuickParentChange::rotation() const { Q_D(const QQuickParentChange); return d->rotationString.value; } -void QQuickParentChange::setRotation(QDeclarativeScriptString rotation) +void QQuickParentChange::setRotation(QQmlScriptString rotation) { Q_D(QQuickParentChange); d->rotationString = rotation; @@ -293,7 +293,7 @@ void QQuickParentChange::setParent(QQuickItem *parent) d->parent = parent; } -QDeclarativeStateOperation::ActionList QQuickParentChange::actions() +QQuickStateOperation::ActionList QQuickParentChange::actions() { Q_D(QQuickParentChange); if (!d->target || !d->parent) @@ -301,7 +301,7 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions() ActionList actions; - QDeclarativeAction a; + QQuickAction a; a.event = this; actions << a; @@ -310,13 +310,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions() QString script = d->xString.value.script(); qreal x = script.toFloat(&ok); if (ok) { - QDeclarativeAction xa(d->target, QLatin1String("x"), x); + QQuickAction xa(d->target, QLatin1String("x"), x); actions << xa; } else { - QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this)); - QDeclarativeProperty property(d->target, QLatin1String("x")); + QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this)); + QQmlProperty property(d->target, QLatin1String("x")); newBinding->setTarget(property); - QDeclarativeAction xa; + QQuickAction xa; xa.property = property; xa.toBinding = newBinding; xa.fromValue = xa.property.read(); @@ -330,13 +330,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions() QString script = d->yString.value.script(); qreal y = script.toFloat(&ok); if (ok) { - QDeclarativeAction ya(d->target, QLatin1String("y"), y); + QQuickAction ya(d->target, QLatin1String("y"), y); actions << ya; } else { - QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this)); - QDeclarativeProperty property(d->target, QLatin1String("y")); + QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this)); + QQmlProperty property(d->target, QLatin1String("y")); newBinding->setTarget(property); - QDeclarativeAction ya; + QQuickAction ya; ya.property = property; ya.toBinding = newBinding; ya.fromValue = ya.property.read(); @@ -350,13 +350,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions() QString script = d->scaleString.value.script(); qreal scale = script.toFloat(&ok); if (ok) { - QDeclarativeAction sa(d->target, QLatin1String("scale"), scale); + QQuickAction sa(d->target, QLatin1String("scale"), scale); actions << sa; } else { - QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this)); - QDeclarativeProperty property(d->target, QLatin1String("scale")); + QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this)); + QQmlProperty property(d->target, QLatin1String("scale")); newBinding->setTarget(property); - QDeclarativeAction sa; + QQuickAction sa; sa.property = property; sa.toBinding = newBinding; sa.fromValue = sa.property.read(); @@ -370,13 +370,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions() QString script = d->rotationString.value.script(); qreal rotation = script.toFloat(&ok); if (ok) { - QDeclarativeAction ra(d->target, QLatin1String("rotation"), rotation); + QQuickAction ra(d->target, QLatin1String("rotation"), rotation); actions << ra; } else { - QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this)); - QDeclarativeProperty property(d->target, QLatin1String("rotation")); + QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this)); + QQmlProperty property(d->target, QLatin1String("rotation")); newBinding->setTarget(property); - QDeclarativeAction ra; + QQuickAction ra; ra.property = property; ra.toBinding = newBinding; ra.fromValue = ra.property.read(); @@ -390,13 +390,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions() QString script = d->widthString.value.script(); qreal width = script.toFloat(&ok); if (ok) { - QDeclarativeAction wa(d->target, QLatin1String("width"), width); + QQuickAction wa(d->target, QLatin1String("width"), width); actions << wa; } else { - QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this)); - QDeclarativeProperty property(d->target, QLatin1String("width")); + QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this)); + QQmlProperty property(d->target, QLatin1String("width")); newBinding->setTarget(property); - QDeclarativeAction wa; + QQuickAction wa; wa.property = property; wa.toBinding = newBinding; wa.fromValue = wa.property.read(); @@ -410,13 +410,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions() QString script = d->heightString.value.script(); qreal height = script.toFloat(&ok); if (ok) { - QDeclarativeAction ha(d->target, QLatin1String("height"), height); + QQuickAction ha(d->target, QLatin1String("height"), height); actions << ha; } else { - QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this)); - QDeclarativeProperty property(d->target, QLatin1String("height")); + QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this)); + QQmlProperty property(d->target, QLatin1String("height")); newBinding->setTarget(property); - QDeclarativeAction ha; + QQuickAction ha; ha.property = property; ha.toBinding = newBinding; ha.fromValue = ha.property.read(); @@ -436,7 +436,7 @@ void QQuickParentChange::saveOriginals() d->origStackBefore = d->rewindStackBefore; } -/*void QQuickParentChange::copyOriginals(QDeclarativeActionEvent *other) +/*void QQuickParentChange::copyOriginals(QQuickActionEvent *other) { Q_D(QQuickParentChange); QQuickParentChange *pc = static_cast<QQuickParentChange*>(other); @@ -464,12 +464,12 @@ void QQuickParentChange::reverse(Reason) d->doChange(d->origParent, d->origStackBefore); } -QDeclarativeActionEvent::EventType QQuickParentChange::type() const +QQuickActionEvent::EventType QQuickParentChange::type() const { return ParentChange; } -bool QQuickParentChange::override(QDeclarativeActionEvent*other) +bool QQuickParentChange::override(QQuickActionEvent*other) { Q_D(QQuickParentChange); if (other->type() != ParentChange) @@ -526,13 +526,13 @@ public: QQuickItem *fill; QQuickItem *centerIn; - QDeclarativeScriptString leftScript; - QDeclarativeScriptString rightScript; - QDeclarativeScriptString topScript; - QDeclarativeScriptString bottomScript; - QDeclarativeScriptString hCenterScript; - QDeclarativeScriptString vCenterScript; - QDeclarativeScriptString baselineScript; + QQmlScriptString leftScript; + QQmlScriptString rightScript; + QQmlScriptString topScript; + QQmlScriptString bottomScript; + QQmlScriptString hCenterScript; + QQmlScriptString vCenterScript; + QQmlScriptString baselineScript; /*qreal leftMargin; qreal rightMargin; @@ -553,13 +553,13 @@ QQuickAnchorSet::~QQuickAnchorSet() { } -QDeclarativeScriptString QQuickAnchorSet::top() const +QQmlScriptString QQuickAnchorSet::top() const { Q_D(const QQuickAnchorSet); return d->topScript; } -void QQuickAnchorSet::setTop(const QDeclarativeScriptString &edge) +void QQuickAnchorSet::setTop(const QQmlScriptString &edge) { Q_D(QQuickAnchorSet); d->usedAnchors |= QQuickAnchors::TopAnchor; @@ -575,13 +575,13 @@ void QQuickAnchorSet::resetTop() d->resetAnchors |= QQuickAnchors::TopAnchor; } -QDeclarativeScriptString QQuickAnchorSet::bottom() const +QQmlScriptString QQuickAnchorSet::bottom() const { Q_D(const QQuickAnchorSet); return d->bottomScript; } -void QQuickAnchorSet::setBottom(const QDeclarativeScriptString &edge) +void QQuickAnchorSet::setBottom(const QQmlScriptString &edge) { Q_D(QQuickAnchorSet); d->usedAnchors |= QQuickAnchors::BottomAnchor; @@ -597,13 +597,13 @@ void QQuickAnchorSet::resetBottom() d->resetAnchors |= QQuickAnchors::BottomAnchor; } -QDeclarativeScriptString QQuickAnchorSet::verticalCenter() const +QQmlScriptString QQuickAnchorSet::verticalCenter() const { Q_D(const QQuickAnchorSet); return d->vCenterScript; } -void QQuickAnchorSet::setVerticalCenter(const QDeclarativeScriptString &edge) +void QQuickAnchorSet::setVerticalCenter(const QQmlScriptString &edge) { Q_D(QQuickAnchorSet); d->usedAnchors |= QQuickAnchors::VCenterAnchor; @@ -619,13 +619,13 @@ void QQuickAnchorSet::resetVerticalCenter() d->resetAnchors |= QQuickAnchors::VCenterAnchor; } -QDeclarativeScriptString QQuickAnchorSet::baseline() const +QQmlScriptString QQuickAnchorSet::baseline() const { Q_D(const QQuickAnchorSet); return d->baselineScript; } -void QQuickAnchorSet::setBaseline(const QDeclarativeScriptString &edge) +void QQuickAnchorSet::setBaseline(const QQmlScriptString &edge) { Q_D(QQuickAnchorSet); d->usedAnchors |= QQuickAnchors::BaselineAnchor; @@ -641,13 +641,13 @@ void QQuickAnchorSet::resetBaseline() d->resetAnchors |= QQuickAnchors::BaselineAnchor; } -QDeclarativeScriptString QQuickAnchorSet::left() const +QQmlScriptString QQuickAnchorSet::left() const { Q_D(const QQuickAnchorSet); return d->leftScript; } -void QQuickAnchorSet::setLeft(const QDeclarativeScriptString &edge) +void QQuickAnchorSet::setLeft(const QQmlScriptString &edge) { Q_D(QQuickAnchorSet); d->usedAnchors |= QQuickAnchors::LeftAnchor; @@ -663,13 +663,13 @@ void QQuickAnchorSet::resetLeft() d->resetAnchors |= QQuickAnchors::LeftAnchor; } -QDeclarativeScriptString QQuickAnchorSet::right() const +QQmlScriptString QQuickAnchorSet::right() const { Q_D(const QQuickAnchorSet); return d->rightScript; } -void QQuickAnchorSet::setRight(const QDeclarativeScriptString &edge) +void QQuickAnchorSet::setRight(const QQmlScriptString &edge) { Q_D(QQuickAnchorSet); d->usedAnchors |= QQuickAnchors::RightAnchor; @@ -685,13 +685,13 @@ void QQuickAnchorSet::resetRight() d->resetAnchors |= QQuickAnchors::RightAnchor; } -QDeclarativeScriptString QQuickAnchorSet::horizontalCenter() const +QQmlScriptString QQuickAnchorSet::horizontalCenter() const { Q_D(const QQuickAnchorSet); return d->hCenterScript; } -void QQuickAnchorSet::setHorizontalCenter(const QDeclarativeScriptString &edge) +void QQuickAnchorSet::setHorizontalCenter(const QQmlScriptString &edge) { Q_D(QQuickAnchorSet); d->usedAnchors |= QQuickAnchors::HCenterAnchor; @@ -742,7 +742,7 @@ void QQuickAnchorSet::resetCenterIn() } -class QQuickAnchorChangesPrivate : public QDeclarativeStateOperationPrivate +class QQuickAnchorChangesPrivate : public QQuickStateOperationPrivate { public: QQuickAnchorChangesPrivate() @@ -760,21 +760,21 @@ public: QQuickItem *target; QQuickAnchorSet *anchorSet; - QDeclarativeBinding *leftBinding; - QDeclarativeBinding *rightBinding; - QDeclarativeBinding *hCenterBinding; - QDeclarativeBinding *topBinding; - QDeclarativeBinding *bottomBinding; - QDeclarativeBinding *vCenterBinding; - QDeclarativeBinding *baselineBinding; - - QDeclarativeAbstractBinding *origLeftBinding; - QDeclarativeAbstractBinding *origRightBinding; - QDeclarativeAbstractBinding *origHCenterBinding; - QDeclarativeAbstractBinding *origTopBinding; - QDeclarativeAbstractBinding *origBottomBinding; - QDeclarativeAbstractBinding *origVCenterBinding; - QDeclarativeAbstractBinding *origBaselineBinding; + QQmlBinding *leftBinding; + QQmlBinding *rightBinding; + QQmlBinding *hCenterBinding; + QQmlBinding *topBinding; + QQmlBinding *bottomBinding; + QQmlBinding *vCenterBinding; + QQmlBinding *baselineBinding; + + QQmlAbstractBinding *origLeftBinding; + QQmlAbstractBinding *origRightBinding; + QQmlAbstractBinding *origHCenterBinding; + QQmlAbstractBinding *origTopBinding; + QQmlAbstractBinding *origBottomBinding; + QQmlAbstractBinding *origVCenterBinding; + QQmlAbstractBinding *origBaselineBinding; QQuickAnchorLine rewindLeft; QQuickAnchorLine rewindRight; @@ -807,24 +807,24 @@ public: bool applyOrigVCenter; bool applyOrigBaseline; - QDeclarativeNullableValue<qreal> origWidth; - QDeclarativeNullableValue<qreal> origHeight; + QQmlNullableValue<qreal> origWidth; + QQmlNullableValue<qreal> origHeight; qreal origX; qreal origY; - QList<QDeclarativeAbstractBinding*> oldBindings; + QList<QQmlAbstractBinding*> oldBindings; - QDeclarativeProperty leftProp; - QDeclarativeProperty rightProp; - QDeclarativeProperty hCenterProp; - QDeclarativeProperty topProp; - QDeclarativeProperty bottomProp; - QDeclarativeProperty vCenterProp; - QDeclarativeProperty baselineProp; + QQmlProperty leftProp; + QQmlProperty rightProp; + QQmlProperty hCenterProp; + QQmlProperty topProp; + QQmlProperty bottomProp; + QQmlProperty vCenterProp; + QQmlProperty baselineProp; }; QQuickAnchorChanges::QQuickAnchorChanges(QObject *parent) - : QDeclarativeStateOperation(*(new QQuickAnchorChangesPrivate), parent) + : QQuickStateOperation(*(new QQuickAnchorChangesPrivate), parent) { } @@ -838,44 +838,44 @@ QQuickAnchorChanges::ActionList QQuickAnchorChanges::actions() d->leftBinding = d->rightBinding = d->hCenterBinding = d->topBinding = d->bottomBinding = d->vCenterBinding = d->baselineBinding = 0; - d->leftProp = QDeclarativeProperty(d->target, QLatin1String("anchors.left")); - d->rightProp = QDeclarativeProperty(d->target, QLatin1String("anchors.right")); - d->hCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.horizontalCenter")); - d->topProp = QDeclarativeProperty(d->target, QLatin1String("anchors.top")); - d->bottomProp = QDeclarativeProperty(d->target, QLatin1String("anchors.bottom")); - d->vCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.verticalCenter")); - d->baselineProp = QDeclarativeProperty(d->target, QLatin1String("anchors.baseline")); + d->leftProp = QQmlProperty(d->target, QLatin1String("anchors.left")); + d->rightProp = QQmlProperty(d->target, QLatin1String("anchors.right")); + d->hCenterProp = QQmlProperty(d->target, QLatin1String("anchors.horizontalCenter")); + d->topProp = QQmlProperty(d->target, QLatin1String("anchors.top")); + d->bottomProp = QQmlProperty(d->target, QLatin1String("anchors.bottom")); + d->vCenterProp = QQmlProperty(d->target, QLatin1String("anchors.verticalCenter")); + d->baselineProp = QQmlProperty(d->target, QLatin1String("anchors.baseline")); if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::LeftAnchor) { - d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this)); + d->leftBinding = new QQmlBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this)); d->leftBinding->setTarget(d->leftProp); } if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::RightAnchor) { - d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this)); + d->rightBinding = new QQmlBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this)); d->rightBinding->setTarget(d->rightProp); } if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::HCenterAnchor) { - d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this)); + d->hCenterBinding = new QQmlBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this)); d->hCenterBinding->setTarget(d->hCenterProp); } if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::TopAnchor) { - d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this)); + d->topBinding = new QQmlBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this)); d->topBinding->setTarget(d->topProp); } if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::BottomAnchor) { - d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this)); + d->bottomBinding = new QQmlBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this)); d->bottomBinding->setTarget(d->bottomProp); } if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::VCenterAnchor) { - d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this)); + d->vCenterBinding = new QQmlBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this)); d->vCenterBinding->setTarget(d->vCenterProp); } if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::BaselineAnchor) { - d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this)); + d->baselineBinding = new QQmlBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this)); d->baselineBinding->setTarget(d->baselineProp); } - QDeclarativeAction a; + QQuickAction a; a.event = this; return ActionList() << a; } @@ -909,43 +909,43 @@ void QQuickAnchorChanges::execute(Reason reason) if (d->applyOrigLeft) { if (!d->origLeftBinding) targetPrivate->anchors()->resetLeft(); - QDeclarativePropertyPrivate::setBinding(d->leftProp, d->origLeftBinding); + QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding); } if (d->applyOrigRight) { if (!d->origRightBinding) targetPrivate->anchors()->resetRight(); - QDeclarativePropertyPrivate::setBinding(d->rightProp, d->origRightBinding); + QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding); } if (d->applyOrigHCenter) { if (!d->origHCenterBinding) targetPrivate->anchors()->resetHorizontalCenter(); - QDeclarativePropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding); + QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding); } if (d->applyOrigTop) { if (!d->origTopBinding) targetPrivate->anchors()->resetTop(); - QDeclarativePropertyPrivate::setBinding(d->topProp, d->origTopBinding); + QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding); } if (d->applyOrigBottom) { if (!d->origBottomBinding) targetPrivate->anchors()->resetBottom(); - QDeclarativePropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding); + QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding); } if (d->applyOrigVCenter) { if (!d->origVCenterBinding) targetPrivate->anchors()->resetVerticalCenter(); - QDeclarativePropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding); + QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding); } if (d->applyOrigBaseline) { if (!d->origBaselineBinding) targetPrivate->anchors()->resetBaseline(); - QDeclarativePropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding); + QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding); } //destroy old bindings if (reason == ActualChange) { for (int i = 0; i < d->oldBindings.size(); ++i) { - QDeclarativeAbstractBinding *binding = d->oldBindings.at(i); + QQmlAbstractBinding *binding = d->oldBindings.at(i); if (binding) binding->destroy(); } @@ -955,48 +955,48 @@ void QQuickAnchorChanges::execute(Reason reason) //reset any anchors that have been specified as "undefined" if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::LeftAnchor) { targetPrivate->anchors()->resetLeft(); - QDeclarativePropertyPrivate::setBinding(d->leftProp, 0); + QQmlPropertyPrivate::setBinding(d->leftProp, 0); } if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::RightAnchor) { targetPrivate->anchors()->resetRight(); - QDeclarativePropertyPrivate::setBinding(d->rightProp, 0); + QQmlPropertyPrivate::setBinding(d->rightProp, 0); } if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::HCenterAnchor) { targetPrivate->anchors()->resetHorizontalCenter(); - QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0); + QQmlPropertyPrivate::setBinding(d->hCenterProp, 0); } if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::TopAnchor) { targetPrivate->anchors()->resetTop(); - QDeclarativePropertyPrivate::setBinding(d->topProp, 0); + QQmlPropertyPrivate::setBinding(d->topProp, 0); } if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::BottomAnchor) { targetPrivate->anchors()->resetBottom(); - QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0); + QQmlPropertyPrivate::setBinding(d->bottomProp, 0); } if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::VCenterAnchor) { targetPrivate->anchors()->resetVerticalCenter(); - QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0); + QQmlPropertyPrivate::setBinding(d->vCenterProp, 0); } if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::BaselineAnchor) { targetPrivate->anchors()->resetBaseline(); - QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0); + QQmlPropertyPrivate::setBinding(d->baselineProp, 0); } //set any anchors that have been specified if (d->leftBinding) - QDeclarativePropertyPrivate::setBinding(d->leftBinding->property(), d->leftBinding); + QQmlPropertyPrivate::setBinding(d->leftBinding->property(), d->leftBinding); if (d->rightBinding) - QDeclarativePropertyPrivate::setBinding(d->rightBinding->property(), d->rightBinding); + QQmlPropertyPrivate::setBinding(d->rightBinding->property(), d->rightBinding); if (d->hCenterBinding) - QDeclarativePropertyPrivate::setBinding(d->hCenterBinding->property(), d->hCenterBinding); + QQmlPropertyPrivate::setBinding(d->hCenterBinding->property(), d->hCenterBinding); if (d->topBinding) - QDeclarativePropertyPrivate::setBinding(d->topBinding->property(), d->topBinding); + QQmlPropertyPrivate::setBinding(d->topBinding->property(), d->topBinding); if (d->bottomBinding) - QDeclarativePropertyPrivate::setBinding(d->bottomBinding->property(), d->bottomBinding); + QQmlPropertyPrivate::setBinding(d->bottomBinding->property(), d->bottomBinding); if (d->vCenterBinding) - QDeclarativePropertyPrivate::setBinding(d->vCenterBinding->property(), d->vCenterBinding); + QQmlPropertyPrivate::setBinding(d->vCenterBinding->property(), d->vCenterBinding); if (d->baselineBinding) - QDeclarativePropertyPrivate::setBinding(d->baselineBinding->property(), d->baselineBinding); + QQmlPropertyPrivate::setBinding(d->baselineBinding->property(), d->baselineBinding); } bool QQuickAnchorChanges::isReversable() @@ -1014,49 +1014,49 @@ void QQuickAnchorChanges::reverse(Reason reason) //reset any anchors set by the state if (d->leftBinding) { targetPrivate->anchors()->resetLeft(); - QDeclarativePropertyPrivate::setBinding(d->leftBinding->property(), 0); + QQmlPropertyPrivate::setBinding(d->leftBinding->property(), 0); if (reason == ActualChange) { d->leftBinding->destroy(); d->leftBinding = 0; } } if (d->rightBinding) { targetPrivate->anchors()->resetRight(); - QDeclarativePropertyPrivate::setBinding(d->rightBinding->property(), 0); + QQmlPropertyPrivate::setBinding(d->rightBinding->property(), 0); if (reason == ActualChange) { d->rightBinding->destroy(); d->rightBinding = 0; } } if (d->hCenterBinding) { targetPrivate->anchors()->resetHorizontalCenter(); - QDeclarativePropertyPrivate::setBinding(d->hCenterBinding->property(), 0); + QQmlPropertyPrivate::setBinding(d->hCenterBinding->property(), 0); if (reason == ActualChange) { d->hCenterBinding->destroy(); d->hCenterBinding = 0; } } if (d->topBinding) { targetPrivate->anchors()->resetTop(); - QDeclarativePropertyPrivate::setBinding(d->topBinding->property(), 0); + QQmlPropertyPrivate::setBinding(d->topBinding->property(), 0); if (reason == ActualChange) { d->topBinding->destroy(); d->topBinding = 0; } } if (d->bottomBinding) { targetPrivate->anchors()->resetBottom(); - QDeclarativePropertyPrivate::setBinding(d->bottomBinding->property(), 0); + QQmlPropertyPrivate::setBinding(d->bottomBinding->property(), 0); if (reason == ActualChange) { d->bottomBinding->destroy(); d->bottomBinding = 0; } } if (d->vCenterBinding) { targetPrivate->anchors()->resetVerticalCenter(); - QDeclarativePropertyPrivate::setBinding(d->vCenterBinding->property(), 0); + QQmlPropertyPrivate::setBinding(d->vCenterBinding->property(), 0); if (reason == ActualChange) { d->vCenterBinding->destroy(); d->vCenterBinding = 0; } } if (d->baselineBinding) { targetPrivate->anchors()->resetBaseline(); - QDeclarativePropertyPrivate::setBinding(d->baselineBinding->property(), 0); + QQmlPropertyPrivate::setBinding(d->baselineBinding->property(), 0); if (reason == ActualChange) { d->baselineBinding->destroy(); d->baselineBinding = 0; } @@ -1064,19 +1064,19 @@ void QQuickAnchorChanges::reverse(Reason reason) //restore previous anchors if (d->origLeftBinding) - QDeclarativePropertyPrivate::setBinding(d->leftProp, d->origLeftBinding); + QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding); if (d->origRightBinding) - QDeclarativePropertyPrivate::setBinding(d->rightProp, d->origRightBinding); + QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding); if (d->origHCenterBinding) - QDeclarativePropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding); + QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding); if (d->origTopBinding) - QDeclarativePropertyPrivate::setBinding(d->topProp, d->origTopBinding); + QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding); if (d->origBottomBinding) - QDeclarativePropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding); + QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding); if (d->origVCenterBinding) - QDeclarativePropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding); + QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding); if (d->origBaselineBinding) - QDeclarativePropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding); + QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding); //restore any absolute geometry changed by the state's anchors QQuickAnchors::Anchors stateVAnchors = d->anchorSet->d_func()->usedAnchors & QQuickAnchors::Vertical_Mask; @@ -1115,39 +1115,39 @@ void QQuickAnchorChanges::reverse(Reason reason) d->target->setY(d->origY); } -QDeclarativeActionEvent::EventType QQuickAnchorChanges::type() const +QQuickActionEvent::EventType QQuickAnchorChanges::type() const { return AnchorChanges; } -QList<QDeclarativeAction> QQuickAnchorChanges::additionalActions() +QList<QQuickAction> QQuickAnchorChanges::additionalActions() { Q_D(QQuickAnchorChanges); - QList<QDeclarativeAction> extra; + QList<QQuickAction> extra; QQuickAnchors::Anchors combined = d->anchorSet->d_func()->usedAnchors | d->anchorSet->d_func()->resetAnchors; bool hChange = combined & QQuickAnchors::Horizontal_Mask; bool vChange = combined & QQuickAnchors::Vertical_Mask; if (d->target) { - QDeclarativeAction a; + QQuickAction a; if (hChange && d->fromX != d->toX) { - a.property = QDeclarativeProperty(d->target, QLatin1String("x")); + a.property = QQmlProperty(d->target, QLatin1String("x")); a.toValue = d->toX; extra << a; } if (vChange && d->fromY != d->toY) { - a.property = QDeclarativeProperty(d->target, QLatin1String("y")); + a.property = QQmlProperty(d->target, QLatin1String("y")); a.toValue = d->toY; extra << a; } if (hChange && d->fromWidth != d->toWidth) { - a.property = QDeclarativeProperty(d->target, QLatin1String("width")); + a.property = QQmlProperty(d->target, QLatin1String("width")); a.toValue = d->toWidth; extra << a; } if (vChange && d->fromHeight != d->toHeight) { - a.property = QDeclarativeProperty(d->target, QLatin1String("height")); + a.property = QQmlProperty(d->target, QLatin1String("height")); a.toValue = d->toHeight; extra << a; } @@ -1167,13 +1167,13 @@ void QQuickAnchorChanges::saveOriginals() if (!d->target) return; - d->origLeftBinding = QDeclarativePropertyPrivate::binding(d->leftProp); - d->origRightBinding = QDeclarativePropertyPrivate::binding(d->rightProp); - d->origHCenterBinding = QDeclarativePropertyPrivate::binding(d->hCenterProp); - d->origTopBinding = QDeclarativePropertyPrivate::binding(d->topProp); - d->origBottomBinding = QDeclarativePropertyPrivate::binding(d->bottomProp); - d->origVCenterBinding = QDeclarativePropertyPrivate::binding(d->vCenterProp); - d->origBaselineBinding = QDeclarativePropertyPrivate::binding(d->baselineProp); + d->origLeftBinding = QQmlPropertyPrivate::binding(d->leftProp); + d->origRightBinding = QQmlPropertyPrivate::binding(d->rightProp); + d->origHCenterBinding = QQmlPropertyPrivate::binding(d->hCenterProp); + d->origTopBinding = QQmlPropertyPrivate::binding(d->topProp); + d->origBottomBinding = QQmlPropertyPrivate::binding(d->bottomProp); + d->origVCenterBinding = QQmlPropertyPrivate::binding(d->vCenterProp); + d->origBaselineBinding = QQmlPropertyPrivate::binding(d->baselineProp); QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target); if (targetPrivate->widthValid) @@ -1189,7 +1189,7 @@ void QQuickAnchorChanges::saveOriginals() saveCurrentValues(); } -void QQuickAnchorChanges::copyOriginals(QDeclarativeActionEvent *other) +void QQuickAnchorChanges::copyOriginals(QQuickActionEvent *other) { Q_D(QQuickAnchorChanges); QQuickAnchorChanges *ac = static_cast<QQuickAnchorChanges*>(other); @@ -1247,39 +1247,39 @@ void QQuickAnchorChanges::clearBindings() d->anchorSet->d_func()->usedAnchors; if (d->applyOrigLeft || (combined & QQuickAnchors::LeftAnchor)) { targetPrivate->anchors()->resetLeft(); - QDeclarativePropertyPrivate::setBinding(d->leftProp, 0); + QQmlPropertyPrivate::setBinding(d->leftProp, 0); } if (d->applyOrigRight || (combined & QQuickAnchors::RightAnchor)) { targetPrivate->anchors()->resetRight(); - QDeclarativePropertyPrivate::setBinding(d->rightProp, 0); + QQmlPropertyPrivate::setBinding(d->rightProp, 0); } if (d->applyOrigHCenter || (combined & QQuickAnchors::HCenterAnchor)) { targetPrivate->anchors()->resetHorizontalCenter(); - QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0); + QQmlPropertyPrivate::setBinding(d->hCenterProp, 0); } if (d->applyOrigTop || (combined & QQuickAnchors::TopAnchor)) { targetPrivate->anchors()->resetTop(); - QDeclarativePropertyPrivate::setBinding(d->topProp, 0); + QQmlPropertyPrivate::setBinding(d->topProp, 0); } if (d->applyOrigBottom || (combined & QQuickAnchors::BottomAnchor)) { targetPrivate->anchors()->resetBottom(); - QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0); + QQmlPropertyPrivate::setBinding(d->bottomProp, 0); } if (d->applyOrigVCenter || (combined & QQuickAnchors::VCenterAnchor)) { targetPrivate->anchors()->resetVerticalCenter(); - QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0); + QQmlPropertyPrivate::setBinding(d->vCenterProp, 0); } if (d->applyOrigBaseline || (combined & QQuickAnchors::BaselineAnchor)) { targetPrivate->anchors()->resetBaseline(); - QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0); + QQmlPropertyPrivate::setBinding(d->baselineProp, 0); } } -bool QQuickAnchorChanges::override(QDeclarativeActionEvent*other) +bool QQuickAnchorChanges::override(QQuickActionEvent*other) { if (other->type() != AnchorChanges) return false; - if (static_cast<QDeclarativeActionEvent*>(this) == other) + if (static_cast<QQuickActionEvent*>(this) == other) return true; if (static_cast<QQuickAnchorChanges*>(other)->object() == object()) return true; diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index ff1671d53a..2523cc6d4f 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_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 @@ -45,28 +45,28 @@ #include "qquickitem.h" #include "qquickanchors_p.h" -#include <QtQuick/private/qdeclarativestate_p.h> +#include <QtQuick/private/qquickstate_p.h> -#include <QtDeclarative/qdeclarativescriptstring.h> +#include <QtQml/qqmlscriptstring.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickParentChangePrivate; -class Q_AUTOTEST_EXPORT QQuickParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent +class Q_AUTOTEST_EXPORT QQuickParentChange : public QQuickStateOperation, public QQuickActionEvent { Q_OBJECT Q_DECLARE_PRIVATE(QQuickParentChange) Q_PROPERTY(QQuickItem *target READ object WRITE setObject) Q_PROPERTY(QQuickItem *parent READ parent WRITE setParent) - Q_PROPERTY(QDeclarativeScriptString x READ x WRITE setX) - Q_PROPERTY(QDeclarativeScriptString y READ y WRITE setY) - Q_PROPERTY(QDeclarativeScriptString width READ width WRITE setWidth) - Q_PROPERTY(QDeclarativeScriptString height READ height WRITE setHeight) - Q_PROPERTY(QDeclarativeScriptString scale READ scale WRITE setScale) - Q_PROPERTY(QDeclarativeScriptString rotation READ rotation WRITE setRotation) + Q_PROPERTY(QQmlScriptString x READ x WRITE setX) + Q_PROPERTY(QQmlScriptString y READ y WRITE setY) + Q_PROPERTY(QQmlScriptString width READ width WRITE setWidth) + Q_PROPERTY(QQmlScriptString height READ height WRITE setHeight) + Q_PROPERTY(QQmlScriptString scale READ scale WRITE setScale) + Q_PROPERTY(QQmlScriptString rotation READ rotation WRITE setRotation) public: QQuickParentChange(QObject *parent=0); ~QQuickParentChange(); @@ -79,39 +79,39 @@ public: QQuickItem *originalParent() const; - QDeclarativeScriptString x() const; - void setX(QDeclarativeScriptString x); + QQmlScriptString x() const; + void setX(QQmlScriptString x); bool xIsSet() const; - QDeclarativeScriptString y() const; - void setY(QDeclarativeScriptString y); + QQmlScriptString y() const; + void setY(QQmlScriptString y); bool yIsSet() const; - QDeclarativeScriptString width() const; - void setWidth(QDeclarativeScriptString width); + QQmlScriptString width() const; + void setWidth(QQmlScriptString width); bool widthIsSet() const; - QDeclarativeScriptString height() const; - void setHeight(QDeclarativeScriptString height); + QQmlScriptString height() const; + void setHeight(QQmlScriptString height); bool heightIsSet() const; - QDeclarativeScriptString scale() const; - void setScale(QDeclarativeScriptString scale); + QQmlScriptString scale() const; + void setScale(QQmlScriptString scale); bool scaleIsSet() const; - QDeclarativeScriptString rotation() const; - void setRotation(QDeclarativeScriptString rotation); + QQmlScriptString rotation() const; + void setRotation(QQmlScriptString rotation); bool rotationIsSet() const; virtual ActionList actions(); virtual void saveOriginals(); - //virtual void copyOriginals(QDeclarativeActionEvent*); + //virtual void copyOriginals(QQuickActionEvent*); virtual void execute(Reason reason = ActualChange); virtual bool isReversable(); virtual void reverse(Reason reason = ActualChange); virtual EventType type() const; - virtual bool override(QDeclarativeActionEvent*other); + virtual bool override(QQuickActionEvent*other); virtual void rewind(); virtual void saveCurrentValues(); }; @@ -122,13 +122,13 @@ class Q_AUTOTEST_EXPORT QQuickAnchorSet : public QObject { Q_OBJECT - Q_PROPERTY(QDeclarativeScriptString left READ left WRITE setLeft RESET resetLeft) - Q_PROPERTY(QDeclarativeScriptString right READ right WRITE setRight RESET resetRight) - Q_PROPERTY(QDeclarativeScriptString horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter) - Q_PROPERTY(QDeclarativeScriptString top READ top WRITE setTop RESET resetTop) - Q_PROPERTY(QDeclarativeScriptString bottom READ bottom WRITE setBottom RESET resetBottom) - Q_PROPERTY(QDeclarativeScriptString verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter) - Q_PROPERTY(QDeclarativeScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline) + Q_PROPERTY(QQmlScriptString left READ left WRITE setLeft RESET resetLeft) + Q_PROPERTY(QQmlScriptString right READ right WRITE setRight RESET resetRight) + Q_PROPERTY(QQmlScriptString horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter) + Q_PROPERTY(QQmlScriptString top READ top WRITE setTop RESET resetTop) + Q_PROPERTY(QQmlScriptString bottom READ bottom WRITE setBottom RESET resetBottom) + Q_PROPERTY(QQmlScriptString verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter) + Q_PROPERTY(QQmlScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline) //Q_PROPERTY(QQuickItem *fill READ fill WRITE setFill RESET resetFill) //Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn) @@ -145,32 +145,32 @@ public: QQuickAnchorSet(QObject *parent=0); virtual ~QQuickAnchorSet(); - QDeclarativeScriptString left() const; - void setLeft(const QDeclarativeScriptString &edge); + QQmlScriptString left() const; + void setLeft(const QQmlScriptString &edge); void resetLeft(); - QDeclarativeScriptString right() const; - void setRight(const QDeclarativeScriptString &edge); + QQmlScriptString right() const; + void setRight(const QQmlScriptString &edge); void resetRight(); - QDeclarativeScriptString horizontalCenter() const; - void setHorizontalCenter(const QDeclarativeScriptString &edge); + QQmlScriptString horizontalCenter() const; + void setHorizontalCenter(const QQmlScriptString &edge); void resetHorizontalCenter(); - QDeclarativeScriptString top() const; - void setTop(const QDeclarativeScriptString &edge); + QQmlScriptString top() const; + void setTop(const QQmlScriptString &edge); void resetTop(); - QDeclarativeScriptString bottom() const; - void setBottom(const QDeclarativeScriptString &edge); + QQmlScriptString bottom() const; + void setBottom(const QQmlScriptString &edge); void resetBottom(); - QDeclarativeScriptString verticalCenter() const; - void setVerticalCenter(const QDeclarativeScriptString &edge); + QQmlScriptString verticalCenter() const; + void setVerticalCenter(const QQmlScriptString &edge); void resetVerticalCenter(); - QDeclarativeScriptString baseline() const; - void setBaseline(const QDeclarativeScriptString &edge); + QQmlScriptString baseline() const; + void setBaseline(const QQmlScriptString &edge); void resetBaseline(); QQuickItem *fill() const; @@ -224,7 +224,7 @@ private: }; class QQuickAnchorChangesPrivate; -class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent +class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QQuickStateOperation, public QQuickActionEvent { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnchorChanges) @@ -247,16 +247,16 @@ public: virtual bool isReversable(); virtual void reverse(Reason reason = ActualChange); virtual EventType type() const; - virtual bool override(QDeclarativeActionEvent*other); + virtual bool override(QQuickActionEvent*other); virtual bool changesBindings(); virtual void saveOriginals(); virtual bool needsCopy() { return true; } - virtual void copyOriginals(QDeclarativeActionEvent*); + virtual void copyOriginals(QQuickActionEvent*); virtual void clearBindings(); virtual void rewind(); virtual void saveCurrentValues(); - QList<QDeclarativeAction> additionalActions(); + QList<QQuickAction> additionalActions(); virtual void saveTargetValues(); }; diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 6d1cc0d8d2..36b902ff8c 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.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 @@ -43,12 +43,13 @@ #include "qquicktext_p_p.h" #include <QtQuick/private/qsgcontext_p.h> +#include <private/qqmlglobal_p.h> #include <private/qsgadaptationlayer_p.h> #include "qquicktextnode_p.h" #include "qquickimage_p_p.h" #include <QtQuick/private/qsgtexture_p.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtGui/qevent.h> #include <QtGui/qabstracttextdocumentlayout.h> #include <QtGui/qpainter.h> @@ -59,8 +60,8 @@ #include <QtGui/qinputmethod.h> #include <private/qtextengine_p.h> -#include <private/qdeclarativestyledtext_p.h> -#include <QtQuick/private/qdeclarativepixmapcache_p.h> +#include <private/qquickstyledtext_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> #include <qmath.h> #include <limits.h> @@ -122,11 +123,11 @@ QQuickTextDocumentWithImageResources::~QQuickTextDocumentWithImageResources() QVariant QQuickTextDocumentWithImageResources::loadResource(int type, const QUrl &name) { - QDeclarativeContext *context = qmlContext(parent()); + QQmlContext *context = qmlContext(parent()); QUrl url = m_baseUrl.resolved(name); if (type == QTextDocument::ImageResource) { - QDeclarativePixmap *p = loadPixmap(context, url); + QQuickPixmap *p = loadPixmap(context, url); return p->image(); } @@ -163,10 +164,10 @@ QSizeF QQuickTextDocumentWithImageResources::intrinsicSize( QSizeF size(width, height); if (!hasWidth || !hasHeight) { - QDeclarativeContext *context = qmlContext(parent()); + QQmlContext *context = qmlContext(parent()); QUrl url = m_baseUrl.resolved(QUrl(imageFormat.name())); - QDeclarativePixmap *p = loadPixmap(context, url); + QQuickPixmap *p = loadPixmap(context, url); if (!p->isReady()) { if (!hasWidth) size.setWidth(16); @@ -201,10 +202,10 @@ void QQuickTextDocumentWithImageResources::drawObject( QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &format) { - QDeclarativeContext *context = qmlContext(parent()); + QQmlContext *context = qmlContext(parent()); QUrl url = m_baseUrl.resolved(QUrl(format.name())); - QDeclarativePixmap *p = loadPixmap(context, url); + QQuickPixmap *p = loadPixmap(context, url); return p->image(); } @@ -217,14 +218,14 @@ void QQuickTextDocumentWithImageResources::setBaseUrl(const QUrl &url, bool clea } } -QDeclarativePixmap *QQuickTextDocumentWithImageResources::loadPixmap( - QDeclarativeContext *context, const QUrl &url) +QQuickPixmap *QQuickTextDocumentWithImageResources::loadPixmap( + QQmlContext *context, const QUrl &url) { - QHash<QUrl, QDeclarativePixmap *>::Iterator iter = m_resources.find(url); + QHash<QUrl, QQuickPixmap *>::Iterator iter = m_resources.find(url); if (iter == m_resources.end()) { - QDeclarativePixmap *p = new QDeclarativePixmap(context->engine(), url); + QQuickPixmap *p = new QQuickPixmap(context->engine(), url); iter = m_resources.insert(url, p); if (p->isLoading()) { @@ -233,7 +234,7 @@ QDeclarativePixmap *QQuickTextDocumentWithImageResources::loadPixmap( } } - QDeclarativePixmap *p = *iter; + QQuickPixmap *p = *iter; if (p->isError()) { if (!errors.contains(url)) { errors.insert(url); @@ -245,7 +246,7 @@ QDeclarativePixmap *QQuickTextDocumentWithImageResources::loadPixmap( void QQuickTextDocumentWithImageResources::clearResources() { - foreach (QDeclarativePixmap *pixmap, m_resources) + foreach (QQuickPixmap *pixmap, m_resources) pixmap->clear(this); qDeleteAll(m_resources); m_resources.clear(); @@ -312,7 +313,7 @@ void QQuickTextPrivate::updateLayout() layout.setFont(font); // needs temporary bool because formatModifiesFontSize is in a bit-field bool fontSizeModified = false; - QDeclarativeStyledText::parse(text, layout, imgTags, q->baseUrl(), qmlContext(q), !maximumLineCountValid, &fontSizeModified); + QQuickStyledText::parse(text, layout, imgTags, q->baseUrl(), qmlContext(q), !maximumLineCountValid, &fontSizeModified); formatModifiesFontSize = fontSizeModified; } else { layout.clearAdditionalFormats(); @@ -364,7 +365,7 @@ void QQuickText::imageDownloadFinished() if (d->extra.isAllocated() && d->extra->nbActiveDownloads == 0) { bool needToUpdateLayout = false; - foreach (QDeclarativeStyledTextImgTag *img, d->visibleImgTags) { + foreach (QQuickStyledTextImgTag *img, d->visibleImgTags) { if (!img->size.isValid()) { img->size = img->pix->implicitSize(); needToUpdateLayout = true; @@ -1026,15 +1027,15 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal qreal textHeight = line.height(); qreal totalLineHeight = textHeight; - QList<QDeclarativeStyledTextImgTag *> imagesInLine; + QList<QQuickStyledTextImgTag *> imagesInLine; - foreach (QDeclarativeStyledTextImgTag *image, imgTags) { + foreach (QQuickStyledTextImgTag *image, imgTags) { if (image->position >= line.textStart() && image->position < line.textStart() + line.textLength()) { if (!image->pix) { QUrl url = q->baseUrl().resolved(image->url); - image->pix = new QDeclarativePixmap(qmlEngine(q), url, image->size); + image->pix = new QQuickPixmap(qmlEngine(q), url, image->size); if (image->pix->isLoading()) { image->pix->connectFinished(q, SLOT(imageDownloadFinished())); if (!extra.isAllocated() || !extra->nbActiveDownloads) @@ -1053,9 +1054,9 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal } qreal ih = qreal(image->size.height()); - if (image->align == QDeclarativeStyledTextImgTag::Top) + if (image->align == QQuickStyledTextImgTag::Top) image->pos.setY(0); - else if (image->align == QDeclarativeStyledTextImgTag::Middle) + else if (image->align == QQuickStyledTextImgTag::Middle) image->pos.setY((textHeight / 2.0) - (ih / 2.0)); else image->pos.setY(textHeight - ih); @@ -1064,7 +1065,7 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal } } - foreach (QDeclarativeStyledTextImgTag *image, imagesInLine) { + foreach (QQuickStyledTextImgTag *image, imagesInLine) { totalLineHeight = qMax(totalLineHeight, textTop + image->pos.y() + image->size.height()); image->pos.setX(line.cursorToX(image->position)); image->pos.setY(image->pos.y() + height + textTop); @@ -1200,7 +1201,7 @@ QQuickText::~QQuickText() The link must be in rich text or HTML format and the \a link string provides access to the particular link. - \snippet doc/src/snippets/declarative/text/onLinkActivated.qml 0 + \snippet doc/src/snippets/qml/text/onLinkActivated.qml 0 The example code will display the text "The main website is at \l{http://qt.nokia.com}{Nokia Qt DF}." @@ -1924,7 +1925,7 @@ QUrl QQuickText::baseUrl() const { Q_D(const QQuickText); if (d->baseUrl.isEmpty()) { - if (QDeclarativeContext *context = qmlContext(this)) + if (QQmlContext *context = qmlContext(this)) const_cast<QQuickTextPrivate *>(d)->baseUrl = context->baseUrl(); } return d->baseUrl; @@ -1952,7 +1953,7 @@ void QQuickText::setBaseUrl(const QUrl &url) void QQuickText::resetBaseUrl() { - if (QDeclarativeContext *context = qmlContext(this)) + if (QQmlContext *context = qmlContext(this)) setBaseUrl(context->baseUrl()); else setBaseUrl(QUrl()); @@ -2093,8 +2094,8 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data node->addTextLayout(QPoint(0, bounds.y()), d->elideLayout, color, d->style, styleColor, linkColor); } - foreach (QDeclarativeStyledTextImgTag *img, d->visibleImgTags) { - QDeclarativePixmap *pix = img->pix; + foreach (QQuickStyledTextImgTag *img, d->visibleImgTags) { + QQuickPixmap *pix = img->pix; if (pix && pix->isReady()) node->addImage(QRectF(img->pos.x(), img->pos.y() + bounds.y(), pix->width(), pix->height()), pix->image()); } diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index 37287b5445..d73c6e1a10 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_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/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index 3be62541ea..0425c37406 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_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 @@ -56,10 +56,10 @@ #include "qquicktext_p.h" #include "qquickimplicitsizeitem_p_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtGui/qabstracttextdocumentlayout.h> #include <QtGui/qtextlayout.h> -#include <private/qdeclarativestyledtext_p.h> +#include <private/qquickstyledtext_p.h> #include <private/qlazilyallocated_p.h> QT_BEGIN_NAMESPACE @@ -107,8 +107,8 @@ public: QUrl baseUrl; QFont font; QFont sourceFont; - QList<QDeclarativeStyledTextImgTag*> imgTags; - QList<QDeclarativeStyledTextImgTag*> visibleImgTags; + QList<QQuickStyledTextImgTag*> imgTags; + QList<QQuickStyledTextImgTag*> visibleImgTags; QTextLayout layout; QTextLayout *elideLayout; @@ -177,7 +177,7 @@ public: static inline QQuickTextPrivate *get(QQuickText *t) { return t->d_func(); } }; -class QDeclarativePixmap; +class QQuickPixmap; class QQuickTextDocumentWithImageResources : public QTextDocument, public QTextObjectInterface { Q_OBJECT @@ -206,13 +206,13 @@ Q_SIGNALS: protected: QVariant loadResource(int type, const QUrl &name); - QDeclarativePixmap *loadPixmap(QDeclarativeContext *context, const QUrl &name); + QQuickPixmap *loadPixmap(QQmlContext *context, const QUrl &name); private slots: void requestFinished(); private: - QHash<QUrl, QDeclarativePixmap *> m_resources; + QHash<QUrl, QQuickPixmap *> m_resources; QUrl m_baseUrl; int outstanding; diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 66285fcd2b..a9bff73bd9 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.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 @@ -48,15 +48,15 @@ #include "qquicktextnode_p.h" #include <QtQuick/qsgsimplerectnode.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtGui/qguiapplication.h> #include <QtGui/qevent.h> #include <QtGui/qpainter.h> #include <QtGui/qtextobject.h> #include <QtCore/qmath.h> -#include <private/qdeclarativeglobal_p.h> -#include <private/qdeclarativeproperty_p.h> +#include <private/qqmlglobal_p.h> +#include <private/qqmlproperty_p.h> #include <private/qtextengine_p.h> #include <private/qsgadaptationlayer_p.h> @@ -683,7 +683,7 @@ QUrl QQuickTextEdit::baseUrl() const { Q_D(const QQuickTextEdit); if (d->baseUrl.isEmpty()) { - if (QDeclarativeContext *context = qmlContext(this)) + if (QQmlContext *context = qmlContext(this)) const_cast<QQuickTextEditPrivate *>(d)->baseUrl = context->baseUrl(); } return d->baseUrl; @@ -702,7 +702,7 @@ void QQuickTextEdit::setBaseUrl(const QUrl &url) void QQuickTextEdit::resetBaseUrl() { - if (QDeclarativeContext *context = qmlContext(this)) + if (QQmlContext *context = qmlContext(this)) setBaseUrl(context->baseUrl()); else setBaseUrl(QUrl()); @@ -910,16 +910,16 @@ void QQuickTextEdit::setCursorPosition(int pos) needed, and the x and y properties of delegate instance will be set so as to be one pixel before the top left of the current character. - Note that the root item of the delegate component must be a QDeclarativeItem or - QDeclarativeItem derived item. + Note that the root item of the delegate component must be a QQuickItem or + QQuickItem derived item. */ -QDeclarativeComponent* QQuickTextEdit::cursorDelegate() const +QQmlComponent* QQuickTextEdit::cursorDelegate() const { Q_D(const QQuickTextEdit); return d->cursorComponent; } -void QQuickTextEdit::setCursorDelegate(QDeclarativeComponent* c) +void QQuickTextEdit::setCursorDelegate(QQmlComponent* c) { Q_D(QQuickTextEdit); if (d->cursorComponent) { @@ -947,13 +947,13 @@ void QQuickTextEdit::loadCursorDelegate() Q_D(QQuickTextEdit); if (d->cursorComponent->isLoading() || !isComponentComplete()) return; - QDeclarativeContext *creationContext = d->cursorComponent->creationContext(); + QQmlContext *creationContext = d->cursorComponent->creationContext(); QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this)); d->cursor = qobject_cast<QQuickItem*>(object); if (d->cursor) { d->control->setCursorWidth(0); updateCursor(); - QDeclarative_setParent_noEvent(d->cursor, this); + QQml_setParent_noEvent(d->cursor, this); d->cursor->setParentItem(this); d->cursor->setHeight(QFontMetrics(d->font).height()); moveCursorDelegate(); diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index b3fd32af69..b28ec9d7d7 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_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 @@ -80,7 +80,7 @@ class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged) Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged) Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged) - Q_PROPERTY(QDeclarativeComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged) + Q_PROPERTY(QQmlComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged) Q_PROPERTY(int selectionStart READ selectionStart NOTIFY selectionStartChanged) Q_PROPERTY(int selectionEnd READ selectionEnd NOTIFY selectionEndChanged) Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectionChanged) @@ -172,8 +172,8 @@ public: int cursorPosition() const; void setCursorPosition(int pos); - QDeclarativeComponent* cursorDelegate() const; - void setCursorDelegate(QDeclarativeComponent*); + QQmlComponent* cursorDelegate() const; + void setCursorDelegate(QQmlComponent*); int selectionStart() const; int selectionEnd() const; diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 8ec589da29..055b5c7929 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_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 @@ -56,7 +56,7 @@ #include "qquicktextedit_p.h" #include "qquickimplicitsizeitem_p_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE class QTextLayout; @@ -108,7 +108,7 @@ public: QFont sourceFont; QFont font; - QDeclarativeComponent* cursorComponent; + QQmlComponent* cursorComponent; QQuickItem* cursor; QQuickTextDocumentWithImageResources *document; QQuickTextControl *control; diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 6f079dc045..1a93345aa2 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.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 @@ -43,9 +43,9 @@ #include "qquicktextinput_p_p.h" #include "qquickcanvas.h" -#include <private/qdeclarativeglobal_p.h> +#include <private/qqmlglobal_p.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtGui/qevent.h> #include <QTextBoundaryFinder> #include "qquicktextnode_p.h" @@ -1211,16 +1211,16 @@ void QQuickTextInput::setInputMethodHints(Qt::InputMethodHints hints) needed, and the x property of delegate instance will be set so as to be one pixel before the top left of the current character. - Note that the root item of the delegate component must be a QDeclarativeItem or - QDeclarativeItem derived item. + Note that the root item of the delegate component must be a QQuickItem or + QQuickItem derived item. */ -QDeclarativeComponent* QQuickTextInput::cursorDelegate() const +QQmlComponent* QQuickTextInput::cursorDelegate() const { Q_D(const QQuickTextInput); return d->cursorComponent; } -void QQuickTextInput::setCursorDelegate(QDeclarativeComponent* c) +void QQuickTextInput::setCursorDelegate(QQmlComponent* c) { Q_D(QQuickTextInput); if (d->cursorComponent == c) @@ -1267,7 +1267,7 @@ void QQuickTextInput::createCursor() if (d->cursorItem) delete d->cursorItem; - QDeclarativeContext *creationContext = d->cursorComponent->creationContext(); + QQmlContext *creationContext = d->cursorComponent->creationContext(); QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this)); d->cursorItem = qobject_cast<QQuickItem*>(object); if (!d->cursorItem) { @@ -1278,7 +1278,7 @@ void QQuickTextInput::createCursor() QRectF r = cursorRectangle(); - QDeclarative_setParent_noEvent(d->cursorItem, this); + QQml_setParent_noEvent(d->cursorItem, this); d->cursorItem->setParentItem(this); d->cursorItem->setPos(r.topLeft()); d->cursorItem->setHeight(r.height()); @@ -1328,7 +1328,7 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const \endlist */ -void QQuickTextInput::positionAt(QDeclarativeV8Function *args) const +void QQuickTextInput::positionAt(QQmlV8Function *args) const { Q_D(const QQuickTextInput); diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index ebd3d58957..011af65bff 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_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 @@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged) Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged) Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged) - Q_PROPERTY(QDeclarativeComponent *cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged) + Q_PROPERTY(QQmlComponent *cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged) Q_PROPERTY(int selectionStart READ selectionStart NOTIFY selectionStartChanged) Q_PROPERTY(int selectionEnd READ selectionEnd NOTIFY selectionEndChanged) Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged) @@ -150,7 +150,7 @@ public: //Auxilliary functions needed to control the TextInput from QML - Q_INVOKABLE void positionAt(QDeclarativeV8Function *args) const; + Q_INVOKABLE void positionAt(QQmlV8Function *args) const; Q_INVOKABLE QRectF positionToRectangle(int pos) const; Q_INVOKABLE void moveCursorSelection(int pos); Q_INVOKABLE void moveCursorSelection(int pos, SelectionMode mode); @@ -220,8 +220,8 @@ public: QString displayText() const; - QDeclarativeComponent* cursorDelegate() const; - void setCursorDelegate(QDeclarativeComponent*); + QQmlComponent* cursorDelegate() const; + void setCursorDelegate(QQmlComponent*); bool focusOnPress() const; void setFocusOnPress(bool); diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index 1921451f88..9a59b44549 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_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 @@ -46,7 +46,7 @@ #include "qquicktext_p.h" #include "qquickimplicitsizeitem_p_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtCore/qelapsedtimer.h> #include <QtCore/qpointer.h> #include <QtCore/qbasictimer.h> @@ -174,9 +174,9 @@ public: QPointF pressPos; QPointF tripleClickStartPoint; - QDeclarativeGuard<QDeclarativeComponent> cursorComponent; + QQmlGuard<QQmlComponent> cursorComponent; #ifndef QT_NO_VALIDATOR - QDeclarativeGuard<QValidator> m_validator; + QQmlGuard<QValidator> m_validator; #endif qreal hscroll; diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp index a3daead6cb..5be4963809 100644 --- a/src/quick/items/qquicktextnode.cpp +++ b/src/quick/items/qquicktextnode.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 @@ -55,7 +55,7 @@ #include <qrawfont.h> #include <qtexttable.h> #include <qtextlist.h> -#include <private/qdeclarativestyledtext_p.h> +#include <private/qquickstyledtext_p.h> #include <private/qquicktext_p_p.h> #include <private/qfont_p.h> #include <private/qfontengine_p.h> diff --git a/src/quick/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h index 9c2217bfd0..2ecd20d933 100644 --- a/src/quick/items/qquicktextnode_p.h +++ b/src/quick/items/qquicktextnode_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/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp index a1a1f59173..6cfa7a0338 100644 --- a/src/quick/items/qquicktranslate.cpp +++ b/src/quick/items/qquicktranslate.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/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h index 82901d7c6a..d2d8c3abc5 100644 --- a/src/quick/items/qquicktranslate_p.h +++ b/src/quick/items/qquicktranslate_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/qquickview.cpp b/src/quick/items/qquickview.cpp index 76d82a4713..7d1411aa6e 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.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 @@ -46,11 +46,11 @@ #include "qquickitem_p.h" #include "qquickitemchangelistener_p.h" -#include <private/qdeclarativeprofilerservice_p.h> -#include <private/qdeclarativeinspectorservice_p.h> +#include <private/qqmlprofilerservice_p.h> +#include <private/qqmlinspectorservice_p.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <private/qdeclarativeengine_p.h> +#include <QtQml/qqmlengine.h> +#include <private/qqmlengine_p.h> #include <QtCore/qbasictimer.h> @@ -62,8 +62,8 @@ void QQuickViewPrivate::init() engine.setIncubationController(q->incubationController()); - if (QDeclarativeDebugService::isDebuggingEnabled()) - QDeclarativeInspectorService::instance()->addView(q); + if (QQmlDebugService::isDebuggingEnabled()) + QQmlInspectorService::instance()->addView(q); } QQuickViewPrivate::QQuickViewPrivate() @@ -73,8 +73,8 @@ QQuickViewPrivate::QQuickViewPrivate() QQuickViewPrivate::~QQuickViewPrivate() { - if (QDeclarativeDebugService::isDebuggingEnabled()) - QDeclarativeInspectorService::instance()->removeView(q_func()); + if (QQmlDebugService::isDebuggingEnabled()) + QQmlInspectorService::instance()->removeView(q_func()); delete root; } @@ -91,11 +91,11 @@ void QQuickViewPrivate::execute() component = 0; } if (!source.isEmpty()) { - component = new QDeclarativeComponent(&engine, source, q); + component = new QQmlComponent(&engine, source, q); if (!component->isLoading()) { q->continueExecute(); } else { - QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), + QObject::connect(component, SIGNAL(statusChanged(QQmlComponent::Status)), q, SLOT(continueExecute())); } } @@ -120,7 +120,7 @@ void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF This is a convenience subclass of QQuickCanvas which will automatically load and display a QML scene when given the URL of the main source file. Alternatively, - you can instantiate your own objects using QDeclarativeComponent and place them in a manually setup QQuickCanvas. + you can instantiate your own objects using QQmlComponent and place them in a manually setup QQuickCanvas. Typical usage: @@ -216,23 +216,23 @@ QUrl QQuickView::source() const } /*! - Returns a pointer to the QDeclarativeEngine used for instantiating + Returns a pointer to the QQmlEngine used for instantiating QML Components. */ -QDeclarativeEngine* QQuickView::engine() const +QQmlEngine* QQuickView::engine() const { Q_D(const QQuickView); - return const_cast<QDeclarativeEngine *>(&d->engine); + return const_cast<QQmlEngine *>(&d->engine); } /*! This function returns the root of the context hierarchy. Each QML - component is instantiated in a QDeclarativeContext. QDeclarativeContext's are + component is instantiated in a QQmlContext. QQmlContext's are essential for passing data to QML components. In QML, contexts are arranged hierarchically and this hierarchy is managed by the - QDeclarativeEngine. + QQmlEngine. */ -QDeclarativeContext* QQuickView::rootContext() const +QQmlContext* QQuickView::rootContext() const { Q_D(const QQuickView); return d->engine.rootContext(); @@ -275,12 +275,12 @@ QQuickView::Status QQuickView::status() const Return the list of errors that occurred during the last compile or create operation. When the status is not Error, an empty list is returned. */ -QList<QDeclarativeError> QQuickView::errors() const +QList<QQmlError> QQuickView::errors() const { Q_D(const QQuickView); if (d->component) return d->component->errors(); - return QList<QDeclarativeError>(); + return QList<QQmlError>(); } /*! @@ -377,11 +377,11 @@ QQuickView::ResizeMode QQuickView::resizeMode() const void QQuickView::continueExecute() { Q_D(QQuickView); - disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute())); + disconnect(d->component, SIGNAL(statusChanged(QQmlComponent::Status)), this, SLOT(continueExecute())); if (d->component->isError()) { - QList<QDeclarativeError> errorList = d->component->errors(); - foreach (const QDeclarativeError &error, errorList) { + QList<QQmlError> errorList = d->component->errors(); + foreach (const QQmlError &error, errorList) { qWarning() << error; } emit statusChanged(status()); @@ -391,8 +391,8 @@ void QQuickView::continueExecute() QObject *obj = d->component->create(); if (d->component->isError()) { - QList<QDeclarativeError> errorList = d->component->errors(); - foreach (const QDeclarativeError &error, errorList) { + QList<QQmlError> errorList = d->component->errors(); + foreach (const QQmlError &error, errorList) { qWarning() << error; } emit statusChanged(status()); @@ -422,7 +422,7 @@ void QQuickViewPrivate::setRootObject(QObject *obj) << "loaded has 'import QtQuick 1.0' or 'import Qt 4.7', this error will occur." << endl << endl << "To load files with 'import QtQuick 1.0' or 'import Qt 4.7', use the" << endl - << "QDeclarativeView class in the qtquick1 module." << endl; + << "QQuickView class in the qtquick1 module." << endl; delete obj; root = 0; } @@ -499,35 +499,35 @@ void QQuickView::resizeEvent(QResizeEvent *e) void QQuickView::keyPressEvent(QKeyEvent *e) { - QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Key); + QQmlProfilerService::addEvent(QQmlProfilerService::Key); QQuickCanvas::keyPressEvent(e); } void QQuickView::keyReleaseEvent(QKeyEvent *e) { - QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Key); + QQmlProfilerService::addEvent(QQmlProfilerService::Key); QQuickCanvas::keyReleaseEvent(e); } void QQuickView::mouseMoveEvent(QMouseEvent *e) { - QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse); + QQmlProfilerService::addEvent(QQmlProfilerService::Mouse); QQuickCanvas::mouseMoveEvent(e); } void QQuickView::mousePressEvent(QMouseEvent *e) { - QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse); + QQmlProfilerService::addEvent(QQmlProfilerService::Mouse); QQuickCanvas::mousePressEvent(e); } void QQuickView::mouseReleaseEvent(QMouseEvent *e) { - QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse); + QQmlProfilerService::addEvent(QQmlProfilerService::Mouse); QQuickCanvas::mouseReleaseEvent(e); } diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h index 6f1b1f12cd..89cca506f7 100644 --- a/src/quick/items/qquickview.h +++ b/src/quick/items/qquickview.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,15 +44,15 @@ #include <QtQuick/qquickcanvas.h> #include <QtCore/qurl.h> -#include <QtDeclarative/qdeclarativedebug.h> +#include <QtQml/qqmldebug.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeEngine; -class QDeclarativeContext; -class QDeclarativeError; +class QQmlEngine; +class QQmlContext; +class QQmlError; class QQuickItem; class QQuickViewPrivate; @@ -70,8 +70,8 @@ public: QUrl source() const; - QDeclarativeEngine* engine() const; - QDeclarativeContext* rootContext() const; + QQmlEngine* engine() const; + QQmlContext* rootContext() const; QQuickItem *rootObject() const; @@ -82,7 +82,7 @@ public: enum Status { Null, Ready, Loading, Error }; Status status() const; - QList<QDeclarativeError> errors() const; + QList<QQmlError> errors() const; QSize sizeHint() const; QSize initialSize() const; diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index 1dacf2f1ee..9b0e26e30d 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_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 @@ -48,7 +48,7 @@ #include <QtCore/qelapsedtimer.h> #include <QtCore/qtimer.h> #include <QtCore/qpointer.h> -#include <QtDeclarative/qdeclarativeengine.h> +#include <QtQml/qqmlengine.h> #include "qquickcanvas_p.h" #include "qquickitemchangelistener_p.h" @@ -57,10 +57,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeContext; -class QDeclarativeError; +class QQmlContext; +class QQmlError; class QQuickItem; -class QDeclarativeComponent; +class QQmlComponent; class QQuickViewPrivate : public QQuickCanvasPrivate, public QQuickItemChangeListener @@ -87,8 +87,8 @@ public: QUrl source; - QDeclarativeEngine engine; - QDeclarativeComponent *component; + QQmlEngine engine; + QQmlComponent *component; QBasicTimer resizetimer; QQuickView::ResizeMode resizeMode; diff --git a/src/quick/items/qquickvisualadaptormodel.cpp b/src/quick/items/qquickvisualadaptormodel.cpp index f504478a3d..fb85810984 100644 --- a/src/quick/items/qquickvisualadaptormodel.cpp +++ b/src/quick/items/qquickvisualadaptormodel.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 @@ -42,9 +42,9 @@ #include "qquickvisualadaptormodel_p.h" #include "qquickvisualdatamodel_p_p.h" -#include <private/qdeclarativeengine_p.h> -#include <private/qdeclarativelistaccessor_p.h> -#include <private/qdeclarativepropertycache_p.h> +#include <private/qqmlengine_p.h> +#include <private/qquicklistaccessor_p.h> +#include <private/qqmlpropertycache_p.h> #include <private/qlistmodelinterface_p.h> #include <private/qmetaobjectbuilder_p.h> #include <private/qintrusivelist_p.h> @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class VDMDelegateDataType : public QDeclarativeRefCount +class VDMDelegateDataType : public QQmlRefCount { public: VDMDelegateDataType() @@ -86,7 +86,7 @@ public: } QMetaObject *metaObject; - QDeclarativePropertyCache *propertyCache; + QQmlPropertyCache *propertyCache; int propertyOffset; int signalOffset; bool shared : 1; @@ -166,10 +166,10 @@ public: return 0; } - QDeclarativeGuard<QDeclarativeEngine> m_engine; - QDeclarativeGuard<QListModelInterface> m_listModelInterface; - QDeclarativeGuard<QAbstractItemModel> m_abstractItemModel; - QDeclarativeListAccessor *m_listAccessor; + QQmlGuard<QQmlEngine> m_engine; + QQmlGuard<QListModelInterface> m_listModelInterface; + QQmlGuard<QAbstractItemModel> m_abstractItemModel; + QQuickListAccessor *m_listAccessor; VDMDelegateDataType *m_delegateDataType; CreateModelData createItem; StringValue stringValue; @@ -650,7 +650,7 @@ public: for (int i = previousPropertyCount; i < metaObject->propertyCount() - objectPropertyOffset; ++i) { QMetaProperty property = metaObject->property(i + objectPropertyOffset); if (property.hasNotifySignal()) { - QDeclarativePropertyPrivate::connect( + QQmlPropertyPrivate::connect( m_object, property.notifySignalIndex(), m_data, notifierId); ++notifierId; } @@ -658,7 +658,7 @@ public: return propertyIndex + m_type->propertyOffset - objectPropertyOffset; } - QDeclarativeGuard<QObject> m_object; + QQmlGuard<QObject> m_object; }; class QQuickVDMObjectData : public QQuickVisualDataModelItem, public QQuickVisualAdaptorModelProxyInterface @@ -712,7 +712,7 @@ void QQuickVisualAdaptorModelPrivate::createMetaObject() m_objectList = false; m_propertyData.clear(); - QV8Engine *v8Engine = QDeclarativeEnginePrivate::getV8Engine(m_engine); + QV8Engine *v8Engine = QQmlEnginePrivate::getV8Engine(m_engine); v8::HandleScope handleScope; v8::Context::Scope contextScope(v8Engine->context()); @@ -722,8 +722,8 @@ void QQuickVisualAdaptorModelPrivate::createMetaObject() v8::String::New("index"), QQuickVisualDataModelItemMetaObject::get_index); if (m_listAccessor - && m_listAccessor->type() != QDeclarativeListAccessor::ListProperty - && m_listAccessor->type() != QDeclarativeListAccessor::Instance) { + && m_listAccessor->type() != QQuickListAccessor::ListProperty + && m_listAccessor->type() != QQuickListAccessor::Instance) { createItem = &QQuickVDMListAccessorData::create; stringValue = &QQuickVDMListAccessorData::stringValue; ft->PrototypeTemplate()->SetAccessor( @@ -794,7 +794,7 @@ void QQuickVisualAdaptorModelPrivate::createMetaObject() } m_delegateDataType->metaObject = m_delegateDataType->builder.toMetaObject(); if (!m_objectList) { - m_delegateDataType->propertyCache = new QDeclarativePropertyCache( + m_delegateDataType->propertyCache = new QQmlPropertyCache( m_engine, m_delegateDataType->metaObject); m_constructor = qPersistentNew<v8::Function>(ft->GetFunction()); } @@ -828,7 +828,7 @@ QVariant QQuickVisualAdaptorModel::model() const return d->m_modelVariant; } -void QQuickVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *engine) +void QQuickVisualAdaptorModel::setModel(const QVariant &model, QQmlEngine *engine) { Q_D(QQuickVisualAdaptorModel); delete d->m_listAccessor; @@ -904,7 +904,7 @@ void QQuickVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngin return; } - d->m_listAccessor = new QDeclarativeListAccessor; + d->m_listAccessor = new QQuickListAccessor; d->m_listAccessor->setList(model, d->m_engine); if ((d->m_count = d->m_listAccessor->count())) emit itemsInserted(0, d->m_count); @@ -964,7 +964,7 @@ QQuickVisualDataModelItem *QQuickVisualAdaptorModel::createItem(QQuickVisualData d->m_cache.insert(item); if (d->m_delegateDataType && d->m_delegateDataType->propertyCache) { - QDeclarativeData *qmldata = QDeclarativeData::get(item, true); + QQmlData *qmldata = QQmlData::get(item, true); qmldata->propertyCache = d->m_delegateDataType->propertyCache; qmldata->propertyCache->addref(); } diff --git a/src/quick/items/qquickvisualadaptormodel_p.h b/src/quick/items/qquickvisualadaptormodel_p.h index e431f3aa26..cf6dabe237 100644 --- a/src/quick/items/qquickvisualadaptormodel_p.h +++ b/src/quick/items/qquickvisualadaptormodel_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 @@ -49,7 +49,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeEngine; +class QQmlEngine; class QQuickVisualDataModelItem; class QQuickVisualDataModelItemMetaType; @@ -72,7 +72,7 @@ public: Flags flags() const; QVariant model() const; - void setModel(const QVariant &, QDeclarativeEngine *); + void setModel(const QVariant &, QQmlEngine *); QVariant rootIndex() const; void setRootIndex(const QVariant &root); diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp index 3aa6077d32..70f8897b2d 100644 --- a/src/quick/items/qquickvisualdatamodel.cpp +++ b/src/quick/items/qquickvisualdatamodel.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 @@ -42,13 +42,13 @@ #include "qquickvisualdatamodel_p_p.h" #include "qquickitem.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> -#include <private/qdeclarativepackage_p.h> +#include <private/qquickpackage_p.h> #include <private/qmetaobjectbuilder_p.h> #include <private/qquickvisualadaptormodel_p.h> -#include <private/qdeclarativechangeset_p.h> -#include <private/qdeclarativeengine_p.h> +#include <private/qquickchangeset_p.h> +#include <private/qqmlengine_p.h> QT_BEGIN_NAMESPACE @@ -93,10 +93,10 @@ QHash<QObject*, QQuickVisualDataModelAttached*> QQuickVisualDataModelAttached::a The example below illustrates using a VisualDataModel with a ListView. - \snippet doc/src/snippets/declarative/visualdatamodel.qml 0 + \snippet doc/src/snippets/qml/visualdatamodel.qml 0 */ -QQuickVisualDataModelPrivate::QQuickVisualDataModelPrivate(QDeclarativeContext *ctxt) +QQuickVisualDataModelPrivate::QQuickVisualDataModelPrivate(QQmlContext *ctxt) : m_adaptorModel(0) , m_delegate(0) , m_cacheMetaType(0) @@ -153,7 +153,7 @@ QQuickVisualDataModel::QQuickVisualDataModel() d->init(); } -QQuickVisualDataModel::QQuickVisualDataModel(QDeclarativeContext *ctxt, QObject *parent) +QQuickVisualDataModel::QQuickVisualDataModel(QQmlContext *ctxt, QObject *parent) : QQuickVisualModel(*(new QQuickVisualDataModelPrivate(ctxt)), parent) { Q_D(QQuickVisualDataModel); @@ -223,7 +223,7 @@ void QQuickVisualDataModel::componentComplete() d->m_context = qmlContext(this); d->m_cacheMetaType = new QQuickVisualDataModelItemMetaType( - QDeclarativeEnginePrivate::getV8Engine(d->m_context->engine()), this, groupNames); + QQmlEnginePrivate::getV8Engine(d->m_context->engine()), this, groupNames); d->m_compositor.setGroupCount(d->m_groupCount); d->m_compositor.setDefaultGroups(defaultGroups); @@ -282,13 +282,13 @@ void QQuickVisualDataModel::setModel(const QVariant &model) The index is exposed as an accessible \c index property. Properties of the model are also available depending upon the type of \l {qmlmodels}{Data Model}. */ -QDeclarativeComponent *QQuickVisualDataModel::delegate() const +QQmlComponent *QQuickVisualDataModel::delegate() const { Q_D(const QQuickVisualDataModel); return d->m_delegate; } -void QQuickVisualDataModel::setDelegate(QDeclarativeComponent *delegate) +void QQuickVisualDataModel::setDelegate(QQmlComponent *delegate) { Q_D(QQuickVisualDataModel); if (d->m_transaction) { @@ -329,10 +329,10 @@ void QQuickVisualDataModel::setDelegate(QDeclarativeComponent *delegate) the new directory's contents. \c main.cpp: - \snippet doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp 0 + \snippet doc/src/snippets/qml/visualdatamodel_rootindex/main.cpp 0 \c view.qml: - \snippet doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml 0 + \snippet doc/src/snippets/qml/visualdatamodel_rootindex/view.qml 0 If the \l model is a QAbstractItemModel subclass, the delegate can also reference a \c hasModelChildren property (optionally qualified by a @@ -406,7 +406,7 @@ void QQuickVisualDataModelPrivate::destroy(QObject *object) { QObjectPrivate *p = QObjectPrivate::get(object); Q_ASSERT(p->declarativeData); - QDeclarativeData *data = static_cast<QDeclarativeData*>(p->declarativeData); + QQmlData *data = static_cast<QQmlData*>(p->declarativeData); if (data->ownContext && data->context) data->context->clearContext(); object->deleteLater(); @@ -470,7 +470,7 @@ void QQuickVisualDataModel::cancel(int index) } if (cacheItem->object && !cacheItem->isObjectReferenced()) { d->destroy(cacheItem->object); - if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object)) + if (QQuickPackage *package = qobject_cast<QQuickPackage *>(cacheItem->object)) d->emitDestroyingPackage(package); else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object)) d->emitDestroyingItem(item); @@ -486,7 +486,7 @@ void QQuickVisualDataModel::cancel(int index) } void QQuickVisualDataModelPrivate::group_append( - QDeclarativeListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group) + QQmlListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group) { QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data); if (d->m_complete) @@ -500,14 +500,14 @@ void QQuickVisualDataModelPrivate::group_append( } int QQuickVisualDataModelPrivate::group_count( - QDeclarativeListProperty<QQuickVisualDataGroup> *property) + QQmlListProperty<QQuickVisualDataGroup> *property) { QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data); return d->m_groupCount - 1; } QQuickVisualDataGroup *QQuickVisualDataModelPrivate::group_at( - QDeclarativeListProperty<QQuickVisualDataGroup> *property, int index) + QQmlListProperty<QQuickVisualDataGroup> *property, int index) { QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data); return index >= 0 && index < d->m_groupCount - 1 @@ -530,13 +530,13 @@ QQuickVisualDataGroup *QQuickVisualDataModelPrivate::group_at( The following example illustrates using groups to select items in a model. - \snippet doc/src/snippets/declarative/visualdatagroup.qml 0 + \snippet doc/src/snippets/qml/visualdatagroup.qml 0 */ -QDeclarativeListProperty<QQuickVisualDataGroup> QQuickVisualDataModel::groups() +QQmlListProperty<QQuickVisualDataGroup> QQuickVisualDataModel::groups() { Q_D(QQuickVisualDataModel); - return QDeclarativeListProperty<QQuickVisualDataGroup>( + return QQmlListProperty<QQuickVisualDataGroup>( this, d, QQuickVisualDataModelPrivate::group_append, @@ -622,7 +622,7 @@ void QQuickVisualDataModelPrivate::updateFilterGroup() if (!m_cacheMetaType) return; - QDeclarativeListCompositor::Group previousGroup = m_compositorGroup; + QQuickListCompositor::Group previousGroup = m_compositorGroup; m_compositorGroup = Compositor::Default; for (int i = 1; i < m_groupCount; ++i) { if (m_filterGroup == m_cacheMetaType->groupNames.at(i - 1)) { @@ -633,11 +633,11 @@ void QQuickVisualDataModelPrivate::updateFilterGroup() QQuickVisualDataGroupPrivate::get(m_groups[m_compositorGroup])->emitters.insert(this); if (m_compositorGroup != previousGroup) { - QVector<QDeclarativeChangeSet::Remove> removes; - QVector<QDeclarativeChangeSet::Insert> inserts; + QVector<QQuickChangeSet::Remove> removes; + QVector<QQuickChangeSet::Insert> inserts; m_compositor.transition(previousGroup, m_compositorGroup, &removes, &inserts); - QDeclarativeChangeSet changeSet; + QQuickChangeSet changeSet; changeSet.apply(removes, inserts); emit q->modelUpdated(changeSet, false); @@ -687,19 +687,19 @@ QObject *QQuickVisualDataModel::parts() return d->m_parts; } -void QQuickVisualDataModelPrivate::emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package) +void QQuickVisualDataModelPrivate::emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package) { for (int i = 1; i < m_groupCount; ++i) QQuickVisualDataGroupPrivate::get(m_groups[i])->createdPackage(cacheItem->index[i], package); } -void QQuickVisualDataModelPrivate::emitInitPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package) +void QQuickVisualDataModelPrivate::emitInitPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package) { for (int i = 1; i < m_groupCount; ++i) QQuickVisualDataGroupPrivate::get(m_groups[i])->initPackage(cacheItem->index[i], package); } -void QQuickVisualDataModelPrivate::emitDestroyingPackage(QDeclarativePackage *package) +void QQuickVisualDataModelPrivate::emitDestroyingPackage(QQuickPackage *package) { for (int i = 1; i < m_groupCount; ++i) QQuickVisualDataGroupPrivate::get(m_groups[i])->destroyingPackage(package); @@ -722,23 +722,23 @@ void QQuickVisualDataModelPrivate::releaseIncubator(QVDMIncubationTask *incubati } } -void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *incubationTask, QDeclarativeIncubator::Status status) +void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *incubationTask, QQmlIncubator::Status status) { Q_Q(QQuickVisualDataModel); - if (status != QDeclarativeIncubator::Ready && status != QDeclarativeIncubator::Error) + if (status != QQmlIncubator::Ready && status != QQmlIncubator::Error) return; QQuickVisualDataModelItem *cacheItem = incubationTask->incubating; cacheItem->incubationTask = 0; - if (status == QDeclarativeIncubator::Ready) { + if (status == QQmlIncubator::Ready) { incubationTask->incubating = 0; releaseIncubator(incubationTask); - if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object)) + if (QQuickPackage *package = qobject_cast<QQuickPackage *>(cacheItem->object)) emitCreatedPackage(cacheItem, package); else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object)) emitCreatedItem(cacheItem, item); - } else if (status == QDeclarativeIncubator::Error) { + } else if (status == QQmlIncubator::Error) { delete incubationTask->incubatingContext; incubationTask->incubatingContext = 0; if (!cacheItem->isReferenced()) { @@ -764,7 +764,7 @@ void QQuickVisualDataModelPrivate::setInitialState(QVDMIncubationTask *incubatio { QQuickVisualDataModelItem *cacheItem = incubationTask->incubating; cacheItem->object = o; - QDeclarative_setParent_noEvent(incubationTask->incubatingContext, cacheItem->object); + QQml_setParent_noEvent(incubationTask->incubatingContext, cacheItem->object); incubationTask->incubatingContext = 0; cacheItem->attached = QQuickVisualDataModelAttached::properties(cacheItem->object); @@ -772,7 +772,7 @@ void QQuickVisualDataModelPrivate::setInitialState(QVDMIncubationTask *incubatio new QQuickVisualDataModelAttachedMetaObject(cacheItem->attached, m_cacheMetaType); cacheItem->attached->emitChanges(); - if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object)) + if (QQuickPackage *package = qobject_cast<QQuickPackage *>(cacheItem->object)) emitInitPackage(cacheItem, package); else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object)) emitInitItem(cacheItem, item); @@ -808,13 +808,13 @@ QObject *QQuickVisualDataModelPrivate::object(Compositor::Group group, int index cacheItem->incubationTask->forceCompletion(); } } else if (!cacheItem->object) { - QVDMIncubationTask *incubator = new QVDMIncubationTask(this, asynchronous ? QDeclarativeIncubator::Asynchronous : QDeclarativeIncubator::AsynchronousIfNested); + QVDMIncubationTask *incubator = new QVDMIncubationTask(this, asynchronous ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); cacheItem->incubationTask = incubator; - QDeclarativeContext *creationContext = m_delegate->creationContext(); - QDeclarativeContext *rootContext = new QQuickVisualDataModelContext( + QQmlContext *creationContext = m_delegate->creationContext(); + QQmlContext *rootContext = new QQuickVisualDataModelContext( cacheItem, creationContext ? creationContext : m_context.data()); - QDeclarativeContext *ctxt = rootContext; + QQmlContext *ctxt = rootContext; if (m_adaptorModel->flags() & QQuickVisualAdaptorModel::ProxiedObject) { if (QQuickVisualAdaptorModelProxyInterface *proxy = qobject_cast<QQuickVisualAdaptorModelProxyInterface *>(cacheItem)) { ctxt->setContextObject(proxy->proxiedObject()); @@ -950,13 +950,13 @@ void QQuickVisualDataModelPrivate::itemsChanged(const QVector<Compositor::Change if (!m_delegate) return; - QVarLengthArray<QVector<QDeclarativeChangeSet::Change>, Compositor::MaximumGroupCount> translatedChanges(m_groupCount); + QVarLengthArray<QVector<QQuickChangeSet::Change>, Compositor::MaximumGroupCount> translatedChanges(m_groupCount); foreach (const Compositor::Change &change, changes) { for (int i = 1; i < m_groupCount; ++i) { if (change.inGroup(i)) { translatedChanges[i].append( - QDeclarativeChangeSet::Change(change.index[i], change.count)); + QQuickChangeSet::Change(change.index[i], change.count)); } } } @@ -978,7 +978,7 @@ void QQuickVisualDataModel::_q_itemsChanged(int index, int count) void QQuickVisualDataModelPrivate::itemsInserted( const QVector<Compositor::Insert> &inserts, - QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts, + QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts, QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems) { int cacheIndex = 0; @@ -996,7 +996,7 @@ void QQuickVisualDataModelPrivate::itemsInserted( for (int i = 1; i < m_groupCount; ++i) { if (insert.inGroup(i)) { (*translatedInserts)[i].append( - QDeclarativeChangeSet::Insert(insert.index[i], insert.count, insert.moveId)); + QQuickChangeSet::Insert(insert.index[i], insert.count, insert.moveId)); inserted[i] += insert.count; } } @@ -1032,7 +1032,7 @@ void QQuickVisualDataModelPrivate::itemsInserted( void QQuickVisualDataModelPrivate::itemsInserted(const QVector<Compositor::Insert> &inserts) { - QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount); + QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount); itemsInserted(inserts, &translatedInserts); Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache)); if (!m_delegate) @@ -1056,7 +1056,7 @@ void QQuickVisualDataModel::_q_itemsInserted(int index, int count) void QQuickVisualDataModelPrivate::itemsRemoved( const QVector<Compositor::Remove> &removes, - QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves, + QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves, QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems) { int cacheIndex = 0; @@ -1075,7 +1075,7 @@ void QQuickVisualDataModelPrivate::itemsRemoved( for (int i = 1; i < m_groupCount; ++i) { if (remove.inGroup(i)) { (*translatedRemoves)[i].append( - QDeclarativeChangeSet::Remove(remove.index[i], remove.count, remove.moveId)); + QQuickChangeSet::Remove(remove.index[i], remove.count, remove.moveId)); removed[i] += remove.count; } } @@ -1093,7 +1093,7 @@ void QQuickVisualDataModelPrivate::itemsRemoved( QQuickVisualDataModelItem *cacheItem = m_cache.at(cacheIndex); if (remove.inGroup(Compositor::Persisted) && cacheItem->objectRef == 0 && cacheItem->object) { destroy(cacheItem->object); - if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object)) + if (QQuickPackage *package = qobject_cast<QQuickPackage *>(cacheItem->object)) emitDestroyingPackage(package); else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object)) emitDestroyingItem(item); @@ -1130,7 +1130,7 @@ void QQuickVisualDataModelPrivate::itemsRemoved( void QQuickVisualDataModelPrivate::itemsRemoved(const QVector<Compositor::Remove> &removes) { - QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount); + QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount); itemsRemoved(removes, &translatedRemoves); Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache)); if (!m_delegate) @@ -1158,10 +1158,10 @@ void QQuickVisualDataModelPrivate::itemsMoved( { QHash<int, QList<QQuickVisualDataModelItem *> > movedItems; - QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount); + QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount); itemsRemoved(removes, &translatedRemoves, &movedItems); - QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount); + QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount); itemsInserted(inserts, &translatedInserts, &movedItems); Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache)); Q_ASSERT(movedItems.isEmpty()); @@ -1206,7 +1206,7 @@ QQuickVisualDataModelPrivate::buildChangeList(const QVector<T> &changes) return indexes; } -void QQuickVisualDataModelPrivate::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) +void QQuickVisualDataModelPrivate::emitModelUpdated(const QQuickChangeSet &changeSet, bool reset) { Q_Q(QQuickVisualDataModel); emit q->modelUpdated(changeSet, reset); @@ -1220,7 +1220,7 @@ void QQuickVisualDataModelPrivate::emitChanges() return; m_transaction = true; - QV8Engine *engine = QDeclarativeEnginePrivate::getV8Engine(m_context->engine()); + QV8Engine *engine = QQmlEnginePrivate::getV8Engine(m_context->engine()); for (int i = 1; i < m_groupCount; ++i) QQuickVisualDataGroupPrivate::get(m_groups[i])->emitChanges(engine); m_transaction = false; @@ -1751,14 +1751,14 @@ void QQuickVisualDataGroupPrivate::setModel(QQuickVisualDataModel *m, Compositor void QQuickVisualDataGroupPrivate::emitChanges(QV8Engine *engine) { Q_Q(QQuickVisualDataGroup); - static int idx = signalIndex("changed(QDeclarativeV8Handle,QDeclarativeV8Handle)"); + static int idx = signalIndex("changed(QQmlV8Handle,QQmlV8Handle)"); if (isSignalConnected(idx) && !changeSet.isEmpty()) { v8::HandleScope handleScope; v8::Context::Scope contextScope(engine->context()); v8::Local<v8::Array> removed = QQuickVisualDataModelPrivate::buildChangeList(changeSet.removes()); v8::Local<v8::Array> inserted = QQuickVisualDataModelPrivate::buildChangeList(changeSet.inserts()); emit q->changed( - QDeclarativeV8Handle::fromHandle(removed), QDeclarativeV8Handle::fromHandle(inserted)); + QQmlV8Handle::fromHandle(removed), QQmlV8Handle::fromHandle(inserted)); } if (changeSet.difference() != 0) emit q->countChanged(); @@ -1771,19 +1771,19 @@ void QQuickVisualDataGroupPrivate::emitModelUpdated(bool reset) changeSet.clear(); } -void QQuickVisualDataGroupPrivate::createdPackage(int index, QDeclarativePackage *package) +void QQuickVisualDataGroupPrivate::createdPackage(int index, QQuickPackage *package) { for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it) it->createdPackage(index, package); } -void QQuickVisualDataGroupPrivate::initPackage(int index, QDeclarativePackage *package) +void QQuickVisualDataGroupPrivate::initPackage(int index, QQuickPackage *package) { for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it) it->initPackage(index, package); } -void QQuickVisualDataGroupPrivate::destroyingPackage(QDeclarativePackage *package) +void QQuickVisualDataGroupPrivate::destroyingPackage(QQuickPackage *package) { for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it) it->destroyingPackage(package); @@ -1904,16 +1904,16 @@ void QQuickVisualDataGroup::setDefaultInclude(bool include) \endlist */ -QDeclarativeV8Handle QQuickVisualDataGroup::get(int index) +QQmlV8Handle QQuickVisualDataGroup::get(int index) { Q_D(QQuickVisualDataGroup); if (!d->model) - return QDeclarativeV8Handle::fromHandle(v8::Undefined());; + return QQmlV8Handle::fromHandle(v8::Undefined());; QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model); if (index < 0 || index >= model->m_compositor.count(d->group)) { qmlInfo(this) << tr("get: index out of range"); - return QDeclarativeV8Handle::fromHandle(v8::Undefined()); + return QQmlV8Handle::fromHandle(v8::Undefined()); } Compositor::iterator it = model->m_compositor.find(d->group, index); @@ -1939,7 +1939,7 @@ QDeclarativeV8Handle QQuickVisualDataGroup::get(int index) ++cacheItem->scriptRef; } - return QDeclarativeV8Handle::fromHandle(cacheItem->indexHandle); + return QQmlV8Handle::fromHandle(cacheItem->indexHandle); } bool QQuickVisualDataGroupPrivate::parseIndex( @@ -1962,7 +1962,7 @@ bool QQuickVisualDataGroupPrivate::parseIndex( return false; } -void QQuickVisualDataGroup::insert(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::insert(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model); @@ -2012,7 +2012,7 @@ void QQuickVisualDataGroup::insert(QDeclarativeV8Function *args) group remain instantiated when not referenced by any view. */ -void QQuickVisualDataGroup::create(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::create(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); if (!d->model) @@ -2067,7 +2067,7 @@ void QQuickVisualDataGroup::create(QDeclarativeV8Function *args) model->emitChanges(); } -void QQuickVisualDataGroup::resolve(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::resolve(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); if (!d->model) @@ -2167,7 +2167,7 @@ void QQuickVisualDataGroup::resolve(QDeclarativeV8Function *args) Removes \a count items starting at \a index from the group. */ -void QQuickVisualDataGroup::remove(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::remove(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); if (!d->model) @@ -2206,7 +2206,7 @@ void QQuickVisualDataGroup::remove(QDeclarativeV8Function *args) } bool QQuickVisualDataGroupPrivate::parseGroupArgs( - QDeclarativeV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const + QQmlV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const { if (!model || !QQuickVisualDataModelPrivate::get(model)->m_cacheMetaType) return false; @@ -2239,7 +2239,7 @@ bool QQuickVisualDataGroupPrivate::parseGroupArgs( Adds \a count items starting at \a index to \a groups. */ -void QQuickVisualDataGroup::addGroups(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::addGroups(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); Compositor::Group group = d->group; @@ -2269,7 +2269,7 @@ void QQuickVisualDataGroup::addGroups(QDeclarativeV8Function *args) Removes \a count items starting at \a index from \a groups. */ -void QQuickVisualDataGroup::removeGroups(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::removeGroups(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); Compositor::Group group = d->group; @@ -2299,7 +2299,7 @@ void QQuickVisualDataGroup::removeGroups(QDeclarativeV8Function *args) Sets the \a groups \a count items starting at \a index belong to. */ -void QQuickVisualDataGroup::setGroups(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::setGroups(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); Compositor::Group group = d->group; @@ -2335,7 +2335,7 @@ void QQuickVisualDataGroup::setGroups(QDeclarativeV8Function *args) Moves \a count at \a from in a group \a to a new position. */ -void QQuickVisualDataGroup::move(QDeclarativeV8Function *args) +void QQuickVisualDataGroup::move(QQmlV8Function *args) { Q_D(QQuickVisualDataGroup); @@ -2461,7 +2461,7 @@ void QQuickVisualPartsModel::updateFilterGroup() m_filterGroup = model->m_filterGroup; } - QDeclarativeListCompositor::Group previousGroup = m_compositorGroup; + QQuickListCompositor::Group previousGroup = m_compositorGroup; m_compositorGroup = Compositor::Default; QQuickVisualDataGroupPrivate::get(model->m_groups[Compositor::Default])->emitters.insert(this); for (int i = 1; i < model->m_groupCount; ++i) { @@ -2473,11 +2473,11 @@ void QQuickVisualPartsModel::updateFilterGroup() QQuickVisualDataGroupPrivate::get(model->m_groups[m_compositorGroup])->emitters.insert(this); if (m_compositorGroup != previousGroup) { - QVector<QDeclarativeChangeSet::Remove> removes; - QVector<QDeclarativeChangeSet::Insert> inserts; + QVector<QQuickChangeSet::Remove> removes; + QVector<QQuickChangeSet::Insert> inserts; model->m_compositor.transition(previousGroup, m_compositorGroup, &removes, &inserts); - QDeclarativeChangeSet changeSet; + QQuickChangeSet changeSet; changeSet.apply(removes, inserts); if (!changeSet.isEmpty()) emit modelUpdated(changeSet, false); @@ -2488,7 +2488,7 @@ void QQuickVisualPartsModel::updateFilterGroup() } void QQuickVisualPartsModel::updateFilterGroup( - Compositor::Group group, const QDeclarativeChangeSet &changeSet) + Compositor::Group group, const QQuickChangeSet &changeSet) { if (!m_inheritGroup) return; @@ -2529,7 +2529,7 @@ QQuickItem *QQuickVisualPartsModel::item(int index, bool asynchronous) QObject *object = model->object(m_compositorGroup, index, asynchronous, true); - if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(object)) { + if (QQuickPackage *package = qobject_cast<QQuickPackage *>(object)) { QObject *part = package->part(m_part); if (!part) return 0; @@ -2553,10 +2553,10 @@ QQuickVisualModel::ReleaseFlags QQuickVisualPartsModel::release(QQuickItem *item { QQuickVisualModel::ReleaseFlags flags = 0; - QHash<QObject *, QDeclarativePackage *>::iterator it = m_packaged.find(item); + QHash<QObject *, QQuickPackage *>::iterator it = m_packaged.find(item); if (it != m_packaged.end()) { - QDeclarativePackage *package = *it; - QDeclarative_setParent_noEvent(item, package); + QQuickPackage *package = *it; + QQml_setParent_noEvent(item, package); QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model); flags = model->release(package); m_packaged.erase(it); @@ -2582,7 +2582,7 @@ void QQuickVisualPartsModel::setWatchedRoles(QList<QByteArray> roles) int QQuickVisualPartsModel::indexOf(QQuickItem *item, QObject *) const { - QHash<QObject *, QDeclarativePackage *>::const_iterator it = m_packaged.find(item); + QHash<QObject *, QQuickPackage *>::const_iterator it = m_packaged.find(item); if (it != m_packaged.end()) { if (QQuickVisualDataModelAttached *attached = QQuickVisualDataModelAttached::properties(*it)) return attached->m_cacheItem->index[m_compositorGroup]; @@ -2590,29 +2590,29 @@ int QQuickVisualPartsModel::indexOf(QQuickItem *item, QObject *) const return -1; } -void QQuickVisualPartsModel::createdPackage(int index, QDeclarativePackage *package) +void QQuickVisualPartsModel::createdPackage(int index, QQuickPackage *package) { if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part))) emit createdItem(index, item); } -void QQuickVisualPartsModel::initPackage(int index, QDeclarativePackage *package) +void QQuickVisualPartsModel::initPackage(int index, QQuickPackage *package) { if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part))) emit initItem(index, item); } -void QQuickVisualPartsModel::destroyingPackage(QDeclarativePackage *package) +void QQuickVisualPartsModel::destroyingPackage(QQuickPackage *package) { if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part))) { Q_ASSERT(!m_packaged.contains(item)); emit destroyingItem(item); item->setParentItem(0); - QDeclarative_setParent_noEvent(item, package); + QQml_setParent_noEvent(item, package); } } -void QQuickVisualPartsModel::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) +void QQuickVisualPartsModel::emitModelUpdated(const QQuickChangeSet &changeSet, bool reset) { emit modelUpdated(changeSet, reset); if (changeSet.difference() != 0) diff --git a/src/quick/items/qquickvisualdatamodel_p.h b/src/quick/items/qquickvisualdatamodel_p.h index 043fcfd8a9..535374be09 100644 --- a/src/quick/items/qquickvisualdatamodel_p.h +++ b/src/quick/items/qquickvisualdatamodel_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 @@ -42,7 +42,7 @@ #ifndef QQUICKVISUALDATAMODEL_P_H #define QQUICKVISUALDATAMODEL_P_H -#include <private/qdeclarativelistcompositor_p.h> +#include <private/qquicklistcompositor_p.h> #include <private/qquickvisualitemmodel_p.h> #include <QtCore/qabstractitemmodel.h> @@ -50,7 +50,7 @@ #include <private/qv8engine_p.h> -#include <private/qdeclarativeglobal_p.h> +#include <private/qqmlglobal_p.h> QT_BEGIN_HEADER @@ -58,33 +58,33 @@ Q_DECLARE_METATYPE(QModelIndex) QT_BEGIN_NAMESPACE -class QDeclarativeChangeSet; -class QDeclarativeComponent; -class QDeclarativePackage; -class QDeclarativeV8Function; +class QQuickChangeSet; +class QQmlComponent; +class QQuickPackage; +class QQmlV8Function; class QQuickVisualDataGroup; class QQuickVisualDataModelAttached; class QQuickVisualDataModelPrivate; -class Q_QUICK_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QDeclarativeParserStatus +class Q_QUICK_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQuickVisualDataModel) Q_PROPERTY(QVariant model READ model WRITE setModel) - Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate) + Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate) Q_PROPERTY(QString filterOnGroup READ filterGroup WRITE setFilterGroup NOTIFY filterGroupChanged RESET resetFilterGroup) Q_PROPERTY(QQuickVisualDataGroup *items READ items CONSTANT) Q_PROPERTY(QQuickVisualDataGroup *persistedItems READ persistedItems CONSTANT) - Q_PROPERTY(QDeclarativeListProperty<QQuickVisualDataGroup> groups READ groups CONSTANT) + Q_PROPERTY(QQmlListProperty<QQuickVisualDataGroup> groups READ groups CONSTANT) Q_PROPERTY(QObject *parts READ parts CONSTANT) Q_PROPERTY(QVariant rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged) Q_CLASSINFO("DefaultProperty", "delegate") - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QQuickVisualDataModel(); - QQuickVisualDataModel(QDeclarativeContext *, QObject *parent=0); + QQuickVisualDataModel(QQmlContext *, QObject *parent=0); virtual ~QQuickVisualDataModel(); void classBegin(); @@ -93,8 +93,8 @@ public: QVariant model() const; void setModel(const QVariant &); - QDeclarativeComponent *delegate() const; - void setDelegate(QDeclarativeComponent *); + QQmlComponent *delegate() const; + void setDelegate(QQmlComponent *); QVariant rootIndex() const; void setRootIndex(const QVariant &root); @@ -118,7 +118,7 @@ public: QQuickVisualDataGroup *items(); QQuickVisualDataGroup *persistedItems(); - QDeclarativeListProperty<QQuickVisualDataGroup> groups(); + QQmlListProperty<QQuickVisualDataGroup> groups(); QObject *parts(); bool event(QEvent *); @@ -160,23 +160,23 @@ public: bool defaultInclude() const; void setDefaultInclude(bool include); - Q_INVOKABLE QDeclarativeV8Handle get(int index); + Q_INVOKABLE QQmlV8Handle get(int index); public Q_SLOTS: - void insert(QDeclarativeV8Function *); - void create(QDeclarativeV8Function *); - void resolve(QDeclarativeV8Function *); - void remove(QDeclarativeV8Function *); - void addGroups(QDeclarativeV8Function *); - void removeGroups(QDeclarativeV8Function *); - void setGroups(QDeclarativeV8Function *); - void move(QDeclarativeV8Function *); + void insert(QQmlV8Function *); + void create(QQmlV8Function *); + void resolve(QQmlV8Function *); + void remove(QQmlV8Function *); + void addGroups(QQmlV8Function *); + void removeGroups(QQmlV8Function *); + void setGroups(QQmlV8Function *); + void move(QQmlV8Function *); Q_SIGNALS: void countChanged(); void nameChanged(); void defaultIncludeChanged(); - void changed(const QDeclarativeV8Handle &removed, const QDeclarativeV8Handle &inserted); + void changed(const QQmlV8Handle &removed, const QQmlV8Handle &inserted); private: Q_DECLARE_PRIVATE(QQuickVisualDataGroup) }; @@ -195,7 +195,7 @@ public: , m_previousGroups(0) , m_modelChanged(false) { - QDeclarative_setParent_noEvent(this, parent); + QQml_setParent_noEvent(this, parent); } ~QQuickVisualDataModelAttached() { attachedProperties.remove(parent()); } @@ -230,7 +230,7 @@ Q_SIGNALS: public: QQuickVisualDataModelItem *m_cacheItem; int m_previousGroups; - int m_previousIndex[QDeclarativeListCompositor::MaximumGroupCount]; + int m_previousIndex[QQuickListCompositor::MaximumGroupCount]; bool m_modelChanged; static QHash<QObject*, QQuickVisualDataModelAttached*> attachedProperties; diff --git a/src/quick/items/qquickvisualdatamodel_p_p.h b/src/quick/items/qquickvisualdatamodel_p_p.h index 1fb23d78bb..c53ed5bdbb 100644 --- a/src/quick/items/qquickvisualdatamodel_p_p.h +++ b/src/quick/items/qquickvisualdatamodel_p_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,10 +44,10 @@ #include "qquickvisualdatamodel_p.h" -#include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/qdeclarativeincubator.h> +#include <QtQml/qqmlcontext.h> +#include <QtQml/qqmlincubator.h> -#include <private/qdeclarativeopenmetaobject_p.h> +#include <private/qqmlopenmetaobject_p.h> // // W A R N I N G @@ -62,9 +62,9 @@ QT_BEGIN_NAMESPACE -typedef QDeclarativeListCompositor Compositor; +typedef QQuickListCompositor Compositor; -class QQuickVisualDataModelItemMetaType : public QDeclarativeRefCount +class QQuickVisualDataModelItemMetaType : public QQmlRefCount { public: QQuickVisualDataModelItemMetaType(QV8Engine *engine, QQuickVisualDataModel *model, const QStringList &groupNames); @@ -85,7 +85,7 @@ public: v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info); static v8::Handle<v8::Value> get_index(v8::Local<v8::String>, const v8::AccessorInfo &info); - QDeclarativeGuard<QQuickVisualDataModel> model; + QQmlGuard<QQuickVisualDataModel> model; const int groupCount; const int memberPropertyOffset; const int indexPropertyOffset; @@ -136,8 +136,8 @@ Q_SIGNALS: public: QQuickVisualDataModelItemMetaType * const metaType; - QDeclarativeGuard<QQuickVisualAdaptorModel> model; - QDeclarativeGuard<QObject> object; + QQmlGuard<QQuickVisualAdaptorModel> model; + QQmlGuard<QObject> object; QQuickVisualDataModelAttached *attached; v8::Persistent<v8::Object> indexHandle; v8::Persistent<v8::Value> modelHandle; @@ -145,17 +145,17 @@ public: int objectRef; int scriptRef; int groups; - int index[QDeclarativeListCompositor::MaximumGroupCount]; + int index[QQuickListCompositor::MaximumGroupCount]; QVDMIncubationTask *incubationTask; }; class QQuickVisualDataModelPrivate; -class QVDMIncubationTask : public QDeclarativeIncubator +class QVDMIncubationTask : public QQmlIncubator { public: QVDMIncubationTask(QQuickVisualDataModelPrivate *l, IncubationMode mode) - : QDeclarativeIncubator(mode) + : QQmlIncubator(mode) , incubating(0) , incubatingContext(0) , vdm(l) {} @@ -164,7 +164,7 @@ public: virtual void setInitialState(QObject *); QQuickVisualDataModelItem *incubating; - QDeclarativeContext *incubatingContext; + QQmlContext *incubatingContext; private: QQuickVisualDataModelPrivate *vdm; @@ -174,10 +174,10 @@ private: class QQuickVisualDataGroupEmitter { public: - virtual void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) = 0; - virtual void createdPackage(int, QDeclarativePackage *) {} - virtual void initPackage(int, QDeclarativePackage *) {} - virtual void destroyingPackage(QDeclarativePackage *) {} + virtual void emitModelUpdated(const QQuickChangeSet &changeSet, bool reset) = 0; + virtual void createdPackage(int, QQuickPackage *) {} + virtual void initPackage(int, QQuickPackage *) {} + virtual void destroyingPackage(QQuickPackage *) {} QIntrusiveListNode emitterNode; }; @@ -198,18 +198,18 @@ public: void emitChanges(QV8Engine *engine); void emitModelUpdated(bool reset); - void createdPackage(int index, QDeclarativePackage *package); - void initPackage(int index, QDeclarativePackage *package); - void destroyingPackage(QDeclarativePackage *package); + void createdPackage(int index, QQuickPackage *package); + void initPackage(int index, QQuickPackage *package); + void destroyingPackage(QQuickPackage *package); bool parseIndex(const v8::Local<v8::Value> &value, int *index, Compositor::Group *group) const; bool parseGroupArgs( - QDeclarativeV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const; + QQmlV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const; Compositor::Group group; - QDeclarativeGuard<QQuickVisualDataModel> model; + QQmlGuard<QQuickVisualDataModel> model; QQuickVisualDataGroupEmitterList emitters; - QDeclarativeChangeSet changeSet; + QQuickChangeSet changeSet; QString name; bool defaultInclude; }; @@ -220,7 +220,7 @@ class QQuickVisualDataModelPrivate : public QObjectPrivate, public QQuickVisualD { Q_DECLARE_PUBLIC(QQuickVisualDataModel) public: - QQuickVisualDataModelPrivate(QDeclarativeContext *); + QQuickVisualDataModelPrivate(QQmlContext *); ~QQuickVisualDataModelPrivate(); static QQuickVisualDataModelPrivate *get(QQuickVisualDataModel *m) { @@ -234,13 +234,13 @@ public: void destroy(QObject *object); QQuickVisualDataModel::ReleaseFlags release(QObject *object); QString stringValue(Compositor::Group group, int index, const QString &name); - void emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package); - void emitInitPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package); + void emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package); + void emitInitPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package); void emitCreatedItem(QQuickVisualDataModelItem *cacheItem, QQuickItem *item) { emit q_func()->createdItem(cacheItem->index[m_compositorGroup], item); } void emitInitItem(QQuickVisualDataModelItem *cacheItem, QQuickItem *item) { emit q_func()->initItem(cacheItem->index[m_compositorGroup], item); } - void emitDestroyingPackage(QDeclarativePackage *package); + void emitDestroyingPackage(QQuickPackage *package); void emitDestroyingItem(QQuickItem *item) { emit q_func()->destroyingItem(item); } void updateFilterGroup(); @@ -251,12 +251,12 @@ public: void itemsInserted( const QVector<Compositor::Insert> &inserts, - QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts, + QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts, QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems = 0); void itemsInserted(const QVector<Compositor::Insert> &inserts); void itemsRemoved( const QVector<Compositor::Remove> &removes, - QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves, + QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves, QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems = 0); void itemsRemoved(const QVector<Compositor::Remove> &removes); void itemsMoved( @@ -264,29 +264,29 @@ public: void itemsChanged(const QVector<Compositor::Change> &changes); template <typename T> static v8::Local<v8::Array> buildChangeList(const QVector<T> &changes); void emitChanges(); - void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset); + void emitModelUpdated(const QQuickChangeSet &changeSet, bool reset); bool insert(Compositor::insert_iterator &before, const v8::Local<v8::Object> &object, int groups); - static void group_append(QDeclarativeListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group); - static int group_count(QDeclarativeListProperty<QQuickVisualDataGroup> *property); - static QQuickVisualDataGroup *group_at(QDeclarativeListProperty<QQuickVisualDataGroup> *property, int index); + static void group_append(QQmlListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group); + static int group_count(QQmlListProperty<QQuickVisualDataGroup> *property); + static QQuickVisualDataGroup *group_at(QQmlListProperty<QQuickVisualDataGroup> *property, int index); void releaseIncubator(QVDMIncubationTask *incubationTask); - void incubatorStatusChanged(QVDMIncubationTask *incubationTask, QDeclarativeIncubator::Status status); + void incubatorStatusChanged(QVDMIncubationTask *incubationTask, QQmlIncubator::Status status); void setInitialState(QVDMIncubationTask *incubationTask, QObject *o); QQuickVisualAdaptorModel *m_adaptorModel; - QDeclarativeComponent *m_delegate; + QQmlComponent *m_delegate; QQuickVisualDataModelItemMetaType *m_cacheMetaType; - QDeclarativeGuard<QDeclarativeContext> m_context; + QQmlGuard<QQmlContext> m_context; QList<QQuickVisualDataModelItem *> m_cache; QQuickVisualDataModelParts *m_parts; QQuickVisualDataGroupEmitterList m_pendingParts; - QDeclarativeListCompositor m_compositor; - QDeclarativeListCompositor::Group m_compositorGroup; + QQuickListCompositor m_compositor; + QQuickListCompositor::Group m_compositorGroup; bool m_complete : 1; bool m_delegateValidated : 1; bool m_reset : 1; @@ -321,7 +321,7 @@ public: void setFilterGroup(const QString &group); void resetFilterGroup(); void updateFilterGroup(); - void updateFilterGroup(Compositor::Group group, const QDeclarativeChangeSet &changeSet); + void updateFilterGroup(Compositor::Group group, const QQuickChangeSet &changeSet); int count() const; bool isValid() const; @@ -332,18 +332,18 @@ public: int indexOf(QQuickItem *item, QObject *objectContext) const; - void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset); + void emitModelUpdated(const QQuickChangeSet &changeSet, bool reset); - void createdPackage(int index, QDeclarativePackage *package); - void initPackage(int index, QDeclarativePackage *package); - void destroyingPackage(QDeclarativePackage *package); + void createdPackage(int index, QQuickPackage *package); + void initPackage(int index, QQuickPackage *package); + void destroyingPackage(QQuickPackage *package); Q_SIGNALS: void filterGroupChanged(); private: QQuickVisualDataModel *m_model; - QHash<QObject *, QDeclarativePackage *> m_packaged; + QHash<QObject *, QQuickPackage *> m_packaged; QString m_part; QString m_filterGroup; QList<QByteArray> m_watchedRoles; @@ -353,11 +353,11 @@ private: class QMetaPropertyBuilder; -class QQuickVisualDataModelPartsMetaObject : public QDeclarativeOpenMetaObject +class QQuickVisualDataModelPartsMetaObject : public QQmlOpenMetaObject { public: QQuickVisualDataModelPartsMetaObject(QObject *parent) - : QDeclarativeOpenMetaObject(parent) {} + : QQmlOpenMetaObject(parent) {} virtual void propertyCreated(int, QMetaPropertyBuilder &); virtual QVariant initialValue(int); @@ -387,15 +387,15 @@ private: QQuickVisualDataModelItemMetaType *metaType; }; -class QQuickVisualDataModelContext : public QDeclarativeContext +class QQuickVisualDataModelContext : public QQmlContext { Q_OBJECT public: QQuickVisualDataModelContext( QQuickVisualDataModelItem *cacheItem, - QDeclarativeContext *parentContext, + QQmlContext *parentContext, QObject *parent = 0) - : QDeclarativeContext(parentContext, parent) + : QQmlContext(parentContext, parent) , cacheItem(cacheItem) { ++cacheItem->scriptRef; diff --git a/src/quick/items/qquickvisualitemmodel.cpp b/src/quick/items/qquickvisualitemmodel.cpp index 2a24e3946c..b1fce55d7d 100644 --- a/src/quick/items/qquickvisualitemmodel.cpp +++ b/src/quick/items/qquickvisualitemmodel.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 @@ -43,11 +43,11 @@ #include "qquickitem.h" #include <QtCore/qcoreapplication.h> -#include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/qdeclarativeengine.h> +#include <QtQml/qqmlcontext.h> +#include <QtQml/qqmlengine.h> -#include <private/qdeclarativechangeset_p.h> -#include <private/qdeclarativeglobal_p.h> +#include <private/qquickchangeset_p.h> +#include <private/qqmlglobal_p.h> #include <private/qobject_p.h> #include <QtCore/qhash.h> @@ -64,18 +64,18 @@ class QQuickVisualItemModelPrivate : public QObjectPrivate public: QQuickVisualItemModelPrivate() : QObjectPrivate() {} - static void children_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *item) { - QDeclarative_setParent_noEvent(item, prop->object); + static void children_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *item) { + QQml_setParent_noEvent(item, prop->object); static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.append(Item(item)); static_cast<QQuickVisualItemModelPrivate *>(prop->data)->itemAppended(); static_cast<QQuickVisualItemModelPrivate *>(prop->data)->emitChildrenChanged(); } - static int children_count(QDeclarativeListProperty<QQuickItem> *prop) { + static int children_count(QQmlListProperty<QQuickItem> *prop) { return static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.count(); } - static QQuickItem *children_at(QDeclarativeListProperty<QQuickItem> *prop, int index) { + static QQuickItem *children_at(QQmlListProperty<QQuickItem> *prop, int index) { return static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.at(index).item; } @@ -83,7 +83,7 @@ public: Q_Q(QQuickVisualItemModel); QQuickVisualItemModelAttached *attached = QQuickVisualItemModelAttached::properties(children.last().item); attached->setIndex(children.count()-1); - QDeclarativeChangeSet changeSet; + QQuickChangeSet changeSet; changeSet.insert(children.count() - 1, 1); emit q->modelUpdated(changeSet, false); emit q->countChanged(); @@ -165,10 +165,10 @@ QQuickVisualItemModel::QQuickVisualItemModel(QObject *parent) It is attached to each instance of the delegate. */ -QDeclarativeListProperty<QQuickItem> QQuickVisualItemModel::children() +QQmlListProperty<QQuickItem> QQuickVisualItemModel::children() { Q_D(QQuickVisualItemModel); - return QDeclarativeListProperty<QQuickItem>(this, d, d->children_append, + return QQmlListProperty<QQuickItem>(this, d, d->children_append, d->children_count, d->children_at); } @@ -206,7 +206,7 @@ QQuickVisualModel::ReleaseFlags QQuickVisualItemModel::release(QQuickItem *item) if (d->children[idx].deref()) { // XXX todo - the original did item->scene()->removeItem(). Why? item->setParentItem(0); - QDeclarative_setParent_noEvent(item, this); + QQml_setParent_noEvent(item, this); } } return 0; @@ -217,7 +217,7 @@ QString QQuickVisualItemModel::stringValue(int index, const QString &name) Q_D(QQuickVisualItemModel); if (index < 0 || index >= d->children.count()) return QString(); - return QDeclarativeEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString(); + return QQmlEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString(); } int QQuickVisualItemModel::indexOf(QQuickItem *item, QObject *) const diff --git a/src/quick/items/qquickvisualitemmodel_p.h b/src/quick/items/qquickvisualitemmodel_p.h index 7d2b79f718..bf56195c66 100644 --- a/src/quick/items/qquickvisualitemmodel_p.h +++ b/src/quick/items/qquickvisualitemmodel_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,7 +43,7 @@ #define QQUICKVISUALITEMMODEL_P_H #include <QtQuick/qtquickglobal.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtCore/qobject.h> QT_BEGIN_HEADER @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickItem; -class QDeclarativeChangeSet; +class QQuickChangeSet; class Q_QUICK_EXPORT QQuickVisualModel : public QObject { @@ -77,7 +77,7 @@ public: Q_SIGNALS: void countChanged(); - void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset); + void modelUpdated(const QQuickChangeSet &changeSet, bool reset); void createdItem(int index, QQuickItem *item); void initItem(int index, QQuickItem *item); void destroyingItem(QQuickItem *item); @@ -97,7 +97,7 @@ class Q_QUICK_EXPORT QQuickVisualItemModel : public QQuickVisualModel Q_OBJECT Q_DECLARE_PRIVATE(QQuickVisualItemModel) - Q_PROPERTY(QDeclarativeListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false) + Q_PROPERTY(QQmlListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false) Q_CLASSINFO("DefaultProperty", "children") public: @@ -113,7 +113,7 @@ public: virtual int indexOf(QQuickItem *item, QObject *objectContext) const; - QDeclarativeListProperty<QQuickItem> children(); + QQmlListProperty<QQuickItem> children(); static QQuickVisualItemModelAttached *qmlAttachedProperties(QObject *obj); diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp index 79fd266e1e..5de8ad1279 100644 --- a/src/quick/items/qquickwindowmanager.cpp +++ b/src/quick/items/qquickwindowmanager.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 @@ -51,7 +51,7 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtGui/qplatformintegration_qpa.h> -#include <QtDeclarative/private/qdeclarativeglobal_p.h> +#include <QtQml/private/qqmlglobal_p.h> #include <QtQuick/QQuickCanvas> #include <QtQuick/private/qquickcanvas_p.h> diff --git a/src/quick/items/qquickwindowmanager_p.h b/src/quick/items/qquickwindowmanager_p.h index a0bdf08a91..9372e90f5e 100644 --- a/src/quick/items/qquickwindowmanager_p.h +++ b/src/quick/items/qquickwindowmanager_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/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index 6faeb96da0..4c9620748a 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.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 Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index b02d29e776..72fd2b32bd 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the Declarative module of the Qt Toolkit. +** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -42,7 +42,7 @@ #ifndef QQUICKWINDOWMODULE_H #define QQUICKWINDOWMODULE_H -#include <qdeclarative.h> +#include <qqml.h> QT_BEGIN_HEADER diff --git a/src/quick/items/syncexcludes b/src/quick/items/syncexcludes index ab7a374a5b..19e41ce643 100644 --- a/src/quick/items/syncexcludes +++ b/src/quick/items/syncexcludes @@ -6,6 +6,6 @@ qdeclarativelayoutitem.cpp qdeclarativelayoutitem_p.h qdeclarativefocuspanel.cpp qdeclarativefocuspanel_p.h -qdeclarativepath_p.h -qdeclarativepath_p_p.h +qquickpath_p.h +qquickpath_p_p.h qdeclarativepath.cpp |