From f9ffe24a87d67f39bb877224f7e2b6f7b3ad6c02 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Thu, 7 Jan 2010 11:34:30 +1000
Subject: Fix warning in qfilesystemmodel_p.h

Reviewed-by: Rhys Weatherley
---
 src/gui/dialogs/qfilesystemmodel_p.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h
index 175159f..68e19dc 100644
--- a/src/gui/dialogs/qfilesystemmodel_p.h
+++ b/src/gui/dialogs/qfilesystemmodel_p.h
@@ -238,15 +238,15 @@ public:
     void sortChildren(int column, const QModelIndex &parent);
 
     inline int translateVisibleLocation(QFileSystemNode *parent, int row) const {
-        if (sortOrder == Qt::AscendingOrder)
-                return row;
-        if (parent->dirtyChildrenIndex == -1 || row < parent->dirtyChildrenIndex)
-            if (parent->dirtyChildrenIndex != -1)
-                return parent->dirtyChildrenIndex - row - 1;
-            else
+        if (sortOrder != Qt::AscendingOrder) {
+            if (parent->dirtyChildrenIndex == -1)
                 return parent->visibleChildren.count() - row - 1;
-        else
-            return row;
+
+            if (row < parent->dirtyChildrenIndex)
+                return parent->dirtyChildrenIndex - row - 1;
+        }
+
+        return row;
     }
 
     inline static QString myComputer() {
-- 
cgit v0.12