Merge branch 'master' into frameworks

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

diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp
index fc604e729f9bb54f72ec89f73971f7d0879fe6fd..bf41b1c84bc47a45c5cf08c010734bff2d663131 100644 (file)
--- a/src/kitemviews/kitemmodelbase.cpp
+++ b/src/kitemviews/kitemmodelbase.cpp
@@ -22,28 +22,19 @@
 
 #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_sortRole()
+    m_groupedSorting(false),
+    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_sortRole(sortRole)
+    m_groupedSorting(false),
+    m_sortRole(sortRole),
+    m_sortOrder(Qt::AscendingOrder)

 {
 }
 
 {
 }
 


@@ -58,34 +49,23 @@ bool KItemModelBase::setData(int index, const QHash<QByteArray, QVariant> &value
     return false;
 }
 
     return false;
 }
 

-bool KItemModelBase::supportsGrouping() const
-{
-    return false;
-}
-
-void KItemModelBase::setGroupRole(const QByteArray& role)
+void KItemModelBase::setGroupedSorting(bool grouped)

 {
 {

-    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
+bool KItemModelBase::groupedSorting() const

 {
 {

-    return m_groupRole;
-}
-
-bool KItemModelBase::supportsSorting() const
-{
-    return false;
+    return m_groupedSorting;

 }
 
 void KItemModelBase::setSortRole(const QByteArray& role)
 {
 }
 
 void KItemModelBase::setSortRole(const QByteArray& role)
 {

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

         const QByteArray previous = m_sortRole;
         m_sortRole = role;
         onSortRoleChanged(role, previous);
         const QByteArray previous = m_sortRole;
         m_sortRole = role;
         onSortRoleChanged(role, previous);


@@ -98,21 +78,73 @@ QByteArray KItemModelBase::sortRole() const
     return m_sortRole;
 }
 
     return m_sortRole;
 }
 

+void KItemModelBase::setSortOrder(Qt::SortOrder order)
+{
+    if (order != m_sortOrder) {
+        const Qt::SortOrder previous = m_sortOrder;
+        m_sortOrder = order;
+        onSortOrderChanged(order, previous);
+        emit sortOrderChanged(order, previous);
+    }
+}
+

 QString KItemModelBase::roleDescription(const QByteArray& role) const
 {
     return role;
 }
 
 QString KItemModelBase::roleDescription(const QByteArray& role) const
 {
     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(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;
+}
+
+QMimeData* KItemModelBase::createMimeData(const KItemSet& indexes) const

 {
     Q_UNUSED(indexes);
     return 0;
 }
 
 {
     Q_UNUSED(indexes);
     return 0;
 }
 

-void KItemModelBase::onGroupRoleChanged(const QByteArray& current, const QByteArray& previous)
+int KItemModelBase::indexForKeyboardSearch(const QString& text, int startFromIndex) const
+{
+    Q_UNUSED(text);
+    Q_UNUSED(startFromIndex);
+    return -1;
+}
+
+bool KItemModelBase::supportsDropping(int index) const
+{
+    Q_UNUSED(index);
+    return false;
+}
+
+void KItemModelBase::onGroupedSortingChanged(bool current)

 {
     Q_UNUSED(current);
 {
     Q_UNUSED(current);

-    Q_UNUSED(previous);

 }
 
 void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous)
 }
 
 void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous)


@@ -121,4 +153,9 @@ void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArr
     Q_UNUSED(previous);
 }
 
     Q_UNUSED(previous);
 }
 

-#include "kitemmodelbase.moc"
+void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
+{
+    Q_UNUSED(current);
+    Q_UNUSED(previous);
+}
+