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 7bfe607a46f8a28fbc1f39376666acdcaee1adbe..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>             *
  *                                                                         *
 /***************************************************************************
  *   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  *
  *                                                                         *
  *   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  *


@@ -22,28 +21,17 @@
 
 #include "kitemmodelbase.h"
 
 
 #include "kitemmodelbase.h"
 

-KItemRange::KItemRange(int index, int count) :
-    index(index),
-    count(count)
-{
-}
-
-bool KItemRange::operator == (const KItemRange& other) const
-{
-    return index == other.index && count == other.count;
-}
-

 KItemModelBase::KItemModelBase(QObject* parent) :
     QObject(parent),
 KItemModelBase::KItemModelBase(QObject* parent) :
     QObject(parent),

-    m_groupRole(),
+    m_groupedSorting(false),

     m_sortRole(),
     m_sortOrder(Qt::AscendingOrder)
 {
 }
 
     m_sortRole(),
     m_sortOrder(Qt::AscendingOrder)
 {
 }
 

-KItemModelBase::KItemModelBase(const QByteArray& groupRole, const QByteArray& sortRole, QObject* parent) :
+KItemModelBase::KItemModelBase(const QByteArray& sortRole, QObject* parent) :

     QObject(parent),
     QObject(parent),

-    m_groupRole(groupRole),
+    m_groupedSorting(false),

     m_sortRole(sortRole),
     m_sortOrder(Qt::AscendingOrder)
 {
     m_sortRole(sortRole),
     m_sortOrder(Qt::AscendingOrder)
 {


@@ -55,42 +43,31 @@ KItemModelBase::~KItemModelBase()
 
 bool KItemModelBase::setData(int index, const QHash<QByteArray, QVariant> &values)
 {
 
 bool KItemModelBase::setData(int index, const QHash<QByteArray, QVariant> &values)
 {

-    Q_UNUSED(index);
-    Q_UNUSED(values);
+    Q_UNUSED(index)
+    Q_UNUSED(values)

     return false;
 }
 
     return false;
 }
 

-bool KItemModelBase::supportsGrouping() const
+void KItemModelBase::setGroupedSorting(bool grouped)

 {
 {

-    return false;
-}
-
-void KItemModelBase::setGroupRole(const QByteArray& role)
-{
-    if (supportsGrouping() && role != m_groupRole) {
-        const QByteArray previous = m_groupRole;
-        m_groupRole = role;
-        onGroupRoleChanged(role, previous);
-        emit groupRoleChanged(role, previous);
+    if (m_groupedSorting != grouped) {
+        m_groupedSorting = grouped;
+        onGroupedSortingChanged(grouped);
+        emit groupedSortingChanged(grouped);

     }
 }
 
     }
 }
 

-QByteArray KItemModelBase::groupRole() const
-{
-    return m_groupRole;
-}
-
-bool KItemModelBase::supportsSorting() const
+bool KItemModelBase::groupedSorting() const

 {
 {

-    return false;
+    return m_groupedSorting;

 }
 
 }
 

-void KItemModelBase::setSortRole(const QByteArray& role)
+void KItemModelBase::setSortRole(const QByteArray& role, bool resortItems)

 {
 {

-    if (supportsSorting() && role != m_sortRole) {
+    if (role != m_sortRole) {

         const QByteArray previous = m_sortRole;
         m_sortRole = role;
         const QByteArray previous = m_sortRole;
         m_sortRole = role;

-        onSortRoleChanged(role, previous);
+        onSortRoleChanged(role, previous, resortItems);

         emit sortRoleChanged(role, previous);
     }
 }
         emit sortRoleChanged(role, previous);
     }
 }


@@ -102,7 +79,7 @@ QByteArray KItemModelBase::sortRole() const
 
 void KItemModelBase::setSortOrder(Qt::SortOrder order)
 {
 
 void KItemModelBase::setSortOrder(Qt::SortOrder order)
 {

-    if (supportsSorting() && order != m_sortOrder) {
+    if (order != m_sortOrder) {

         const Qt::SortOrder previous = m_sortOrder;
         m_sortOrder = order;
         onSortOrderChanged(order, previous);
         const Qt::SortOrder previous = m_sortOrder;
         m_sortOrder = order;
         onSortOrderChanged(order, previous);


@@ -115,41 +92,89 @@ QString KItemModelBase::roleDescription(const QByteArray& role) const
     return role;
 }
 
     return role;
 }
 

-QMimeData* KItemModelBase::createMimeData(const QSet<int>& indexes) const
+QList<QPair<int, QVariant> > KItemModelBase::groups() const
+{
+    return QList<QPair<int, QVariant> >();
+}
+
+bool KItemModelBase::setExpanded(int index, bool expanded)

 {
 {

-    Q_UNUSED(indexes);
+    Q_UNUSED(index)
+    Q_UNUSED(expanded)
+    return false;
+}
+
+bool KItemModelBase::isExpanded(int index) const
+{
+    Q_UNUSED(index)
+    return false;
+}
+
+bool KItemModelBase::isExpandable(int index) const
+{
+    Q_UNUSED(index)
+    return false;
+}
+
+int KItemModelBase::expandedParentsCount(int index) const
+{
+    Q_UNUSED(index)

     return 0;
 }
 
     return 0;
 }
 

+QMimeData* KItemModelBase::createMimeData(const KItemSet& indexes) const
+{
+    Q_UNUSED(indexes)
+    return nullptr;
+}
+

 int KItemModelBase::indexForKeyboardSearch(const QString& text, int startFromIndex) const
 {
 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
 {
     return -1;
 }
 
 bool KItemModelBase::supportsDropping(int index) const
 {

-    Q_UNUSED(index);
+    Q_UNUSED(index)

     return false;
 }
 
     return false;
 }
 

-void KItemModelBase::onGroupRoleChanged(const QByteArray& current, const QByteArray& previous)
+QString KItemModelBase::blacklistItemDropEventMimeType() const

 {
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    return QStringLiteral("application/x-dolphin-blacklist-drop");

 }
 
 }
 

-void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous)
+void KItemModelBase::onGroupedSortingChanged(bool current)

 {
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+}
+
+void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems)
+{
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+    Q_UNUSED(resortItems)

 }
 
 void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
 {
 }
 
 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
+{
+    return data(index).value("url").toUrl();

 }
 
 }
 

-#include "kitemmodelbase.moc"
+bool KItemModelBase::isDir(int index) const
+{
+    return data(index).value("isDir").toBool();
+}
+
+QUrl KItemModelBase::directory() const
+{
+    return QUrl();
+}