Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / kitemviews / kitemrange.h

diff --git a/src/kitemviews/kitemrange.h b/src/kitemviews/kitemrange.h
index 70927b91578045d814f9e70d06c5a4df006b79b5..f62305a393cc08097cdf5d6657932bd6d0a54502 100644 (file)
--- a/src/kitemviews/kitemrange.h
+++ b/src/kitemviews/kitemrange.h
@@ -2,8 +2,7 @@
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *   Copyright (C) 2013 by Frank Reininghaus <frank78ac@googlemail.com>    *
  *                                                                         *
- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
+ *   Based on the Itemviews NG project from Trolltech Labs                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -51,7 +50,7 @@ class KItemRangeList : public QList<KItemRange>
 {
 public:
     KItemRangeList() : QList<KItemRange>() {}
-    KItemRangeList(const QList<KItemRange>& list) : QList<KItemRange>(list) {}
+    explicit KItemRangeList(const QList<KItemRange>& list) : QList<KItemRange>(list) {}
 
     template<class Container>
     static KItemRangeList fromSortedContainer(const Container& container);
@@ -78,7 +77,10 @@ KItemRangeList KItemRangeList::fromSortedContainer(const Container& container)
     int index = *it;
     int count = 1;
 
-    ++it;
+    // Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672
+    while (it != end && *it == index) {
+        ++it;
+    }
 
     while (it != end) {
         if (*it == index + count) {
@@ -89,6 +91,11 @@ KItemRangeList KItemRangeList::fromSortedContainer(const Container& container)
             count = 1;
         }
         ++it;
+
+        // Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672
+        while (it != end && *it == *(it - 1)) {
+            ++it;
+        }
     }
 
     result << KItemRange(index, count);