diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-26 10:50:19 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-28 08:39:33 +0200 |
commit | d197b2d2cdb8787456cc9b7da27b7400e3b7a159 (patch) | |
tree | da7d79f9bf10bff3df36aa00dd5fa30ab731b1a9 /src | |
parent | cd6b2696a772fec45bc86521003a597cdd6febee (diff) |
Remove forwardTo code
Committed by accident but slipped through the cracks somehow.
Change-Id: I64f172e5615de439987438b9300077e79503174e
Reviewed-on: http://codereview.qt.nokia.com/2135
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/items/qsgmousearea.cpp | 21 | ||||
-rw-r--r-- | src/declarative/items/qsgmousearea_p.h | 3 | ||||
-rw-r--r-- | src/declarative/items/qsgmousearea_p_p.h | 2 |
3 files changed, 0 insertions, 26 deletions
diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp index 98ba7022ea..ac577a4810 100644 --- a/src/declarative/items/qsgmousearea.cpp +++ b/src/declarative/items/qsgmousearea.cpp @@ -258,8 +258,6 @@ QSGMouseAreaPrivate::QSGMouseAreaPrivate() moved(false), stealMouse(false), doubleClick(false), preventStealing(false), dragRejected(false), drag(0) { - Q_Q(QSGMouseArea); - forwardTo = QDeclarativeListProperty<QSGItem>(q, forwardToList); } QSGMouseAreaPrivate::~QSGMouseAreaPrivate() @@ -286,12 +284,6 @@ void QSGMouseAreaPrivate::saveEvent(QGraphicsSceneMouseEvent *event) void QSGMouseAreaPrivate::forwardEvent(QGraphicsSceneMouseEvent* event) { Q_Q(QSGMouseArea); - for(int i=0; i < forwardToList.count(); i++){ - event->setPos(forwardToList[i]->mapFromScene(event->scenePos())); - forwardToList[i]->canvas()->sendEvent(forwardToList[i], event); - if(event->isAccepted()) - break; - } event->setPos(q->mapFromScene(event->scenePos())); } @@ -477,8 +469,6 @@ void QSGMouseArea::mousePressEvent(QGraphicsSceneMouseEvent *event) setKeepMouseGrab(d->stealMouse); event->setAccepted(setPressed(true)); - if(!event->isAccepted() && d->forwardToList.count()) - d->forwardEvent(event); } } @@ -591,9 +581,6 @@ void QSGMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event) emit mouseYChanged(&me); me.setPosition(d->lastPos); emit positionChanged(&me); - - if(!event->isAccepted() && d->forwardToList.count()) - d->forwardEvent(event); } void QSGMouseArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) @@ -631,8 +618,6 @@ void QSGMouseArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) ungrabMouse(); setKeepMouseGrab(false); - if(!event->isAccepted() && d->forwardToList.count()) - d->forwardEvent(event); } d->doubleClick = false; } @@ -930,10 +915,4 @@ QSGDrag *QSGMouseArea::drag() return d->drag; } -QDeclarativeListProperty<QSGItem> QSGMouseArea::forwardTo() -{ - Q_D(QSGMouseArea); - return d->forwardTo; -} - QT_END_NAMESPACE diff --git a/src/declarative/items/qsgmousearea_p.h b/src/declarative/items/qsgmousearea_p.h index df553e21c3..aac829f6a9 100644 --- a/src/declarative/items/qsgmousearea_p.h +++ b/src/declarative/items/qsgmousearea_p.h @@ -161,7 +161,6 @@ class Q_AUTOTEST_EXPORT QSGMouseArea : public QSGItem Q_PROPERTY(bool hoverEnabled READ hoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged) Q_PROPERTY(QSGDrag *drag READ drag CONSTANT) //### add flicking to QSGDrag or add a QDeclarativeFlick ??? Q_PROPERTY(bool preventStealing READ preventStealing WRITE setPreventStealing NOTIFY preventStealingChanged) - Q_PROPERTY(QDeclarativeListProperty<QSGItem> forwardTo READ forwardTo); public: QSGMouseArea(QSGItem *parent=0); @@ -189,8 +188,6 @@ public: bool preventStealing() const; void setPreventStealing(bool prevent); - QDeclarativeListProperty<QSGItem> forwardTo(); - Q_SIGNALS: void hoveredChanged(); void pressedChanged(); diff --git a/src/declarative/items/qsgmousearea_p_p.h b/src/declarative/items/qsgmousearea_p_p.h index e0bb64c4eb..30ec75c3a9 100644 --- a/src/declarative/items/qsgmousearea_p_p.h +++ b/src/declarative/items/qsgmousearea_p_p.h @@ -106,8 +106,6 @@ public: Qt::MouseButtons lastButtons; Qt::KeyboardModifiers lastModifiers; QBasicTimer pressAndHoldTimer; - QDeclarativeListProperty<QSGItem> forwardTo; - QList<QSGItem*> forwardToList; }; QT_END_NAMESPACE |