diff options
author | Yann Bodson <[email protected]> | 2012-02-06 08:20:02 +1000 |
---|---|---|
committer | Qt by Nokia <[email protected]> | 2012-02-07 05:32:40 +0100 |
commit | 0ca9d3f0f720e1933379ef40bc5c29253e21cba0 (patch) | |
tree | 985aa27bae9acbb5ce4553ff5a7d5a981577ecc4 /src/quick/items/qquickpathview.cpp | |
parent | df9b5ed53f5a5e6bfe1354e3a7d890deb2405429 (diff) |
Remove warnings with clang
Change-Id: I924f0adc036b47e2342bf383d308c6a5269c2de6
Reviewed-by: Michael Brasser <[email protected]>
Diffstat (limited to 'src/quick/items/qquickpathview.cpp')
-rw-r--r-- | src/quick/items/qquickpathview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 675069cad8..aa8ddfbec0 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -1503,14 +1503,14 @@ void QQuickPathView::refill() if (QQuickPathViewAttached *att = d->attached(d->currentItem)) att->setOnPath(false); } else if (!waiting && d->currentIndex >= 0 && d->currentIndex < d->modelCount) { - if (d->currentItem = d->getItem(d->currentIndex, d->currentIndex, false)) { + if ((d->currentItem = d->getItem(d->currentIndex, d->currentIndex, false))) { d->updateItem(d->currentItem, d->currentIndex < d->firstIndex ? 0.0 : 1.0); if (QQuickPathViewAttached *att = d->attached(d->currentItem)) att->setIsCurrentItem(true); } } } else if (!waiting && !d->currentItem) { - if (d->currentItem = d->getItem(d->currentIndex, d->currentIndex, true)) { + if ((d->currentItem = d->getItem(d->currentIndex, d->currentIndex, true))) { d->currentItem->setFocus(true); if (QQuickPathViewAttached *att = d->attached(d->currentItem)) att->setIsCurrentItem(true); @@ -1674,13 +1674,13 @@ void QQuickPathViewPrivate::createCurrentItem() return; int itemIndex = (currentIndex - firstIndex + modelCount) % modelCount; if (itemIndex < items.count()) { - if (currentItem = getItem(currentIndex, currentIndex, true)) { + if ((currentItem = getItem(currentIndex, currentIndex, true))) { currentItem->setFocus(true); if (QQuickPathViewAttached *att = attached(currentItem)) att->setIsCurrentItem(true); } } else if (currentIndex >= 0 && currentIndex < modelCount) { - if (currentItem = getItem(currentIndex, currentIndex, false)) { + if ((currentItem = getItem(currentIndex, currentIndex, false))) { updateItem(currentItem, currentIndex < firstIndex ? 0.0 : 1.0); if (QQuickPathViewAttached *att = attached(currentItem)) att->setIsCurrentItem(true); |