diff options
Diffstat (limited to 'src/declarative/fx')
25 files changed, 39 insertions, 92 deletions
diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 09d6178..d25b679 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -223,7 +223,7 @@ void QFxAnchorsPrivate::addDepend(QFxItem *item) if (!item) return; QFxItemPrivate *p = - static_cast<QFxItemPrivate *>(QObjectPrivate::get(item)); + static_cast<QFxItemPrivate *>(QGraphicsItemPrivate::get(item)); p->dependantAnchors.append(q); } @@ -233,7 +233,7 @@ void QFxAnchorsPrivate::remDepend(QFxItem *item) if (!item) return; QFxItemPrivate *p = - static_cast<QFxItemPrivate *>(QObjectPrivate::get(item)); + static_cast<QFxItemPrivate *>(QGraphicsItemPrivate::get(item)); p->dependantAnchors.removeAll(q); } diff --git a/src/declarative/fx/qfxanimatedimageitem.h b/src/declarative/fx/qfxanimatedimageitem.h index 5d115d7..8ef2b1c 100644 --- a/src/declarative/fx/qfxanimatedimageitem.h +++ b/src/declarative/fx/qfxanimatedimageitem.h @@ -88,7 +88,7 @@ protected: private: Q_DISABLE_COPY(QFxAnimatedImageItem) - Q_DECLARE_PRIVATE(QFxAnimatedImageItem) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxAnimatedImageItem) }; QML_DECLARE_TYPE(QFxAnimatedImageItem) diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h index e749272..97b8b7b 100644 --- a/src/declarative/fx/qfxcomponentinstance.h +++ b/src/declarative/fx/qfxcomponentinstance.h @@ -78,7 +78,7 @@ protected: QFxComponentInstance(QFxComponentInstancePrivate &dd, QFxItem *parent); private: - Q_DECLARE_PRIVATE(QFxComponentInstance) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxComponentInstance) }; QML_DECLARE_TYPE(QFxComponentInstance) diff --git a/src/declarative/fx/qfxcontentwrapper.h b/src/declarative/fx/qfxcontentwrapper.h index d8fe0b8..f1678d0 100644 --- a/src/declarative/fx/qfxcontentwrapper.h +++ b/src/declarative/fx/qfxcontentwrapper.h @@ -71,7 +71,7 @@ protected: QFxContentWrapper(QFxContentWrapperPrivate &dd, QFxItem *parent); private: - Q_DECLARE_PRIVATE(QFxContentWrapper) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxContentWrapper) }; QML_DECLARE_TYPE(QFxContentWrapper) diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h index 77aaf50..71e409e 100644 --- a/src/declarative/fx/qfxflickable.h +++ b/src/declarative/fx/qfxflickable.h @@ -184,7 +184,7 @@ protected: private: Q_DISABLE_COPY(QFxFlickable) - Q_DECLARE_PRIVATE(QFxFlickable) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxFlickable) }; QML_DECLARE_TYPE(QFxFlickable) diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index 0957c2f..d6222f3 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -219,7 +219,7 @@ void QFxFlipablePrivate::setBackTransform() p3 = axisRotation.transform().map(p3); axisRotation.setAngle(rotation); - QSimpleCanvas::Matrix mat; + QTransform mat; mat.translate(back->width()/2,back->height()/2); if (back->width() && p1.x() >= p2.x()) mat.rotate(180, Qt::YAxis); @@ -284,7 +284,7 @@ QFxFlipable::Side QFxFlipable::side() const //in some cases the user may want to specify a more complex transformation. //in that case, we still allow the generic use of transform. //(the logic here should be kept in sync with setBackTransform and setRotation) -void QFxFlipable::transformChanged(const QSimpleCanvas::Matrix &trans) +void QFxFlipable::transformChanged(const QTransform &trans) { Q_D(QFxFlipable); QPointF p1(0, 0); @@ -308,7 +308,7 @@ void QFxFlipable::transformChanged(const QSimpleCanvas::Matrix &trans) if (newSide != d->current) { d->current = newSide; if (d->current==Back) { - QSimpleCanvas::Matrix mat; + QTransform mat; mat.translate(d->back->width()/2,d->back->height()/2); if (d->back->width() && p1.x() >= p2.x()) mat.rotate(180, Qt::YAxis); diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h index f00e023..5a6271b 100644 --- a/src/declarative/fx/qfxflipable.h +++ b/src/declarative/fx/qfxflipable.h @@ -84,7 +84,7 @@ public: Side side() const; protected: - virtual void transformChanged(const QSimpleCanvas::Matrix &); + virtual void transformChanged(const QTransform &); Q_SIGNALS: void sideChanged(); @@ -92,7 +92,7 @@ Q_SIGNALS: private: Q_PRIVATE_SLOT(d_func(), void _q_updateAxis()) Q_DISABLE_COPY(QFxFlipable) - Q_DECLARE_PRIVATE(QFxFlipable) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxFlipable) }; QML_DECLARE_TYPE(QFxFlipable) diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h index 1514451..954f4eb 100644 --- a/src/declarative/fx/qfxgridview.h +++ b/src/declarative/fx/qfxgridview.h @@ -54,7 +54,7 @@ class QFxGridViewPrivate; class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable { Q_OBJECT - Q_DECLARE_PRIVATE(QFxGridView) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxGridView) Q_PROPERTY(QVariant model READ model WRITE setModel) Q_CLASSINFO("DefaultProperty", "delegate") diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index 039334a..e2205e5 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -111,7 +111,7 @@ private Q_SLOTS: private: Q_DISABLE_COPY(QFxImage) - Q_DECLARE_PRIVATE(QFxImage) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImage) void setGridScaledImage(const QFxGridScaledImage& sci); }; QML_DECLARE_TYPE(QFxImage) diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index b4de109..7938c63 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -1070,52 +1070,6 @@ void QFxItem::geometryChanged(const QRectF &newGeometry, } } -/*! - \qmlproperty bool Item::flipVertically - \qmlproperty bool Item::flipHorizontally - - When set, the item will be displayed flipped horizontally or vertically - about its center. - */ - -/*! - \property QFxItem::flipVertically - - When set, the item will be displayed flipped horizontally or vertically - about its center. - */ -bool QFxItem::flipVertically() const -{ - return flip() & VerticalFlip; -} - -void QFxItem::setFlipVertically(bool v) -{ - if (v) - setFlip((QSimpleCanvasItem::Flip)(flip() | VerticalFlip)); - else - setFlip((QSimpleCanvasItem::Flip)(flip() & ~VerticalFlip)); -} - -/*! - \property QFxItem::flipHorizontally - - When set, the item will be displayed flipped horizontally or vertically - about its center. - */ -bool QFxItem::flipHorizontally() const -{ - return flip() & HorizontalFlip; -} - -void QFxItem::setFlipHorizontally(bool v) -{ - if (v) - setFlip((QSimpleCanvasItem::Flip)(flip() | HorizontalFlip)); - else - setFlip((QSimpleCanvasItem::Flip)(flip() & ~HorizontalFlip)); -} - /*! \fn void QFxItem::keyPress(QFxKeyEvent *event) This signal is emitted by keyPressEvent() for the \a event. */ @@ -2035,7 +1989,7 @@ void QFxItem::reparentItems() void QFxItem::updateTransform() { Q_D(QFxItem); - QSimpleCanvas::Matrix trans; + QTransform trans; for (int ii = d->_transform.count() - 1; ii >= 0; --ii) { QFxTransform *a = d->_transform.at(ii); if (!a->isIdentity()) @@ -2049,7 +2003,7 @@ void QFxItem::updateTransform() /*! \internal */ -void QFxItem::transformChanged(const QSimpleCanvas::Matrix &) +void QFxItem::transformChanged(const QTransform &) { } diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 3188516..ef69fd3 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -117,8 +117,6 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QSimpleCanvasItem, public QmlParserS Q_PROPERTY(qreal y READ y WRITE setY NOTIFY topChanged) Q_PROPERTY(qreal z READ z WRITE setZ) Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged) - Q_PROPERTY(bool flipVertically READ flipVertically WRITE setFlipVertically) - Q_PROPERTY(bool flipHorizontally READ flipHorizontally WRITE setFlipHorizontally) Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) Q_PROPERTY(int baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged) Q_PROPERTY(QFxAnchorLine left READ left) @@ -173,11 +171,6 @@ public: QUrl qml() const; void setQml(const QUrl &); - bool flipVertically() const; - void setFlipVertically(bool); - bool flipHorizontally() const; - void setFlipHorizontally(bool); - int baselineOffset() const; void setBaselineOffset(int); @@ -231,7 +224,7 @@ Q_SIGNALS: void newChildCreated(const QString &url, QScriptValue); protected: - virtual void transformChanged(const QSimpleCanvas::Matrix &); + virtual void transformChanged(const QTransform &); virtual void classBegin(); virtual void classComplete(); virtual void componentComplete(); @@ -264,7 +257,7 @@ private: friend class QmlStatePrivate; friend class QFxAnchors; Q_DISABLE_COPY(QFxItem) - Q_DECLARE_PRIVATE(QFxItem) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxItem) }; QML_DECLARE_TYPE(QFxItem) diff --git a/src/declarative/fx/qfxlayouts.h b/src/declarative/fx/qfxlayouts.h index b119d6f..abf4bb2 100644 --- a/src/declarative/fx/qfxlayouts.h +++ b/src/declarative/fx/qfxlayouts.h @@ -115,7 +115,7 @@ private: void applyTransition(const QList<QPair<QString, QVariant> >& changes, QFxItem* target, QmlTransition* transition); Q_DISABLE_COPY(QFxBaseLayout) - Q_DECLARE_PRIVATE(QFxBaseLayout) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxBaseLayout) }; class Q_DECLARATIVE_EXPORT QFxVerticalLayout : public QFxBaseLayout diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h index 5dfb0e4..7fa2050 100644 --- a/src/declarative/fx/qfxlistview.h +++ b/src/declarative/fx/qfxlistview.h @@ -55,7 +55,7 @@ class QFxListViewPrivate; class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable { Q_OBJECT - Q_DECLARE_PRIVATE(QFxListView) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxListView) Q_ENUMS(CurrentItemPositioning) Q_PROPERTY(QVariant model READ model WRITE setModel) diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h index d7db1dc..d8586e9 100644 --- a/src/declarative/fx/qfxmouseregion.h +++ b/src/declarative/fx/qfxmouseregion.h @@ -152,7 +152,7 @@ protected: private: Q_DISABLE_COPY(QFxMouseRegion) - Q_DECLARE_PRIVATE(QFxMouseRegion) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxMouseRegion) }; QML_DECLARE_TYPE(QFxMouseRegion) diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h index ed254ce..35f8f89 100644 --- a/src/declarative/fx/qfxpainteditem.h +++ b/src/declarative/fx/qfxpainteditem.h @@ -82,7 +82,7 @@ protected Q_SLOTS: private: void init(); Q_DISABLE_COPY(QFxPaintedItem) - Q_DECLARE_PRIVATE(QFxPaintedItem) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxPaintedItem) }; QML_DECLARE_TYPE(QFxPaintedItem) diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index a0373d7..bb84df2 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -221,7 +221,7 @@ private Q_SLOTS: private: Q_DISABLE_COPY(QFxParticles) - Q_DECLARE_PRIVATE(QFxParticles) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxParticles) }; QML_DECLARE_TYPE(QFxParticles) diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qfxpathview.h index cbdafa8..a40f1f2 100644 --- a/src/declarative/fx/qfxpathview.h +++ b/src/declarative/fx/qfxpathview.h @@ -125,7 +125,7 @@ private: friend class QFxPathViewAttached; static QHash<QObject*, QObject*> attachedProperties; Q_DISABLE_COPY(QFxPathView) - Q_DECLARE_PRIVATE(QFxPathView) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxPathView) }; QML_DECLARE_TYPE(QFxPathView) diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h index d232328..eee1f86 100644 --- a/src/declarative/fx/qfxrect.h +++ b/src/declarative/fx/qfxrect.h @@ -176,7 +176,7 @@ protected: private: Q_DISABLE_COPY(QFxRect) - Q_DECLARE_PRIVATE(QFxRect) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxRect) }; QML_DECLARE_TYPE(QFxRect) diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index 0211ebb..a6d68cb 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -62,7 +62,7 @@ QFxItem *QFxRepeaterPrivate::addItem(QmlContext *ctxt, QFxItem *lastItem) QFxItem *item = qobject_cast<QFxItem *>(nobj); if (item) { item->setParent(q->itemParent()); - item->stackUnder(lastItem); +// item->stackUnder(lastItem); deletables << nobj; } else { delete nobj; diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h index c1b194a..17ffa57 100644 --- a/src/declarative/fx/qfxrepeater.h +++ b/src/declarative/fx/qfxrepeater.h @@ -78,7 +78,7 @@ protected: private: Q_DISABLE_COPY(QFxRepeater) - Q_DECLARE_PRIVATE(QFxRepeater) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxRepeater) }; QML_DECLARE_TYPE(QFxRepeater) diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h index 35e8b03..83e7299 100644 --- a/src/declarative/fx/qfxtext.h +++ b/src/declarative/fx/qfxtext.h @@ -138,7 +138,7 @@ protected: private: Q_DISABLE_COPY(QFxText) - Q_DECLARE_PRIVATE(QFxText) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxText) }; QML_DECLARE_TYPE(QFxText) diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h index b761a1b..920bd04 100644 --- a/src/declarative/fx/qfxtextedit.h +++ b/src/declarative/fx/qfxtextedit.h @@ -200,7 +200,7 @@ private: friend class QmlFont; Q_DISABLE_COPY(QFxTextEdit) - Q_DECLARE_PRIVATE(QFxTextEdit) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxTextEdit) }; QML_DECLARE_TYPE(QFxTextEdit) diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp index 8d9084f..8973295 100644 --- a/src/declarative/fx/qfxtransform.cpp +++ b/src/declarative/fx/qfxtransform.cpp @@ -71,9 +71,9 @@ bool QFxTransform::isIdentity() const return true; } -QSimpleCanvas::Matrix QFxTransform::transform() const +QTransform QFxTransform::transform() const { - return QSimpleCanvas::Matrix(); + return QTransform(); } void QFxTransform::update() diff --git a/src/declarative/fx/qfxtransform.h b/src/declarative/fx/qfxtransform.h index 0a17917..a549b30 100644 --- a/src/declarative/fx/qfxtransform.h +++ b/src/declarative/fx/qfxtransform.h @@ -62,7 +62,7 @@ public: void update(); virtual bool isIdentity() const; - virtual QSimpleCanvas::Matrix transform() const; + virtual QTransform transform() const; }; QML_DECLARE_TYPE(QFxTransform) @@ -127,7 +127,7 @@ public: void setAngle(qreal); virtual bool isIdentity() const; - virtual QSimpleCanvas::Matrix transform() const; + virtual QTransform transform() const; Q_SIGNALS: void angleChanged(); @@ -140,7 +140,7 @@ private: qreal _angle; mutable bool _dirty; - mutable QSimpleCanvas::Matrix _transform; + mutable QTransform _transform; }; QML_DECLARE_TYPE(QFxRotation) @@ -160,7 +160,7 @@ public: void setAngle(qreal); virtual bool isIdentity() const; - virtual QSimpleCanvas::Matrix transform() const; + virtual QTransform transform() const; private Q_SLOTS: void update(); @@ -169,7 +169,7 @@ private: qreal _angle; mutable bool _dirty; - mutable QSimpleCanvas::Matrix _transform; + mutable QTransform _transform; }; QML_DECLARE_TYPE(QFxRotation3D) @@ -189,7 +189,7 @@ public: void setDistance(qreal); virtual bool isIdentity() const; - virtual QSimpleCanvas::Matrix transform() const; + virtual QTransform transform() const; private Q_SLOTS: void update(); @@ -198,7 +198,7 @@ private: qreal _distance; mutable bool _dirty; - mutable QSimpleCanvas::Matrix _transform; + mutable QTransform _transform; }; QML_DECLARE_TYPE(QFxTranslation3D) @@ -296,7 +296,7 @@ public: void setbottomRight_x(qreal); virtual bool isIdentity() const; - virtual QSimpleCanvas::Matrix transform() const; + virtual QTransform transform() const; private: QPointF p; diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h index f30fd0d..115bddc 100644 --- a/src/declarative/fx/qfxwebview.h +++ b/src/declarative/fx/qfxwebview.h @@ -205,7 +205,7 @@ private: void init(); virtual void componentComplete(); Q_DISABLE_COPY(QFxWebView) - Q_DECLARE_PRIVATE(QFxWebView) + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxWebView) }; QML_DECLARE_TYPE(QFxWebView) |