diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-08 08:22:10 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-08 08:22:10 (GMT) |
| commit | 6e99e7c7d772e122b0e515c1613d9a1e427181ad (patch) | |
| tree | 08ba4a1db8d17bffa2a69a0538298818668e50fd /src/gui/dialogs/qfilesystemmodel_p.h | |
| parent | 751de8211033b40c66d88140137eef76e6b20cfa (diff) | |
| parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
| download | Qt-6e99e7c7d772e122b0e515c1613d9a1e427181ad.zip Qt-6e99e7c7d772e122b0e515c1613d9a1e427181ad.tar.gz Qt-6e99e7c7d772e122b0e515c1613d9a1e427181ad.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/multimedia/audio/qaudioformat.cpp
Diffstat (limited to 'src/gui/dialogs/qfilesystemmodel_p.h')
| -rw-r--r-- | src/gui/dialogs/qfilesystemmodel_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h index 93a71e1..6c85a7c 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() { |