Fix build with Qt 5.14 RC

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

diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h
index 4afad1f8b811dfb58b09876fa44a5d9d67f4058d..6f57100066029ee9704da3a6b41f2fb028aeae37 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.h
+++ b/src/kitemviews/kitemlistselectionmanager.h
@@ -23,22 +23,26 @@
 #ifndef KITEMLISTSELECTIONMANAGER_H
 #define KITEMLISTSELECTIONMANAGER_H
 
 #ifndef KITEMLISTSELECTIONMANAGER_H
 #define KITEMLISTSELECTIONMANAGER_H
 

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

 
 #include <QObject>
 
 #include <QObject>

-#include <QSet>

 
 class KItemModelBase;
 
 /**
  * @brief Allows to select and deselect items of a KItemListView.
  */
 
 class KItemModelBase;
 
 /**
  * @brief Allows to select and deselect items of a KItemListView.
  */

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

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 

+    enum RangesRemovingBehaviour {
+        DiscardRemovedIndex,
+        AdjustRemovedIndex
+    };
+

 public:
     enum SelectionMode {
         Select,
 public:
     enum SelectionMode {
         Select,


@@ -46,18 +50,25 @@ public:
         Toggle
     };
 
         Toggle
     };
 

-    KItemListSelectionManager(QObject* parent = 0);
-    virtual ~KItemListSelectionManager();
+    explicit KItemListSelectionManager(QObject* parent = nullptr);
+    ~KItemListSelectionManager() override;

 
     void setCurrentItem(int current);
     int currentItem() const;
 
 
     void setCurrentItem(int current);
     int currentItem() const;
 

-    void setSelectedItems(const QSet<int>& items);
-    QSet<int> selectedItems() const;
+    void setSelectedItems(const KItemSet& items);
+    KItemSet selectedItems() const;

     bool isSelected(int index) const;
     bool hasSelection() const;
 
     void setSelected(int index, int count = 1, SelectionMode mode = Select);
     bool isSelected(int index) const;
     bool hasSelection() const;
 
     void setSelected(int index, int count = 1, SelectionMode mode = Select);

+    /**
+     * Equivalent to:
+     * clearSelection();
+     * setSelected(index, count);
+     * but emitting once only selectionChanged signal
+     */
+    void replaceSelection(int index, int count = 1);

     void clearSelection();
 
     void beginAnchoredSelection(int anchor);
     void clearSelection();
 
     void beginAnchoredSelection(int anchor);


@@ -68,7 +79,7 @@ public:
 
 signals:
     void currentChanged(int current, int previous);
 
 signals:
     void currentChanged(int current, int previous);

-    void selectionChanged(const QSet<int>& current, const QSet<int>& previous);
+    void selectionChanged(const KItemSet& current, const KItemSet& previous);

 
 private:
     void setModel(KItemModelBase* model);
 
 private:
     void setModel(KItemModelBase* model);


@@ -81,18 +92,18 @@ private:
      * Helper method for itemsRemoved. Returns the changed index after removing
      * the given range. If the index is part of the range, -1 will be returned.
      */
      * Helper method for itemsRemoved. Returns the changed index after removing
      * the given range. If the index is part of the range, -1 will be returned.
      */

-    int indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges) const;
+    int indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges, const RangesRemovingBehaviour behaviour) const;

 
 private:
     int m_currentItem;
     int m_anchorItem;
 
 private:
     int m_currentItem;
     int m_anchorItem;

-    QSet<int> m_selectedItems;
+    KItemSet m_selectedItems;

     bool m_isAnchoredSelectionActive;
 
     KItemModelBase* m_model;
 
     friend class KItemListController; // Calls setModel()
     bool m_isAnchoredSelectionActive;
 
     KItemModelBase* m_model;
 
     friend class KItemListController; // Calls setModel()

-    friend class KItemListView;       // Calls itemsInserted() and itemsRemoved()
+    friend class KItemListView;       // Calls itemsInserted(), itemsRemoved() and itemsMoved()

     friend class KItemListSelectionManagerTest;
 };
 
     friend class KItemListSelectionManagerTest;
 };