summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2009-07-23 04:57:53 (GMT)
committerLars Knoll <lars.knoll@nokia.com>2009-07-29 03:47:15 (GMT)
commitb44728b41ccc24b272f49e878cd28b29430aad57 (patch)
tree5f8188b4d8286ccd59db08e80649ad06f68793f2
parent978f4b014980e1e307676dbdc8ad1d9c50d4a8fb (diff)
downloadQt-b44728b41ccc24b272f49e878cd28b29430aad57.zip
Qt-b44728b41ccc24b272f49e878cd28b29430aad57.tar.gz
Qt-b44728b41ccc24b272f49e878cd28b29430aad57.tar.bz2
rename transformOrigin to transformOriginPoint
Like this we do not clash with the transformOrigin property in QFxItem.
-rw-r--r--src/declarative/fx/qfxitem.cpp8
-rw-r--r--src/declarative/fx/qfxitem.h1
2 files changed, 1 insertions, 8 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index a23fc3b..009e192 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1928,16 +1928,10 @@ void QFxItem::setTransformOrigin(TransformOrigin origin)
Q_D(QFxItem);
if (origin != d->origin) {
d->origin = origin;
- QPointF to = d->computeTransformOrigin();
- QGraphicsItem::setTransformOrigin(to.x(), to.y());
+ QGraphicsItem::setTransformOriginPoint(d->computeTransformOrigin());
}
}
-QPointF QFxItem::transformOriginPoint() const
-{
- return QGraphicsItem::transformOrigin();
-}
-
qreal QFxItem::width() const
{
Q_D(const QFxItem);
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index 3620513..791d215 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -228,7 +228,6 @@ public:
TransformOrigin transformOrigin() const;
void setTransformOrigin(TransformOrigin);
- QPointF transformOriginPoint() const;
void setPaintMargin(qreal margin);
QRectF boundingRect() const;