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

[dolphin.git] / src / kitemviews / kitemmodelbase.cpp

diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp
index d73468336b6dde6071b578fe703ee78a8a5d15d8..faabdbe1dccbac882b18d6a66b3e9107ec39379c 100644 (file)
--- a/src/kitemviews/kitemmodelbase.cpp
+++ b/src/kitemviews/kitemmodelbase.cpp
@@ -1,8 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.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  *
@@ -44,8 +43,8 @@ KItemModelBase::~KItemModelBase()
 
 bool KItemModelBase::setData(int index, const QHash<QByteArray, QVariant> &values)
 {
-    Q_UNUSED(index);
-    Q_UNUSED(values);
+    Q_UNUSED(index)
+    Q_UNUSED(values)
     return false;
 }
 
@@ -63,12 +62,12 @@ bool KItemModelBase::groupedSorting() const
     return m_groupedSorting;
 }
 
-void KItemModelBase::setSortRole(const QByteArray& role)
+void KItemModelBase::setSortRole(const QByteArray& role, bool resortItems)
 {
     if (role != m_sortRole) {
         const QByteArray previous = m_sortRole;
         m_sortRole = role;
-        onSortRoleChanged(role, previous);
+        onSortRoleChanged(role, previous, resortItems);
         emit sortRoleChanged(role, previous);
     }
 }
@@ -100,45 +99,45 @@ QList<QPair<int, QVariant> > KItemModelBase::groups() const
 
 bool KItemModelBase::setExpanded(int index, bool expanded)
 {
-    Q_UNUSED(index);
-    Q_UNUSED(expanded);
+    Q_UNUSED(index)
+    Q_UNUSED(expanded)
     return false;
 }
 
 bool KItemModelBase::isExpanded(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return false;
 }
 
 bool KItemModelBase::isExpandable(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return false;
 }
 
 int KItemModelBase::expandedParentsCount(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 0;
 }
 
 QMimeData* KItemModelBase::createMimeData(const KItemSet& indexes) const
 {
-    Q_UNUSED(indexes);
-    return 0;
+    Q_UNUSED(indexes)
+    return nullptr;
 }
 
 int KItemModelBase::indexForKeyboardSearch(const QString& text, int startFromIndex) const
 {
-    Q_UNUSED(text);
-    Q_UNUSED(startFromIndex);
+    Q_UNUSED(text)
+    Q_UNUSED(startFromIndex)
     return -1;
 }
 
 bool KItemModelBase::supportsDropping(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return false;
 }
 
@@ -149,19 +148,20 @@ QString KItemModelBase::blacklistItemDropEventMimeType() const
 
 void KItemModelBase::onGroupedSortingChanged(bool current)
 {
-    Q_UNUSED(current);
+    Q_UNUSED(current)
 }
 
-void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous)
+void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems)
 {
-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+    Q_UNUSED(resortItems)
 }
 
 void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
 {
-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
 }
 
 QUrl KItemModelBase::url(int index) const
@@ -177,4 +177,4 @@ bool KItemModelBase::isDir(int index) const
 QUrl KItemModelBase::directory() const
 {
     return QUrl();
-}
\ No newline at end of file
+}