Merge branch 'Applications/18.08'

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

diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index b8a93edacbaeaccf382971dc17d299bcda8c6dc8..2f84a6c2c3f2580ffb9acd0d6e9d255453ce74af 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -24,11 +24,11 @@
 #define KITEMLISTCONTROLLER_H
 
 #include "dolphin_export.h"
 #define KITEMLISTCONTROLLER_H
 
 #include "dolphin_export.h"

-

 #include "kitemset.h"
 
 #include <QObject>
 #include <QPointF>
 #include "kitemset.h"
 
 #include <QObject>
 #include <QPointF>

+

 class QTimer;
 class KItemModelBase;
 class KItemListKeyboardSearchManager;
 class QTimer;
 class KItemModelBase;
 class KItemListKeyboardSearchManager;


@@ -59,7 +59,6 @@ class QTransform;
 class DOLPHIN_EXPORT KItemListController : public QObject
 {
     Q_OBJECT
 class DOLPHIN_EXPORT KItemListController : public QObject
 {
     Q_OBJECT

-    Q_ENUMS(SelectionBehavior)

     Q_PROPERTY(KItemModelBase* model READ model WRITE setModel)
     Q_PROPERTY(KItemListView *view READ view WRITE setView)
     Q_PROPERTY(SelectionBehavior selectionBehavior READ selectionBehavior WRITE setSelectionBehavior)
     Q_PROPERTY(KItemModelBase* model READ model WRITE setModel)
     Q_PROPERTY(KItemListView *view READ view WRITE setView)
     Q_PROPERTY(SelectionBehavior selectionBehavior READ selectionBehavior WRITE setSelectionBehavior)


@@ -72,6 +71,7 @@ public:
         SingleSelection,
         MultiSelection
     };
         SingleSelection,
         MultiSelection
     };

+    Q_ENUM(SelectionBehavior)

 
     enum AutoActivationBehavior {
         ActivationAndExpansion,
 
     enum AutoActivationBehavior {
         ActivationAndExpansion,


@@ -88,8 +88,8 @@ public:
      * @param view   View of the controller. The ownership is passed to the controller.
      * @param parent Optional parent object.
      */
      * @param view   View of the controller. The ownership is passed to the controller.
      * @param parent Optional parent object.
      */

-    KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = 0);
-    virtual ~KItemListController();
+    KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = nullptr);
+    ~KItemListController() override;

 
     void setModel(KItemModelBase* model);
     KItemModelBase* model() const;
 
     void setModel(KItemModelBase* model);
     KItemModelBase* model() const;


@@ -108,6 +108,8 @@ public:
     void setMouseDoubleClickAction(MouseDoubleClickAction action);
     MouseDoubleClickAction mouseDoubleClickAction() const;
 
     void setMouseDoubleClickAction(MouseDoubleClickAction action);
     MouseDoubleClickAction mouseDoubleClickAction() const;
 

+    int indexCloseToMousePressedPosition() const;
+

     /**
      * Sets the delay in milliseconds when dragging an object above an item
      * until the item gets activated automatically. A value of -1 indicates
     /**
      * Sets the delay in milliseconds when dragging an object above an item
      * until the item gets activated automatically. A value of -1 indicates


@@ -237,6 +239,8 @@ signals:
     void modelChanged(KItemModelBase* current, KItemModelBase* previous);
     void viewChanged(KItemListView* current, KItemListView* previous);
 
     void modelChanged(KItemModelBase* current, KItemModelBase* previous);
     void viewChanged(KItemListView* current, KItemListView* previous);
 

+    void selectedItemTextPressed(int index);
+

 private slots:
     void slotViewScrollOffsetChanged(qreal current, qreal previous);
 
 private slots:
     void slotViewScrollOffsetChanged(qreal current, qreal previous);