summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativegridview.cpp
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2011-01-18 03:42:48 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2011-01-18 04:46:09 (GMT)
commit9f6fd23fda43a5668d3fad398eb3e9d80cee9c44 (patch)
treec9b8a100ff15f0743a8d4a4d6f976db862c5bb5c /src/declarative/graphicsitems/qdeclarativegridview.cpp
parent9ef953a65a96b511aae2a4ba6db9579b5d23cc29 (diff)
downloadQt-9f6fd23fda43a5668d3fad398eb3e9d80cee9c44.zip
Qt-9f6fd23fda43a5668d3fad398eb3e9d80cee9c44.tar.gz
Qt-9f6fd23fda43a5668d3fad398eb3e9d80cee9c44.tar.bz2
Fix QtDeclarative compilation warnings
Task-number: Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegridview.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativegridview.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 6e6e8c1..0bea638 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -2618,12 +2618,8 @@ void QDeclarativeGridView::itemsMoved(int from, int to, int count)
return;
QHash<int,FxGridItem*> moved;
- bool removedBeforeVisible = false;
FxGridItem *firstItem = d->firstVisibleItem();
- if (from < to && from < d->visibleIndex && to > d->visibleIndex)
- removedBeforeVisible = true;
-
QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
while (it != d->visibleItems.end()) {
FxGridItem *item = *it;
@@ -2632,16 +2628,12 @@ void QDeclarativeGridView::itemsMoved(int from, int to, int count)
item->index += (to-from);
moved.insert(item->index, item);
it = d->visibleItems.erase(it);
- if (item->rowPos() < firstItem->rowPos())
- removedBeforeVisible = true;
} else {
if (item->index > from && item->index != -1) {
// move everything after the moved items.
item->index -= count;
if (item->index < d->visibleIndex)
d->visibleIndex = item->index;
- } else if (item->index != -1) {
- removedBeforeVisible = true;
}
++it;
}