From 835b795c3dd752f11c11178bf52b018ddc76b368 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 15 Mar 2010 14:25:26 +0100
Subject: detach in fewer cases, remove redundant calculation

Reviewed-by: thiago
---
 src/corelib/tools/qlist.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index c6dd106..dc8c849 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -636,12 +636,10 @@ inline void QList<T>::move(int from, int to)
 template<typename T>
 Q_OUTOFLINE_TEMPLATE QList<T> QList<T>::mid(int pos, int alength) const
 {
-    if (alength < 0)
+    if (alength < 0 || pos + alength > size())
         alength = size() - pos;
     if (pos == 0 && alength == size())
         return *this;
-    if (pos + alength > size())
-        alength = size() - pos;
     QList<T> cpy;
     cpy.reserve(alength);
     cpy.d->end = alength;
-- 
cgit v0.12