Changeset 651 for trunk/src/gui/dialogs/qfilesystemmodel_p.h

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qfilesystemmodel_p.h (modified) (2 diffs)

trunk/src/gui/dialogs/qfilesystemmodel_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -262 +262 @@
 
     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)
+        if (sortOrder != Qt::AscendingOrder) {
+            if (parent->dirtyChildrenIndex == -1)
+                return parent->visibleChildren.count() - row - 1;
+
+            if (row < parent->dirtyChildrenIndex)
                 return parent->dirtyChildrenIndex - row - 1;
-            else
-                return parent->visibleChildren.count() - row - 1;
-        else
-            return row;
+        }
+
+        return row;
     }