summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Baryshnikov <nib952051@gmail.com>2015-04-21 13:28:19 +0300
committerNikita Baryshnikov <nib952051@gmail.com>2015-04-25 12:49:05 +0000
commitb089579dc32a3893ad89c9c180933339e387627a (patch)
tree2fa82c492d0bf8c5cc9eb3193544c4591ba85e0d
parentbc162382e5aef0b796582340beb866fb7c55a289 (diff)
QDir: sort-by-size remove two unconditional branches
recent change ad03511256a8279a8f55069e5a3a3465a9e122ec made r be arbitrary, not just -1, 0, +1, and now it doesn't make sense to have two unneeded unconditional branches in the sort-by-size case Change-Id: I9d80210846e89e3e8c574f0c32e04b05202b8a5b Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r--src/corelib/io/qdir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 3a9ae2ee6d..9b1ec3917a 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -239,7 +239,7 @@ bool QDirSortItemComparator::operator()(const QDirSortItem &n1, const QDirSortIt
break;
}
case QDir::Size:
- r = int(qBound<qint64>(-1, f2->item.size() - f1->item.size(), 1));
+ r = f2->item.size() - f1->item.size();
break;
case QDir::Type:
{