diff options
author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-08-09 18:32:48 +0300 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-08-12 16:01:10 +0000 |
commit | e5592e75b5d17f409a0623f663474f963d66486b (patch) | |
tree | 60cc03127ed7e258f01291f059f99a844bc61201 /src/quick/items/qquickwindow.cpp | |
parent | 87c23b33b7293a43a851a6e43a0ddc6ef44c17e4 (diff) |
Quick: use const (and const APIs) more
For CoW types, prefer const methods to avoid needless detach()ing.
Change-Id: I270cdc6eb8c5946f5c20b379bbb7c60f0ba518eb
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 16cbb2aa2f..f958d1a087 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1691,7 +1691,7 @@ bool QQuickWindowPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce if (itemPrivate->hoverEnabled) { QPointF p = item->mapFromScene(scenePos); if (item->contains(p)) { - if (!hoverItems.isEmpty() && hoverItems[0] == item) { + if (!hoverItems.isEmpty() && hoverItems.at(0) == item) { //move accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp, accepted); } else { @@ -1702,24 +1702,24 @@ bool QQuickWindowPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce itemsToHover << parent; // Leaving from previous hovered items until we reach the item or one of its ancestors. - while (!hoverItems.isEmpty() && !itemsToHover.contains(hoverItems[0])) { + while (!hoverItems.isEmpty() && !itemsToHover.contains(hoverItems.at(0))) { QQuickItem *hoverLeaveItem = hoverItems.takeFirst(); sendHoverEvent(QEvent::HoverLeave, hoverLeaveItem, scenePos, lastScenePos, modifiers, timestamp, accepted); } - if (!hoverItems.isEmpty() && hoverItems[0] == item){//Not entering a new Item + if (!hoverItems.isEmpty() && hoverItems.at(0) == item) {//Not entering a new Item // ### Shouldn't we send moves for the parent items as well? accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp, accepted); } else { // Enter items that are not entered yet. int startIdx = -1; if (!hoverItems.isEmpty()) - startIdx = itemsToHover.indexOf(hoverItems[0]) - 1; + startIdx = itemsToHover.indexOf(hoverItems.at(0)) - 1; if (startIdx == -1) startIdx = itemsToHover.count() - 1; for (int i = startIdx; i >= 0; i--) { - QQuickItem *itemToHover = itemsToHover[i]; + QQuickItem *itemToHover = itemsToHover.at(i); QQuickItemPrivate *itemToHoverPrivate = QQuickItemPrivate::get(itemToHover); // The item may be about to be deleted or reparented to another window // due to another hover event delivered in this function. If that is the @@ -3104,7 +3104,7 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item) << itemPriv->paintNode; nodes.removeAll(0); - Q_ASSERT(nodes.first() == itemPriv->itemNodeInstance); + Q_ASSERT(nodes.constFirst() == itemPriv->itemNodeInstance); for (int i=1; i<nodes.size(); ++i) { QSGNode *n = nodes.at(i); // Failing this means we messed up reparenting |