QQuickListViewPrivate::updateHeader: Remove unnecessary nullptr check.

updateHeader checks for a nonexistent header at the very beginning and creates
one if there is none, so 'header' will always have a valid pointer. static_cast
isn't type-safe, so if it wasn't a FxListItemSG, it wouldn't end up giving us 0
anyway, so this check did nothing.

Change-Id: I7a021173b2ab7c634f0a290b8e3b3e1659756076
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 14 insertions, 16 deletions

diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 2958c0a67a..ccc036b2b0 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1358,26 +1358,24 @@ void QQuickListViewPrivate::updateHeader()
     }
 
     FxListItemSG *listItem = static_cast<FxListItemSG*>(header);
-    if (listItem) {
-        if (visibleItems.count()) {
-            if (headerPositioning == QQuickListView::OverlayHeader) {
-                listItem->setPosition(isContentFlowReversed() ? -position() - size() : position());
-            } else if (headerPositioning == QQuickListView::PullBackHeader) {
-                qreal viewPos = isContentFlowReversed() ? -position() - size() : position();
-                qreal clampedPos = qBound(originPosition() - headerSize(), listItem->position(), lastPosition() - headerSize() - size());
-                listItem->setPosition(qBound(viewPos - headerSize(), clampedPos, viewPos));
+    if (visibleItems.count()) {
+        if (headerPositioning == QQuickListView::OverlayHeader) {
+            listItem->setPosition(isContentFlowReversed() ? -position() - size() : position());
+        } else if (headerPositioning == QQuickListView::PullBackHeader) {
+            qreal viewPos = isContentFlowReversed() ? -position() - size() : position();
+            qreal clampedPos = qBound(originPosition() - headerSize(), listItem->position(), lastPosition() - headerSize() - size());
+            listItem->setPosition(qBound(viewPos - headerSize(), clampedPos, viewPos));
+        } else {
+            qreal startPos = originPosition();
+            if (visibleIndex == 0) {
+                listItem->setPosition(startPos - headerSize());
             } else {
-                qreal startPos = originPosition();
-                if (visibleIndex == 0) {
+                if (position() <= startPos || listItem->position() > startPos - headerSize())
                     listItem->setPosition(startPos - headerSize());
-                } else {
-                    if (position() <= startPos || listItem->position() > startPos - headerSize())
-                        listItem->setPosition(startPos - headerSize());
-                }
             }
-        } else {
-            listItem->setPosition(-headerSize());
         }
+    } else {
+        listItem->setPosition(-headerSize());
     }
 
     if (created)