diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2009-07-22 20:18:23 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2009-07-29 03:46:11 (GMT) |
| commit | 978f4b014980e1e307676dbdc8ad1d9c50d4a8fb (patch) | |
| tree | f7f814b895a568f1e0310ffe911b18771d426b2d | |
| parent | a6afeb2f0a12d781f5599da34d16f4dabfc9ccdb (diff) | |
| download | Qt-978f4b014980e1e307676dbdc8ad1d9c50d4a8fb.zip Qt-978f4b014980e1e307676dbdc8ad1d9c50d4a8fb.tar.gz Qt-978f4b014980e1e307676dbdc8ad1d9c50d4a8fb.tar.bz2 | |
Remove itemBoundingRect()
We can simply use boundingRect() instead.
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 5 | ||||
| -rw-r--r-- | src/declarative/fx/qfxitem.h | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxmouseregion.cpp | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 318ad3b..a23fc3b 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -2028,11 +2028,6 @@ bool QFxItem::heightValid() const return d->heightValid; } -QRect QFxItem::itemBoundingRect() -{ - return boundingRect().toAlignedRect(); -} - QFxItem *QFxItem::mouseGrabberItem() const { QGraphicsScene *s = scene(); diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 1c0db84..3620513 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -230,8 +230,6 @@ public: void setTransformOrigin(TransformOrigin); QPointF transformOriginPoint() const; - QRect itemBoundingRect(); // ### remove me - void setPaintMargin(qreal margin); QRectF boundingRect() const; virtual void paintContents(QPainter &); diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index bc19c23..e4e7442 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -333,8 +333,7 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event) // ### we should skip this if these signals aren't used // ### can GV handle this for us? - const QRect &bounds = itemBoundingRect(); - bool contains = bounds.contains(d->lastPos.toPoint()); + bool contains = boundingRect().contains(d->lastPos); if (d->hovered && !contains) setHovered(false); else if (!d->hovered && contains) |