Merge branch 'Applications/16.04'

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

diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h
index 129524b31d42e44ed0153b5b65fc2cb2d602c1f5..bd5ca1d652cfb8f7b9bad39704f9d03395a08887 100644 (file)
--- a/src/kitemviews/kitemmodelbase.h
+++ b/src/kitemviews/kitemmodelbase.h
@@ -23,25 +23,17 @@
 #ifndef KITEMMODELBASE_H
 #define KITEMMODELBASE_H
 
 #ifndef KITEMMODELBASE_H
 #define KITEMMODELBASE_H
 

-#include <libdolphin_export.h>
+#include "dolphin_export.h"
+
+#include <kitemviews/kitemrange.h>
+#include <kitemviews/kitemset.h>

 
 #include <QHash>
 #include <QObject>
 
 #include <QHash>
 #include <QObject>

-#include <QSet>

 #include <QVariant>
 
 class QMimeData;
 
 #include <QVariant>
 
 class QMimeData;
 

-struct KItemRange
-{
-    KItemRange(int index = 0, int count = 0);
-    int index;
-    int count;
-
-    bool operator == (const KItemRange& other) const;
-};
-typedef QList<KItemRange> KItemRangeList;
-

 /**
  * @brief Base class for model implementations used by KItemListView and KItemListController.
  *
 /**
  * @brief Base class for model implementations used by KItemListView and KItemListController.
  *


@@ -57,13 +49,13 @@ typedef QList<KItemRange> KItemRangeList;
  * Also optionally it is possible to provide a tree of items by implementing the methods
  * setExpanded(), isExpanded(), isExpandable() and expandedParentsCount().
  */
  * Also optionally it is possible to provide a tree of items by implementing the methods
  * setExpanded(), isExpanded(), isExpandable() and expandedParentsCount().
  */

-class LIBDOLPHINPRIVATE_EXPORT KItemModelBase : public QObject
+class DOLPHIN_EXPORT KItemModelBase : public QObject

 {
     Q_OBJECT
 
 public:
     KItemModelBase(QObject* parent = 0);
 {
     Q_OBJECT
 
 public:
     KItemModelBase(QObject* parent = 0);

-    KItemModelBase(const QByteArray& sortRole, QObject* parent = 0);
+    explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = 0);

     virtual ~KItemModelBase();
 
     /** @return The number of items. */
     virtual ~KItemModelBase();
 
     /** @return The number of items. */


@@ -157,7 +149,7 @@ public:
      *         caller of this method. The method must be implemented if dragging of
      *         items should be possible.
      */
      *         caller of this method. The method must be implemented if dragging of
      *         items should be possible.
      */

-    virtual QMimeData* createMimeData(const QSet<int>& indexes) const;
+    virtual QMimeData* createMimeData(const KItemSet& indexes) const;

 
     /**
      * @return Reimplement this to return the index for the first item
 
     /**
      * @return Reimplement this to return the index for the first item


@@ -218,11 +210,20 @@ signals:
      * with the items 5 and 6 then the parameters look like this:
      * - itemRange: has the index 0 and a count of 7.
      * - movedToIndexes: Contains the seven values 5, 6, 2, 3, 4, 0, 1
      * with the items 5 and 6 then the parameters look like this:
      * - itemRange: has the index 0 and a count of 7.
      * - movedToIndexes: Contains the seven values 5, 6, 2, 3, 4, 0, 1

+     *
+     * This signal implies that the groups might have changed. Therefore,
+     * gropusChanged() is not emitted if this signal is emitted.

      */
     void itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes);
 
     void itemsChanged(const KItemRangeList& itemRanges, const QSet<QByteArray>& roles);
 
      */
     void itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes);
 
     void itemsChanged(const KItemRangeList& itemRanges, const QSet<QByteArray>& roles);
 

+    /**
+     * Is emitted if the groups have changed, even though the order of the
+     * items has not been modified.
+     */
+    void groupsChanged();
+

     void groupedSortingChanged(bool current);
     void sortRoleChanged(const QByteArray& current, const QByteArray& previous);
     void sortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous);
     void groupedSortingChanged(bool current);
     void sortRoleChanged(const QByteArray& current, const QByteArray& previous);
     void sortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous);