From d197b2d2cdb8787456cc9b7da27b7400e3b7a159 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 26 Jul 2011 10:50:19 +1000 Subject: [PATCH] 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 Reviewed-by: Alan Alpert --- src/declarative/items/qsgmousearea.cpp | 21 --------------------- src/declarative/items/qsgmousearea_p.h | 3 --- src/declarative/items/qsgmousearea_p_p.h | 2 -- 3 files changed, 26 deletions(-) diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp index 98ba702..ac577a4 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(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 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 df553e2..aac829f 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 forwardTo READ forwardTo); public: QSGMouseArea(QSGItem *parent=0); @@ -189,8 +188,6 @@ public: bool preventStealing() const; void setPreventStealing(bool prevent); - QDeclarativeListProperty 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 e0bb64c..30ec75c 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 forwardTo; - QList forwardToList; }; QT_END_NAMESPACE -- 2.7.4